各証明証画像の有効期限入力 対応

app/Http/Controllers/Web/SeasonTicketContract/UploadOtherLicenseImagesController.php

@@ -44,6 +44,7 @@ class UploadOtherLicenseImagesController extends WebController
 
         $seasonTicketContract->set(SeasonTicketContract::FIELD_OTHER_LICENSE_IMAGES, $data);
         $seasonTicketContract->set(SeasonTicketContract::FIELD_OTHER_LICENSE_IMAGES_UPLOAD_DATETIME, DateUtil::now());
+        $seasonTicketContract->set(SeasonTicketContract::FIELD_OTHER_LICENSE_EXPIRES_DATE, $param->expiresAt);
 
         $access->update($seasonTicketContract);
         return $this->successResponse();

app/Http/Controllers/Web/SeasonTicketContract/UploadOtherLicenseImagesParam.php

@@ -4,10 +4,12 @@ namespace App\Http\Controllers\Web\SeasonTicketContract;
 
 use App\Http\Controllers\Web\BaseParam;
 use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Carbon;
 
 /**
  * @property UploadedFile[] $images
  * @property string $seasonTicketContractRecordNo
+ * @property Carbon expiresAt
  */
 class UploadOtherLicenseImagesParam extends BaseParam
 {
@@ -15,6 +17,7 @@ class UploadOtherLicenseImagesParam extends BaseParam
     {
         return [
             'season_ticket_contract_record_no' => $this->str(),
+            'expires_at' => $this->date(),
             ...$this->images('images')
         ];
     }

app/Http/Controllers/Web/SeasonTicketContract/UploadStudentLicenseImagesController.php

@@ -46,6 +46,7 @@ class UploadStudentLicenseImagesController extends WebController
 
         $seasonTicketContract->set(SeasonTicketContract::FIELD_STUDENT_LICENSE_IMAGES, $data);
         $seasonTicketContract->set(SeasonTicketContract::FIELD_STUDENT_LICENSE_IMAGES_UPLOAD_DATETIME, DateUtil::now());
+        $seasonTicketContract->set(SeasonTicketContract::FIELD_STUDENT_LICENSE_EXPIRES_DATE, $param->expiresAt);
 
         $access->update($seasonTicketContract);
         return $this->successResponse();

app/Http/Controllers/Web/SeasonTicketContract/UploadStudentLicenseImagesParam.php

@@ -4,10 +4,12 @@ namespace App\Http\Controllers\Web\SeasonTicketContract;
 
 use App\Http\Controllers\Web\BaseParam;
 use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Carbon;
 
 /**
- * @property UploadedFile[] $images
- * @property string $seasonTicketContractRecordNo
+ * @property UploadedFile[] images
+ * @property string seasonTicketContractRecordNo
+ * @property Carbon expiresAt
  */
 class UploadStudentLicenseImagesParam extends BaseParam
 {
@@ -15,6 +17,7 @@ class UploadStudentLicenseImagesParam extends BaseParam
     {
         return [
             'season_ticket_contract_record_no' => $this->str(),
+            'expires_at' => $this->date(),
             ...$this->images('images')
         ];
     }

app/Kintone/Models/KintoneModel.php

@@ -401,7 +401,7 @@ abstract class KintoneModel
 
             if ($type === FieldType::DATETIME) {
                 if ($value instanceof Carbon) {
-                    $ret[$columnName] = $value->format('Y/m/d H:i:s');
+                    $ret[$columnName] = $value->format('Y/m/d H:i');
                 } else {
                     $ret[$columnName] = $value;
                 }

app/Kintone/Models/SeasonTicketContract.php

@@ -30,6 +30,8 @@ class SeasonTicketContract extends KintoneModel
     const FIELD_OTHER_LICENSE_IMAGES = "障がい者手帳画像";
     const FIELD_STUDENT_LICENSE_IMAGES_UPLOAD_DATETIME = "学生証画像更新日時";
     const FIELD_OTHER_LICENSE_IMAGES_UPLOAD_DATETIME = "障がい者手帳画像更新日時";
+    const FIELD_STUDENT_LICENSE_EXPIRES_DATE = "学生証有効期限";
+    const FIELD_OTHER_LICENSE_EXPIRES_DATE = "障がい者手帳有効期限";
 
     protected const FIELDS = [
         ...parent::FIELDS,
@@ -46,6 +48,8 @@ class SeasonTicketContract extends KintoneModel
         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,
+        self::FIELD_STUDENT_LICENSE_EXPIRES_DATE => FieldType::DATE,
+        self::FIELD_OTHER_LICENSE_EXPIRES_DATE => FieldType::DATE,
     ];
 
     protected const FIELD_NAMES = [