add address swagger json

.env.example

@@ -49,7 +49,3 @@ PUSHER_APP_CLUSTER=mt1
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
-UNITY_APP_URL="https://unity.izyim.com"
-EXCHANGE_URL=https://dev.exchange.cief-malaysia.com/
-MIX_EXCHANGE_URL="${EXCHANGE_URL}"

.gitignore

@@ -22,7 +22,4 @@ rebuild_docker.sh
 docker/*
 db/*
 docker-compose.yml
-package-lock.json
-public/*
-/public/*
-storage/framework/laravel-excel/*
+package-lock.json

app/Classes/General/Eloquent/AbstractListRecord.php

@@ -43,4 +43,4 @@ abstract class AbstractListRecord extends AbstractGetRecord
 
     }
 
-}
+}

app/Classes/General/Eloquent/Filters/CompanyModuleId.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class CompanyModuleId implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->where('company_module_id', $value);
-    }
-
-}

app/Classes/General/Eloquent/Filters/CreatedAfter.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Builder;
-
-class CreatedAfter implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->where('created_at', '>', Carbon::parse($value));
-    }
-}

app/Classes/General/Eloquent/Filters/HasBusinessModuleType.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class HasBusinessModuleType implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereHas('companyModules', function (Builder $query) use($value) {
-            $query->where('type', $value);
-        });
-    }
-
-}

app/Classes/General/Eloquent/Filters/HasMorphCompanyModule.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-
-use Illuminate\Database\Eloquent\Builder;
-
-class HasMorphCompanyModule implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereHasMorph('owner', ['App\Models\CompanyModule'], function ($query) use($value) {
-                $query->where('id',$value);
-            });
-    }
-}

app/Classes/General/Eloquent/Filters/HasPendingDelivery.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class HasPendingDelivery implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $value ? $builder->whereHas('packingLists', function (Builder $query) use($value) {
-            $query->whereDoesntHave('transports');
-        }) : $builder->whereDoesntHave('packingLists', function (Builder $query) use($value) {
-            $query->whereDoesntHave('transports');
-        });
-    }
-
-}

app/Classes/General/Eloquent/Filters/PackingListStatus.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class PackingListStatus implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->where('packing_lists.status', $value);
-    }
-
-}

app/Classes/General/Eloquent/Filters/PackingListType.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class PackingListType implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->where('packing_lists.type', $value);
-    }
-
-}

app/Classes/General/Eloquent/Filters/Reference.php

@@ -14,7 +14,7 @@ class Reference implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->where('reference', '=', $value);
+        return $builder->where('Reference', '=', $value);
     }
 
 }

app/Classes/General/Eloquent/Filters/ReferenceLike.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class ReferenceLike implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->where('reference', 'LIKE', '%'.$value.'%');
-    }
-
-}

app/Classes/General/Eloquent/Filters/WithArrivalDate.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\DB;
-
-class WithArrivalDate implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->leftJoin('transport_arrangements', function ($join) {
-            $join->on('packing_lists.id', '=', 'transport_arrangements.owner_id')->where('transport_arrangements.owner_type', 'App\Models\PackingList');
-        })->addSelect(['packing_lists.*', DB::raw('transport_arrangements.drop_date as arrival_date')]);
-    }
-}

app/Classes/General/Eloquent/Filters/WithBookings.php

@@ -5,7 +5,7 @@ namespace App\Classes\General\Eloquent\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
 
-class WithOwner implements Filter
+class WithBookings implements Filter
 {
 
     /**
@@ -15,6 +15,6 @@ class WithOwner implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->with('owner');
+        return $builder->with('bookings');
     }
 }

app/Classes/General/Eloquent/Filters/WithCompanyModuleType.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-
-use Illuminate\Database\Eloquent\Builder;
-
-class WithCompanyModuleType implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereHas('companyModule', function ($query) use ($value) {
-            $query->where('company_modules.type', '=', $value);
-        });
-    }
-}

app/Classes/General/Eloquent/Filters/WithConfirmedOrders.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-
-use Illuminate\Database\Eloquent\Builder;
-
-class WithConfirmedOrders implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereHas('parcels');
-    }
-}

app/Classes/General/Eloquent/Filters/WithOrders.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-
-use Illuminate\Database\Eloquent\Builder;
-
-class WithOrders implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->with('orders');
-    }
-}

app/Classes/General/Eloquent/Filters/WithPackingLists.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-
-use Illuminate\Database\Eloquent\Builder;
-
-class WithPackingLists implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->with('packingLists');
-    }
-}

app/Classes/General/Eloquent/Filters/WithParcels.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-
-use Illuminate\Database\Eloquent\Builder;
-
-class WithParcels implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->with('parcels');
-    }
-}

app/Classes/General/Eloquent/Filters/WithoutConfirmedOrders.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-
-use Illuminate\Database\Eloquent\Builder;
-
-class WithoutConfirmedOrders implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereDoesntHave('parcels');
-    }
-}

app/Classes/General/Interfaces/ContainerOwner.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Classes\General\Interfaces;
-
-
-use Illuminate\Database\Eloquent\Relations\MorphMany;
-
-interface ContainerOwner
-{
-
-    public function containers(): morphMany;
-
-}

app/Classes/General/Interfaces/Packable.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Classes\General\Interfaces;
-
-
-use Illuminate\Database\Eloquent\Relations\MorphMany;
-
-interface Packable
-{
-    public function packingLists(): morphMany;
-
-}

app/Classes/General/Interfaces/Remarkable.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Classes\General\Interfaces;
-
-
-use Illuminate\Database\Eloquent\Relations\MorphMany;
-
-interface Remarkable
-{
-
-    public function remarks(): morphMany;
-
-}

app/Classes/General/Interfaces/Steppable.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Classes\General\Interfaces;
-
-
-use Illuminate\Database\Eloquent\Relations\MorphMany;
-
-interface Steppable
-{
-
-    public function steps(): morphMany;
-
-}

app/Classes/General/Interfaces/Transportable.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Classes\General\Interfaces;
-
-
-use Illuminate\Database\Eloquent\Relations\MorphMany;
-
-interface Transportable
-{
-
-    public function transports(): morphMany;
-
-}

app/Classes/Jobs/CurlContainerListJob.php

@@ -1,94 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use Carbon\Carbon;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class CurlContainerListJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-
-    private $page;
-
-    public function __construct($page = 1)
-    {
-        $this->page = $page;
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \GuzzleHttp\Exception\GuzzleException
-     */
-    public function handle()
-    {
-        $cookies = $this->getCookie();
-
-        $headers = [
-            'Content-Type' => 'application/json',
-            'Cookie' => $cookies,
-        ];
-
-        $last_two_month = Carbon::now()->subMonth(2)->format('Y-m-d');
-
-        $client = new \GuzzleHttp\Client(['headers' => $headers]);
-        $res = $client->post('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', [\GuzzleHttp\RequestOptions::JSON => json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":' . $this->page . ',"PageSize":10,"PageOffset":0,"SortExpression":"CreatedOn DESC","GroupExpression":"","Filter":["LoadedTime:<=%js%\"' . $last_two_month . 'T00:00:00.000\"\u0000"],"ContextKey":"view1","FilterIsExternal":false,"LookupContextFieldName":null,"LookupContextController":null,"LookupContextView":null,"LookupContext":null,"Inserting":false,"LastCommandName":null,"ExternalFilter":[],"DoesNotRequireData":false,"LastView":"grid1","Tag":null,"RequiresFirstLetters":false,"ViewType":"Grid","SupportsCaching":true,"SystemFilter":null,"RequiresRowCount":true,"QuickFindHint":null,"RequiresPivot":false,"PivotDefinitions":null,"RequiresMetaData":true}}')]);
-
-        $data = json_decode($res->getBody()->getContents());
-
-        if (!empty($data->d->Rows)) {
-            // insert data here
-
-            // next page
-            $this->page = $this->page > 0 ? $this->page + 1 : 1;
-            CurlContainerListJob::dispatch($this->page + 1)
-                ->delay(Carbon::now()->addSeconds(10));
-        }
-    }
-
-    public function getCookie()
-    {
-        // get latest cookies
-        $client = new \GuzzleHttp\Client(['cookies' => true]);
-        $r = $client->request('GET', 'http://portal.vtnation.com.my');
-        $call_cookie = $client->getConfig('cookies');
-        $call_cookie = $call_cookie->toArray();
-        $latest_cookie = [];
-
-        foreach ($call_cookie as $key => $row) {
-            $latest_cookie[] = $row['Name'] . '=' . $row['Value'];
-        }
-        $latest_cookie = implode(';', $latest_cookie);
-
-        // get access token
-        $headers = [
-            'Content-Type' => 'application/json',
-            'Cookie' => $latest_cookie,
-        ];
-        $client = new \GuzzleHttp\Client(['headers' => $headers]);
-        $res = $client->post('http://portal.vtnation.com.my/Services/DataControllerService.asmx/Login', [\GuzzleHttp\RequestOptions::JSON => [
-            "username" => "CIEF",
-            "password" => "0122120880",
-            "createPersistentCookie" => true,
-        ]]);
-
-        $token = json_decode($res->getBody()->getContents());
-        $token = $token->d->AccessToken;
-
-        $latest_cookie = $latest_cookie . ';AppVTCC=' . $token;
-        return $latest_cookie;
-    }
-}

app/Classes/Jobs/FetchContainersStatusUpdateFromVTPortalJob.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-
-use App\Classes\Modules\PackingLists\Processors\FetchContainersStatusUpdateFromVTPortalProcessor;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class FetchContainersStatusUpdateFromVTPortalJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $timeout = 900;
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
-     */
-    public function handle()
-    {
-        (App()->make(FetchContainersStatusUpdateFromVTPortalProcessor::class))->execute();
-    }
-}

app/Classes/Jobs/FetchDeliveryListFromVTPortalJob.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-
-use App\Classes\Modules\PackingLists\Processors\FetchDeliveryListFromVTPortalProcessor;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class FetchDeliveryListFromVTPortalJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public $timeout = 900;
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
-     */
-    public function handle()
-    {
-
-        (App()->make(FetchDeliveryListFromVTPortalProcessor::class))->execute();
-    }
-}

app/Classes/Jobs/FetchLoadedContainersFromVTPortalJob.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-
-use App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor;
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class FetchLoadedContainersFromVTPortalJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public $timeout = 900;
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
-     */
-    public function handle()
-    {
-        (App()->make(FetchLoadedContainersFromVTPortalProcessor::class))->execute();
-    }
-}

app/Classes/Jobs/FetchPackingListFromVTPortalJob.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-
-use App\Classes\Modules\PackingLists\Processors\FetchPackingListFromVTPortalProcessor;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class FetchPackingListFromVTPortalJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public $timeout = 1800;
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
-     */
-    public function handle()
-    {
-        (App()->make(FetchPackingListFromVTPortalProcessor::class))->execute();
-    }
-}

app/Classes/Jobs/FetchWarehouseReceiveListFromVTPortalJob.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-
-use App\Classes\Modules\PackingLists\Processors\FetchWarehouseReceiveListFromVTPortalProcessor;
-use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class FetchWarehouseReceiveListFromVTPortalJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public $timeout = 900;
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
-     */
-    public function handle()
-    {
-        (App()->make(FetchWarehouseReceiveListFromVTPortalProcessor::class))->execute();
-    }
-}

app/Classes/Modules/Accounts/ControllersLogic/AuthenticateUserLogic.php

@@ -35,6 +35,7 @@ class AuthenticateUserLogic extends AbstractControllerLogic
      * @return JsonResponse
      * @throws \App\Classes\Exceptions\AccessForbiddenException
      * @throws \App\Classes\Exceptions\AccessUnauthorisedException
+     * @throws \App\Classes\Exceptions\InternalServerErrorException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
     protected function logic(Request $request): JsonResponse {

app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php

@@ -4,28 +4,21 @@ namespace App\Classes\Modules\Accounts\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 
-use App\Classes\General\Services\GeneratesInitials;
 use App\Classes\Modules\Accounts\Processors\AuthenticationProcessor;
 use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
 use App\Classes\Modules\Accounts\Processors\GenerateEmailVerificationAttemptProcessor;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
 use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
+use App\Classes\Modules\Companies\Processors\AssignSegmentProcessor;
 use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
 use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
 use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
-use App\Classes\Modules\Companies\Services\ApprovesCompanyConnection;
-use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
-use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Documents\Processors\UploadIdentityDocumentProcessor;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\BusinessType;
-use App\Classes\ValueObjects\Constants\CompanyType;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 
 use App\Models\Company;
-use App\Models\CompanyModule;
 use App\Models\User;
 
 use Illuminate\Http\JsonResponse;
@@ -58,18 +51,15 @@ class CreateCustomerLogic extends AbstractControllerLogic
     /** @var CreateContactProcessor */
     private $createContactProcessor;
 
-    /** @var CreatesCompanyConnection */
-    private $createsCompanyConnection;
-
-    /** @var ApprovesCompanyConnection */
-    private $approvesCompanyConnection;
-
     /** @var AssignEmployeeProcessor */
     private $assignEmployeeProcessor;
 
     /** @var UploadIdentityDocumentProcessor */
     private $uploadIdentityDocumentProcessor;
 
+    /** @var AssignSegmentProcessor */
+    private $assignSegmentProcessor;
+
     /** @var AuthenticationProcessor */
     private $authenticationProcessor;
 
@@ -82,22 +72,20 @@ class CreateCustomerLogic extends AbstractControllerLogic
      * @param CreateCompanyProcessor $createCompanyProcessor
      * @param CreateCompanyModuleProcessor $createCompanyModuleProcessor
      * @param CreateContactProcessor $createContactProcessor
-     * @param CreatesCompanyConnection $createsCompanyConnection
-     * @param ApprovesCompanyConnection $approvesCompanyConnection
      * @param AssignEmployeeProcessor $assignEmployeeProcessor
+     * @param AssignSegmentProcessor $assignSegmentProcessor
      * @param UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor
      * @param AuthenticationProcessor $authenticationProcessor
      * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
      */
-    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, AssignEmployeeProcessor $assignEmployeeProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor)
+    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, AssignEmployeeProcessor $assignEmployeeProcessor, AssignSegmentProcessor $assignSegmentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor)
     {
         $this->createUserProcessor = $createUserProcessor;
         $this->createCompanyProcessor = $createCompanyProcessor;
         $this->createCompanyModuleProcessor = $createCompanyModuleProcessor;
         $this->createContactProcessor = $createContactProcessor;
-        $this->createsCompanyConnection = $createsCompanyConnection;
-        $this->approvesCompanyConnection = $approvesCompanyConnection;
         $this->assignEmployeeProcessor = $assignEmployeeProcessor;
+        $this->assignSegmentProcessor = $assignSegmentProcessor;
         $this->uploadIdentityDocumentProcessor = $uploadIdentityDocumentProcessor;
         $this->authenticationProcessor = $authenticationProcessor;
         $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
@@ -108,37 +96,30 @@ class CreateCustomerLogic extends AbstractControllerLogic
      * @return JsonResponse
      * @throws \App\Classes\Exceptions\AccessForbiddenException
      * @throws \App\Classes\Exceptions\AccessUnauthorisedException
+     * @throws \App\Classes\Exceptions\InternalServerErrorException
      * @throws \App\Classes\Exceptions\MalformedRequestException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request): JsonResponse
     {
         /** @var User $user */
-        $user = $this->createUserProcessor->execute($request, RoleTypes::USER, !App::environment(['production']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
+        $user = $this->createUserProcessor->execute($request, RoleTypes::USER, App::environment(['local']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
 
         /** @var Company $company */
-        $company = $this->createCompanyProcessor->execute($request->input('type') === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name'), $request->input('type'), ApprovalStatus::PENDING_SUBMISSION);
+        $company = $this->createCompanyProcessor->execute($request, $request->input('type'), ApprovalStatus::PENDING_SUBMISSION);
 
-        $contactObject = new ContactObject($request->input('name'), $request->input('phone'), $request->input('contact_email'), $request->input('wechat_id'));
+        $this->createContactProcessor->execute($request, $company);
 
-        $this->createContactProcessor->execute($contactObject, $company);
-
-        /** @var CompanyModule $companyModule */
-        $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::IMPORTER);
-
-        $connectionObject = new CompanyConnectionObject($companyModule, 'CIEF', mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate());
-
-        $connection = $this->createsCompanyConnection->execute($connectionObject);
-
-        $this->approvesCompanyConnection->execute($connection);
+        $companyModule = $this->createCompanyModuleProcessor->execute($company);
 
         $Object = new EmploymentObject($companyModule, $user);
-
         $this->assignEmployeeProcessor->execute($Object);
 
+        //$this->assignSegmentProcessor->execute($company);
+
         $this->uploadIdentityDocumentProcessor->execute($request, $company);
 
-//        $this->generateEmailVerificationAttemptProcessor->execute($user);
+        $this->generateEmailVerificationAttemptProcessor->execute($user);
 
         return $this->response($this->authenticationProcessor->execute($request));
     }

app/Classes/Modules/Accounts/ControllersLogic/CreateInvitedCustomerLogic.php

@@ -1,105 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\ControllersLogic;
-
-use App\Classes\Exceptions\AccessForbiddenException;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Accounts\Processors\AuthenticationProcessor;
-use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
-use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
-use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
-use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-use App\Models\Company;
-use App\Models\CompanyModule;
-use App\Models\User;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\App;
-
-class CreateInvitedCustomerLogic extends AbstractControllerLogic
-{
-
-
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Created User',
-            'message' => 'You have successfully created a new User'
-        ];
-    }
-
-    /** @var CreateUserProcessor */
-    private $createUserProcessor;
-
-    /** @var CreateContactProcessor */
-    private $createContactProcessor;
-
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
-    /** @var AssignEmployeeProcessor */
-    private $assignEmployeeProcessor;
-
-    /** @var AuthenticationProcessor */
-    private $authenticationProcessor;
-
-
-    /**
-     * CreateInvitedCustomerLogic constructor.
-     * @param CreateUserProcessor $createUserProcessor
-     * @param CreateContactProcessor $createContactProcessor
-     * @param FetchesCompany $fetchesCompany
-     * @param AssignEmployeeProcessor $assignEmployeeProcessor
-     * @param AuthenticationProcessor $authenticationProcessor
-     */
-    public function __construct(CreateUserProcessor $createUserProcessor, CreateContactProcessor $createContactProcessor, FetchesCompany $fetchesCompany, AssignEmployeeProcessor $assignEmployeeProcessor, AuthenticationProcessor $authenticationProcessor)
-    {
-        $this->createUserProcessor = $createUserProcessor;
-        $this->createContactProcessor = $createContactProcessor;
-        $this->fetchesCompany = $fetchesCompany;
-        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
-        $this->authenticationProcessor = $authenticationProcessor;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request): JsonResponse
-    {
-        /** @var Company $company */
-        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
-
-        /** @var CompanyModule $companyModule */
-        $companyModule = $company->companyModules()->first();
-
-        if($companyModule->employees()->exists()){
-            throw new AccessForbiddenException('This company\'s account has been claimed by another user already!');
-        }
-
-        /** @var User $user */
-        $user = $this->createUserProcessor->execute($request, RoleTypes::USER, !App::environment(['production']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
-
-        $contactObject = new ContactObject($request->input('name'), $request->input('phone'), $request->input('contact_email'), $request->input('wechat_id'));
-
-        $this->createContactProcessor->execute($contactObject, $company);
-
-        $Object = new EmploymentObject($companyModule, $user);
-
-        $this->assignEmployeeProcessor->execute($Object);
-
-        return $this->response($this->authenticationProcessor->execute($request));
-    }
-}

app/Classes/Modules/Accounts/ControllersLogic/CrossAuthenticateUserLogic.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\ControllersLogic;
-
-use App\Classes\Modules\Accounts\Processors\CrossAuthenticationProcessor;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class CrossAuthenticateUserLogic extends AbstractControllerLogic
-{
-
-    protected function notification():array {
-        return [
-            'title' => 'Cross Authentication',
-            'message' => 'You have successfully logged in to your account'
-        ];
-    }
-
-    /** @var CrossAuthenticationProcessor */
-    private $crossAuthenticationProcessor;
-
-
-    /**
-     * CrossAuthenticateUserLogic constructor.
-     * @param CrossAuthenticationProcessor $authenticationProcessor
-     */
-    public function __construct(CrossAuthenticationProcessor $crossAuthenticationProcessor)
-    {
-        $this->crossAuthenticationProcessor = $crossAuthenticationProcessor;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function logic(Request $request): JsonResponse {
-        return $this->response($this->crossAuthenticationProcessor->execute($request));
-    }
-
-}

app/Classes/Modules/Accounts/ControllersLogic/LogoutUserLogic.php

@@ -37,6 +37,7 @@ class LogoutUserLogic extends AbstractControllerLogic
      */
     protected function logic(Request $request): JsonResponse {
 
+        logger("logout");
         $this->invalidatesAuthenticationToken->execute();
 
         return $this->response();

app/Classes/Modules/Accounts/DataTransferObjects/CrossAuthenticationCredentialsObject.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\DataTransferObjects;
-
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class CrossAuthenticationCredentialsObject implements DataTransferObject
-{
-
-    /** @var string */
-    private $access_token;
-
-    /** @var string */
-    private $platform;
-
-    /**
-     * CrossAuthenticationCredentialsObject constructor.
-     * @param string $access_token
-     * @param string $platform
-     */
-    public function __construct(string $access_token, int $platform)
-    {
-        $this->access_token = $access_token;
-        $this->platform = $platform;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAccessToken(): string
-    {
-        return $this->access_token;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPlatform(): int
-    {
-        return $this->platform;
-    }
-}

app/Classes/Modules/Accounts/DataTransferObjects/FullNameObject.php

@@ -4,14 +4,19 @@ namespace App\Classes\Modules\Accounts\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
 
-class FullNameObject implements DataTransferObject
+class FullnameObject implements DataTransferObject
 {
     /** @var string */
     private $name;
 
     /**
-     * FullNameObject constructor.
+     * UserObject constructor.
      * @param string $name
+     * @param string $email
+     * @param string $password
+     * @param string $passwordConfirmation
+     * @param int|null $type
+     * @param int|null $status
      */
     public function __construct(string $name)
     {

app/Classes/Modules/Accounts/DataTransferObjects/UserSocialAccountObject.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-use App\Models\User;
-
-class UserSocialAccountObject implements DataTransferObject
-{
-    /** @var String */
-    private $app_id;
-
-    /** @var User */
-    private $user;
-
-    /** @var integer */
-    private $platform;
-
-    /**
-     * UserSocialAccountObject constructor.
-     * @param String $token
-     * @param String $app_id
-     */
-    public function __construct(String $app_id, User $user, int $platform)
-    {
-        $this->app_id = $app_id;
-        $this->user = $user;
-        $this->platform = $platform;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAppId(): String
-    {
-        return $this->app_id;
-    }
-
-    /**
-     * @return User
-     */
-    public function getUser(): User
-    {
-        return $this->user;
-    }
-
-    /**
-     * @return int
-     */
-    public function getPlatform(): int
-    {
-        return $this->platform;
-    }
-}

app/Classes/Modules/Accounts/Processors/CrossAuthenticationProcessor.php

@@ -1,211 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\Processors;
-
-use App\Classes\Modules\Accounts\DataTransferObjects\CrossAuthenticationCredentialsObject;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
-use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
-use App\Classes\Modules\Accounts\DataTransferObjects\UserSocialAccountObject;
-
-use App\Classes\Modules\Accounts\Services\CrossAuthenticatesUser;
-use App\Classes\Modules\Accounts\Services\AuthenticationRedirect;
-use App\Classes\Modules\Accounts\Services\FetchesUser;
-use App\Classes\Modules\Accounts\Services\GeneratesAuthenticationToken;
-use App\Classes\Modules\Accounts\Standards\Rules\CanCrossAuthenticateUser;
-use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
-
-use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
-use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
-use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
-use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
-use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
-use App\Classes\General\Services\GeneratesInitials;
-use App\Classes\Modules\Companies\Services\ApprovesCompanyConnection;
-use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
-use App\Classes\Modules\Documents\Processors\UploadIdentityDocumentProcessor;
-use App\Classes\Modules\Accounts\Services\CreatesUserSocialAccount;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\BusinessType;
-use App\Classes\ValueObjects\Constants\CompanyType;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-
-use Illuminate\Http\Request;
-use App\Models\UserSocialAccount;
-
-class CrossAuthenticationProcessor
-{
-
-    /** @var CanCrossAuthenticateUser */
-    private $canCrossAuthenticateUser;
-
-    /** @var CrossAuthenticatesUser */
-    private $authenticatesUser;
-
-    /** @var GeneratesAuthenticationToken */
-    private $generatesAuthenticationToken;
-
-    /** @var FetchesUser */
-    private $fetchesUser;
-
-    /** @var AuthenticationRedirect */
-    private $authenticationRedirect;
-
-    /** @var CreateUserProcessor */
-    private $createUserProcessor;
-
-    /** @var CreateCompanyProcessor */
-    private $createCompanyProcessor;
-
-    /** @var CreateContactProcessor */
-    private $createContactProcessor;
-
-    /** @var CreateCompanyModuleProcessor */
-    private $createCompanyModuleProcessor;
-
-    /** @var CreatesCompanyConnection */
-    private $createsCompanyConnection;
-
-    /** @var ApprovesCompanyConnection */
-    private $approvesCompanyConnection;
-
-    /** @var AssignEmployeeProcessor */
-    private $assignEmployeeProcessor;
-
-    /** @var UploadIdentityDocumentProcessor */
-    private $uploadIdentityDocumentProcessor;
-
-    /** @var CreatesUserSocialAccount */
-    private $createsUserSocialAccount;
-
-    /**
-     * CrossAuthenticationProcessor constructor.
-     * @param CanCrossAuthenticateUser $canCrossAuthenticateUser
-     * @param CrossAuthenticatesUser $crossAuthenticatesUser
-     * @param GeneratesAuthenticationToken $generatesAuthenticationToken
-     * @param FetchesUser $fetchesUser
-     * @param AuthenticationRedirect $authenticationRedirect
-     * @param CreateUserProcessor $createUserProcessor
-     * @param CreateCompanyProcessor $createCompanyProcessor
-     * @param CreateContactProcessor $createContactProcessor
-     * @param CreateCompanyModuleProcessor $createCompanyModuleProcessor
-     * @param CreatesCompanyConnection $createsCompanyConnection
-     * @param ApprovesCompanyConnection $approvesCompanyConnection
-     * @param AssignEmployeeProcessor $assignEmployeeProcessor
-     * @param UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor
-     * @param CreatesUserSocialAccount $createsUserSocialAccount
-     */
-    public function __construct(
-        CanCrossAuthenticateUser $canCrossAuthenticateUser, 
-        CrossAuthenticatesUser $crossAuthenticatesUser, 
-        GeneratesAuthenticationToken $generatesAuthenticationToken, 
-        FetchesUser $fetchesUser, 
-        AuthenticationRedirect $authenticationRedirect,
-        CreateUserProcessor $createUserProcessor,
-        CreateCompanyProcessor $createCompanyProcessor,
-        CreateContactProcessor $createContactProcessor,
-        CreateCompanyModuleProcessor $createCompanyModuleProcessor,
-        CreatesCompanyConnection $createsCompanyConnection,
-        ApprovesCompanyConnection $approvesCompanyConnection,
-        AssignEmployeeProcessor $assignEmployeeProcessor,
-        UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor,
-        CreatesUserSocialAccount $createsUserSocialAccount
-    )
-    {
-        $this->canCrossAuthenticateUser = $canCrossAuthenticateUser;
-        $this->crossAuthenticatesUser = $crossAuthenticatesUser;
-        $this->generatesAuthenticationToken = $generatesAuthenticationToken;
-        $this->fetchesUser = $fetchesUser;
-        $this->authenticationRedirect = $authenticationRedirect;
-        $this->createUserProcessor = $createUserProcessor;
-        $this->createCompanyProcessor = $createCompanyProcessor;
-        $this->createContactProcessor = $createContactProcessor;
-        $this->createCompanyModuleProcessor = $createCompanyModuleProcessor;
-        $this->createsCompanyConnection = $createsCompanyConnection;
-        $this->createsCompanyConnection = $createsCompanyConnection;
-        $this->approvesCompanyConnection = $approvesCompanyConnection;
-        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
-        $this->uploadIdentityDocumentProcessor = $uploadIdentityDocumentProcessor;
-        $this->createsUserSocialAccount = $createsUserSocialAccount;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return array
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function execute(Request $request): array {
-
-        $object = new CrossAuthenticationCredentialsObject($request->input('access_token'), $request->input('platform'));
-
-        $this->canCrossAuthenticateUser->passes($object);
-
-        $cross = $this->crossAuthenticatesUser->execute($object);
-
-        $user_social_account = UserSocialAccount::where('app_id', $cross->token->user->id)->first();
-        if (!$user_social_account) {
-
-            $request->request->add([
-                'name' => $cross->token->user->name,
-                'email' => $cross->token->user->email,
-                'password' => 'pass123',
-                'password_confirmation' => 'pass123',
-            ]);
-
-            $user = $this->createUserProcessor->execute(
-                $request, 
-                RoleTypes::USER, 
-                env('APP_ENV') != 'production' ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION
-            );
-
-            $company = $this->createCompanyProcessor->execute(
-                $cross->payload->data->name,
-                CompanyType::COMPANY_BUSINESS, 
-                ApprovalStatus::PENDING_SUBMISSION
-            );
-
-            $contactObject = new ContactObject(
-                $cross->payload->data->contact->reference, 
-                $cross->payload->data->contact->phone, 
-                $cross->payload->data->contact->email, 
-                $cross->payload->data->contact->wechat_id
-            );
-            $contact = $this->createContactProcessor->execute($contactObject, $company);
-
-            $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::IMPORTER);
-
-            $connectionObject = new CompanyConnectionObject(
-                $companyModule, 'CIEF', 
-                mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate()
-            );
-            $connection = $this->createsCompanyConnection->execute($connectionObject);
-
-            $this->approvesCompanyConnection->execute($connection);
-
-            $object = new EmploymentObject($companyModule, $user);
-            $this->assignEmployeeProcessor->execute($object);
-
-            $request->request->add([
-                'files' => [$cross->document->src],
-                'identification_no' => $cross->payload->data->identification->reference,
-            ]);
-
-            $this->uploadIdentityDocumentProcessor->execute($request, $company);
-
-            $object = new UserSocialAccountObject(
-                $cross->token->user->id, 
-                $user,
-                $request->input('platform')
-            );
-            $this->createsUserSocialAccount->execute($object);
-        }
-        else {
-            $user = $user_social_account->user()->first();
-        }
-
-        return ['access_token' => $this->generatesAuthenticationToken->execute($user), 'redirect_url' => $this->authenticationRedirect->url($user)];
-    }
-}

app/Classes/Modules/Accounts/Processors/GenerateEmailVerificationAttemptProcessor.php

@@ -56,4 +56,4 @@ class GenerateEmailVerificationAttemptProcessor
 
     }
 
-}
+}

app/Classes/Modules/Accounts/Services/AuthenticatesUser.php

@@ -2,9 +2,9 @@
 
 namespace App\Classes\Modules\Accounts\Services;
 
+
 use App\Classes\Exceptions\AccessUnauthorisedException;
 use App\Classes\Modules\Accounts\DataTransferObjects\AuthenticationCredentialsObject;
-
 class AuthenticatesUser
 {
 

app/Classes/Modules/Accounts/Services/CreatesUserSocialAccount.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Accounts\DataTransferObjects\UserSocialAccountObject;
-use App\Models\UserSocialAccount;
-
-class CreatesUserSocialAccount extends AbstractUpdateRecord
-{
-    /**
-     * @param UserSocialAccountObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(UserSocialAccountObject $object) {
-        $model = new UserSocialAccount();
-        $model->user_id = $object->getUser()->id;
-        $model->app_id = $object->getAppId();
-        $model->platform = $object->getPlatform();
-        return $this->handler($model);
-
-    }
-}

app/Classes/Modules/Accounts/Services/CrossAuthenticatesUser.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\AccessUnauthorisedException;
-use App\Classes\Modules\Accounts\DataTransferObjects\CrossAuthenticationCredentialsObject;
-use App\Classes\ValueObjects\Constants\PlatformType;
-
-class CrossAuthenticatesUser
-{
-
-    /**
-     * @param CrossAuthenticationCredentialsObject $object
-     * @return false|string
-     * @throws AccessUnauthorisedException
-     */
-
-    public function execute(CrossAuthenticationCredentialsObject $object){
-
-        if ($object->getPlatform() == PlatformType::EXCHANGE) {
-
-            $token = $object->getAccessToken();
-
-            $tokenParts = explode(".", $token);  
-            $tokenPayload = base64_decode($tokenParts[1]);
-            $jwtPayload = json_decode($tokenPayload);
-
-            $response = Http::withToken($object->getAccessToken())->get(env('EXCHANGE_URL') . 'api/v1/company/' .  $jwtPayload->user->company_id . '/show')->object();
-
-            $response_document = Http::withToken($object->getAccessToken())->get(env('EXCHANGE_URL') . 'api/v1/storage/' .  $response->payload->data->identification->files[0]->file->file_info[0]->original->file . '/fetch')->object();
-            $response->token = $jwtPayload;
-            $response->document = $response_document->payload;
-        }
-
-        return $response;
-
-    }
-
-}

app/Classes/Modules/Accounts/Services/ExpiresPasswordReset.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\Services;
-
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Models\PasswordReset;
-
-class ExpiresPasswordReset extends AbstractUpdateRecord
-{
-
-
-    /**
-     * @param PasswordReset $model
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws MalformedRequestException
-     */
-    public function execute(PasswordReset $model){
-
-        $model->is_expired = true;
-        return $this->handler($model);
-
-
-    }
-
-
-}

app/Classes/Modules/Accounts/Services/FetchesUserSocialAccount.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\Services;
-
-
-use App\Classes\General\Eloquent\AbstractFetchRecord;
-use Illuminate\Database\Eloquent\Builder;
-use App\Models\UserSocialAccount;
-
-class FetchesUserSocialAccount extends AbstractFetchRecord
-{
-
-    /** @var UserSocialAccount */
-    private $repository;
-
-    /**
-     * FetchesUser constructor.
-     * @param UserSocialAccount $repository
-     */
-    public function __construct(UserSocialAccount $repository)
-    {
-        $this->repository = $repository;
-    }
-
-
-    /**
-     * @return Builder
-     */
-    public function getRepository(): Builder
-    {
-        return $this->repository->newQuery();
-    }
-}

app/Classes/Modules/Accounts/Services/GeneratesAuthenticationToken.php

@@ -3,7 +3,6 @@
 namespace App\Classes\Modules\Accounts\Services;
 
 use App\Classes\Exceptions\InternalServerErrorException;
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Models\Company;
 use App\Models\Role;
@@ -54,6 +53,9 @@ class GeneratesAuthenticationToken {
      */
     private function setTokenClaims(User $user): void {
 
+        /** @var Company $companyModule */
+        $companyModule = $user->companyModule()->first();
+
         $claims = [
             'id' => $user->id,
             'name' => $user->name,
@@ -63,10 +65,6 @@ class GeneratesAuthenticationToken {
         ];
 
         if($user->type === RoleTypes::USER) {
-
-            /** @var Company $companyModule */
-            $companyModule = $user->companyModule()->first();
-
             $claims = array_merge($claims, [
                 'company_id' => $companyModule->company_id
             ]);

app/Classes/Modules/Accounts/Services/UpdatesUser.php

@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Accounts\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Accounts\DataTransferObjects\FullNameObject;
+use App\Classes\Modules\Accounts\DataTransferObjects\FullnameObject;
 use App\Models\User;
 
 class UpdatesUser extends AbstractUpdateRecord
@@ -11,7 +11,7 @@ class UpdatesUser extends AbstractUpdateRecord
 
     /**
      * @param User $model
-     * @param FullNameObject $object
+     * @param UserObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */

app/Classes/Modules/Accounts/Standards/Rules/CanCrossAuthenticateUser.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Exceptions\RequestValidationException;
-use App\Classes\Modules\Accounts\DataTransferObjects\AuthenticationCredentialsObject;
-use App\Classes\Modules\Accounts\Standards\Validators\UserCrossAuthenticationValidation;
-
-class CanCrossAuthenticateUser extends AbstractRule
-{
-
-    /** @var UserCrossAuthenticationValidation */
-    private $userCrossAuthenticationValidation;
-
-    /**
-     * CanCrossAuthenticateUser constructor.
-     * @param UserCrossAuthenticationValidation $userCrossAuthenticationValidation
-     */
-    public function __construct(UserCrossAuthenticationValidation $userCrossAuthenticationValidation)
-    {
-        $this->userCrossAuthenticationValidation = $userCrossAuthenticationValidation;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        return true;
-
-    }
-
-
-    /**
-     * @param AuthenticationCredentialsObject $object
-     * @return bool
-     * @throws RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->userCrossAuthenticationValidation->validate($object);
-    }
-
-    /**
-     * @param AuthenticationCredentialsObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-}

app/Classes/Modules/Accounts/Standards/Validators/UserCrossAuthenticationValidation.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\Standards\Validators;
-
-use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\Accounts\DataTransferObjects\CrossAuthenticationCredentialsObject;
-
-class UserCrossAuthenticationValidation extends AbstractValidation
-{
-
-
-    /**
-     * @param CrossAuthenticationCredentialsObject $object
-     * @return array
-     */
-    protected function data($object): array {
-        return [
-            'access_token' => $object->getAccesstoken(),
-            'platform' => $object->getPlatform()
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function rules(): array {
-        return [
-            'access_token' => 'required',
-            'platform' => 'required'
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function messages(): array {
-        return [];
-    }
-
-
-
-
-}

app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php

@@ -8,7 +8,7 @@ use App\Classes\Modules\Addresses\Services\CreatesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesDistrict;
 use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
-use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Http\Resources\AddressResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -33,8 +33,8 @@ class CreateAddressLogic extends AbstractControllerLogic
     /** @var FetchesDistrict */
     private $fetchesDistrict;
 
-    /** @var FetchesCompanyModule */
-    private $fetchesCompanyModule;
+    /** @var FetchesCompany */
+    private $fetchesCompany;
 
     /** @var CreatesAddress */
     private $createsAddress;
@@ -43,14 +43,14 @@ class CreateAddressLogic extends AbstractControllerLogic
      * CreateAddressLogic constructor.
      * @param CanCreateAddress $canCreateAddress
      * @param FetchesDistrict $fetchesDistrict
-     * @param FetchesCompanyModule $fetchesCompanyModule
+     * @param FetchesCompany $fetchesCompany
      * @param CreatesAddress $createsAddress
      */
-    public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompanyModule $fetchesCompanyModule, CreatesAddress $createsAddress)
+    public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesAddress $createsAddress)
     {
         $this->canCreateAddress = $canCreateAddress;
         $this->fetchesDistrict = $fetchesDistrict;
-        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->fetchesCompany = $fetchesCompany;
         $this->createsAddress = $createsAddress;
     }
 
@@ -66,13 +66,13 @@ class CreateAddressLogic extends AbstractControllerLogic
 
         $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
 
-        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), $request->input('reference'));
+        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
 
         $this->canCreateAddress->passes($object);
 
-        $address = $this->createsAddress->execute($this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]), $object);
+        $query = $this->createsAddress->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object);
 
-        return $this->resourceResponse(new AddressResource($address));
+        return $this->resourceResponse(new AddressResource($query));
 
     }
 

app/Classes/Modules/Addresses/ControllersLogic/DeleteAddressLogic.php

@@ -50,20 +50,23 @@ class DeleteAddressLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws ErrorException
      */
     public function logic(Request $request) : JsonResponse
     {
+        try {
 
-        $this->canDeleteAddress->passes();
+            $this->canDeleteAddress->passes();
 
-        $query = $this->fetchesAddress->execute(['id' => $request->route('id')]);
+            $query = $this->fetchesAddress->execute(['id' => $request->route('id')]);
 
-        $this->deletesAddress->execute($query);
+            $this->deletesAddress->execute($query);
 
-        return $this->response([]);
+            return $this->response([]);
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
 
     }
 

app/Classes/Modules/Addresses/ControllersLogic/FetchAddressLogic.php

@@ -45,16 +45,21 @@ class FetchAddressLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws ErrorException
      */
     public function logic(Request $request) : JsonResponse
     {
-        $this->canFetchAddress->passes();
+        try {
 
-        $query = $this->fetchesAddress->execute(['id' => $request->route('id')]);
+            $this->canFetchAddress->passes();
 
-        return $this->resourceResponse(new AddressResource($query));
+            $query = $this->fetchesAddress->execute(['id' => $request->route('id')]);
+
+            return $this->resourceResponse(new AddressResource($query));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
 
     }
 

app/Classes/Modules/Addresses/ControllersLogic/ListAddressesLogic.php

@@ -45,18 +45,21 @@ class ListAddressesLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws ErrorException
      */
     public function logic(Request $request) : JsonResponse
     {
+        try {
 
-        $this->canListAddresses->passes();
+            $this->canListAddresses->passes();
 
-        $query = $this->listsAddresses->execute($this->listsAddresses->deserializeFilters($request->input('filters')));
+            $query = $this->listsAddresses->execute($this->listsAddresses->deserializeFilters($request->input('filters')));
 
-        return $this->collectionResponse(AddressResource::collection($query));
+            return $this->collectionResponse(AddressResource::collection($query));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
 
     }
 

app/Classes/Modules/Addresses/ControllersLogic/SetAddressToDefaultLogic.php

@@ -2,13 +2,15 @@
 
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
-use App\Classes\General\Interfaces\Addressable;
 use App\Http\Resources\AddressResource;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
+use App\Classes\Modules\Addresses\Standards\Rules\CanUpdateAddress;
 use App\Classes\Modules\Addresses\Services\ResetsAddressesDefault;
 use App\Classes\Modules\Addresses\Services\SetsAddressToDefault;
+
 use App\Models\Address;
+use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -27,26 +29,25 @@ class SetAddressToDefaultLogic extends AbstractControllerLogic
         ];
     }
 
-    /** @var FetchesAddress */
-    private $fetchesAddress;
-
     /** @var ResetsAddressesDefault */
     private $resetsAddressesDefault;
 
+    /** @var FetchesAddress */
+    private $fetchesAddress;
+
     /** @var SetsAddressToDefault*/
     private $setsAddressToDefault;
 
-
     /**
      * SetAddressToDefaultLogic constructor.
-     * @param FetchesAddress $fetchesAddress
      * @param ResetsAddressesDefault $resetsAddressesDefault
+     * @param FetchesAddress $fetchesAddress
      * @param SetsAddressToDefault $setsAddressToDefault
      */
-    public function __construct(FetchesAddress $fetchesAddress, ResetsAddressesDefault $resetsAddressesDefault, SetsAddressToDefault $setsAddressToDefault)
+    public function __construct(ResetsAddressesDefault $resetsAddressesDefault, FetchesAddress $fetchesAddress, SetsAddressToDefault $setsAddressToDefault)
     {
-        $this->fetchesAddress = $fetchesAddress;
         $this->resetsAddressesDefault = $resetsAddressesDefault;
+        $this->fetchesAddress = $fetchesAddress;
         $this->setsAddressToDefault = $setsAddressToDefault;
     }
 
@@ -62,9 +63,8 @@ class SetAddressToDefaultLogic extends AbstractControllerLogic
 
         $address = $this->fetchesAddress->execute(['id' => $request->route('id')]);
 
-        $this->resetsAddressesDefault->execute($address->owner, $address->type);
+        $this->resetsAddressesDefault->execute($address);
 
         return $this->resourceResponse(new AddressResource($this->setsAddressToDefault->execute($address)));
-
     }
 }

app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php

@@ -10,6 +10,7 @@ use App\Classes\Modules\Addresses\Services\FetchesDistrict;
 use App\Classes\Modules\Addresses\Standards\Rules\CanUpdateAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
 use App\Http\Resources\AddressResource;
+use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -57,23 +58,28 @@ class UpdateAddressLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws ErrorException
      */
     public function logic(Request $request) : JsonResponse
     {
-        $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
+        try {
 
-        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), $request->input('reference'));
+            $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
+            $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
+            //$object = new AddressObject($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->canUpdateAddress->passes($object);
+            $this->canUpdateAddress->passes($object);
 
-        $address = $this->fetchesAddress->execute(['id' => $request->route('id')]);
+            $query = $this->fetchesAddress->execute(['id' => $request->route('id')]);
 
-        $address = $this->updatesAddress->execute($address, $object);
+            $query = $this->updatesAddress->execute($query, $object);
 
-        return $this->resourceResponse(new AddressResource($address));
+            return $this->resourceResponse(new AddressResource($query));
+
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
 
     }
 

app/Classes/Modules/Addresses/DataTransferObjects/AddressObject.php

@@ -3,7 +3,6 @@
 namespace App\Classes\Modules\Addresses\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
 
 class AddressObject implements DataTransferObject
 {
@@ -26,9 +25,6 @@ class AddressObject implements DataTransferObject
     /** @var int */
     private $postCode;
 
-    /** @var string|null */
-    private $reference;
-
     /**
      * AddressObject constructor.
      * @param string $streetOne
@@ -37,9 +33,8 @@ class AddressObject implements DataTransferObject
      * @param int $stateId
      * @param int $districtId
      * @param int $postCode
-     * @param null|string $reference
      */
-    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode, ?string $reference = null, ?int $status = ApprovalStatus::APPROVED)
+    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode)
     {
         $this->streetOne = $streetOne;
         $this->streetTwo = $streetTwo;
@@ -47,8 +42,6 @@ class AddressObject implements DataTransferObject
         $this->stateId = $stateId;
         $this->districtId = $districtId;
         $this->postCode = $postCode;
-        $this->reference = $reference;
-        $this->status = $status;
     }
 
     /**
@@ -99,21 +92,5 @@ class AddressObject implements DataTransferObject
         return $this->postCode;
     }
 
-    /**
-     * @return null|string
-     */
-    public function getReference(): ?string
-    {
-        return $this->reference;
-    }
-
-    /**
-     * @return int
-     */
-    public function getStatus(): int
-    {
-        return $this->status;
-    }
-
 
 }

app/Classes/Modules/Addresses/Processors/CreateAddressFromOldAddressProcessor.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Addresses\Processors;
-
-use App\Classes\General\Interfaces\Addressable;
-use App\Classes\Modules\Addresses\Services\CleansOldAddress;
-use App\Classes\Modules\Addresses\Services\CreatesAddress;
-use App\Classes\Modules\Addresses\Services\FetchesAddress;
-use App\Models\OldAddress;
-use App\Models\Order;
-use Illuminate\Database\Eloquent\Model;
-
-class CreateAddressFromOldAddressProcessor
-{
-
-    /** @var CleansOldAddress */
-    private $cleansOldAddress;
-
-    /** @var CreatesAddress */
-    private $createsAddress;
-
-
-    /**
-     * CreateAddressFromOldAddressProcessor constructor.
-     * @param CleansOldAddress $cleansOldAddress
-     * @param CreatesAddress $createsAddress
-     */
-    public function __construct(CleansOldAddress $cleansOldAddress, CreatesAddress $createsAddress)
-    {
-        $this->cleansOldAddress = $cleansOldAddress;
-        $this->createsAddress = $createsAddress;
-    }
-
-
-    /**
-     * @param OldAddress $address
-     * @param Addressable $addressable
-     * @return Model|null
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(OldAddress $address, Addressable $addressable): ?Model {
-
-        if(!$object = $this->cleansOldAddress->execute($address)){
-            return null;
-        }
-
-
-        if(!$addressable instanceof Order && $address = $addressable->addresses()->where('street_one', $object->getStreetOne())->first()) {
-            return $address;
-        }
-
-        return $this->createsAddress->execute($addressable, $object);
-
-    }
-
-}

app/Classes/Modules/Addresses/Processors/CreateOrderAddressProcessor.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Addresses\Processors;
-
-use App\Classes\Modules\Addresses\Services\CreatesOrderAddress;
-use App\Classes\Modules\Addresses\Services\FetchesAddress;
-use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
-use Illuminate\Database\Eloquent\Model;
-use App\Models\Order;
-
-class CreateOrderAddressProcessor
-{
-
-    /** @var CanCreateAddress */
-    private $canCreateAddress;
-
-    /** @var CreatesAddress */
-    private $createsOrderAddress;
-
-    private $fetchesAddress;
-
-    /**
-     * CreateAddressProcessor constructor.
-     * @param CanCreateAddress $canCreateAddress
-     * @param CreatesOrderAddress $createsOrderAddress
-     * @param FetchesAddress $fetchesAddress
-     */
-    public function __construct(CanCreateAddress $canCreateAddress, CreatesOrderAddress $createsOrderAddress, FetchesAddress $fetchesAddress)
-    {
-        $this->fetchesAddress = $fetchesAddress;
-        $this->canCreateAddress = $canCreateAddress;
-        $this->createsOrderAddress = $createsOrderAddress;
-    }
-
-    /**
-     * @param EmploymentObject $object
-     * @return Model
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function execute(int $address, Order $order): Model {
-
-        $address = $this->fetchesAddress->execute(['id' => $address_id]);
-
-
-       // $this->canCreateAddress->passes($object);
-
-        //Fetches Address  & duplicate
-
-        return $this->createsOrderAddress->execute($address, $order);
-    }
-
-}

app/Classes/Modules/Addresses/Services/CleansOldAddress.php

@@ -1,52 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Omair Saleh
- * Date: 20/8/2021
- * Time: 1:05 AM
- */
-
-namespace App\Classes\Modules\Addresses\Services;
-
-
-use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
-use App\Models\District;
-use App\Models\OldAddress;
-
-class CleansOldAddress
-{
-
-    public function execute(OldAddress $address){
-        if($address->street_one === '' && $address->street_two === ''){
-            return null;
-        }
-
-        if(!$address->post_code){
-            return null;
-        }
-
-        $district = District::where('postcode', 'like', '%'. $address->post_code .'%')->first();
-
-        if(!$district) {
-            return null;
-        }
-
-        return new AddressObject($this->cleanAddress($address->street_one, $district, $address->post_code), $this->cleanAddress($address->street_two, $district, $address->post_code), $district->country_id, $district->state_id, $district->id, $address->post_code, 'Delivery Address');
-
-    }
-
-    public function cleanAddress($address, $district, $postcode){
-        $address = str_replace('Malaysia', '', str_replace('malaysia', '', str_replace('MALAYSIA', '', $address)));
-        $address = str_replace($district->state->name, '',str_replace($district->name, '', $address));
-        $address = str_replace(strtolower($district->state->name), '',str_replace(strtolower($district->name), '', $address));
-        $address = str_replace(strtoupper($district->state->name), '',str_replace(strtoupper($district->name), '', $address));
-        $address = str_replace($postcode, '', $address);
-        $address = str_replace(', ,', ',', str_replace(', ,', ',', str_replace(', ,', ',', $address)));
-        $address = str_replace(',', ', ', $address);
-        $address = preg_replace('!\s+!', ' ', $address);
-        $address = preg_replace("/,+/", ",", $address);
-        return rtrim(rtrim(rtrim(rtrim($address, '.')), ','));
-
-    }
-
-}

app/Classes/Modules/Addresses/Services/CreatesAddress.php

@@ -2,35 +2,31 @@
 
 namespace App\Classes\Modules\Addresses\Services;
 
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
-use App\Classes\General\Interfaces\Addressable;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
 use App\Models\Address;
-use App\Models\CompanyModule;
+use App\Models\Company;
 
 class CreatesAddress extends AbstractUpdateRelationshipRecord
 {
 
     /**
-     * @param Addressable $addressable
+     * @param Company $company
      * @param AddressObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Addressable $addressable, AddressObject $object) {
-
+    public function execute(Company $company, AddressObject $object) {
         $model = new Address();
-
-        $model->reference = $object->getReference();
         $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();
-        $model->status = $object->getStatus();
 
-        return $this->handler($addressable->addresses(), $model);
+        return $this->handler($company->addresses(), $model);
 
     }
 }

app/Classes/Modules/Addresses/Services/CreatesOrderAddress.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Addresses\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
-use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
-use App\Models\Order;
-use App\Models\Address;
-
-class CreatesOrderAddress extends AbstractUpdateRelationshipRecord
-{
-
-    public function execute(Address $address, Order $order) {
-
-        $model = new Address();
-        $model->street_one = $address->street_one;
-        $model->street_two = $address->street_two;
-        $model->country_id = $address->country_id;
-        $model->state_id = $address->state_id;
-        $model->district_id = $address->district_id;
-        $model->postcode = $address->postcode;
-
-        return $this->handler($order->addresses(), $model);
-
-    }
-}

app/Classes/Modules/Addresses/Services/ResetsAddressesDefault.php

@@ -3,20 +3,17 @@
 namespace App\Classes\Modules\Addresses\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\General\Interfaces\Addressable;
 use App\Models\Address;
-use App\Models\CompanyModule;
 
 class ResetsAddressesDefault extends AbstractUpdateRecord
 {
 
     /**
-     * @param Addressable $addressable
-     * @param int $type
+     * @param Address $address
      * @return void
      */
-    public function execute(Addressable $addressable, int $type)
+    public function execute(Address $address)
     {
-        $addressable->addresses()->where('type', $type)->update(['default' => false]);
+        $address->company->addresses()->update(['billing' => false]);
     }
 }

app/Classes/Modules/Addresses/Services/SetsAddressToDefault.php

@@ -15,7 +15,7 @@ class SetsAddressToDefault extends AbstractUpdateRecord
      */
     public function execute(Address $model)
     {
-        $model->default = true;
+        $model->billing = true;
 
         return $this->handler($model);
     }

app/Classes/Modules/Addresses/Services/UpdatesAddress.php

@@ -17,13 +17,15 @@ class UpdatesAddress extends AbstractUpdateRecord
      */
     public function execute(Address $model, AddressObject $object) {
 
-        $model->reference = $object->getReference();
+        //$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();
 
         return $this->handler($model);
 

app/Classes/Modules/Banks/ControllersLogic/CreateBankLogic.php

@@ -1,72 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Banks\Standards\Rules\CanCreateBank;
-use App\Classes\Modules\Banks\Services\CreatesBank;
-use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
-use App\Http\Resources\BankResource;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class CreateBankLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Bank',
-            'message' => 'You have successfully created a new Bank'
-        ];
-    }
-
-    /** @var CanCreateBank */
-    private $canCreateBank;
-
-    /** @var CreatesBank */
-    private $createsBank;
-
-
-    /**
-     * CreateBankLogic constructor.
-     * @param CanCreateBank $canCreateBank
-     * @param CreatesBank $createsBank
-     */
-    public function __construct(
-        CanCreateBank $canCreateBank,
-        CreatesBank $createsBank
-    )
-    {
-        $this->canCreateBank = $canCreateBank;
-        $this->createsBank = $createsBank;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-
-        $bank_object = new BankObject($request->input('company_id'), $request->input('account_type'),
-            $request->input('bank_name'), $request->input('holder_name'),  $request->input('account_no'),
-             $request->input('bank_branch'),  $request->input('swift'),  $request->input('snap'),
-            $request->input('country_id'), $request->input('reference'));
-
-        $this->canCreateBank->passes($bank_object);
-
-        $bank = $this->createsBank->execute($bank_object);
-
-        return $this->resourceResponse(new BankResource($bank));
-
-    }
-}

app/Classes/Modules/Banks/ControllersLogic/DeleteBankLogic.php

@@ -1,77 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\ControllersLogic;
-
-use App\Classes\Exceptions\RequestValidationException;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Banks\Services\FetchesBank;
-use App\Classes\Modules\Banks\Standards\Rules\CanDeleteBank;
-use App\Classes\Modules\Banks\Services\DeletesBank;
-use App\Http\Resources\BankResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class DeleteBankLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Delete Bank',
-            'message' => 'You have successfully deleted the Bank'
-        ];
-    }
-
-    /** @var CanDeleteBank */
-    private $canDeleteBank;
-
-    /** @var DeletesBank */
-    private $deletesBank;
-
-    /** @var FetchesBank */
-    private $fetchesBank;
-
-
-    /**
-     * DeleteBankLogic constructor.
-     * @param CanDeleteBank $canDeleteBank
-     * @param DeletesBank $deletesBank
-     * @param FetchesBank $fetchesBank
-     */
-    public function __construct(
-        CanDeleteBank $canDeleteBank,
-        DeletesBank $deletesBank,
-        FetchesBank $fetchesBank
-    )
-    {
-        $this->canDeleteBank = $canDeleteBank;
-        $this->deletesBank = $deletesBank;
-        $this->fetchesBank = $fetchesBank;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-
-        $this->canDeleteBank->passes();
-
-        $bank = $this->fetchesBank->execute(['id' => $request->route('id')]);
-
-        if($bank->default){
-            throw new RequestValidationException('You can\'t delete bank account when it set to default');
-        }
-
-        $this->deletesBank->execute($bank);
-
-        return $this->response([]);
-    }
-
-}

app/Classes/Modules/Banks/ControllersLogic/ListBanksLogic.php

@@ -1,62 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Banks\Services\ListsBanks;
-use App\Classes\Modules\Banks\Standards\Rules\CanListBanks;
-use App\Http\Resources\BankResource;
-use App\Http\Resources\CompanyResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ListBanksLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieve Banks',
-            'message' => 'You have successfully retrieved a list of Banks'
-        ];
-    }
-
-    /** @var CanListBanks */
-    private $canListBanks;
-
-    /** @var ListsBanks */
-    private $listsBanks;
-
-    /**
-     * ListBanksLogic constructor.
-     * @param CanListBanks $canListBanks
-     * @param ListsBanks $listsBanks
-     */
-    public function __construct(CanListBanks $canListBanks, ListsBanks $listsBanks)
-    {
-        $this->canListBanks = $canListBanks;
-        $this->listsBanks = $listsBanks;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $this->canListBanks->passes();
-
-        $banks = $this->listsBanks->execute($this->listsBanks->deserializeFilters($request->input('filters')));
-
-        return $this->collectionResponse(BankResource::collection($banks));
-
-    }
-
-}

app/Classes/Modules/Banks/ControllersLogic/SetBankToDefaultLogic.php

@@ -1,78 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\ControllersLogic;
-
-use App\Http\Resources\BankResource;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Banks\Services\FetchesBank;
-use App\Classes\Modules\Banks\Services\ListsBanks;
-
-use App\Classes\Modules\Banks\Standards\Rules\CanUpdateBank;
-use App\Classes\Modules\Banks\Services\ResetsBanksDefault;
-use App\Classes\Modules\Banks\Services\SetsBankToDefault;
-
-use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
-use App\Classes\ValueObjects\Constants\DefaultType;
-
-use App\Models\Bank;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class SetBankToDefaultLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Bank',
-            'message' => 'You have successfully updated the Bank'
-        ];
-    }
-
-    /** @var ResetsBanksDefault */
-    private $resetsBanksDefault;
-
-    /** @var FetchesBank */
-    private $fetchesBank;
-
-    /** @var SetsBankToDefault*/
-    private $setsBankToDefault ;
-
-    /**
-     * SetBankToDefaultLogic constructor.
-     * @param ResetsBanksDefault $resetsBanksDefault
-     * @param FetchesBank $fetchesBank
-     * @param SetsBankToDefault $setsBankToDefault
-     */
-    public function __construct(ResetsBanksDefault $resetsBanksDefault, FetchesBank $fetchesBank, SetsBankToDefault $setsBankToDefault)
-    {
-        $this->resetsBanksDefault = $resetsBanksDefault;
-        $this->fetchesBank = $fetchesBank;
-        $this->setsBankToDefault = $setsBankToDefault;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-
-        /** @var Bank $bank */
-        $bank = $this->fetchesBank->execute(['id' => $request->route('id')]);
-
-        $this->resetsBanksDefault->execute($bank);
-
-        $this->setsBankToDefault->execute($bank);
-
-        return $this->resourceResponse(new BankResource($this->setsBankToDefault->execute($bank)));
-    }
-
-}

app/Classes/Modules/Banks/ControllersLogic/UpdateBankLogic.php

@@ -1,85 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\ControllersLogic;
-
-use App\Http\Resources\BankResource;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Banks\Services\FetchesBank;
-
-use App\Classes\Modules\Banks\Standards\Rules\CanUpdateBank;
-use App\Classes\Modules\Banks\Services\UpdatesBank;
-use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class UpdateBankLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Update Bank Account',
-            'message' => 'You have successfully updated the Bank Account'
-        ];
-    }
-
-    /** @var CanUpdateBank */
-    private $canUpdateBank;
-
-    /** @var UpdatesBank */
-    private $updatesBank;
-
-    /** @var FetchesBank */
-    private $fetchesBank;
-
-
-    /**
-     * UpdateBankLogic constructor.
-     * @param CanUpdateBank $canUpdateBank
-     * @param UpdatesBank $updatesBank
-     * @param FetchesBank $fetchesBank
-     */
-    public function __construct(
-        CanUpdateBank $canUpdateBank,
-        UpdatesBank $updatesBank,
-        FetchesBank $fetchesBank
-    )
-    {
-        $this->canUpdateBank = $canUpdateBank;
-        $this->updatesBank = $updatesBank;
-        $this->fetchesBank = $fetchesBank;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-
-        $bankObject = new BankObject($request->input('company_id'), $request->input('country_id'),
-            $request->input('reference'), $request->input('bank_name'), $request->input('holder_name'),
-            $request->input('account_no'));
-
-
-        $bank = $this->fetchesBank->execute(['id' => $request->route('id')]);
-
-        $this->canUpdateBank->passes($bankObject);
-
-        $bank_query = $this->updatesBank->execute($bank, $bankObject);
-
-        return $this->resourceResponse(new BankResource($bank_query));
-
-    }
-
-}

app/Classes/Modules/Banks/DataTransferObjects/BankObject.php

@@ -1,136 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class BankObject implements DataTransferObject
-{
-
-    /** @var int  */
-    private $company_id;
-
-    /** @var int */
-    private $type;
-
-    /** @var string */
-    private $bank_name;
-
-    /** @var string */
-    private $holder_name;
-
-    /** @var string */
-    private $account_no;
-
-    /** @var int */
-    private $country_id;
-
-    /** @var string|null */
-    private $reference;
-
-    /**
-     * BankObject constructor.
-     * @param int $company_id
-     * @param int $type
-     * @param string $bank_name
-     * @param string $holder_name
-     * @param string $account_no
-     * @param int $country_id
-     * @param null|string $reference
-     */
-    public function __construct(int $company_id, int $type, string $bank_name, string $holder_name, string $account_no, ?string $bank_branch = null, ?string $swift = null, ?string $snap = null, int $country_id, ?string $reference = null)
-    {
-        $this->company_id = $company_id;
-        $this->type = $type;
-        $this->bank_name = $bank_name;
-        $this->holder_name = $holder_name;
-        $this->account_no = $account_no;
-        $this->bank_branch = $bank_branch;
-        $this->swift = $swift;
-        $this->snap = $snap;
-        $this->country_id = $country_id;
-        $this->reference = $reference;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCompanyId(): int
-    {
-        return $this->company_id;
-    }
-
-    /**
-     * @return int
-     */
-    public function getType(): int
-    {
-        return $this->type;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBankName(): string
-    {
-        return $this->bank_name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getHolderName(): string
-    {
-        return $this->holder_name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAccountNo(): string
-    {
-        return $this->account_no;
-    }
-
-    /**
-     * @return null|string
-     */
-    public function getBankBranch(): ?string
-    {
-        return $this->bank_branch;
-    }
-
-    /**
-     * @return null|string
-     */
-    public function getSwift(): ?string
-    {
-        return $this->swift;
-    }
-
-    /**
-     * @return null|string
-     */
-    public function getSnap(): ?string
-    {
-        return $this->snap;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCountryId(): int
-    {
-        return $this->country_id;
-    }
-
-    /**
-     * @return null|string
-     */
-    public function getReference(): ?string
-    {
-        return $this->reference;
-    }
-
-
-}

app/Classes/Modules/Banks/Services/CreatesBank.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
-use App\Models\Bank;
-
-class CreatesBank extends AbstractUpdateRecord
-{
-    /**
-     * @param BankObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(BankObject $object) {
-
-        $model = new Bank();
-        $model->company_id = $object->getCompanyId();
-        $model->reference = $object->getReference();
-        $model->bank_name = $object->getBankName();
-        $model->holder_name = $object->getHolderName();
-        $model->account_no = $object->getAccountNo();
-        $model->bank_branch = $object->getBankBranch();
-        $model->swift = $object->getSwift();
-        $model->snap = $object->getSnap();
-        $model->type = $object->getType();
-        $model->country_id = $object->getCountryId();
-
-        return $this->handler($model);
-
-    }
-}

app/Classes/Modules/Banks/Services/DeletesBank.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\Services;
-
-use App\Classes\General\Eloquent\AbstractDeleteRecord;
-use App\Models\Bank;
-
-class DeletesBank extends AbstractDeleteRecord
-{
-
-    /**
-     * @param Bank $model
-     * @return mixed
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Bank $model) {
-        return $this->handler($model);
-    }
-}

app/Classes/Modules/Banks/Services/FetchesBank.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\Services;
-
-
-use App\Classes\General\Eloquent\AbstractFetchRecord;
-use Illuminate\Database\Eloquent\Builder;
-use App\Models\Bank;
-
-class FetchesBank extends AbstractFetchRecord
-{
-
-    /** @var Bank */
-    private $repository;
-
-
-    /**
-     * FetchesBank constructor.
-     * @param Bank $repository
-     */
-    public function __construct(Bank $repository)
-    {
-        $this->repository = $repository;
-    }
-
-
-    /**
-     * @return Builder
-     */
-    public function getRepository(): Builder
-    {
-        return $this->repository->newQuery();
-    }
-}

app/Classes/Modules/Banks/Services/ListsBanks.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\Services;
-
-
-use App\Classes\General\Eloquent\AbstractListRecord;
-use Illuminate\Database\Eloquent\Builder;
-use App\Models\Bank;
-
-class ListsBanks extends AbstractListRecord
-{
-
-    /** @var Bank */
-    private $repository;
-
-    /**
-     * ListsBank constructor.
-     * @param Bank $repository
-     */
-    public function __construct(Bank $repository)
-    {
-        $this->repository = $repository;
-    }
-
-
-    /**
-     * @return Builder
-     */
-    function getRepository(): Builder
-    {
-        return $this->repository->newQuery();
-    }
-}

app/Classes/Modules/Banks/Services/ResetsBanksDefault.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Models\Bank;
-
-class ResetsBanksDefault extends AbstractUpdateRecord
-{
-
-    /**
-     * @param Bank $bank
-     * @return void
-     */
-    public function execute(Bank $bank)
-    {
-        $bank->company->banks()->where('type', $bank->type)->update(['default' => false]);
-    }
-
-}

app/Classes/Modules/Banks/Services/SetsBankToDefault.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Models\Bank;
-
-class SetsBankToDefault extends AbstractUpdateRecord
-{
-
-    /**
-     * @param Bank $model
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Bank $model)
-    {
-        $model->default = true;
-
-        return $this->handler($model);
-    }
-}

app/Classes/Modules/Banks/Services/UpdatesBank.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
-use App\Models\Bank;
-
-class UpdatesBank extends AbstractUpdateRecord
-{
-
-    /**
-     * @param Bank $model
-     * @param BankObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Bank $model, BankObject $object)
-    {
-        $model->bank_name = $object->getBankName();
-        $model->holder_name = $object->getHolderName();
-        $model->account_no = $object->getAccountNo();
-        $model->bank_branch = $object->getBankBranch();
-        $model->swift = $object->getSwift();
-        $model->snap = $object->getSnap();
-        $model->default = $object->getDefault();
-
-        return $this->handler($model);
-    }
-}

app/Classes/Modules/Banks/Standards/Rules/CanCreateBank.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\Standards\Rules;
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Banks\Standards\Validators\BankValidation;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
-
-class CanCreateBank extends AbstractRule
-{
-
-    /** @var BankValidation */
-    private $BankValidation;
-
-    /**
-     * CanCreateBank constructor.
-     * @param BankValidation $BankValidation
-     */
-    public function __construct(BankValidation $BankValidation)
-    {
-        $this->BankValidation = $BankValidation;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @param CompanyObject $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->BankValidation->validate($object);
-    }
-
-    /**
-     * @param CompanyObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-}

app/Classes/Modules/Banks/Standards/Rules/CanDeleteBank.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\Standards\Rules;
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
-
-class CanDeleteBank extends AbstractRule
-{
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-        return true;
-
-    }
-
-    /**
-     * @param BankObject $object
-     * @return bool
-     */
-    protected function validators($object): bool
-    {
-        return true;
-
-    }
-
-
-    /**
-     * @param BankObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}

app/Classes/Modules/Banks/Standards/Rules/CanListBanks.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\Standards\Rules;
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Banks\Standards\Validators\BankValidation;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
-
-class CanListBanks extends AbstractRule
-{
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @param CompanyObject $object
-     * @return bool
-     */
-    protected function validators($object): bool
-    {
-        return true;
-    }
-
-    /**
-     * @param CompanyObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-}

app/Classes/Modules/Banks/Standards/Rules/CanUpdateBank.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
-use App\Classes\Modules\Banks\Standards\Validators\BankValidation;
-
-class CanUpdateBank extends AbstractRule
-{
-
-    /** @var BankValidation */
-    private $BankValidation;
-
-
-    /**
-     * CanUpdateBank constructor.
-     * @param BankValidation $BankValidation
-     */
-    public function __construct(BankValidation $BankValidation)
-    {
-        $this->BankValidation = $BankValidation;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-        return true;
-    }
-
-    /**
-     * @param BankObject $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->BankValidation->validate($object);
-    }
-
-    /**
-     * @param BankObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}

app/Classes/Modules/Banks/Standards/Validators/BankValidation.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Banks\Standards\Validators;
-
-use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
-
-class BankValidation extends AbstractValidation
-{
-    /**
-     * @param BankObject $object
-     * @return array
-     */
-    protected function data($object): array 
-    {
-        return [
-            'country_id' => $object->getCountryId(),
-            'company_id' => $object->getCompanyId(),
-            'bank_name' => $object->getBankName(),
-            'holder_name' => $object->getHolderName(),
-            'account_no' => $object->getAccountNo()
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function rules(): array 
-    {
-        return [
-            'country_id' => 'required',
-            'company_id' => 'required',
-            'bank_name' => 'required',
-            'holder_name' => 'required',
-            'account_no' => 'required'
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function messages(): array 
-    {
-        return [];
-    }
-}

app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php

@@ -5,7 +5,6 @@ namespace App\Classes\Modules\Companies\ControllersLogic;
 use App\Classes\Modules\Companies\Services\UpdatesCompanyStatus;
 use App\Classes\Modules\Documents\Services\RejectsDocument;
 use App\Classes\Modules\Documents\Standards\Rules\CanApproveDocument;
-use App\Classes\Modules\Orders\Services\UpdatesOrdersStatus;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\DocumentResource;
 
@@ -47,9 +46,6 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
     /** @var UpdatesCompanyStatus */
     private $updatesCompanyStatus;
 
-    /** @var UpdatesOrdersStatus */
-    private $updatesOrdersStatus;
-
     /**
      * ApproveIdentificationDocumentLogic constructor.
      * @param CanApproveDocument $canApproveDocument
@@ -57,16 +53,14 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
      * @param RejectsDocument $rejectsDocument
      * @param FetchesDocument $fetchesDocument
      * @param UpdatesCompanyStatus $updatesCompanyStatus
-     * @param UpdatesOrdersStatus $updatesOrdersStatus
      */
-    public function __construct(CanApproveDocument $canApproveDocument, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, UpdatesCompanyStatus $updatesCompanyStatus, UpdatesOrdersStatus $updatesOrdersStatus)
+    public function __construct(CanApproveDocument $canApproveDocument, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, UpdatesCompanyStatus $updatesCompanyStatus)
     {
         $this->canApproveDocument = $canApproveDocument;
         $this->approvesDocument = $approvesDocument;
         $this->rejectsDocument = $rejectsDocument;
         $this->fetchesDocument = $fetchesDocument;
         $this->updatesCompanyStatus = $updatesCompanyStatus;
-        $this->updatesOrdersStatus = $updatesOrdersStatus;
     }
 
     /**
@@ -90,11 +84,6 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
 
         $this->updatesCompanyStatus->execute($document->owner, $status === 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
 
-        if($status === 'approve'){
-            $orders = $this->updatesOrdersStatus->execute($document->owner, ApprovalStatus::APPROVED);
-        }
-
-
         return $this->resourceResponse(new DocumentResource($document));
 
     }

app/Classes/Modules/Companies/ControllersLogic/AssignCompanyConnectionToConnectionSegmentLogic.php

@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Companies\Processors\AssignConnectionSegmentProcessor;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Companies\Services\FetchesCompanyConnection;
-use App\Http\Resources\CompanyResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class AssignCompanyConnectionToConnectionSegmentLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Assign Company Connection To Connection Segment',
-            'message' => 'You have successfully assigned Company Connection to Connection segment'
-        ];
-    }
-
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
-    /** @var FetchesCompanyConnection */
-    private $fetchesCompanyConnection;
-
-    /** @var AssignConnectionSegmentProcessor */
-    private $assignCompanyConnectionToConnectionSegmentProcessor;
-
-    /**
-     * AssignCompanyToSegmentLogic constructor.
-     * @param FetchesCompany $fetchesCompany
-     * @param FetchesCompanyConnection $fetchesCompanyConnection
-     * @param AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor
-     */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesCompanyConnection $fetchesCompanyConnection, AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor)
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->fetchesCompanyConnection = $fetchesCompanyConnection;
-        $this->assignCompanyConnectionToConnectionSegmentProcessor = $assignCompanyConnectionToConnectionSegmentProcessor;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-
-        $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
-
-        $companyConnection = $this->fetchesCompanyConnection->execute(['id' => $request->route('company_connection_id')]);
-
-        $this->assignCompanyConnectionToConnectionSegmentProcessor->execute($companyConnection, $request->input('segment_id'));
-
-        return $this->resourceResponse(new CompanyResource($company));
-    }
-}

app/Classes/Modules/Companies/ControllersLogic/CreateCompanyLogic.php

@@ -2,18 +2,26 @@
 
 namespace App\Classes\Modules\Companies\ControllersLogic;
 
+
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
-use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\CompanyType;
 use App\Http\Resources\CompanyResource;
-use App\Models\Company;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 class CreateCompanyLogic extends AbstractControllerLogic
 {
+    /**
+     * CreateCompanyLogic constructor.
+     * @param CreateCompanyProcessor $createCompanyProcessor
+     */
+    public function __construct(CreateCompanyProcessor $createCompanyProcessor)
+    {
+        $this->createCompanyProcessor = $createCompanyProcessor;
+    }
 
     /**
      * @return array
@@ -25,23 +33,9 @@ class CreateCompanyLogic extends AbstractControllerLogic
         ];
     }
 
-
-    /** @var CreateCompanyProcessor  */
+    /** @var CreateCompanyProcessor */
     private $createCompanyProcessor;
 
-    /** @var CreateCompanyModuleProcessor  */
-    private $createCompanyModuleProcessor;
-
-    /**
-     * CreateCompanyLogic constructor.
-     * @param CreateCompanyProcessor $createCompanyProcessor
-     * @param CreateCompanyModuleProcessor $createCompanyModuleProcessor
-     */
-    public function __construct(CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor)
-    {
-        $this->createCompanyProcessor = $createCompanyProcessor;
-        $this->createCompanyModuleProcessor = $createCompanyModuleProcessor;
-    }
 
     /**
      * @param Request $request
@@ -52,12 +46,8 @@ class CreateCompanyLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        /** @var Company $company */
-        $company = $this->createCompanyProcessor->execute($request->input('type') === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name'), $request->input('type'), ApprovalStatus::PENDING_SUBMISSION);
-
-        $this->createCompanyModuleProcessor->execute($company , $request->input('business_type'));
-
+        $company = $this->createCompanyProcessor->execute($request, BusinessType::CURRENCY_VENDOR, CompanyType::COMPANY_BUSINESS, ApprovalStatus::APPROVED);
         return $this->resourceResponse(new CompanyResource($company));
     }
 
-}
+}

app/Classes/Modules/Companies/ControllersLogic/FetchCompanyLogic.php

@@ -7,6 +7,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Standards\Rules\CanFetchCompany;
 use App\Http\Resources\CompanyResource;
+use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -51,7 +52,7 @@ class FetchCompanyLogic extends AbstractControllerLogic
     {
         $this->canFetchCompany->passes();
 
-        $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+        $query = $this->fetchesCompany->execute(['id' => $request->route('id'), 'with_bookings' => true]);
 
         return $this->resourceResponse(new CompanyResource($query));
 

app/Classes/Modules/Companies/ControllersLogic/ListCompaniesLogic.php

@@ -53,6 +53,10 @@ class ListCompaniesLogic extends AbstractControllerLogic
     {
         $this->canListCompanies->passes();
 
+        logger("llogic");
+
+        logger($request->input('filters'));
+
         $query = $this->listsCompanies->execute($this->listsCompanies->deserializeFilters($request->input('filters')));
         return $this->collectionResponse(CompanyResource::collection($query));
 

app/Classes/Modules/Companies/ControllersLogic/RemoveCompanyConnectionFromConnectionSegmentLogic.php

@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Companies\Services\FetchesCompanyConnection;
-use App\Classes\Modules\Companies\Services\RemovesCompanyConnectionFromConnectionSegment;
-use App\Classes\Modules\Segments\Services\FetchesSegment;
-use App\Http\Resources\CompanyResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class RemoveCompanyConnectionFromConnectionSegmentLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Detach Company Connection From Connection Segment',
-            'message' => 'You have successfully detached Company Connection from Connection segment'
-        ];
-    }
-
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
-    /** @var FetchesCompanyConnection */
-    private $fetchesCompanyConnection;
-
-    /** @var FetchesSegment */
-    private $fetchesSegment;
-
-    /** @var RemovesCompanyConnectionFromConnectionSegment */
-    private $removesCompanyConnectionFromConnectionSegment;
-
-    /**
-     * RemoveCompanyFromSegmentLogic constructor.
-     * @param FetchesCompany $fetchesCompany
-     * @param FetchesCompanyConnection $fetchesCompanyConnection
-     * @param FetchesSegment $fetchesSegment
-     * @param RemovesCompanyConnectionFromConnectionSegment $removesCompanyConnectionFromConnectionSegment
-     */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesCompanyConnection $fetchesCompanyConnection, FetchesSegment $fetchesSegment, RemovesCompanyConnectionFromConnectionSegment $removesCompanyConnectionFromConnectionSegment)
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->fetchesCompanyConnection = $fetchesCompanyConnection;
-        $this->fetchesSegment = $fetchesSegment;
-        $this->removesCompanyConnectionFromConnectionSegment = $removesCompanyConnectionFromConnectionSegment;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-
-        $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
-
-        $companyConnection = $this->fetchesCompanyConnection->execute(['id' => $request->route('company_connection_id')]);
-
-        $segment = $this->fetchesSegment->execute(['id' => $request->route('segment_id')]);
-
-        $this->removesCompanyConnectionFromConnectionSegment->execute($companyConnection, $segment);
-
-        return $this->resourceResponse(new CompanyResource($company));
-    }
-}

app/Classes/Modules/Companies/DataTransferObjects/CompanyConnectionObject.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-use App\Models\CompanyModule;
-
-class CompanyConnectionObject implements DataTransferObject
-{
-
-    /** @var CompanyModule */
-    private $invitee;
-
-    /** @var string */
-    private $inviterReference;
-
-    /** @var string */
-    private $inviteeReference;
-
-    /**
-     * CompanyConnectionObject constructor.
-     * @param CompanyModule $invitee
-     * @param string $inviterReference
-     * @param string $inviteeReference
-     */
-    public function __construct(CompanyModule $invitee, string $inviterReference, string $inviteeReference)
-    {
-        $this->invitee = $invitee;
-        $this->inviterReference = $inviterReference;
-        $this->inviteeReference = $inviteeReference;
-    }
-
-    /**
-     * @return CompanyModule
-     */
-    public function getInvitee(): CompanyModule
-    {
-        return $this->invitee;
-    }
-
-    /**
-     * @return string
-     */
-    public function getInviterReference(): string
-    {
-        return $this->inviterReference;
-    }
-
-    /**
-     * @return string
-     */
-    public function getInviteeReference(): string
-    {
-        return $this->inviteeReference;
-    }
-
-
-}

app/Classes/Modules/Companies/DataTransferObjects/CompanyModuleObject.php

@@ -6,74 +6,34 @@ use App\Classes\General\Interfaces\DataTransferObject;
 
 class CompanyModuleObject implements DataTransferObject
 {
-
-    /** @var string */
-    private $name;
-
-    /** @var string */
-    private $reference;
-
-    /** @var string */
-    private $unity_hash_id;
-
-    /** @var string */
-    private $unity_signature;
-
     /** @var int */
+    private $companyId;
+
+    /** @var int|null */
     private $type;
 
-    /** @var int */
+    /** @var int|null */
     private $status;
 
     /**
-     * CompanyModuleObject constructor.
-     * @param string $name
-     * @param string $reference
-     * @param string $unity_hash_id
-     * @param string $unity_signature
-     * @param int $type
-     * @param int $status
+     * CompanyObject constructor.
+     * @param int $companyId
+     * @param int|null $type
+     * @param int|null $status
      */
-    public function __construct(string $name, string $reference, string $unity_hash_id, string $unity_signature, int $type, int $status)
+    public function __construct(int $companyId, int $type, int $status)
     {
-        $this->name = $name;
-        $this->reference = $reference;
-        $this->unity_hash_id = $unity_hash_id;
-        $this->unity_signature = $unity_signature;
+        $this->companyId = $companyId;
         $this->type = $type;
         $this->status = $status;
     }
 
     /**
-     * @return string
+     * @return int
      */
-    public function getName(): string
+    public function getCompanyId(): int
     {
-        return $this->name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getReference(): string
-    {
-        return $this->reference;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUnityHashId(): string
-    {
-        return $this->unity_hash_id;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUnitySignature(): string
-    {
-        return $this->unity_signature;
+        return $this->companyId;
     }
 
     /**
@@ -91,6 +51,4 @@ class CompanyModuleObject implements DataTransferObject
     {
         return $this->status;
     }
-
-
 }

app/Classes/Modules/Companies/DataTransferObjects/CompanyObject.php

@@ -20,9 +20,6 @@ class CompanyObject implements DataTransferObject
     /** @var int|null */
     private $status;
 
-    /** @var string */
-    private $unity_hash_id;
-
     /**
      * CompanyObject constructor.
      * @param string $name
@@ -74,4 +71,7 @@ class CompanyObject implements DataTransferObject
         return $this->status;
     }
 
-}
+
+
+
+}

app/Classes/Modules/Companies/Processors/AssignConnectionSegmentProcessor.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\Processors;
-
-use App\Classes\Modules\Companies\Services\AssignsCompanyConnectionToConnectionSegment;
-use App\Classes\Modules\Companies\Standards\Rules\CanAssignSegment;
-use App\Classes\Modules\Segments\Services\FetchesSegment;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Models\CompanyConnection;
-use Illuminate\Database\Eloquent\Model;
-
-class AssignConnectionSegmentProcessor
-{
-
-    /** @var CanAssignSegment */
-    private $canAssignSegment;
-
-    /** @var AssignsCompanyConnectionToConnectionSegment */
-    private $assignsCompanyConnectionToConnectionSegment;
-
-    /** @var FetchesSegment */
-    private $fetchesSegment;
-
-    /**
-     * AssignCompanyToSegmentProcessor constructor.
-     * @param CanAssignSegment $canAssignSegment
-     * @param AssignsCompanyConnectionToConnectionSegment $assignsCompanyConnectionToConnectionSegment
-     * @param FetchesSegment $fetchesSegment
-     */
-    public function __construct(CanAssignSegment $canAssignSegment, AssignsCompanyConnectionToConnectionSegment $assignsCompanyConnectionToConnectionSegment, FetchesSegment $fetchesSegment)
-    {
-        $this->canAssignSegment = $canAssignSegment;
-        $this->assignsCompanyConnectionToConnectionSegment = $assignsCompanyConnectionToConnectionSegment;
-        $this->fetchesSegment = $fetchesSegment;
-    }
-
-
-    /**
-     * @param CompanyConnection $companyConnection
-     * @param int|null $segmentId
-     * @return Model
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function execute(CompanyConnection $companyConnection, ?int $segmentId = SegmentConstants::STANDARD_SEGMENT): Model {
-
-        $segment = $this->fetchesSegment->execute(['id' => $segmentId]);
-
-        $this->canAssignSegment->passes();
-
-        return $this->assignsCompanyConnectionToConnectionSegment->execute($companyConnection, $segment);
-
-    }
-
-}

app/Classes/Modules/Companies/Processors/CreateCompanyModuleProcessor.php

@@ -2,14 +2,11 @@
 
 namespace App\Classes\Modules\Companies\Processors;
 
-use App\Classes\Modules\Unity\Processors\CreateEntityProcessor;
-use App\Classes\Modules\Unity\Processors\CreateEntitySignatureProcessor;
 use App\Classes\Modules\Companies\DataTransferObjects\CompanyModuleObject;
 use App\Classes\Modules\Companies\Services\CreatesCompanyModule;
-use App\Classes\Modules\Companies\Standards\Rules\CanCreateCompanyModule;
-use App\Classes\ValueObjects\Constants\BusinessType;
-use App\Models\CompanyModule;
+
 use Illuminate\Database\Eloquent\Model;
+
 use App\Models\Company;
 
 class CreateCompanyModuleProcessor
@@ -18,57 +15,27 @@ class CreateCompanyModuleProcessor
     /** @var CreatesCompanyModule */
     private $createsCompanyModule;
 
-    /** @var CreateEntityProcessor  */
-    private $createUnityEntityProcessor;
-
-    /** @var CanCreateCompanyModule  */
-    private $canCreateCompanyModule;
-
-    /** @var CreateEntityProcessor*/
-    private $createsEntityProcessor;
-
-    /** @var CreateEntitySignatureProcessor  */
-    private $createUnityEntitySignatureProcessor;
-
     /**
      * CreateCompanyModuleProcessor constructor.
      * @param CreatesCompanyModule $createsCompanyModule
-     * @param CreateEntityProcessor $createUnityEntityProcessor
-     * @param CanCreateCompanyModule $canCreateCompanyModule
-     * @param CreateEntityProcessor $createsEntityProcessor
-     * @param CreateEntitySignatureProcessor $createUnityEntitySignatureProcessor
      */
-    public function __construct(CreatesCompanyModule $createsCompanyModule, CreateEntityProcessor $createUnityEntityProcessor, CanCreateCompanyModule $canCreateCompanyModule, CreateEntityProcessor $createsEntityProcessor, CreateEntitySignatureProcessor $createUnityEntitySignatureProcessor)
+    public function __construct(CreatesCompanyModule $createsCompanyModule)
     {
         $this->createsCompanyModule = $createsCompanyModule;
-        $this->createUnityEntityProcessor = $createUnityEntityProcessor;
-        $this->canCreateCompanyModule = $canCreateCompanyModule;
-        $this->createsEntityProcessor = $createsEntityProcessor;
-        $this->createUnityEntitySignatureProcessor = $createUnityEntitySignatureProcessor;
     }
 
-
     /**
      * @param Company $company
-     * @param int|null $businessType
      * @return Model
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
      */
-    public function execute(Company $company , ?int $businessType = BusinessType::IMPORTER): Model
+    public function execute(Company $company): Model
     {
-        $unityEntity = $this->createUnityEntityProcessor->execute($company->name);
+        $company_module_object = new CompanyModuleObject(
+            $company->id,
+            $company->type,
+            $company->status,
+        );
 
-        $unityEntitySignature = $this->createUnityEntitySignatureProcessor->execute($unityEntity->hash_id);
-
-        $company_module_object = new CompanyModuleObject($company->name, $company->reference, $unityEntity->hash_id, $unityEntitySignature->hash_id, $businessType, $company->status);
-
-        $this->canCreateCompanyModule->passes($company_module_object);
-
-        /** @var CompanyModule $companyModule */
-        $companyModule = $this->createsCompanyModule->execute($company, $company_module_object);
-
-        return $companyModule;
+        return $this->createsCompanyModule->execute($company_module_object);
     }
 }

app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php

@@ -3,11 +3,8 @@
 namespace App\Classes\Modules\Companies\Processors;
 
 use App\Classes\General\Services\GeneratesInitials;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
 use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
 use App\Classes\Modules\Companies\Services\CreatesCompany;
-use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
-use App\Classes\Modules\Companies\Services\GeneratesUniqueAccountNumber;
 use App\Classes\Modules\Companies\Standards\Rules\CanCreateCompany;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\BusinessType;
@@ -24,35 +21,37 @@ class CreateCompanyProcessor
     /** @var CreatesCompany */
     private $createsCompany;
 
-    /** @var GeneratesUniqueAccountNumber */
-    private $generatesUniqueAccountNumber;
-
     /**
-     * CreateCompanyProcessor constructor.
+     * CreateUserProcessor constructor.
      * @param CanCreateCompany $canCreateCompany
      * @param CreatesCompany $createsCompany
-     * @param GeneratesUniqueAccountNumber $generatesUniqueAccountNumber
      */
-    public function __construct(CanCreateCompany $canCreateCompany, CreatesCompany $createsCompany, GeneratesUniqueAccountNumber $generatesUniqueAccountNumber)
+    public function __construct(CanCreateCompany $canCreateCompany, CreatesCompany $createsCompany)
     {
         $this->canCreateCompany = $canCreateCompany;
         $this->createsCompany = $createsCompany;
-        $this->generatesUniqueAccountNumber = $generatesUniqueAccountNumber;
     }
 
 
     /**
-     * @param string $name
-     * @param int $companyType
+     * @param Request $request
+     * @param int $businessType
+     * @param int|null $companyType
      * @param int|null $status
      * @return Model
      * @throws \App\Classes\Exceptions\AccessForbiddenException
      * @throws \App\Classes\Exceptions\MalformedRequestException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
-    public function execute(string $name, int $companyType = CompanyType::COMPANY_BUSINESS, ?int $status = ApprovalStatus::PENDING_SUBMISSION): Model {
+    public function execute(Request $request, ?int $companyType = CompanyType::COMPANY_BUSINESS, ?int $status = ApprovalStatus::PENDING_SUBMISSION): Model {
+
+        $companyName = $companyType === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name');
+        $company_object = new CompanyObject(
+            $companyName,
+            mt_rand(1000, 9999).(new GeneratesInitials())->name($companyName)->length(3)->generate(),
+            $companyType,
+            $status);
 
-        $company_object = new CompanyObject($name, $this->generatesUniqueAccountNumber->execute(), $companyType, $status);
 
         $this->canCreateCompany->passes($company_object);
 
@@ -60,4 +59,4 @@ class CreateCompanyProcessor
 
     }
 
-}
+}

app/Classes/Modules/Companies/Services/ApprovesCompanyConnection.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\CompanyConnection;
-use App\Models\Document;
-use Carbon\Carbon;
-
-class ApprovesCompanyConnection extends AbstractUpdateRecord
-{
-
-    /**
-     * @param CompanyConnection $model
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(CompanyConnection $model)
-    {
-        $model->status = ApprovalStatus::APPROVED;
-
-        return $this->handler($model);
-    }
-}

app/Classes/Modules/Companies/Services/AssignsCompanyConnectionToConnectionSegment.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\Services;
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Models\CompanyConnection;
-use App\Models\Segment;
-use Illuminate\Database\QueryException;
-
-class AssignsCompanyConnectionToConnectionSegment extends AbstractUpdateRecord
-{
-    /**
-     * @param CompanyConnection $companyConnection
-     * @param Segment $segment
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws MalformedRequestException
-     */
-    public function execute(CompanyConnection $companyConnection, Segment $segment)
-    {
-        try {
-
-            $companyConnection->segments()->attach($segment);
-
-            return $companyConnection;
-
-        } catch (QueryException $exception){
-            throw new MalformedRequestException($exception);
-        }
-
-
-    }
-}

app/Classes/Modules/Companies/Services/ChecksIfCompanyAccountNumberExists.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\Services;
-
-use App\Models\Company;
-
-class ChecksIfCompanyAccountNumberExists
-{
-
-    /** @var Company */
-    private $repository;
-
-    /**
-     * ChecksIfAccountNumberExists constructor.
-     * @param Company $repository
-     */
-    public function __construct(Company $repository)
-    {
-        $this->repository = $repository;
-    }
-
-    public function execute(int $accountNumber): bool {
-        return $this->repository->where('reference', $accountNumber)->exists();
-    }
-
-}

app/Classes/Modules/Companies/Services/CreatesCompanyConnection.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
-use App\Models\CompanyConnection;
-
-class CreatesCompanyConnection extends AbstractUpdateRecord
-{
-
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
-    /**
-     * CreatesCompanyConnection constructor.
-     * @param FetchesCompany $fetchesCompany
-     */
-    public function __construct(FetchesCompany $fetchesCompany)
-    {
-        $this->fetchesCompany = $fetchesCompany;
-    }
-
-
-    /**
-     * @param CompanyConnectionObject $object
-     * @return mixed
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(CompanyConnectionObject $object)
-    {
-
-        $companyModule = $this->fetchesCompany->execute(['id', 1])->companyModules()->first();
-
-        $connection = new CompanyConnection();
-        $connection->inviter_id = $companyModule->id;
-        $connection->invitee_id = $object->getInvitee()->id;
-        $connection->inviter_reference = $object->getInviterReference();
-        $connection->invitee_reference = $object->getInviteeReference();
-
-        return $this->handler($connection);
-
-    }
-}

app/Classes/Modules/Companies/Services/CreatesCompanyModule.php

@@ -3,30 +3,24 @@
 namespace App\Classes\Modules\Companies\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
 use App\Classes\Modules\Companies\DataTransferObjects\CompanyModuleObject;
-use App\Models\Company;
 use App\Models\CompanyModule;
 
-class CreatesCompanyModule extends AbstractUpdateRelationshipRecord
+class CreatesCompanyModule extends AbstractUpdateRecord
 {
 
     /**
-     * @param Company $company
      * @param CompanyModuleObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Company $company, CompanyModuleObject $object)
+    public function execute(CompanyModuleObject $object)
     {
         $model = new CompanyModule();
-        $model->name = $object->getName();
-        $model->reference = $object->getReference();
+        $model->company_id = $object->getCompanyId();
         $model->type = $object->getType();
         $model->status = $object->getStatus();
-        $model->unity_hash_id = $object->getUnityHashId();
-        $model->unity_signature = $object->getUnitySignature();
 
-        return $this->handler($company->companyModules(), $model);
+        return $this->handler($model);
     }
 }