Merge remote-tracking branch 'origin/master'

app/Http/Controllers/ItemController.php

@@ -145,7 +145,8 @@ class ItemController extends Controller
                         $query->select('id','name','cell_number');
                     }
                 ] );
-            }
+            },
+            'media'
         ] );
 
         return ItemResource::make( $Item );

app/Http/Controllers/TestResultController.php

@@ -167,7 +167,7 @@ class TestResultController extends Controller
 
     public function show($id)
     {
-        $TestResult = TestResult::with('input_values', 'user.medical_center', 'test_type')
+        $TestResult = TestResult::with('input_values', 'user.medical_center', 'test_type', 'media')
             ->select('result', 'verified', 'device_id', 'user_id', 'id', 'test_type_id', 'created_at')
             ->findOrFail($id);
         $options = [];

app/Http/Resources/ItemResource.php

@@ -32,7 +32,7 @@ class ItemResource extends JsonResource
             'package_id' => $this->package_id,
             'package' => PackageResource::make($this->whenLoaded('package')),
             'transfers' => TransferResource::collection($this->whenLoaded('transfers')),
-            'files' => MediaResource::collection($this->media),
+            'files' => MediaResource::collection($this->whenLoaded('media')),
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at
         ];

app/Http/Resources/TestResultResource.php

@@ -33,7 +33,7 @@ class TestResultResource extends JsonResource
             'device_label' => $this->when( $this->device_label , $this->device_label ) ,
             'input_values' => $this->when( $this->input_values , $this->input_values ) ,
             'user' => UserResource::make( $this->whenLoaded( 'user' ) ) ,
-            'files' => MediaResource::collection( $this->media ) ,
+            'files' => MediaResource::collection($this->whenLoaded('media')) ,
             'created_at' => $this->created_at ,
             'updated_at' => $this->updated_at
         ];