cief/portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/portal.git synced 2026-08-25 07:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP - Order steps & remaining APIs

Browse Source
This commit is contained in:
Fairuz
2021-07-24 00:11:59 +08:00
parent 4eaf1917fa
commit 1281990b08
10 changed files with 61 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php
+27 -7
View File
@@ -5,9 +5,12 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic;
use App\Classes\General\Abstracts\AbstractControllerLogic;
use App\Classes\Modules\PackingLists\Services\CreatesPackingList;
use App\Classes\Modules\PackingLists\Services\CreatesPackingListPackage;
use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingListPackage;
use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
use App\Classes\Modules\Companies\Services\FetchesCompany;
use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListPackageObject;
use App\Classes\Modules\Packages\Services\FetchesPackage;
use App\Http\Resources\PackingListResource;
use ErrorException;
use Illuminate\Http\JsonResponse;
@@ -29,12 +32,16 @@ class CreatePackingListLogic extends AbstractControllerLogic
/** @var CanCreatePackingList */
private $canCreatePackingList;
private $canCreatePackingListPackage;
/** @var FetchesCompany */
private $fetchesCompany;
private $fetchesPackage;
/** @var CreatesPackingList */
private $createsPackingList;
private $createsPackingListPackage;
/**
* CreatePackingListLogic constructor.
* @param CanCreatePackingList $canCreatePackingList
@@ -42,11 +49,13 @@ class CreatePackingListLogic extends AbstractControllerLogic
* @param FetchesCompany $fetchesCompany
* @param CreatesPackingList $createsPackingList
*/
public function __construct(CanCreatePackingList $canCreatePackingList, FetchesCompany $fetchesCompany, CreatesPackingList $createsPackingList)
public function __construct(CanCreatePackingList $canCreatePackingList, CanCreatePackingListPackage $canCreatePackingListPackage, FetchesPackage $fetchesPackage, CreatesPackingList $createsPackingList, CreatesPackingListPackage $createsPackingListPackage)
{
$this->canCreatePackingList = $canCreatePackingList;
$this->fetchesCompany = $fetchesCompany;
$this->canCreatePackingListPackage = $canCreatePackingListPackage;
$this->fetchesPackage = $fetchesPackage;
$this->createsPackingList = $createsPackingList;
$this->createsPackingListPackage = $createsPackingListPackage;
}
/**
@@ -59,13 +68,24 @@ class CreatePackingListLogic extends AbstractControllerLogic
public function logic(Request $request) : JsonResponse
{
$district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
$package = $this->fetchesPackage->execute(['id'=>$request->input('package_id')]);
$object = new PackingListObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
$reference_no = rand(1000000, 9999999);
$object = new PackingListObject($reference_no, 0);
$this->canCreatePackingList->passes($object);
$query = $this->createsPackingList->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object);
$packageList = $this->createsPackingList->execute( $object);
$object = new PackingListPackageObject($packageList->id, $package->id);
$this->canCreatePackingListPackage->passes($object);
$query = $this->createsPackingListPackage->execute($object);
return $this->resourceResponse(new PackingListResource($query));
app/Classes/Modules/PackingLists/DataTransferObjects/PackingListPackageObject.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace App\Classes\Modules\PackingLists\DataTransferObjects;
use App\Classes\General\Interfaces\DataTransferObject;
class PackingListObject implements DataTransferObject
class PackingListPackageObject implements DataTransferObject
{
private $packingListId;
app/Classes/Modules/PackingLists/Services/CreatesPackingList.php
+5 -18
View File
@@ -3,30 +3,17 @@
namespace App\Classes\Modules\PackingLists\Services;
use App\Classes\General\Eloquent\AbstractUpdateRecord;
use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
use App\Models\PackingList;
use App\Models\Company;
class CreatesPackingList extends AbstractUpdateRelationshipRecord
class CreatesPackingList extends AbstractUpdateRecord
{
/**
* @param Company $company
* @param PackingListObject $object
* @return \Illuminate\Database\Eloquent\Model
* @throws \App\Classes\Exceptions\MalformedRequestException
*/
public function execute(Company $company, PackingListObject $object) {
public function execute(PackingListObject $object) {
$model = new PackingList();
$model->street_one = $object->getStreetOne();
$model->street_two = $object->getStreetTwo();
$model->country_id = $object->getCountryId();
$model->state_id = $object->getStateId();
$model->district_id = $object->getDistrictId();
$model->postcode = $object->getPostCode();
return $this->handler($company->PackingLists(), $model);
$model->reference = $object->getReference();
$model->status = $object->getStatus();
return $this->handler($model);
}
}
app/Classes/Modules/PackingLists/Services/CreatesPackingListPackage.php
+19
View File
@@ -0,0 +1,19 @@
<?php
namespace App\Classes\Modules\PackingLists\Services;
use App\Classes\General\Eloquent\AbstractUpdateRecord;
use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListPackageObject;
use App\Models\PackingListPackage;
class CreatesPackingListPackage extends AbstractUpdateRecord
{
public function execute(PackingListPackageObject $object) {
$model = new PackingListPackage();
$model->packing_list_id = $object->getPackingListId();
$model->package_id = $object->getPackageId();
return $this->handler( $model);
}
}
app/Classes/Modules/PackingLists/Services/CreatesPackingListPackages.php
-32
View File
@@ -1,32 +0,0 @@
<?php
namespace App\Classes\Modules\PackingLists\Services;
use App\Classes\General\Eloquent\AbstractUpdateRecord;
use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
use App\Models\PackingList;
use App\Models\Company;
class CreatesPackingListPackages extends AbstractUpdateRelationshipRecord
{
/**
* @param Company $company
* @param PackingListObject $object
* @return \Illuminate\Database\Eloquent\Model
* @throws \App\Classes\Exceptions\MalformedRequestException
*/
public function execute(Company $company, PackingListObject $object) {
$model = new PackingList();
$model->street_one = $object->getStreetOne();
$model->street_two = $object->getStreetTwo();
$model->country_id = $object->getCountryId();
$model->state_id = $object->getStateId();
$model->district_id = $object->getDistrictId();
$model->postcode = $object->getPostCode();
return $this->handler($company->PackingLists(), $model);
}
}
app/Classes/Modules/PackingLists/Standards/Rules/CanCreatePackingListPackage.php
+3 -3
View File
@@ -10,14 +10,14 @@ use App\Classes\Modules\PackingLists\Standards\Validators\PackingListPackageVali
class CanCreatePackingListPackage extends AbstractRule
{
/** @var PackingListValidationPackage */
/** @var PackingListPackageValidation */
private $packingListPackageValidation;
/**
* CanCreatePackingListPackage constructor.
* @param PackingListValidationPackage $packingListPackageValidation
* @param PackingListPackageValidation $packingListPackageValidation
*/
public function __construct(PackingListValidationPackage $packingListPackageValidation)
public function __construct(PackingListPackageValidation $packingListPackageValidation)
{
$this->packingListPackageValidation = $packingListPackageValidation;
}
app/Http/Controllers/PackingLists/CreatePackingListController.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
namespace App\Http\Controllers\PackingList;
namespace App\Http\Controllers\PackingLists;
use App\Classes\Modules\PackingLists\ControllersLogic\CreatePackingListLogic;
use Illuminate\Http\JsonResponse;
app/Models/PackingList.php
+1 -1
View File
@@ -8,5 +8,5 @@ class PackingList extends AbstractModel
{
use SoftDeletes;
protected $table = 'package_lists';
protected $table = 'packing_lists';
}
app/Models/PackingListPackage.php
+2 -2
View File
@@ -9,7 +9,7 @@ class PackingListPackage extends AbstractModel
{
use SoftDeletes;
protected $table = 'package_list_packages';
protected $table = 'packing_list_packages';
public function package(): BelongsTo
{
@@ -18,6 +18,6 @@ class PackingListPackage extends AbstractModel
public function packageList(): BelongsTo
{
return $this->BelongsTo(PackageList::class, 'package_list_id', 'id');
return $this->BelongsTo(PackageList::class, 'packing_list_id', 'id');
}
}
resources/views/swagger/json.blade.php
+2 -16
View File
@@ -71,25 +71,11 @@
"description": "",
"parameters": [
{
"name": "type",
"name": "package_id",
"in": "query",
"description": "Transport type",
"description": "Package Id",
"required": true,
"type": "integer"
},
{
"name": "courier",
"in": "query",
"description": "Courier Provider Name",
"required": true,
"type": "string"
},
{
"name": "tracking_number",
"in": "query",
"description": "Tracking No.",
"required": true,
"type": "string"
}
],
"responses": {