cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-22 05:53:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Laravel Vapor - Renamed a file to fit its purpose (code sync from shipping portal)

Browse Source
This commit is contained in:
Dillon Ngo
2024-07-01 13:26:00 +08:00
parent 328417c8cf
commit a4010fcac2
12 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Jobs/ListBookingsJob.php
+9 -9
View File
@@ -3,7 +3,7 @@
namespace App\Classes\Jobs;
use App\Classes\Modules\Bookings\Processors\ListBookingsJobProcessor;
use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
@@ -18,32 +18,32 @@ class ListBookingsJob implements ShouldQueue
public $timeout = 900;
/** @var ListGenericJobObject */
private $listGenericJobObject;
/** @var JobSubmissionObject */
private $jobSubmissionObject;
private $jobId;
/**
* ListBookingsJob constructor.
* @param ListGenericJobObject $listGenericJobObject
* @param JobSubmissionObject $jobSubmissionObject
*/
public function __construct(ListGenericJobObject $listGenericJobObject)
public function __construct(JobSubmissionObject $jobSubmissionObject)
{
$this->listGenericJobObject = $listGenericJobObject;
$this->jobSubmissionObject = $jobSubmissionObject;
}
public function handle()
{
$rawPayload = $this->job->payload();
if(isset($rawPayload['data']['commandName'])){
$this->listGenericJobObject->setJobCommandName($rawPayload['data']['commandName']);
$this->jobSubmissionObject->setJobCommandName($rawPayload['data']['commandName']);
}
if(isset($rawPayload['data']['command'])){
$this->listGenericJobObject->setJobCommand($rawPayload['data']['command']);
$this->jobSubmissionObject->setJobCommand($rawPayload['data']['command']);
}
$result = (App()->make(ListBookingsJobProcessor::class))->execute($this->listGenericJobObject);
$result = (App()->make(ListBookingsJobProcessor::class))->execute($this->jobSubmissionObject);
}
public function getJobId(){
app/Classes/Jobs/ListDocumentsJob.php
+9 -9
View File
@@ -3,7 +3,7 @@
namespace App\Classes\Jobs;
use App\Classes\Modules\Documents\Processors\ListDocumentsJobProcessor;
use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
@@ -18,32 +18,32 @@ class ListDocumentsJob implements ShouldQueue
public $timeout = 900;
/** @var ListGenericJobObject */
private $listGenericJobObject;
/** @var JobSubmissionObject */
private $jobSubmissionObject;
private $jobId;
/**
* ListDocumentsJob constructor.
* @param ListGenericJobObject $listGenericJobObject
* @param JobSubmissionObject $JobSubmissionObject
*/
public function __construct(ListGenericJobObject $listGenericJobObject)
public function __construct(JobSubmissionObject $jobSubmissionObject)
{
$this->listGenericJobObject = $listGenericJobObject;
$this->jobSubmissionObject = $jobSubmissionObject;
}
public function handle()
{
$rawPayload = $this->job->payload();
if(isset($rawPayload['data']['commandName'])){
$this->listGenericJobObject->setJobCommandName($rawPayload['data']['commandName']);
$this->jobSubmissionObject->setJobCommandName($rawPayload['data']['commandName']);
}
if(isset($rawPayload['data']['command'])){
$this->listGenericJobObject->setJobCommand($rawPayload['data']['command']);
$this->jobSubmissionObject->setJobCommand($rawPayload['data']['command']);
}
$result = (App()->make(ListDocumentsJobProcessor::class))->execute($this->listGenericJobObject);
$result = (App()->make(ListDocumentsJobProcessor::class))->execute($this->jobSubmissionObject);
}
public function getJobId(){
app/Classes/Jobs/ListTransactionsJob.php
+9 -9
View File
@@ -3,7 +3,7 @@
namespace App\Classes\Jobs;
use App\Classes\Modules\Transactions\Processors\ListTransactionsJobProcessor;
use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
@@ -18,32 +18,32 @@ class ListTransactionsJob implements ShouldQueue
public $timeout = 900;
/** @var ListGenericJobObject */
private $listGenericJobObject;
/** @var JobSubmissionObject */
private $jobSubmissionObject;
private $jobId;
/**
* ListTransactionsJob constructor.
* @param ListGenericJobObject $listGenericJobObject
* @param JobSubmissionObject $jobSubmissionObject
*/
public function __construct(ListGenericJobObject $listGenericJobObject)
public function __construct(JobSubmissionObject $jobSubmissionObject)
{
$this->listGenericJobObject = $listGenericJobObject;
$this->jobSubmissionObject = $jobSubmissionObject;
}
public function handle()
{
$rawPayload = $this->job->payload();
if(isset($rawPayload['data']['commandName'])){
$this->listGenericJobObject->setJobCommandName($rawPayload['data']['commandName']);
$this->jobSubmissionObject->setJobCommandName($rawPayload['data']['commandName']);
}
if(isset($rawPayload['data']['command'])){
$this->listGenericJobObject->setJobCommand($rawPayload['data']['command']);
$this->jobSubmissionObject->setJobCommand($rawPayload['data']['command']);
}
$result = (App()->make(ListTransactionsJobProcessor::class))->execute($this->listGenericJobObject);
$result = (App()->make(ListTransactionsJobProcessor::class))->execute($this->jobSubmissionObject);
}
public function getJobId(){
app/Classes/Modules/Bookings/ControllersLogic/ListBookingJobLogic.php
+4 -4
View File
@@ -5,7 +5,7 @@ namespace App\Classes\Modules\Bookings\ControllersLogic;
use App\Classes\General\Abstracts\AbstractControllerLogic;
use App\Classes\Jobs\ListBookingsJob;
use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
@@ -53,7 +53,7 @@ class ListBookingJobLogic extends AbstractControllerLogic
$userInfoJson = json_encode($userInfo);
$requestSignature = md5($userInfoJson . $request->fullUrl());
$listGenericJobObject = new ListGenericJobObject(
$jobSubmissionObject = new JobSubmissionObject(
$request->fullUrl(),
$request->all(),
$requestSignature,
@@ -62,12 +62,12 @@ class ListBookingJobLogic extends AbstractControllerLogic
$userInfo
);
ListBookingsJob::dispatch($listGenericJobObject)->onQueue(env('SQS_QUEUENAME_PREFIX', '').'high_priority');
ListBookingsJob::dispatch($jobSubmissionObject)->onQueue(env('SQS_QUEUENAME_PREFIX', '').'high_priority');
$result = [];
$result['job_id'] = $jobId;
$this->createsJobResult->execute($listGenericJobObject);
$this->createsJobResult->execute($jobSubmissionObject);
return $this->response(['data' => $result]);
}
app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php
+6 -6
View File
@@ -5,7 +5,7 @@ namespace App\Classes\Modules\Bookings\Processors;
use App\Classes\Modules\Bookings\Services\ListsBookings;
use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor;
use App\Classes\General\Helper;
use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
use App\Http\Resources\V2\ListBookingJobResource;
class ListBookingsJobProcessor
@@ -29,18 +29,18 @@ class ListBookingsJobProcessor
}
/**
* @param ListGenericJobObject $listGenericJobObject
* @param JobSubmissionObject $jobSubmissionObject
* @return void
* @throws \App\Classes\Exceptions\MalformedRequestException
* @throws \App\Classes\Exceptions\JobResourceNotFoundException
*/
public function execute(ListGenericJobObject $listGenericJobObject) {
public function execute(JobSubmissionObject $jobSubmissionObject) {
$query = $this->listsBookings->execute($this->listsBookings->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]);
$query = $this->listsBookings->execute($this->listsBookings->deserializeFilters($jobSubmissionObject->getPayload()['filters']), ['page' => $jobSubmissionObject->getPayload()['page']]);
foreach ($query->items() as $item) {
$item['userInfo'] = $listGenericJobObject->getUserInfo();
$item['userInfo'] = $jobSubmissionObject->getUserInfo();
}
$resultCurrent = Helper::collectionResponse(ListBookingJobResource::collection($query));
$this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
$this->updateJobResultProcessor->execute($jobSubmissionObject, $resultCurrent);
}
}
app/Classes/Modules/Documents/ControllersLogic/ListDocumentJobLogic.php
+4 -4
View File
@@ -5,7 +5,7 @@ namespace App\Classes\Modules\Documents\ControllersLogic;
use App\Classes\General\Abstracts\AbstractControllerLogic;
use App\Classes\Modules\Jobs\Services\CreatesJobResult;
use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
use App\Classes\Jobs\ListDocumentsJob;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -54,7 +54,7 @@ class ListDocumentJobLogic extends AbstractControllerLogic
$userInfoJson = json_encode($userInfo);
$requestSignature = md5($userInfoJson . $request->fullUrl());
$listGenericJobObject = new ListGenericJobObject(
$jobSubmissionObject = new JobSubmissionObject(
$request->fullUrl(),
$request->all(),
$requestSignature,
@@ -63,12 +63,12 @@ class ListDocumentJobLogic extends AbstractControllerLogic
$userInfo
);
ListDocumentsJob::dispatch($listGenericJobObject)->onQueue(env('SQS_QUEUENAME_PREFIX', '').'high_priority');
ListDocumentsJob::dispatch($jobSubmissionObject)->onQueue(env('SQS_QUEUENAME_PREFIX', '').'high_priority');
$result = [];
$result['job_id'] = $jobId;
$this->createsJobResult->execute($listGenericJobObject);
$this->createsJobResult->execute($jobSubmissionObject);
return $this->response(['data' => $result]);
}
app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php
+6 -6
View File
@@ -5,7 +5,7 @@ namespace App\Classes\Modules\Documents\Processors;
use App\Classes\Modules\Documents\Services\ListsDocuments;
use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor;
use App\Classes\General\Helper;
use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
use App\Http\Resources\V2\ListDocumentJobResource;
class ListDocumentsJobProcessor
@@ -29,19 +29,19 @@ class ListDocumentsJobProcessor
}
/**
* @param ListGenericJobObject $listGenericJobObject
* @param JobSubmissionObject $jobSubmissionObject
* @return void
* @throws \App\Classes\Exceptions\MalformedRequestException
* @throws \App\Classes\Exceptions\JobResourceNotFoundException
*/
public function execute(ListGenericJobObject $listGenericJobObject) {
public function execute(JobSubmissionObject $jobSubmissionObject) {
$query = $this->listsDocuments->execute($this->listsDocuments->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]);
$query = $this->listsDocuments->execute($this->listsDocuments->deserializeFilters($jobSubmissionObject->getPayload()['filters']), ['page' => $jobSubmissionObject->getPayload()['page']]);
foreach ($query->items() as $item) {
$item['userInfo'] = $listGenericJobObject->getUserInfo();
$item['userInfo'] = $jobSubmissionObject->getUserInfo();
}
$resultCurrent = Helper::collectionResponse(ListDocumentJobResource::collection($query));
$this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
$this->updateJobResultProcessor->execute($jobSubmissionObject, $resultCurrent);
}
}
app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php → app/Classes/Modules/Jobs/DataTransferObjects/JobSubmissionObject.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace App\Classes\Modules\Jobs\DataTransferObjects;
use App\Classes\General\Interfaces\DataTransferObject;
class ListGenericJobObject implements DataTransferObject
class JobSubmissionObject implements DataTransferObject
{
/** @var string */
private $name;
app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php
+6 -6
View File
@@ -6,7 +6,7 @@ namespace App\Classes\Modules\Jobs\Processors;
use App\Classes\Modules\Jobs\Services\UpdatesJobResult;
use App\Classes\Modules\Jobs\Services\FetchesJobResult;
use App\Classes\Exceptions\JobResourceNotFoundException;
use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
use App\Classes\Modules\Jobs\DataTransferObjects\UpdateJobResultObject;
class UpdateJobResultProcessor
@@ -30,14 +30,14 @@ class UpdateJobResultProcessor
}
/**
* @param ListGenericJobObject $listGenericJobObject
* @param JobSubmissionObject $jobSubmissionObject
* @param array $resultCurrent
* @return void
* @throws \App\Classes\Exceptions\MalformedRequestException
* @throws \App\Classes\Exceptions\JobResourceNotFoundException
*/
public function execute(ListGenericJobObject $listGenericJobObject, $resultCurrent) {
$jobResultCurrent = $this->fetchesJobResult->execute(['job_id' => $listGenericJobObject->getJobId()]);
public function execute(JobSubmissionObject $jobSubmissionObject, $resultCurrent) {
$jobResultCurrent = $this->fetchesJobResult->execute(['job_id' => $jobSubmissionObject->getJobId()]);
$resultCurrentJson = json_encode($resultCurrent);
$resultSignatureCurrent = md5($resultCurrentJson);
@@ -45,10 +45,10 @@ class UpdateJobResultProcessor
$jobResultExisting = $this->fetchesJobResult->execute(['request_signature' => $jobResultCurrent->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
$resultSignatureExisting = $jobResultExisting->result_signature;
//if($resultSignatureExisting != $resultSignatureCurrent){
$this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
$this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $jobSubmissionObject->getJobCommandName(), $jobSubmissionObject->getJobCommand());
//}
} catch (JobResourceNotFoundException $exception){
$this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
$this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $jobSubmissionObject->getJobCommandName(), $jobSubmissionObject->getJobCommand());
}
}
app/Classes/Modules/Jobs/Services/CreatesJobResult.php
+7 -7
View File
@@ -4,22 +4,22 @@ namespace App\Classes\Modules\Jobs\Services;
use App\Classes\General\Eloquent\AbstractUpdateRecord;
use App\Models\JobResult;
use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
class CreatesJobResult extends AbstractUpdateRecord
{
/**
* @param ListGenericJobObject $listGenericJobObject
* @param JobSubmissionObject $jobSubmissionObject
* @return \Illuminate\Database\Eloquent\Model
* @throws \App\Classes\Exceptions\MalformedRequestException
*/
public function execute(ListGenericJobObject $listGenericJobObject)
public function execute(JobSubmissionObject $jobSubmissionObject)
{
$model = new JobResult();
$model->job_id = $listGenericJobObject->getJobId();
$model->request_signature = $listGenericJobObject->getRequestSignature();
$model->result_signature = $listGenericJobObject->getResultSignature();
$model->url = $listGenericJobObject->getName();
$model->job_id = $jobSubmissionObject->getJobId();
$model->request_signature = $jobSubmissionObject->getRequestSignature();
$model->result_signature = $jobSubmissionObject->getResultSignature();
$model->url = $jobSubmissionObject->getName();
return $this->handler($model);
}
app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsJobLogic.php
+4 -4
View File
@@ -6,7 +6,7 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
use App\Classes\General\Abstracts\AbstractControllerLogic;
use App\Classes\Jobs\ListTransactionsJob;
use App\Classes\Modules\Jobs\Services\CreatesJobResult;
use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
@@ -52,7 +52,7 @@ class ListTransactionsJobLogic extends AbstractControllerLogic
$userInfoJson = json_encode($userInfo);
$requestSignature = md5($userInfoJson . $request->fullUrl());
$listGenericJobObject = new ListGenericJobObject(
$jobSubmissionObject = new JobSubmissionObject(
$request->fullUrl(),
$request->all(),
$requestSignature,
@@ -61,12 +61,12 @@ class ListTransactionsJobLogic extends AbstractControllerLogic
$userInfo
);
ListTransactionsJob::dispatch($listGenericJobObject)->onQueue(env('SQS_QUEUENAME_PREFIX', '').'high_priority');
ListTransactionsJob::dispatch($jobSubmissionObject)->onQueue(env('SQS_QUEUENAME_PREFIX', '').'high_priority');
$result = [];
$result['job_id'] = $jobId;
$this->createsJobResult->execute($listGenericJobObject);
$this->createsJobResult->execute($jobSubmissionObject);
return $this->response(['data' => $result]);
}
app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php
+6 -6
View File
@@ -5,7 +5,7 @@ namespace App\Classes\Modules\Transactions\Processors;
use App\Classes\Modules\Transactions\Services\ListsTransactions;
use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor;
use App\Classes\General\Helper;
use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject;
use App\Http\Resources\V2\ListTransactionJobResource;
class ListTransactionsJobProcessor
@@ -29,19 +29,19 @@ class ListTransactionsJobProcessor
}
/**
* @param ListGenericJobObject $listGenericJobObject
* @param JobSubmissionObject $jobSubmissionObject
* @return void
* @throws \App\Classes\Exceptions\MalformedRequestException
* @throws \App\Classes\Exceptions\JobResourceNotFoundException
*/
public function execute(ListGenericJobObject $listGenericJobObject) {
public function execute(JobSubmissionObject $jobSubmissionObject) {
$query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]);
$query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($jobSubmissionObject->getPayload()['filters']), ['page' => $jobSubmissionObject->getPayload()['page']]);
foreach ($query->items() as $item) {
$item['userInfo'] = $listGenericJobObject->getUserInfo();
$item['userInfo'] = $jobSubmissionObject->getUserInfo();
}
$resultCurrent = Helper::collectionResponse(ListTransactionJobResource::collection($query));
$this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
$this->updateJobResultProcessor->execute($jobSubmissionObject, $resultCurrent);
}
}