From 7b7b24c842dbc695071fd3b4c7b7d8314333a6de Mon Sep 17 00:00:00 2001
From: Tb Fajri <tubagus@sismedika.com>
Date: Fri, 9 Feb 2024 10:09:59 +0700
Subject: [PATCH] update file name

---
 .../Transformers/AlarmCenter/DataServiceMonitoring.php   | 4 ++--
 .../Http/Controllers/Api/DailyMonitoringController.php   | 9 ++++++---
 app/Models/RequestDailyMonitoring.php                    | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php b/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php
index 1feb3adb..639040f8 100644
--- a/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php
+++ b/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php
@@ -124,7 +124,7 @@ class DataServiceMonitoring extends JsonResource
                             if ($document){
                                 foreach($document as $d){
                                     $arr_document[]= [
-                                        'path' => env('APP_URL') . '/storage/lab_result/' . $d->original_name,
+                                        'path' => env('APP_URL') . '/storage/lab_result/' . $d->name . '.' . $d->extension,
                                         'type' => $d->type,
                                         'original_name' => $d->original_name,
                                         'name' => $d->name,
@@ -179,7 +179,7 @@ class DataServiceMonitoring extends JsonResource
                             if ($document){
                                 foreach($document as $d){
                                     $arr_document[]= [
-                                        'path' => env('APP_URL') . '/storage/lab_result/' . $d->original_name,
+                                        'path' => env('APP_URL') . '/storage/lab_result/' . $d->name . '.' . $d->extension,
                                         'type' => $d->type,
                                         'original_name' => $d->original_name,
                                         'name' => $d->name,
diff --git a/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php b/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
index 96b82f24..67a49953 100644
--- a/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
+++ b/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
@@ -312,13 +312,14 @@ class DailyMonitoringController extends Controller
                     $name     = 'labresult-' . uniqid();
                     $extension= $file->getClientOriginalExtension();
                     $fileName = $name . '.' . $extension;
+                    $orignalName = $file->getClientOriginalName();
                     $path = $file->storeAs($this->path_for_store, $fileName);
                     File::create([
                         'fileable_type' => 'App\Models\LaboratoriumResult',
                         'fileable_id'   => $db_response->id,
                         'type'          => 'confirmation-medical-letter',
                         'name'          => $name,
-                        'original_name' => $fileName,
+                        'original_name' => $orignalName,
                         'extension'     => $extension,
                         'path'          => $path,
                     ]);
@@ -330,13 +331,14 @@ class DailyMonitoringController extends Controller
                     $name     = 'labresult-' . uniqid();
                     $extension= $file->getClientOriginalExtension();
                     $fileName = $name . '.' . $extension;
+                    $orignalName = $file->getClientOriginalName();
                     $path = $file->storeAs($this->path_for_store, $fileName);
                     File::create([
                         'fileable_type' => 'App\Models\LaboratoriumResult',
                         'fileable_id'   => $db_response->id,
                         'type'          => 'medical-action-letter',
                         'name'          => $name,
-                        'original_name' => $fileName,
+                        'original_name' => $orignalName,
                         'extension'     => $extension,
                         'path'          => $path,
                     ]);
@@ -348,6 +350,7 @@ class DailyMonitoringController extends Controller
                 foreach ($request->result as $file) {
                     $name     = 'labresult-' . uniqid();
                     $extension= $file->getClientOriginalExtension();
+                    $orignalName = $file->getClientOriginalName();
                     $fileName = $name . '.' . $extension;
                     $path = $file->storeAs($this->path_for_store, $fileName);
                     File::create([
@@ -355,7 +358,7 @@ class DailyMonitoringController extends Controller
                         'fileable_id'   => $db_response->id,
                         'type'          => 'laboratorium-result',
                         'name'          => $name,
-                        'original_name' => $fileName,
+                        'original_name' => $orignalName,
                         'extension'     => $extension,
                         'path'          => $path,
                     ]);
diff --git a/app/Models/RequestDailyMonitoring.php b/app/Models/RequestDailyMonitoring.php
index cb8405aa..97933ea6 100644
--- a/app/Models/RequestDailyMonitoring.php
+++ b/app/Models/RequestDailyMonitoring.php
@@ -87,7 +87,7 @@ class RequestDailyMonitoring extends Model
         foreach ($document as $row) {
             $arr_document[] = [
                 'file_name' => $row->original_name,
-                'path' => env('APP_URL') . '/storage/lab_result/' . $row->original_name,
+                'path' => env('APP_URL') . '/storage/lab_result/' . $row->name .'.'. $row->extension,
                 'type' => $row->type,
             ];
         }