From c8cdc5ff7862cd1ecf59c5fd11368eba8faa5fa6 Mon Sep 17 00:00:00 2001
From: Martin Kiragu <sirmartins6@gmail.com>
Date: Fri, 26 May 2023 16:56:21 +0300
Subject: [PATCH] update unclaumed list query and response

---
 .../ControllersLogic/ListPackingListsLogic.php | 18 +++++++++++++++---
 app/Transformers/PackageListTransformer.php    | 14 ++++++++------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php
index b9e3142d..2b2e30a8 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php
@@ -8,9 +8,11 @@ use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanListPackingLists;
 use App\Http\Resources\PackingListNullOrderResource;
 use App\Http\Resources\PackingListResource;
+use App\Transformers\PackageListTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Spatie\Fractalistic\ArraySerializer;
 
 class ListPackingListsLogic extends AbstractControllerLogic
 {
@@ -18,7 +20,8 @@ class ListPackingListsLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Retrieved PackingLists',
             'message' => 'You have successfully retrieved a list of PackingLists'
@@ -48,13 +51,22 @@ class ListPackingListsLogic extends AbstractControllerLogic
      * @return JsonResponse
      * @throws ErrorException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $this->canListPackingLists->passes();
 
         $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($request->input('filters')));
 
-        return $this->collectionResponse(PackingListResource::collection($query));
+        return fractal()
+            ->parseIncludes(['transport', 'packages'])
+            ->collection($query, new PackageListTransformer(), "data")
+            ->serializeWith(new ArraySerializer())
+            ->respond(200, [], JSON_PRETTY_PRINT);
+
+
+        //return $this->collectionResponse(PackingListResource::collection($query));
+
+
     }
 
 }
diff --git a/app/Transformers/PackageListTransformer.php b/app/Transformers/PackageListTransformer.php
index 058f954f..52fb4650 100644
--- a/app/Transformers/PackageListTransformer.php
+++ b/app/Transformers/PackageListTransformer.php
@@ -17,12 +17,10 @@ class PackageListTransformer extends TransformerAbstract
      *
      * @var array
      */
-    protected $defaultIncludes = [
+    protected array $defaultIncludes = [
         'transport',
-        'receive_packing_list',
         'packages',
-        'shipping_transaction',
-        'suspended_invoice'
+
     ];
 
     /**
@@ -30,8 +28,12 @@ class PackageListTransformer extends TransformerAbstract
      *
      * @var array
      */
-    protected $availableIncludes = [
-        'order'
+    protected array $availableIncludes = [
+        'order',
+        'receive_packing_list',
+        'shipping_transaction',
+        'suspended_invoice'
+
     ];
 
     /**