From b727b9d2d2b47ea2486a726fa9174846cb99f327 Mon Sep 17 00:00:00 2001 From: "sosuke.iwabuchi" Date: Fri, 22 Sep 2023 15:28:37 +0900 Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E5=83=8F=E3=82=A2=E3=83=83=E3=83=97?= =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=83=89=E5=85=88=E3=81=AE=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UploadOtherLicenseImagesParam.php | 17 ------------- .../UploadStudentLicenseImagesParam.php | 17 ------------- .../UploadOtherLicenseImagesController.php | 20 +++++++--------- .../UploadOtherLicenseImagesParam.php | 21 ++++++++++++++++ .../UploadStudentLicenseImagesController.php | 16 ++++++------- .../UploadStudentLicenseImagesParam.php | 21 ++++++++++++++++ app/Kintone/Models/Customer.php | 10 -------- app/Kintone/Models/SeasonTicketContract.php | 24 +++++++++++++++++++ routes/api.php | 4 ++-- 9 files changed, 83 insertions(+), 67 deletions(-) delete mode 100644 app/Http/Controllers/Web/Customer/UploadOtherLicenseImagesParam.php delete mode 100644 app/Http/Controllers/Web/Customer/UploadStudentLicenseImagesParam.php rename app/Http/Controllers/Web/{Customer => SeasonTicketContract}/UploadOtherLicenseImagesController.php (62%) create mode 100644 app/Http/Controllers/Web/SeasonTicketContract/UploadOtherLicenseImagesParam.php rename app/Http/Controllers/Web/{Customer => SeasonTicketContract}/UploadStudentLicenseImagesController.php (67%) create mode 100644 app/Http/Controllers/Web/SeasonTicketContract/UploadStudentLicenseImagesParam.php diff --git a/app/Http/Controllers/Web/Customer/UploadOtherLicenseImagesParam.php b/app/Http/Controllers/Web/Customer/UploadOtherLicenseImagesParam.php deleted file mode 100644 index 7650d2a..0000000 --- a/app/Http/Controllers/Web/Customer/UploadOtherLicenseImagesParam.php +++ /dev/null @@ -1,17 +0,0 @@ -images('images'); - } -} diff --git a/app/Http/Controllers/Web/Customer/UploadStudentLicenseImagesParam.php b/app/Http/Controllers/Web/Customer/UploadStudentLicenseImagesParam.php deleted file mode 100644 index 2c8ccef..0000000 --- a/app/Http/Controllers/Web/Customer/UploadStudentLicenseImagesParam.php +++ /dev/null @@ -1,17 +0,0 @@ -images('images'); - } -} diff --git a/app/Http/Controllers/Web/Customer/UploadOtherLicenseImagesController.php b/app/Http/Controllers/Web/SeasonTicketContract/UploadOtherLicenseImagesController.php similarity index 62% rename from app/Http/Controllers/Web/Customer/UploadOtherLicenseImagesController.php rename to app/Http/Controllers/Web/SeasonTicketContract/UploadOtherLicenseImagesController.php index f3bedc3..a68d540 100644 --- a/app/Http/Controllers/Web/Customer/UploadOtherLicenseImagesController.php +++ b/app/Http/Controllers/Web/SeasonTicketContract/UploadOtherLicenseImagesController.php @@ -1,16 +1,15 @@ middleware('auth:sanctum'); @@ -32,10 +30,8 @@ class UploadOtherLicenseImagesController extends WebController { $param = $this->param; - $customer = Customer::getSelf(); - - $access = Customer::getAccess(); - + $access = SeasonTicketContract::getAccess(); + $seasonTicketContract = $access->find($param->seasonTicketContractRecordNo); $data = []; foreach ($param->images as $index => $file) { @@ -46,10 +42,10 @@ class UploadOtherLicenseImagesController extends WebController ]; } - $customer->set(Customer::FIELD_OTHER_LICENSE_IMAGES, $data); - $customer->set(Customer::FIELD_OTHER_LICENSE_IMAGES_UPLOAD_DATETIME, DateUtil::now()); + $seasonTicketContract->set(SeasonTicketContract::FIELD_OTHER_LICENSE_IMAGES, $data); + $seasonTicketContract->set(SeasonTicketContract::FIELD_OTHER_LICENSE_IMAGES_UPLOAD_DATETIME, DateUtil::now()); - $access->update($customer); + $access->update($seasonTicketContract); return $this->successResponse(); } } diff --git a/app/Http/Controllers/Web/SeasonTicketContract/UploadOtherLicenseImagesParam.php b/app/Http/Controllers/Web/SeasonTicketContract/UploadOtherLicenseImagesParam.php new file mode 100644 index 0000000..160003c --- /dev/null +++ b/app/Http/Controllers/Web/SeasonTicketContract/UploadOtherLicenseImagesParam.php @@ -0,0 +1,21 @@ + $this->str(), + ...$this->images('images') + ]; + } +} diff --git a/app/Http/Controllers/Web/Customer/UploadStudentLicenseImagesController.php b/app/Http/Controllers/Web/SeasonTicketContract/UploadStudentLicenseImagesController.php similarity index 67% rename from app/Http/Controllers/Web/Customer/UploadStudentLicenseImagesController.php rename to app/Http/Controllers/Web/SeasonTicketContract/UploadStudentLicenseImagesController.php index 63f749e..f0afe7a 100644 --- a/app/Http/Controllers/Web/Customer/UploadStudentLicenseImagesController.php +++ b/app/Http/Controllers/Web/SeasonTicketContract/UploadStudentLicenseImagesController.php @@ -1,9 +1,9 @@ param; - $customer = Customer::getSelf(); - - $access = Customer::getAccess(); - + $access = SeasonTicketContract::getAccess(); + $seasonTicketContract = $access->find($param->seasonTicketContractRecordNo); $data = []; foreach ($param->images as $index => $file) { @@ -46,10 +44,10 @@ class UploadStudentLicenseImagesController extends WebController ]; } - $customer->set(Customer::FIELD_STUDENT_LICENSE_IMAGES, $data); - $customer->set(Customer::FIELD_STUDENT_LICENSE_IMAGES_UPLOAD_DATETIME, DateUtil::now()); + $seasonTicketContract->set(SeasonTicketContract::FIELD_STUDENT_LICENSE_IMAGES, $data); + $seasonTicketContract->set(SeasonTicketContract::FIELD_STUDENT_LICENSE_IMAGES_UPLOAD_DATETIME, DateUtil::now()); - $access->update($customer); + $access->update($seasonTicketContract); return $this->successResponse(); } } diff --git a/app/Http/Controllers/Web/SeasonTicketContract/UploadStudentLicenseImagesParam.php b/app/Http/Controllers/Web/SeasonTicketContract/UploadStudentLicenseImagesParam.php new file mode 100644 index 0000000..59d434e --- /dev/null +++ b/app/Http/Controllers/Web/SeasonTicketContract/UploadStudentLicenseImagesParam.php @@ -0,0 +1,21 @@ + $this->str(), + ...$this->images('images') + ]; + } +} diff --git a/app/Kintone/Models/Customer.php b/app/Kintone/Models/Customer.php index 948e6c5..d9c635c 100644 --- a/app/Kintone/Models/Customer.php +++ b/app/Kintone/Models/Customer.php @@ -16,10 +16,6 @@ class Customer extends KintoneModel const FIELD_CUSTOMER_NAME_KANA = "顧客名カナ"; const FIELD_EMAIL = "メールアドレス"; const FIELD_PHONE_NUMBER = "電話番号"; - const FIELD_STUDENT_LICENSE_IMAGES = "学生証画像"; - const FIELD_OTHER_LICENSE_IMAGES = "その他証明証画像"; - const FIELD_STUDENT_LICENSE_IMAGES_UPLOAD_DATETIME = "学生証画像更新日時"; - const FIELD_OTHER_LICENSE_IMAGES_UPLOAD_DATETIME = "その他証明証画像更新日時"; protected const FIELDS = [ ...parent::FIELDS, @@ -28,18 +24,12 @@ class Customer extends KintoneModel self::FIELD_CUSTOMER_NAME_KANA => FieldType::SINGLE_LINE_TEXT, self::FIELD_EMAIL => FieldType::LINK, self::FIELD_PHONE_NUMBER => FieldType::LINK, - self::FIELD_STUDENT_LICENSE_IMAGES => FieldType::FILE, - self::FIELD_OTHER_LICENSE_IMAGES => FieldType::FILE, - self::FIELD_STUDENT_LICENSE_IMAGES_UPLOAD_DATETIME => FieldType::DATETIME, - self::FIELD_OTHER_LICENSE_IMAGES_UPLOAD_DATETIME => FieldType::DATETIME, ]; protected const FIELD_NAMES = [ ...parent::FIELD_NAMES, self::FIELD_CUSTOMER_NAME => 'customer_name', self::FIELD_EMAIL => 'email', - self::FIELD_STUDENT_LICENSE_IMAGES_UPLOAD_DATETIME => 'student_license_images_upload_datetime', - self::FIELD_OTHER_LICENSE_IMAGES_UPLOAD_DATETIME => 'other_license_images_upload_datetime', ]; public static function getSelf(): static diff --git a/app/Kintone/Models/SeasonTicketContract.php b/app/Kintone/Models/SeasonTicketContract.php index 1549e7a..43ee421 100644 --- a/app/Kintone/Models/SeasonTicketContract.php +++ b/app/Kintone/Models/SeasonTicketContract.php @@ -2,6 +2,8 @@ namespace App\Kintone\Models; +use LogicException; + /** * アプリ名 車室情報管理 */ @@ -16,6 +18,11 @@ class SeasonTicketContract extends KintoneModel const FIELD_CONTRACT_END_DATE = "解約日"; const FIELD_CONTRACT_AMOUNT = "契約金額"; + const FIELD_STUDENT_LICENSE_IMAGES = "学生証画像"; + const FIELD_OTHER_LICENSE_IMAGES = "障がい者手帳画像"; + const FIELD_STUDENT_LICENSE_IMAGES_UPLOAD_DATETIME = "学生証画像更新日時"; + const FIELD_OTHER_LICENSE_IMAGES_UPLOAD_DATETIME = "障がい者手帳画像更新日時"; + protected const FIELDS = [ ...parent::FIELDS, self::FIELD_CUSTOMER_CODE => FieldType::NUMBER, @@ -24,6 +31,10 @@ class SeasonTicketContract extends KintoneModel self::FIELD_CONTRACT_START_DATE => FieldType::DATE, self::FIELD_CONTRACT_END_DATE => FieldType::DATE, self::FIELD_CONTRACT_AMOUNT => FieldType::NUMBER, + self::FIELD_STUDENT_LICENSE_IMAGES => FieldType::FILE, + self::FIELD_OTHER_LICENSE_IMAGES => FieldType::FILE, + self::FIELD_STUDENT_LICENSE_IMAGES_UPLOAD_DATETIME => FieldType::DATETIME, + self::FIELD_OTHER_LICENSE_IMAGES_UPLOAD_DATETIME => FieldType::DATETIME, ]; protected const FIELD_NAMES = [ @@ -33,5 +44,18 @@ class SeasonTicketContract extends KintoneModel self::FIELD_CONTRACT_START_DATE => 'contract_start_date', self::FIELD_CONTRACT_END_DATE => 'contract_end_date', self::FIELD_CONTRACT_AMOUNT => 'contract_amount', + self::FIELD_STUDENT_LICENSE_IMAGES_UPLOAD_DATETIME => 'student_license_images_upload_datetime', + self::FIELD_OTHER_LICENSE_IMAGES_UPLOAD_DATETIME => 'other_license_images_upload_datetime', ]; + + public function parkingRoom() + { + $key = $this->getStr(self::FIELD_SEASON_TICKET_SEQ_NO); + if (!$key) { + throw new LogicException("モデル初期化不正"); + } + return ParkingRoom::getAccess()->first( + ParkingRoom::getQuery()->where(ParkingRoom::FIELD_SEASON_TICKET_CONTRACT_RECORD_NO, $key) + ); + } } diff --git a/routes/api.php b/routes/api.php index f6fda89..8fdb9df 100644 --- a/routes/api.php +++ b/routes/api.php @@ -25,12 +25,12 @@ RouteHelper::post('/season-ticket-contract/parking-certificate-order', App\Http\ RouteHelper::post('/season-ticket-contract/termination-order', App\Http\Controllers\Web\SeasonTicketContract\TerminationOrderController::class); RouteHelper::get('/season-ticket-contract/termination-order/options', App\Http\Controllers\Web\SeasonTicketContract\TerminationOrderOptionsController::class); RouteHelper::post('/season-ticket-contract/update-vehicle-info-order', App\Http\Controllers\Web\SeasonTicketContract\UpdateVehicleInfoOrderController::class); +RouteHelper::post('/upload/student-license-images', App\Http\Controllers\Web\SeasonTicketContract\UploadStudentLicenseImagesController::class); +RouteHelper::post('/upload/other-license-images', App\Http\Controllers\Web\SeasonTicketContract\UploadOtherLicenseImagesController::class); RouteHelper::get('/faq', App\Http\Controllers\Web\FAQ\FAQsController::class); RouteHelper::get('/faq/genres', App\Http\Controllers\Web\FAQ\FAQGenresController::class); RouteHelper::post('/ask', App\Http\Controllers\Web\FAQ\AskController::class); -RouteHelper::post('/upload/student-license-images', App\Http\Controllers\Web\Customer\UploadStudentLicenseImagesController::class); -RouteHelper::post('/upload/other-license-images', App\Http\Controllers\Web\Customer\UploadOtherLicenseImagesController::class); RouteHelper::post('/email/change/start', App\Http\Controllers\Web\Customer\ChangeEmailStartController::class); RouteHelper::post('/email/change/verify', App\Http\Controllers\Web\Customer\ChangeEmailVerifyController::class);