Merge remote-tracking branch 'origin/staging' into origin/production

Modules/Client/Http/Controllers/Api/CorporateMemberController.php

@@ -215,6 +215,7 @@ class CorporateMemberController extends Controller
                     'requestLogMedicalPlans:request_log_daily_monitoring_id,plan,type'
                 ],
                 'service:code,name',
+                'files',
             ])
             ->find($request_log_id, ['id', 'submission_date', 'discharge_date', 'member_id', 'service_code', 'organization_id']);
 

Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php

@@ -15,6 +15,33 @@ class DataServiceMonitoring extends JsonResource
      */
     public function toArray($request)
     {
+        $files = [];
+        $filesFinalLogResult = [];
+        $filesFinalLogDiagnosis = [];
+        $filesFinalLogKondisi = [];
+        if (count($this->files)>0){
+            foreach ($this->files as $key => $value) {
+                if($value->type == 'final-log-result'){
+                    array_push($filesFinalLogResult, $value);
+                };
+
+                if($value->type == 'final-log-diagnosis'){
+                    array_push($filesFinalLogDiagnosis, $value);
+                }
+
+                if($value->type == 'final-log-kondisi'){
+                    array_push($filesFinalLogKondisi, $value);
+                }
+            }
+
+            $files = [
+                'result' => $filesFinalLogResult,
+                'diagnosis' => $filesFinalLogDiagnosis,
+                'kondisi' => $filesFinalLogKondisi,
+
+            ];
+        }
+
         return [
             'companyName' => $this->member->currentCorporate->name ?? null,
             'serviceCode' => $this->service_code ?? null,
@@ -24,6 +51,7 @@ class DataServiceMonitoring extends JsonResource
             'phoneNumber' => $this->person->phone ?? null,
             'email' => $this->member->email ?? ($this->member->person->email ?? null),
             'serviceName' => $this->service->name ?? ($this->service_code ?? null),
+            'files' => $files,
             'benefits' => collect($this->requestLogBenefits)->map(function ($requestLogBenefit) {
                 return [
                     'amountIncurred' => $requestLogBenefit->amount_incurred,

Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php

@@ -324,10 +324,16 @@ class RequestLogController extends Controller
         ];
         $validator = Validator::make($request->all(), [
             'request_logs_id' => 'required',
-            'discharge_date' => 'required'
+            'discharge_date' => 'required',
+            'result_files.*' => 'max:10000',
+            'diagnosa_files.*' => 'max:10000',
+            'kondisi_files.*' => 'max:10000',
         ], [
             'request_logs_id.required' => trans('Validation.required',['attribute' => 'Request Logs ID']),
-            'discharge_date.required' => trans('Validation.required',['attribute' => 'Discharge Date'])
+            'discharge_date.required' => trans('Validation.required',['attribute' => 'Discharge Date']),
+            'result_files.*.max' => trans('Validation.max.file', ['attribute' => 'Result Files', 'max' => '10 MB' ]),
+            'diagnosa_files.*.max' => trans('Validation.max.file', ['attribute' => 'Diagnosis Files', 'max' => '10 MB' ]),
+            'kondisi_files.*.max' => trans('Validation.max.file', ['attribute' => 'Condition Files', 'max' => '10 MB' ]),
         ]);
         if ($validator->fails())
         {

Modules/Internal/Transformers/RequestLogResource.php

@@ -25,6 +25,7 @@ class RequestLogResource extends JsonResource
             'id' => $this->id,
             'code' => $this->code,
             'submission_date' => $this->submission_date,
+            'submission_date_fgl' => $this->approved_final_log_at,
             'member_name' => $this->member->name,
             'status' => $this->status ?? 'unknown',
             'provider' => $provider ? $provider->name : '-',

Modules/Internal/Transformers/RequestLogShowResource.php

@@ -107,6 +107,7 @@ class RequestLogShowResource extends JsonResource
             'principal_name' => $requestLog['member']['principal_id'] ? Helper::principalName($requestLog['member']['principal_id']) : '-',
             'relation_with_principal' => Helper::relationWithPrincipal($requestLog['member']['relation_with_principal']),
             'submission_date' => $requestLog['submission_date'],
+            'approved_final_log_at' => $requestLog['approved_final_log_at'], // submission final log
             'discharge_date' => $requestLog['discharge_date'],
             'service_type' => Helper::serviceName($requestLog['service_code']),
             'claim_method' => $requestLog['payment_type'],