From 67e104d7e7832ed17feb81bab4cf6df3e5ee74e5 Mon Sep 17 00:00:00 2001 From: Fairuz Date: Fri, 23 Jul 2021 01:25:48 +0800 Subject: [PATCH] WIP - Order steps & remaining APIs --- .../ControllersLogic/CreatePackageLogic.php | 46 +++++++------- .../ControllersLogic/DeletePackageLogic.php | 48 +++++++-------- .../ControllersLogic/FetchPackageLogic.php | 40 ++++++------- .../ControllersLogic/ListPackagesLogic.php | 40 ++++++------- .../ControllersLogic/UpdatePackageLogic.php | 60 +++++++++---------- .../DataTransferObjects/PackageObject.php | 6 +- .../Packages/Services/CreatesPackage.php | 16 ++--- .../Packages/Services/DeletesPackage.php | 10 ++-- .../Packages/Services/FetchesPackage.php | 14 ++--- .../Packages/Services/ListsPackages.php | 14 ++--- .../Packages/Services/UpdatesPackage.php | 14 ++--- .../Standards/Rules/CanCreatePackage.php | 26 ++++---- .../Standards/Rules/CanDeletePackage.php | 10 ++-- .../Standards/Rules/CanFetchPackage.php | 10 ++-- .../Standards/Rules/CanListPackages.php | 10 ++-- .../Standards/Rules/CanUpdatePackage.php | 26 ++++---- .../Validators/PackageValidation.php | 8 +-- .../CreatePackingListLogic.php | 46 +++++++------- .../DeletePackingListLogic.php | 48 +++++++-------- .../FetchPackingListLogic.php | 40 ++++++------- .../ListPackingListsLogic.php | 40 ++++++------- .../UpdatePackingListLogic.php | 60 +++++++++---------- .../DataTransferObjects/PackingListObject.php | 6 +- .../Services/CreatesPackingList.php | 16 ++--- .../Services/DeletesPackingList.php | 10 ++-- .../Services/FetchesPackingList.php | 14 ++--- .../Services/ListsPackingLists.php | 14 ++--- .../Services/UpdatesPackingList.php | 14 ++--- .../Standards/Rules/CanCreatePackingList.php | 26 ++++---- .../Standards/Rules/CanDeletePackingList.php | 10 ++-- .../Standards/Rules/CanFetchPackingList.php | 10 ++-- .../Standards/Rules/CanListPackingLists.php | 10 ++-- .../Standards/Rules/CanUpdatePackingList.php | 26 ++++---- .../Validators/PackingListValidation.php | 8 +-- 34 files changed, 398 insertions(+), 398 deletions(-) diff --git a/app/Classes/Modules/Packages/ControllersLogic/CreatePackageLogic.php b/app/Classes/Modules/Packages/ControllersLogic/CreatePackageLogic.php index 4eb7665e..f3492f4f 100644 --- a/app/Classes/Modules/Packages/ControllersLogic/CreatePackageLogic.php +++ b/app/Classes/Modules/Packages/ControllersLogic/CreatePackageLogic.php @@ -1,20 +1,20 @@ 'Created Remark', - 'message' => 'You have successfully created a new Remark' + 'title' => 'Created Package', + 'message' => 'You have successfully created a new Package' ]; } - /** @var CanCreateRemark */ - private $canCreateRemark; + /** @var CanCreatePackage */ + private $canCreatePackage; /** @var FetchesDistrict */ private $fetchesDistrict; @@ -36,22 +36,22 @@ class CreateRemarkLogic extends AbstractControllerLogic /** @var FetchesCompany */ private $fetchesCompany; - /** @var CreatesRemark */ - private $createsRemark; + /** @var CreatesPackage */ + private $createsPackage; /** - * CreateRemarkLogic constructor. - * @param CanCreateRemark $canCreateRemark + * CreatePackageLogic constructor. + * @param CanCreatePackage $canCreatePackage * @param FetchesDistrict $fetchesDistrict * @param FetchesCompany $fetchesCompany - * @param CreatesRemark $createsRemark + * @param CreatesPackage $createsPackage */ - public function __construct(CanCreateRemark $canCreateRemark, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesRemark $createsRemark) + public function __construct(CanCreatePackage $canCreatePackage, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesPackage $createsPackage) { - $this->canCreateRemark = $canCreateRemark; + $this->canCreatePackage = $canCreatePackage; $this->fetchesDistrict = $fetchesDistrict; $this->fetchesCompany = $fetchesCompany; - $this->createsRemark = $createsRemark; + $this->createsPackage = $createsPackage; } /** @@ -66,13 +66,13 @@ class CreateRemarkLogic extends AbstractControllerLogic $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]); - $object = new RemarkObject($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('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code')); - $this->canCreateRemark->passes($object); + $this->canCreatePackage->passes($object); - $query = $this->createsRemark->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object); + $query = $this->createsPackage->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object); - return $this->resourceResponse(new RemarkResource($query)); + return $this->resourceResponse(new PackageResource($query)); } diff --git a/app/Classes/Modules/Packages/ControllersLogic/DeletePackageLogic.php b/app/Classes/Modules/Packages/ControllersLogic/DeletePackageLogic.php index f731cca5..3fc88e79 100644 --- a/app/Classes/Modules/Packages/ControllersLogic/DeletePackageLogic.php +++ b/app/Classes/Modules/Packages/ControllersLogic/DeletePackageLogic.php @@ -1,49 +1,49 @@ 'Deleted Remark', - 'message' => 'You have successfully deleted a Remark' + 'title' => 'Deleted Package', + 'message' => 'You have successfully deleted a Package' ]; } - /** @var CanDeleteRemark */ - private $canDeleteRemark; + /** @var CanDeletePackage */ + private $canDeletePackage; - /** @var DeletesRemark */ - private $deletesRemark; + /** @var DeletesPackage */ + private $deletesPackage; - /** @var FetchesRemark */ - private $fetchesRemark; + /** @var FetchesPackage */ + private $fetchesPackage; /** - * DeleteRemarkControllersLogic constructor. - * @param CanDeleteRemark $canDeleteRemark - * @param DeletesRemark $deletesRemark - * @param FetchesRemark $fetchesRemark + * DeletePackageControllersLogic constructor. + * @param CanDeletePackage $canDeletePackage + * @param DeletesPackage $deletesPackage + * @param FetchesPackage $fetchesPackage */ - public function __construct(CanDeleteRemark $canDeleteRemark, DeletesRemark $deletesRemark, FetchesRemark $fetchesRemark) + public function __construct(CanDeletePackage $canDeletePackage, DeletesPackage $deletesPackage, FetchesPackage $fetchesPackage) { - $this->canDeleteRemark = $canDeleteRemark; - $this->deletesRemark = $deletesRemark; - $this->fetchesRemark = $fetchesRemark; + $this->canDeletePackage = $canDeletePackage; + $this->deletesPackage = $deletesPackage; + $this->fetchesPackage = $fetchesPackage; } @@ -56,11 +56,11 @@ class DeleteRemarkLogic extends AbstractControllerLogic { try { - $this->canDeleteRemark->passes(); + $this->canDeletePackage->passes(); - $query = $this->fetchesRemark->execute(['id' => $request->route('id')]); + $query = $this->fetchesPackage->execute(['id' => $request->route('id')]); - $this->deletesRemark->execute($query); + $this->deletesPackage->execute($query); return $this->response([]); diff --git a/app/Classes/Modules/Packages/ControllersLogic/FetchPackageLogic.php b/app/Classes/Modules/Packages/ControllersLogic/FetchPackageLogic.php index 3ff151d3..20ea0a94 100644 --- a/app/Classes/Modules/Packages/ControllersLogic/FetchPackageLogic.php +++ b/app/Classes/Modules/Packages/ControllersLogic/FetchPackageLogic.php @@ -1,17 +1,17 @@ 'Retrieved Remark', - 'message' => 'You have successfully retrieved a Remark' + 'title' => 'Retrieved Package', + 'message' => 'You have successfully retrieved a Package' ]; } - /** @var CanFetchRemark */ - private $canFetchRemark; + /** @var CanFetchPackage */ + private $canFetchPackage; - /** @var FetchesRemark */ - private $fetchesRemark; + /** @var FetchesPackage */ + private $fetchesPackage; /** - * FetchRemarkControllersLogic constructor. - * @param CanFetchRemark $canFetchRemark - * @param FetchesRemark $fetchesRemark + * FetchPackageControllersLogic constructor. + * @param CanFetchPackage $canFetchPackage + * @param FetchesPackage $fetchesPackage */ - public function __construct(CanFetchRemark $canFetchRemark, FetchesRemark $fetchesRemark) + public function __construct(CanFetchPackage $canFetchPackage, FetchesPackage $fetchesPackage) { - $this->canFetchRemark = $canFetchRemark; - $this->fetchesRemark = $fetchesRemark; + $this->canFetchPackage = $canFetchPackage; + $this->fetchesPackage = $fetchesPackage; } @@ -51,11 +51,11 @@ class FetchRemarkLogic extends AbstractControllerLogic { try { - $this->canFetchRemark->passes(); + $this->canFetchPackage->passes(); - $query = $this->fetchesRemark->execute(['id' => $request->route('id')]); + $query = $this->fetchesPackage->execute(['id' => $request->route('id')]); - return $this->resourceResponse(new RemarkResource($query)); + return $this->resourceResponse(new PackageResource($query)); } catch (\Exception $exception){ throw new ErrorException($exception->getMessage(), $exception->getCode()); diff --git a/app/Classes/Modules/Packages/ControllersLogic/ListPackagesLogic.php b/app/Classes/Modules/Packages/ControllersLogic/ListPackagesLogic.php index a7d7ff43..69acf7b6 100644 --- a/app/Classes/Modules/Packages/ControllersLogic/ListPackagesLogic.php +++ b/app/Classes/Modules/Packages/ControllersLogic/ListPackagesLogic.php @@ -1,17 +1,17 @@ 'Retrieved Remarks', - 'message' => 'You have successfully retrieved a list of Remarks' + 'title' => 'Retrieved Packages', + 'message' => 'You have successfully retrieved a list of Packages' ]; } - /** @var CanListRemarks */ - private $canListRemarks; + /** @var CanListPackages */ + private $canListPackages; - /** @var ListsRemarks */ - private $listsRemarks; + /** @var ListsPackages */ + private $listsPackages; /** - * ListRemarksLogic constructor. - * @param CanListRemarks $canListRemarks - * @param ListsRemarks $listsRemarks + * ListPackagesLogic constructor. + * @param CanListPackages $canListPackages + * @param ListsPackages $listsPackages */ - public function __construct(CanListRemarks $canListRemarks, ListsRemarks $listsRemarks) + public function __construct(CanListPackages $canListPackages, ListsPackages $listsPackages) { - $this->canListRemarks = $canListRemarks; - $this->listsRemarks = $listsRemarks; + $this->canListPackages = $canListPackages; + $this->listsPackages = $listsPackages; } @@ -51,11 +51,11 @@ class ListRemarksLogic extends AbstractControllerLogic { try { - $this->canListRemarks->passes(); + $this->canListPackages->passes(); - $query = $this->listsRemarks->execute($this->listsRemarks->deserializeFilters($request->input('filters'))); + $query = $this->listsPackages->execute($this->listsPackages->deserializeFilters($request->input('filters'))); - return $this->collectionResponse(RemarkResource::collection($query)); + return $this->collectionResponse(PackageResource::collection($query)); } catch (\Exception $exception){ throw new ErrorException($exception->getMessage(), $exception->getCode()); diff --git a/app/Classes/Modules/Packages/ControllersLogic/UpdatePackageLogic.php b/app/Classes/Modules/Packages/ControllersLogic/UpdatePackageLogic.php index 020906eb..3a844486 100644 --- a/app/Classes/Modules/Packages/ControllersLogic/UpdatePackageLogic.php +++ b/app/Classes/Modules/Packages/ControllersLogic/UpdatePackageLogic.php @@ -1,20 +1,20 @@ 'Updated Remark', - 'message' => 'You have successfully updated the Remark' + 'title' => 'Updated Package', + 'message' => 'You have successfully updated the Package' ]; } - /** @var CanUpdateRemark */ - private $canUpdateRemark; + /** @var CanUpdatePackage */ + private $canUpdatePackage; - /** @var UpdatesRemark */ - private $updatesRemark; + /** @var UpdatesPackage */ + private $updatesPackage; - /** @var FetchesRemark */ - private $fetchesRemark; + /** @var FetchesPackage */ + private $fetchesPackage; /** @var FetchesDistrict */ private $fetchesDistrict; /** - * UpdateRemarkLogic constructor. - * @param CanUpdateRemark $canUpdateRemark - * @param UpdatesRemark $updatesRemark - * @param FetchesRemark $fetchesRemark + * UpdatePackageLogic constructor. + * @param CanUpdatePackage $canUpdatePackage + * @param UpdatesPackage $updatesPackage + * @param FetchesPackage $fetchesPackage * @param FetchesDistrict $fetchesDistrict */ - public function __construct(CanUpdateRemark $canUpdateRemark, UpdatesRemark $updatesRemark, FetchesRemark $fetchesRemark, FetchesDistrict $fetchesDistrict) + public function __construct(CanUpdatePackage $canUpdatePackage, UpdatesPackage $updatesPackage, FetchesPackage $fetchesPackage, FetchesDistrict $fetchesDistrict) { - $this->canUpdateRemark = $canUpdateRemark; - $this->updatesRemark = $updatesRemark; - $this->fetchesRemark = $fetchesRemark; + $this->canUpdatePackage = $canUpdatePackage; + $this->updatesPackage = $updatesPackage; + $this->fetchesPackage = $fetchesPackage; $this->fetchesDistrict = $fetchesDistrict; } @@ -65,16 +65,16 @@ class UpdateRemarkLogic extends AbstractControllerLogic try { $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]); - $object = new RemarkObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code')); - //$object = new RemarkObject($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($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')); - $this->canUpdateRemark->passes($object); + $this->canUpdatePackage->passes($object); - $query = $this->fetchesRemark->execute(['id' => $request->route('id')]); + $query = $this->fetchesPackage->execute(['id' => $request->route('id')]); - $query = $this->updatesRemark->execute($query, $object); + $query = $this->updatesPackage->execute($query, $object); - return $this->resourceResponse(new RemarkResource($query)); + return $this->resourceResponse(new PackageResource($query)); } catch (\Exception $exception){ diff --git a/app/Classes/Modules/Packages/DataTransferObjects/PackageObject.php b/app/Classes/Modules/Packages/DataTransferObjects/PackageObject.php index 67beaa30..ae6112c1 100644 --- a/app/Classes/Modules/Packages/DataTransferObjects/PackageObject.php +++ b/app/Classes/Modules/Packages/DataTransferObjects/PackageObject.php @@ -1,10 +1,10 @@ street_one = $object->getStreetOne(); $model->street_two = $object->getStreetTwo(); $model->country_id = $object->getCountryId(); @@ -26,7 +26,7 @@ class CreatesRemark extends AbstractUpdateRelationshipRecord $model->district_id = $object->getDistrictId(); $model->postcode = $object->getPostCode(); - return $this->handler($company->Remarks(), $model); + return $this->handler($company->Packages(), $model); } } diff --git a/app/Classes/Modules/Packages/Services/DeletesPackage.php b/app/Classes/Modules/Packages/Services/DeletesPackage.php index 4c29be9d..ec780b79 100644 --- a/app/Classes/Modules/Packages/Services/DeletesPackage.php +++ b/app/Classes/Modules/Packages/Services/DeletesPackage.php @@ -1,19 +1,19 @@ handler($model); } } diff --git a/app/Classes/Modules/Packages/Services/FetchesPackage.php b/app/Classes/Modules/Packages/Services/FetchesPackage.php index a3b5c765..310b6620 100644 --- a/app/Classes/Modules/Packages/Services/FetchesPackage.php +++ b/app/Classes/Modules/Packages/Services/FetchesPackage.php @@ -1,23 +1,23 @@ repository = $repository; } diff --git a/app/Classes/Modules/Packages/Services/ListsPackages.php b/app/Classes/Modules/Packages/Services/ListsPackages.php index 53479558..40bdd5bb 100644 --- a/app/Classes/Modules/Packages/Services/ListsPackages.php +++ b/app/Classes/Modules/Packages/Services/ListsPackages.php @@ -1,23 +1,23 @@ repository = $repository; } diff --git a/app/Classes/Modules/Packages/Services/UpdatesPackage.php b/app/Classes/Modules/Packages/Services/UpdatesPackage.php index 082e2281..bdee9f3e 100644 --- a/app/Classes/Modules/Packages/Services/UpdatesPackage.php +++ b/app/Classes/Modules/Packages/Services/UpdatesPackage.php @@ -1,21 +1,21 @@ company_id = $object->getCompanyId(); $model->street_one = $object->getStreetOne(); diff --git a/app/Classes/Modules/Packages/Standards/Rules/CanCreatePackage.php b/app/Classes/Modules/Packages/Standards/Rules/CanCreatePackage.php index fc51178f..d40b1591 100644 --- a/app/Classes/Modules/Packages/Standards/Rules/CanCreatePackage.php +++ b/app/Classes/Modules/Packages/Standards/Rules/CanCreatePackage.php @@ -1,25 +1,25 @@ RemarkValidation = $RemarkValidation; + $this->PackageValidation = $PackageValidation; } @@ -34,19 +34,19 @@ class CanCreateRemark extends AbstractRule } /** - * @param RemarkObject $object + * @param PackageObject $object * @return bool * @throws \App\Classes\Exceptions\RequestValidationException */ protected function validators($object): bool { - return $this->RemarkValidation->validate($object); + return $this->PackageValidation->validate($object); } /** - * @param RemarkObject $object + * @param PackageObject $object * @return bool */ protected function criteria($object): bool diff --git a/app/Classes/Modules/Packages/Standards/Rules/CanDeletePackage.php b/app/Classes/Modules/Packages/Standards/Rules/CanDeletePackage.php index 7ddece31..80139d86 100644 --- a/app/Classes/Modules/Packages/Standards/Rules/CanDeletePackage.php +++ b/app/Classes/Modules/Packages/Standards/Rules/CanDeletePackage.php @@ -1,12 +1,12 @@ RemarkValidation = $RemarkValidation; + $this->PackageValidation = $PackageValidation; } @@ -34,19 +34,19 @@ class CanUpdateRemark extends AbstractRule } /** - * @param RemarkObject $object + * @param PackageObject $object * @return bool * @throws \App\Classes\Exceptions\RequestValidationException */ protected function validators($object): bool { - return $this->RemarkValidation->validate($object); + return $this->PackageValidation->validate($object); } /** - * @param RemarkObject $object + * @param PackageObject $object * @return bool */ protected function criteria($object): bool diff --git a/app/Classes/Modules/Packages/Standards/Validators/PackageValidation.php b/app/Classes/Modules/Packages/Standards/Validators/PackageValidation.php index 25c9dfee..2cbf304e 100644 --- a/app/Classes/Modules/Packages/Standards/Validators/PackageValidation.php +++ b/app/Classes/Modules/Packages/Standards/Validators/PackageValidation.php @@ -1,17 +1,17 @@ 'Created Remark', - 'message' => 'You have successfully created a new Remark' + 'title' => 'Created PackingList', + 'message' => 'You have successfully created a new PackingList' ]; } - /** @var CanCreateRemark */ - private $canCreateRemark; + /** @var CanCreatePackingList */ + private $canCreatePackingList; /** @var FetchesDistrict */ private $fetchesDistrict; @@ -36,22 +36,22 @@ class CreateRemarkLogic extends AbstractControllerLogic /** @var FetchesCompany */ private $fetchesCompany; - /** @var CreatesRemark */ - private $createsRemark; + /** @var CreatesPackingList */ + private $createsPackingList; /** - * CreateRemarkLogic constructor. - * @param CanCreateRemark $canCreateRemark + * CreatePackingListLogic constructor. + * @param CanCreatePackingList $canCreatePackingList * @param FetchesDistrict $fetchesDistrict * @param FetchesCompany $fetchesCompany - * @param CreatesRemark $createsRemark + * @param CreatesPackingList $createsPackingList */ - public function __construct(CanCreateRemark $canCreateRemark, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesRemark $createsRemark) + public function __construct(CanCreatePackingList $canCreatePackingList, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesPackingList $createsPackingList) { - $this->canCreateRemark = $canCreateRemark; + $this->canCreatePackingList = $canCreatePackingList; $this->fetchesDistrict = $fetchesDistrict; $this->fetchesCompany = $fetchesCompany; - $this->createsRemark = $createsRemark; + $this->createsPackingList = $createsPackingList; } /** @@ -66,13 +66,13 @@ class CreateRemarkLogic extends AbstractControllerLogic $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]); - $object = new RemarkObject($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('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code')); - $this->canCreateRemark->passes($object); + $this->canCreatePackingList->passes($object); - $query = $this->createsRemark->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object); + $query = $this->createsPackingList->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object); - return $this->resourceResponse(new RemarkResource($query)); + return $this->resourceResponse(new PackingListResource($query)); } diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/DeletePackingListLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/DeletePackingListLogic.php index f731cca5..850f196b 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/DeletePackingListLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/DeletePackingListLogic.php @@ -1,49 +1,49 @@ 'Deleted Remark', - 'message' => 'You have successfully deleted a Remark' + 'title' => 'Deleted PackingList', + 'message' => 'You have successfully deleted a PackingList' ]; } - /** @var CanDeleteRemark */ - private $canDeleteRemark; + /** @var CanDeletePackingList */ + private $canDeletePackingList; - /** @var DeletesRemark */ - private $deletesRemark; + /** @var DeletesPackingList */ + private $deletesPackingList; - /** @var FetchesRemark */ - private $fetchesRemark; + /** @var FetchesPackingList */ + private $fetchesPackingList; /** - * DeleteRemarkControllersLogic constructor. - * @param CanDeleteRemark $canDeleteRemark - * @param DeletesRemark $deletesRemark - * @param FetchesRemark $fetchesRemark + * DeletePackingListControllersLogic constructor. + * @param CanDeletePackingList $canDeletePackingList + * @param DeletesPackingList $deletesPackingList + * @param FetchesPackingList $fetchesPackingList */ - public function __construct(CanDeleteRemark $canDeleteRemark, DeletesRemark $deletesRemark, FetchesRemark $fetchesRemark) + public function __construct(CanDeletePackingList $canDeletePackingList, DeletesPackingList $deletesPackingList, FetchesPackingList $fetchesPackingList) { - $this->canDeleteRemark = $canDeleteRemark; - $this->deletesRemark = $deletesRemark; - $this->fetchesRemark = $fetchesRemark; + $this->canDeletePackingList = $canDeletePackingList; + $this->deletesPackingList = $deletesPackingList; + $this->fetchesPackingList = $fetchesPackingList; } @@ -56,11 +56,11 @@ class DeleteRemarkLogic extends AbstractControllerLogic { try { - $this->canDeleteRemark->passes(); + $this->canDeletePackingList->passes(); - $query = $this->fetchesRemark->execute(['id' => $request->route('id')]); + $query = $this->fetchesPackingList->execute(['id' => $request->route('id')]); - $this->deletesRemark->execute($query); + $this->deletesPackingList->execute($query); return $this->response([]); diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/FetchPackingListLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/FetchPackingListLogic.php index 3ff151d3..6d722729 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/FetchPackingListLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/FetchPackingListLogic.php @@ -1,17 +1,17 @@ 'Retrieved Remark', - 'message' => 'You have successfully retrieved a Remark' + 'title' => 'Retrieved PackingList', + 'message' => 'You have successfully retrieved a PackingList' ]; } - /** @var CanFetchRemark */ - private $canFetchRemark; + /** @var CanFetchPackingList */ + private $canFetchPackingList; - /** @var FetchesRemark */ - private $fetchesRemark; + /** @var FetchesPackingList */ + private $fetchesPackingList; /** - * FetchRemarkControllersLogic constructor. - * @param CanFetchRemark $canFetchRemark - * @param FetchesRemark $fetchesRemark + * FetchPackingListControllersLogic constructor. + * @param CanFetchPackingList $canFetchPackingList + * @param FetchesPackingList $fetchesPackingList */ - public function __construct(CanFetchRemark $canFetchRemark, FetchesRemark $fetchesRemark) + public function __construct(CanFetchPackingList $canFetchPackingList, FetchesPackingList $fetchesPackingList) { - $this->canFetchRemark = $canFetchRemark; - $this->fetchesRemark = $fetchesRemark; + $this->canFetchPackingList = $canFetchPackingList; + $this->fetchesPackingList = $fetchesPackingList; } @@ -51,11 +51,11 @@ class FetchRemarkLogic extends AbstractControllerLogic { try { - $this->canFetchRemark->passes(); + $this->canFetchPackingList->passes(); - $query = $this->fetchesRemark->execute(['id' => $request->route('id')]); + $query = $this->fetchesPackingList->execute(['id' => $request->route('id')]); - return $this->resourceResponse(new RemarkResource($query)); + return $this->resourceResponse(new PackingListResource($query)); } catch (\Exception $exception){ throw new ErrorException($exception->getMessage(), $exception->getCode()); diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php index a7d7ff43..a1e485ce 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php @@ -1,17 +1,17 @@ 'Retrieved Remarks', - 'message' => 'You have successfully retrieved a list of Remarks' + 'title' => 'Retrieved PackingLists', + 'message' => 'You have successfully retrieved a list of PackingLists' ]; } - /** @var CanListRemarks */ - private $canListRemarks; + /** @var CanListPackingLists */ + private $canListPackingLists; - /** @var ListsRemarks */ - private $listsRemarks; + /** @var ListsPackingLists */ + private $listsPackingLists; /** - * ListRemarksLogic constructor. - * @param CanListRemarks $canListRemarks - * @param ListsRemarks $listsRemarks + * ListPackingListsLogic constructor. + * @param CanListPackingLists $canListPackingLists + * @param ListsPackingLists $listsPackingLists */ - public function __construct(CanListRemarks $canListRemarks, ListsRemarks $listsRemarks) + public function __construct(CanListPackingLists $canListPackingLists, ListsPackingLists $listsPackingLists) { - $this->canListRemarks = $canListRemarks; - $this->listsRemarks = $listsRemarks; + $this->canListPackingLists = $canListPackingLists; + $this->listsPackingLists = $listsPackingLists; } @@ -51,11 +51,11 @@ class ListRemarksLogic extends AbstractControllerLogic { try { - $this->canListRemarks->passes(); + $this->canListPackingLists->passes(); - $query = $this->listsRemarks->execute($this->listsRemarks->deserializeFilters($request->input('filters'))); + $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($request->input('filters'))); - return $this->collectionResponse(RemarkResource::collection($query)); + return $this->collectionResponse(PackingListResource::collection($query)); } catch (\Exception $exception){ throw new ErrorException($exception->getMessage(), $exception->getCode()); diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListLogic.php index 020906eb..399a55e5 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListLogic.php @@ -1,20 +1,20 @@ 'Updated Remark', - 'message' => 'You have successfully updated the Remark' + 'title' => 'Updated PackingList', + 'message' => 'You have successfully updated the PackingList' ]; } - /** @var CanUpdateRemark */ - private $canUpdateRemark; + /** @var CanUpdatePackingList */ + private $canUpdatePackingList; - /** @var UpdatesRemark */ - private $updatesRemark; + /** @var UpdatesPackingList */ + private $updatesPackingList; - /** @var FetchesRemark */ - private $fetchesRemark; + /** @var FetchesPackingList */ + private $fetchesPackingList; /** @var FetchesDistrict */ private $fetchesDistrict; /** - * UpdateRemarkLogic constructor. - * @param CanUpdateRemark $canUpdateRemark - * @param UpdatesRemark $updatesRemark - * @param FetchesRemark $fetchesRemark + * UpdatePackingListLogic constructor. + * @param CanUpdatePackingList $canUpdatePackingList + * @param UpdatesPackingList $updatesPackingList + * @param FetchesPackingList $fetchesPackingList * @param FetchesDistrict $fetchesDistrict */ - public function __construct(CanUpdateRemark $canUpdateRemark, UpdatesRemark $updatesRemark, FetchesRemark $fetchesRemark, FetchesDistrict $fetchesDistrict) + public function __construct(CanUpdatePackingList $canUpdatePackingList, UpdatesPackingList $updatesPackingList, FetchesPackingList $fetchesPackingList, FetchesDistrict $fetchesDistrict) { - $this->canUpdateRemark = $canUpdateRemark; - $this->updatesRemark = $updatesRemark; - $this->fetchesRemark = $fetchesRemark; + $this->canUpdatePackingList = $canUpdatePackingList; + $this->updatesPackingList = $updatesPackingList; + $this->fetchesPackingList = $fetchesPackingList; $this->fetchesDistrict = $fetchesDistrict; } @@ -65,16 +65,16 @@ class UpdateRemarkLogic extends AbstractControllerLogic try { $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]); - $object = new RemarkObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code')); - //$object = new RemarkObject($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($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')); - $this->canUpdateRemark->passes($object); + $this->canUpdatePackingList->passes($object); - $query = $this->fetchesRemark->execute(['id' => $request->route('id')]); + $query = $this->fetchesPackingList->execute(['id' => $request->route('id')]); - $query = $this->updatesRemark->execute($query, $object); + $query = $this->updatesPackingList->execute($query, $object); - return $this->resourceResponse(new RemarkResource($query)); + return $this->resourceResponse(new PackingListResource($query)); } catch (\Exception $exception){ diff --git a/app/Classes/Modules/PackingLists/DataTransferObjects/PackingListObject.php b/app/Classes/Modules/PackingLists/DataTransferObjects/PackingListObject.php index 67beaa30..8410d893 100644 --- a/app/Classes/Modules/PackingLists/DataTransferObjects/PackingListObject.php +++ b/app/Classes/Modules/PackingLists/DataTransferObjects/PackingListObject.php @@ -1,10 +1,10 @@ street_one = $object->getStreetOne(); $model->street_two = $object->getStreetTwo(); $model->country_id = $object->getCountryId(); @@ -26,7 +26,7 @@ class CreatesRemark extends AbstractUpdateRelationshipRecord $model->district_id = $object->getDistrictId(); $model->postcode = $object->getPostCode(); - return $this->handler($company->Remarks(), $model); + return $this->handler($company->PackingLists(), $model); } } diff --git a/app/Classes/Modules/PackingLists/Services/DeletesPackingList.php b/app/Classes/Modules/PackingLists/Services/DeletesPackingList.php index 4c29be9d..c0102a97 100644 --- a/app/Classes/Modules/PackingLists/Services/DeletesPackingList.php +++ b/app/Classes/Modules/PackingLists/Services/DeletesPackingList.php @@ -1,19 +1,19 @@ handler($model); } } diff --git a/app/Classes/Modules/PackingLists/Services/FetchesPackingList.php b/app/Classes/Modules/PackingLists/Services/FetchesPackingList.php index a3b5c765..7d16bafe 100644 --- a/app/Classes/Modules/PackingLists/Services/FetchesPackingList.php +++ b/app/Classes/Modules/PackingLists/Services/FetchesPackingList.php @@ -1,23 +1,23 @@ repository = $repository; } diff --git a/app/Classes/Modules/PackingLists/Services/ListsPackingLists.php b/app/Classes/Modules/PackingLists/Services/ListsPackingLists.php index 53479558..7cf87438 100644 --- a/app/Classes/Modules/PackingLists/Services/ListsPackingLists.php +++ b/app/Classes/Modules/PackingLists/Services/ListsPackingLists.php @@ -1,23 +1,23 @@ repository = $repository; } diff --git a/app/Classes/Modules/PackingLists/Services/UpdatesPackingList.php b/app/Classes/Modules/PackingLists/Services/UpdatesPackingList.php index 082e2281..2a53408b 100644 --- a/app/Classes/Modules/PackingLists/Services/UpdatesPackingList.php +++ b/app/Classes/Modules/PackingLists/Services/UpdatesPackingList.php @@ -1,21 +1,21 @@ company_id = $object->getCompanyId(); $model->street_one = $object->getStreetOne(); diff --git a/app/Classes/Modules/PackingLists/Standards/Rules/CanCreatePackingList.php b/app/Classes/Modules/PackingLists/Standards/Rules/CanCreatePackingList.php index fc51178f..e100bbac 100644 --- a/app/Classes/Modules/PackingLists/Standards/Rules/CanCreatePackingList.php +++ b/app/Classes/Modules/PackingLists/Standards/Rules/CanCreatePackingList.php @@ -1,25 +1,25 @@ RemarkValidation = $RemarkValidation; + $this->PackingListValidation = $PackingListValidation; } @@ -34,19 +34,19 @@ class CanCreateRemark extends AbstractRule } /** - * @param RemarkObject $object + * @param PackingListObject $object * @return bool * @throws \App\Classes\Exceptions\RequestValidationException */ protected function validators($object): bool { - return $this->RemarkValidation->validate($object); + return $this->PackingListValidation->validate($object); } /** - * @param RemarkObject $object + * @param PackingListObject $object * @return bool */ protected function criteria($object): bool diff --git a/app/Classes/Modules/PackingLists/Standards/Rules/CanDeletePackingList.php b/app/Classes/Modules/PackingLists/Standards/Rules/CanDeletePackingList.php index 7ddece31..ac8abc28 100644 --- a/app/Classes/Modules/PackingLists/Standards/Rules/CanDeletePackingList.php +++ b/app/Classes/Modules/PackingLists/Standards/Rules/CanDeletePackingList.php @@ -1,12 +1,12 @@ RemarkValidation = $RemarkValidation; + $this->PackingListValidation = $PackingListValidation; } @@ -34,19 +34,19 @@ class CanUpdateRemark extends AbstractRule } /** - * @param RemarkObject $object + * @param PackingListObject $object * @return bool * @throws \App\Classes\Exceptions\RequestValidationException */ protected function validators($object): bool { - return $this->RemarkValidation->validate($object); + return $this->PackingListValidation->validate($object); } /** - * @param RemarkObject $object + * @param PackingListObject $object * @return bool */ protected function criteria($object): bool diff --git a/app/Classes/Modules/PackingLists/Standards/Validators/PackingListValidation.php b/app/Classes/Modules/PackingLists/Standards/Validators/PackingListValidation.php index 25c9dfee..88585970 100644 --- a/app/Classes/Modules/PackingLists/Standards/Validators/PackingListValidation.php +++ b/app/Classes/Modules/PackingLists/Standards/Validators/PackingListValidation.php @@ -1,17 +1,17 @@