From b6e03c7afbdb70b9ee4f03b8a85325c8666fce9f Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Tue, 19 Dec 2023 20:58:15 +0800 Subject: [PATCH] Vue Polling - Code sycn with fixes from Shipping Portal (dillon/51-vue-polling-experimental-1) --- app/Classes/General/Helper.php | 9 +++++++++ .../Processors/ListBookingsJobProcessor.php | 13 ++----------- .../Processors/ListDocumentsJobProcessor.php | 13 ++----------- .../Processors/ListTransactionsJobProcessor.php | 13 ++----------- 4 files changed, 15 insertions(+), 33 deletions(-) diff --git a/app/Classes/General/Helper.php b/app/Classes/General/Helper.php index 315f0a2c..45c72f53 100644 --- a/app/Classes/General/Helper.php +++ b/app/Classes/General/Helper.php @@ -2,6 +2,7 @@ namespace App\Classes\General; +use Illuminate\Http\Resources\Json\ResourceCollection; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; @@ -57,4 +58,12 @@ class Helper return $json !== null ? collect(json_decode($json))->toArray() : []; } + /** + * @param ResourceCollection $collection + * @return array + */ + static function collectionResponse(ResourceCollection $collection){ + return json_decode($collection->response()->getContent(), true); + } + } diff --git a/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php b/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php index 79345634..6ded2977 100644 --- a/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php +++ b/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php @@ -5,6 +5,7 @@ namespace App\Classes\Modules\Bookings\Processors; use App\Classes\Modules\Bookings\Services\ListsBookings; use App\Classes\Modules\Jobs\Services\CreatesJobResult; use App\Classes\Exceptions\MalformedRequestException; +use App\Classes\General\Helper; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Log; use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject; @@ -44,7 +45,7 @@ class ListBookingsJobProcessor } //cief todo: remove comments - $result = $this->collectionResponse(BookingResource::collection($query)); + $result = Helper::collectionResponse(BookingResource::collection($query)); // $result = new JobBookingCollectionResponse($query, $listGenericJobObject->getuserInfo()); // $result = $this->collectionResponse(new BookingResourceCollection(BookingResource::collection($query), $listGenericJobObject->getuserInfo())); @@ -53,14 +54,4 @@ class ListBookingsJobProcessor return $create; } - - - /** - * @param ResourceCollection $collection - * @return JsonResponse - */ - public function collectionResponse(ResourceCollection $collection){ - return json_decode($collection->response()->getContent(), true); - } - } diff --git a/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php b/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php index 10740950..eb7cf1c4 100644 --- a/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php +++ b/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php @@ -5,6 +5,7 @@ namespace App\Classes\Modules\Documents\Processors; use App\Classes\Modules\Documents\Services\ListsDocuments; use App\Classes\Modules\Jobs\Services\CreatesJobResult; use App\Classes\Exceptions\MalformedRequestException; +use App\Classes\General\Helper; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Log; use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject; @@ -44,20 +45,10 @@ class ListDocumentsJobProcessor $item['userInfo'] = $listGenericJobObject->getUserInfo(); } - $result = $this->collectionResponse(DocumentResource::collection($query)); + $result = Helper::collectionResponse(DocumentResource::collection($query)); $create = $this->createsJobResult->execute($listGenericJobObject, json_encode($result)); return $create; } - - - /** - * @param ResourceCollection $collection - * @return JsonResponse - */ - public function collectionResponse(ResourceCollection $collection){ - return json_decode($collection->response()->getContent(), true); - } - } diff --git a/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php b/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php index 3b09eebb..36671c89 100644 --- a/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php @@ -5,6 +5,7 @@ namespace App\Classes\Modules\Transactions\Processors; use App\Classes\Modules\Transactions\Services\ListsTransactions; use App\Classes\Modules\Jobs\Services\CreatesJobResult; use App\Classes\Exceptions\MalformedRequestException; +use App\Classes\General\Helper; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Log; use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject; @@ -40,20 +41,10 @@ class ListTransactionsJobProcessor $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]); - $result = $this->collectionResponse(TransactionResource::collection($query)); + $result = Helper::collectionResponse(TransactionResource::collection($query)); $create = $this->createsJobResult->execute($listGenericJobObject, json_encode($result)); return $create; } - - - /** - * @param ResourceCollection $collection - * @return JsonResponse - */ - public function collectionResponse(ResourceCollection $collection){ - return json_decode($collection->response()->getContent(), true); - } - }