WIP - Order steps & remaining APIs

app/Classes/Modules/ContainerPackingLists/ControllersLogic/CreateContainerPackingListLogic.php

@@ -8,7 +8,7 @@ use App\Classes\Modules\ContainerPackingLists\Services\CreatesContainerPackingLi
 use App\Classes\Modules\ContainerPackingLists\Standards\Rules\CanCreateContainerPackingList;
 use App\Classes\Modules\ContainerPackingLists\DataTransferObjects\ContainerPackingListObject;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Http\Resources\PackingListResource;
+use App\Http\Resources\ContainerPackingListResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -60,7 +60,7 @@ class CreateContainerPackingListLogic extends AbstractControllerLogic
 
         $query = $this->createsContainerPackingList->execute($object);
 
-        return $this->resourceResponse(new PackingListResource($packingList));
+        return $this->resourceResponse(new ContainerPackingListResource($query));
 
     }
 

app/Classes/Modules/ContainerPackingLists/ControllersLogic/FetchContainerPackingListLogic 2.php

@@ -1,66 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\ContainerPackingLists\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\ContainerPackingLists\Services\FetchesContainerPackingList;
-use App\Classes\Modules\ContainerPackingLists\Standards\Rules\CanFetchContainerPackingList;
-use App\Http\Resources\ContainerPackingListResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class FetchContainerPackingListLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved ContainerPackingList',
-            'message' => 'You have successfully retrieved a ContainerPackingList'
-        ];
-    }
-
-    /** @var CanFetchContainerPackingList */
-    private $canFetchContainerPackingList;
-
-    /** @var FetchesContainerPackingList */
-    private $fetchesContainerPackingList;
-
-    /**
-     * FetchContainerPackingListControllersLogic constructor.
-     * @param CanFetchContainerPackingList $canFetchContainerPackingList
-     * @param FetchesContainerPackingList $fetchesContainerPackingList
-     */
-    public function __construct(CanFetchContainerPackingList $canFetchContainerPackingList, FetchesContainerPackingList $fetchesContainerPackingList)
-    {
-        $this->canFetchContainerPackingList = $canFetchContainerPackingList;
-        $this->fetchesContainerPackingList = $fetchesContainerPackingList;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-
-            $this->canFetchContainerPackingList->passes();
-
-            $query = $this->fetchesContainerPackingList->execute(['id' => $request->route('id')]);
-
-            return $this->resourceResponse(new ContainerPackingListResource($query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
-    }
-
-}

app/Classes/Modules/ContainerPackingLists/ControllersLogic/UpdateContainerPackingListLogic.php

@@ -6,7 +6,6 @@ namespace App\Classes\Modules\ContainerPackingLists\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\ContainerPackingLists\Services\UpdatesContainerPackingList;
 use App\Classes\Modules\ContainerPackingLists\Services\FetchesContainerPackingList;
-use App\Classes\Modules\ContainerPackingLists\Services\FetchesDistrict;
 use App\Classes\Modules\ContainerPackingLists\Standards\Rules\CanUpdateContainerPackingList;
 use App\Classes\Modules\ContainerPackingLists\DataTransferObjects\ContainerPackingListObject;
 use App\Http\Resources\ContainerPackingListResource;
@@ -36,22 +35,17 @@ class UpdateContainerPackingListLogic extends AbstractControllerLogic
     /** @var FetchesContainerPackingList */
     private $fetchesContainerPackingList;
 
-    /** @var FetchesDistrict */
-    private $fetchesDistrict;
-
     /**
      * UpdateContainerPackingListLogic constructor.
      * @param CanUpdateContainerPackingList $canUpdateContainerPackingList
      * @param UpdatesContainerPackingList $updatesContainerPackingList
      * @param FetchesContainerPackingList $fetchesContainerPackingList
-     * @param FetchesDistrict $fetchesDistrict
      */
-    public function __construct(CanUpdateContainerPackingList $canUpdateContainerPackingList, UpdatesContainerPackingList $updatesContainerPackingList, FetchesContainerPackingList $fetchesContainerPackingList, FetchesDistrict $fetchesDistrict)
+    public function __construct(CanUpdateContainerPackingList $canUpdateContainerPackingList, UpdatesContainerPackingList $updatesContainerPackingList, FetchesContainerPackingList $fetchesContainerPackingList)
     {
         $this->canUpdateContainerPackingList = $canUpdateContainerPackingList;
         $this->updatesContainerPackingList = $updatesContainerPackingList;
         $this->fetchesContainerPackingList = $fetchesContainerPackingList;
-        $this->fetchesDistrict = $fetchesDistrict;
     }
 
 
@@ -62,24 +56,16 @@ class UpdateContainerPackingListLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
 
-            $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
-            $object = new ContainerPackingListObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
-            //$object = new ContainerPackingListObject($request->input('company_id'), $request->input('street_one'), $request->input('street_two'), $request->input('city'), $request->input('state'), $request->input('post_code'), $request->input('country'), $request->input('default'), $request->input('billing'));
+        $container = $this->fetchesContainerPackingList->execute(['id' => $request->route('id')]);
 
-            $this->canUpdateContainerPackingList->passes($object);
+        $object = new ContainerPackingListObject( $container->packing_list_id , $request->input('container_reference'), $request->input('container_type'), $request->input('seal_reference'));
 
-            $query = $this->fetchesContainerPackingList->execute(['id' => $request->route('id')]);
+        $this->canUpdateContainerPackingList->passes($object);
 
-            $query = $this->updatesContainerPackingList->execute($query, $object);
+        $query = $this->updatesContainerPackingList->execute($container, $object);
 
-            return $this->resourceResponse(new ContainerPackingListResource($query));
-
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->resourceResponse(new ContainerPackingListResource($query));
 
     }
 

app/Classes/Modules/ContainerPackingLists/DataTransferObjects/ContainerPackingListObject.php

@@ -38,7 +38,7 @@ class ContainerPackingListObject implements DataTransferObject
         return $this->containerType;
     }
 
-    public function getSealReference(): int
+    public function getSealReference(): ?string
     {
         return $this->sealReference;
     }

app/Classes/Modules/ContainerPackingLists/Standards/Validators/ContainerPackingListPackageValidation.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\Standards\Validators;
-
-
-use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
-
-class PackingListPackageValidation extends AbstractValidation
-{
-
-
-    /**
-     * @param PackingListObject $object
-     * @return array
-     */
-    protected function data($object): array {
-        return [
-            'packing_list_id' => $object->getPackingListId(),
-            'package_id' => $object->getPackageId()
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function rules(): array {
-        return [
-            'packing_list_id' => 'required',
-            'package_id' => 'required',
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function messages(): array {
-        return [];
-    }
-
-}

app/Classes/Modules/ContainerPackingLists/Standards/Validators/ContainerPackingListValidation 2.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\Standards\Validators;
-
-
-use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
-
-class PackingListValidation extends AbstractValidation
-{
-
-
-    /**
-     * @param PackingListObject $object
-     * @return array
-     */
-    protected function data($object): array {
-        return [
-            'status' => $object->getStatus(),
-            'reference' => $object->getReference()
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function rules(): array {
-        return [
-            'status' => 'required',
-            'reference' => 'required',
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function messages(): array {
-        return [];
-    }
-
-}

app/Classes/Modules/ContainerPackingLists/Standards/Validators/ContainerPackingListValidation.php

@@ -1,23 +1,22 @@
 <?php
 
-namespace App\Classes\Modules\PackingLists\Standards\Validators;
+namespace App\Classes\Modules\ContainerPackingLists\Standards\Validators;
 
 
 use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerPackingListObject;
 
 class ContainerPackingListValidation extends AbstractValidation
 {
 
-
     /**
-     * @param PackingListObject $object
+     * @param ContainerPackingListObject $object
      * @return array
      */
     protected function data($object): array {
         return [
-            'status' => $object->getPackingListId(),
-            'reference' => $object->getContainerReference(),
+            'packing_list_id' => $object->getPackingListId(),
+            'container_reference' => $object->getContainerReference(),
             'container_type' => $object->getContainerType(),
             'seal_reference' => $object->getSealReference(),
         ];
@@ -28,10 +27,8 @@ class ContainerPackingListValidation extends AbstractValidation
      */
     protected function rules(): array {
         return [
-            'status' => 'required',
-            'reference' => 'required',
-            'container_type' => 'required',
-            'seal_reference' => 'required',
+            'packing_list_id' => 'required',
+            'container_reference' => 'required',
         ];
     }
 

app/Classes/Modules/PackageItems/ControllersLogic/CreatePackageItemLogic.php

@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\PackageItems\ControllersLogic;
 
-
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackageItems\Services\CreatesPackageItem;
 use App\Classes\Modules\Orders\Services\FetchesOrder;
@@ -73,7 +73,7 @@ class CreatePackageItemLogic extends AbstractControllerLogic
             $request->input('uom'),
             $request->input('price'),
             $request->input('total'),
-            0);
+            ApprovalStatus::PENDING_SUBMISSION);
 
         $this->canCreatePackageItem->passes($object);
 

app/Classes/Modules/PackageItems/ControllersLogic/UpdatePackageItemLogic.php

@@ -6,7 +6,6 @@ namespace App\Classes\Modules\PackageItems\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackageItems\Services\UpdatesPackageItem;
 use App\Classes\Modules\PackageItems\Services\FetchesPackageItem;
-use App\Classes\Modules\PackageItems\Services\FetchesDistrict;
 use App\Classes\Modules\PackageItems\Standards\Rules\CanUpdatePackageItem;
 use App\Classes\Modules\PackageItems\DataTransferObjects\PackageItemObject;
 use App\Http\Resources\PackageItemResource;
@@ -36,22 +35,17 @@ class UpdatePackageItemLogic extends AbstractControllerLogic
     /** @var FetchesPackageItem */
     private $fetchesPackageItem;
 
-    /** @var FetchesDistrict */
-    private $fetchesDistrict;
-
     /**
      * UpdatePackageItemLogic constructor.
      * @param CanUpdatePackageItem $canUpdatePackageItem
      * @param UpdatesPackageItem $updatesPackageItem
      * @param FetchesPackageItem $fetchesPackageItem
-     * @param FetchesDistrict $fetchesDistrict
      */
-    public function __construct(CanUpdatePackageItem $canUpdatePackageItem, UpdatesPackageItem $updatesPackageItem, FetchesPackageItem $fetchesPackageItem, FetchesDistrict $fetchesDistrict)
+    public function __construct(CanUpdatePackageItem $canUpdatePackageItem, UpdatesPackageItem $updatesPackageItem, FetchesPackageItem $fetchesPackageItem)
     {
         $this->canUpdatePackageItem = $canUpdatePackageItem;
         $this->updatesPackageItem = $updatesPackageItem;
         $this->fetchesPackageItem = $fetchesPackageItem;
-        $this->fetchesDistrict = $fetchesDistrict;
     }
 
 
@@ -62,24 +56,24 @@ class UpdatePackageItemLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
+        $packageItem = $this->fetchesPackageItem->execute(['id' => $request->route('id')]);
 
-            $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
-            $object = new PackageItemObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
-            //$object = new PackageItemObject($request->input('company_id'), $request->input('street_one'), $request->input('street_two'), $request->input('city'), $request->input('state'), $request->input('post_code'), $request->input('country'), $request->input('default'), $request->input('billing'));
+        $object = new PackageItemObject(
+            $packageItem->package_id,
+            $request->input('name'),
+            $packageItem->reference,
+            $request->input('description'),
+            $request->input('quantity'),
+            $request->input('uom'),
+            $request->input('price'),
+            $request->input('total'),
+            $request->input('status'));
 
-            $this->canUpdatePackageItem->passes($object);
+        $this->canUpdatePackageItem->passes($object);
 
-            $query = $this->fetchesPackageItem->execute(['id' => $request->route('id')]);
+        $query = $this->updatesPackageItem->execute($packageItem, $object);
 
-            $query = $this->updatesPackageItem->execute($query, $object);
-
-            return $this->resourceResponse(new PackageItemResource($query));
-
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->resourceResponse(new PackageItemResource($query));
 
     }
 

app/Classes/Modules/Packages/ControllersLogic/CreatePackageLogic.php

@@ -2,7 +2,7 @@
 
 namespace App\Classes\Modules\Packages\ControllersLogic;
 
-
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Packages\Services\CreatesPackage;
 use App\Classes\Modules\Orders\Services\FetchesOrder;
@@ -30,7 +30,7 @@ class CreatePackageLogic extends AbstractControllerLogic
     /** @var CanCreatePackage */
     private $canCreatePackage;
 
-    /** @var FetchesDistrict */
+    /** @var FetchesOrder */
     private $fetchesOrder;
 
     /** @var FetchesCompany */
@@ -42,7 +42,7 @@ class CreatePackageLogic extends AbstractControllerLogic
     /**
      * CreatePackageLogic constructor.
      * @param CanCreatePackage $canCreatePackage
-     * @param FetchesDistrict $fetchesDistrict
+     * @param FetchesOrder $fetchesOrder
      * @param FetchesCompany $fetchesCompany
      * @param CreatesPackage $createsPackage
      */
@@ -76,7 +76,7 @@ class CreatePackageLogic extends AbstractControllerLogic
             $request->input('length'),
             $request->input('weight'),
             $request->input('quantity'),
-            0);
+            ApprovalStatus::PENDING_SUBMISSION);
 
         $this->canCreatePackage->passes($object);
 

app/Classes/Modules/Packages/ControllersLogic/UpdatePackageLogic.php

@@ -6,7 +6,6 @@ namespace App\Classes\Modules\Packages\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Packages\Services\UpdatesPackage;
 use App\Classes\Modules\Packages\Services\FetchesPackage;
-use App\Classes\Modules\Packages\Services\FetchesDistrict;
 use App\Classes\Modules\Packages\Standards\Rules\CanUpdatePackage;
 use App\Classes\Modules\Packages\DataTransferObjects\PackageObject;
 use App\Http\Resources\PackageResource;
@@ -36,22 +35,18 @@ class UpdatePackageLogic extends AbstractControllerLogic
     /** @var FetchesPackage */
     private $fetchesPackage;
 
-    /** @var FetchesDistrict */
-    private $fetchesDistrict;
 
     /**
      * UpdatePackageLogic constructor.
      * @param CanUpdatePackage $canUpdatePackage
      * @param UpdatesPackage $updatesPackage
      * @param FetchesPackage $fetchesPackage
-     * @param FetchesDistrict $fetchesDistrict
      */
-    public function __construct(CanUpdatePackage $canUpdatePackage, UpdatesPackage $updatesPackage, FetchesPackage $fetchesPackage, FetchesDistrict $fetchesDistrict)
+    public function __construct(CanUpdatePackage $canUpdatePackage, UpdatesPackage $updatesPackage, FetchesPackage $fetchesPackage)
     {
         $this->canUpdatePackage = $canUpdatePackage;
         $this->updatesPackage = $updatesPackage;
         $this->fetchesPackage = $fetchesPackage;
-        $this->fetchesDistrict = $fetchesDistrict;
     }
 
 
@@ -62,25 +57,25 @@ class UpdatePackageLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
+        $package = $this->fetchesPackage->execute(['id' => $request->route('id')]);
 
-            $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
-            $object = new PackageObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
-            //$object = new PackageObject($request->input('company_id'), $request->input('street_one'), $request->input('street_two'), $request->input('city'), $request->input('state'), $request->input('post_code'), $request->input('country'), $request->input('default'), $request->input('billing'));
+        $object = new PackageObject(
+            $package->order_id,
+            null,
+            $request->input('type'),
+            $request->input('description'),
+            $request->input('width'),
+            $request->input('height'),
+            $request->input('length'),
+            $request->input('weight'),
+            $request->input('quantity'),
+            $request->input('status'));
 
-            $this->canUpdatePackage->passes($object);
+        $this->canUpdatePackage->passes($object);
 
-            $query = $this->fetchesPackage->execute(['id' => $request->route('id')]);
-
-            $query = $this->updatesPackage->execute($query, $object);
-
-            return $this->resourceResponse(new PackageResource($query));
-
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        $query = $this->updatesPackage->execute($package, $object);
 
+        return $this->resourceResponse(new PackageResource($query));
     }
 
 }

app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php

@@ -45,7 +45,6 @@ class CreatePackingListLogic extends AbstractControllerLogic
     /**
      * CreatePackingListLogic constructor.
      * @param CanCreatePackingList $canCreatePackingList
-     * @param FetchesDistrict $fetchesDistrict
      * @param FetchesCompany $fetchesCompany
      * @param CreatesPackingList $createsPackingList
      */

app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListLogic.php

@@ -6,7 +6,6 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\UpdatesPackingList;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\Modules\PackingLists\Services\FetchesDistrict;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanUpdatePackingList;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
 use App\Http\Resources\PackingListResource;
@@ -36,25 +35,19 @@ class UpdatePackingListLogic extends AbstractControllerLogic
     /** @var FetchesPackingList */
     private $fetchesPackingList;
 
-    /** @var FetchesDistrict */
-    private $fetchesDistrict;
-
     /**
      * UpdatePackingListLogic constructor.
      * @param CanUpdatePackingList $canUpdatePackingList
      * @param UpdatesPackingList $updatesPackingList
      * @param FetchesPackingList $fetchesPackingList
-     * @param FetchesDistrict $fetchesDistrict
      */
-    public function __construct(CanUpdatePackingList $canUpdatePackingList, UpdatesPackingList $updatesPackingList, FetchesPackingList $fetchesPackingList, FetchesDistrict $fetchesDistrict)
+    public function __construct(CanUpdatePackingList $canUpdatePackingList, UpdatesPackingList $updatesPackingList, FetchesPackingList $fetchesPackingList)
     {
         $this->canUpdatePackingList = $canUpdatePackingList;
         $this->updatesPackingList = $updatesPackingList;
         $this->fetchesPackingList = $fetchesPackingList;
-        $this->fetchesDistrict = $fetchesDistrict;
     }
 
-
     /**
      * @param Request $request
      * @return JsonResponse
@@ -62,25 +55,15 @@ class UpdatePackingListLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
+        $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-            $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
-            $object = new PackingListObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
-            //$object = new PackingListObject($request->input('company_id'), $request->input('street_one'), $request->input('street_two'), $request->input('city'), $request->input('state'), $request->input('post_code'), $request->input('country'), $request->input('default'), $request->input('billing'));
+        $object = new PackingListObject($packingList->reference, $request->input('status'));
 
-            $this->canUpdatePackingList->passes($object);
+        $this->canUpdatePackingList->passes($object);
 
-            $query = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
-
-            $query = $this->updatesPackingList->execute($query, $object);
-
-            return $this->resourceResponse(new PackingListResource($query));
-
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        $query = $this->updatesPackingList->execute($packingList, $object);
 
+        return $this->resourceResponse(new PackingListResource($query));
     }
 
 }

app/Classes/Modules/PackingLists/Services/UpdatesPackingList.php

@@ -17,15 +17,8 @@ class UpdatesPackingList extends AbstractUpdateRecord
      */
     public function execute(PackingList $model, PackingListObject $object) {
 
-        //$model->company_id = $object->getCompanyId();
-        $model->street_one = $object->getStreetOne();
-        $model->street_two = $object->getStreetTwo();
-        $model->district_id = $object->getDistrictId();
-        $model->state_id = $object->getStateId();
-        $model->postcode = $object->getPostCode();
-        $model->country_id = $object->getCountryId();
-        //$model->default = $object->getDefault();
-        //$model->billing = $object->getBilling();
+        $model->reference = $object->getReference();
+        $model->status = $object->getStatus();
 
         return $this->handler($model);
 

app/Classes/Modules/Remarks/ControllersLogic/UpdateRemarkLogic.php

@@ -39,7 +39,6 @@ class UpdateRemarkLogic extends AbstractControllerLogic
      * @param CanUpdateRemark $canUpdateRemark
      * @param UpdatesRemark $updatesRemark
      * @param FetchesRemark $fetchesRemark
-     * @param FetchesDistrict $fetchesDistrict
      */
     public function __construct(CanUpdateRemark $canUpdateRemark, UpdatesRemark $updatesRemark, FetchesRemark $fetchesRemark)
     {

app/Classes/Modules/Schedules/ControllersLogic/UpdateScheduleLogic.php

@@ -41,7 +41,6 @@ class UpdateScheduleLogic extends AbstractControllerLogic
      * @param CanUpdateSchedule $canUpdateSchedule
      * @param UpdatesSchedule $updatesSchedule
      * @param FetchesSchedule $fetchesSchedule
-     * @param FetchesDistrict $fetchesDistrict
      */
     public function __construct(CanUpdateSchedule $canUpdateSchedule, UpdatesSchedule $updatesSchedule, FetchesSchedule $fetchesSchedule)
     {

app/Classes/Modules/Transports/ControllersLogic/CreateTransportLogic.php

@@ -5,7 +5,6 @@ namespace App\Classes\Modules\Transports\ControllersLogic;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transports\Services\CreatesTransport;
-use App\Classes\Modules\Transports\Services\FetchesDistrict;
 use App\Classes\Modules\Transports\Standards\Rules\CanCreateTransport;
 use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
 use App\Classes\Modules\ContainerPackingLists\Services\FetchesContainerPackingList;

app/Classes/Modules/Transports/DataTransferObjects/TransportObject.php

@@ -28,14 +28,14 @@ class TransportObject implements DataTransferObject
 
     /**
      * TransportObject constructor.
-     * @param string $type
+     * @param int $type
      * @param null|string $courier
-     * @param int $tracking_number
+     * @param string $tracking_number
      * @param int $dispatch_date
      * @param int $drop_date
      * @param int $status
      */
-    public function __construct(string $type, string $courier, int $tracking_number, ?string $dispatch_date, ?string $drop_date, int $status)
+    public function __construct(int $type, string $courier, string $tracking_number, ?string $dispatch_date, ?string $drop_date, int $status)
     {
         $this->type = $type;
         $this->courier = $courier;
@@ -46,9 +46,9 @@ class TransportObject implements DataTransferObject
     }
 
     /**
-     * @return string
+     * @return int
      */
-    public function getType(): string
+    public function getType(): int
     {
         return $this->type;
     }
@@ -64,7 +64,7 @@ class TransportObject implements DataTransferObject
     /**
      * @return int
      */
-    public function getTrackingNumber(): int
+    public function getTrackingNumber(): string
     {
         return $this->tracking_number;
     }

app/Http/Resources/ContainerPackingListResource.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ContainerPackingListResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'packing_list_id' => $this->packing_list_id,
+            'container_reference' => $this->container_reference,
+            'container_type' => $this->container_type,
+            'seal_reference' => $this->seal_reference,
+        ];
+    }
+}

resources/views/swagger/json.blade.php

@@ -210,25 +210,18 @@
         "parameters": [
           {
             "name": "id",
-            "in": "query",
-            "description": "transport id",
+            "in": "path",
+            "description": "Packing list id",
             "required": true,
             "type": "integer"
           },
           {
-            "name": "commenter_id",
+            "name": "status",
             "in": "query",
-            "description": "Commenter id",
+            "description": "Status",
             "required": true,
             "type": "integer"
           },
-          {
-            "name": "content",
-            "in": "query",
-            "description": "Content",
-            "required": true,
-            "type": "string"
-          }
         ],
         "responses": {
           "200": {
@@ -331,7 +324,7 @@
             "in": "query",
             "description": "Container type",
             "required": true,
-            "type": "string"
+            "type": "integer"
           },
           {
             "name": "seal_reference",
@@ -422,7 +415,7 @@
         "produces": [
           "application/json"
         ],
-        "operationId": "showPacking",
+        "operationId": "showContainerPacking",
         "summary": "Show container packing list",
         "description": "",
         "parameters": [
@@ -467,7 +460,7 @@
         "produces": [
           "application/json"
         ],
-        "operationId": "updatePacking",
+        "operationId": "updateContainerPacking",
         "summary": "Update packing",
         "description": "",
         "parameters": [
@@ -497,7 +490,7 @@
             "in": "query",
             "description": "Container type",
             "required": true,
-            "type": "string"
+            "type": "integer"
           },
           {
             "name": "seal_reference",
@@ -1088,6 +1081,13 @@
             "required": true,
             "type": "integer"
           },
+          {
+            "name": "status",
+            "in": "query",
+            "description": "Status",
+            "required": true,
+            "type": "integer"
+          },
         ],
         "responses": {
           "200": {
@@ -1181,7 +1181,7 @@
           {
             "name": "name",
             "in": "query",
-            "description": "Courier Provider Name",
+            "description": "Name",
             "required": true,
             "type": "string"
           },
@@ -1359,19 +1359,54 @@
             "type": "string"
           },
           {
-            "name": "commenter_id",
+            "name": "name",
             "in": "query",
-            "description": "Commenter id",
+            "description": "Name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "description",
+            "in": "query",
+            "description": "Description",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "quantity",
+            "in": "query",
+            "description": "Quantity",
+            "required": true,
+            "type": "number"
+          },
+          {
+            "name": "uom",
+            "in": "query",
+            "description": "UOM",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "price",
+            "in": "query",
+            "description": "Price",
+            "required": true,
+            "type": "number"
+          },
+          {
+            "name": "total",
+            "in": "query",
+            "description": "Total",
+            "required": true,
+            "type": "number"
+          },
+          {
+            "name": "status",
+            "in": "query",
+            "description": "Status",
             "required": true,
             "type": "integer"
           },
-          {
-            "name": "comment",
-            "in": "query",
-            "description": "Comment",
-            "required": true,
-            "type": "string"
-          }
         ],
         "responses": {
           "200": {
@@ -1661,7 +1696,7 @@
             "in": "query",
             "description": "Status",
             "required": true,
-            "type": "string"
+            "type": "integer"
           },
         ],
         "responses": {
@@ -1756,14 +1791,14 @@
           {
             "name": "etd",
             "in": "query",
-            "description": "Estimate time deliver",
+            "description": "Estimate time deliver (e.g. 2021-09-01)",
             "required": true,
             "type": "string"
           },
           {
             "name": "eta",
             "in": "query",
-            "description": "Estimate time arrival",
+            "description": "Estimate time arrival (e.g. 2021-09-01)",
             "required": true,
             "type": "string"
           }
@@ -1908,14 +1943,14 @@
           {
             "name": "etd",
             "in": "query",
-            "description": "Estimate time deliver",
+            "description": "Estimate time deliver (e.g. 2021-09-01)",
             "required": true,
             "type": "string"
           },
           {
             "name": "eta",
             "in": "query",
-            "description": "Estimate time arrival",
+            "description": "Estimate time arrival (e.g. 2021-09-01)",
             "required": true,
             "type": "string"
           },
@@ -1924,7 +1959,7 @@
             "in": "query",
             "description": "Status",
             "required": true,
-            "type": "string"
+            "type": "integer"
           }
         ],
         "responses": {