updated pakage remark - haziq

# Conflicts:
#	app/Http/Resources/OrderResource.php
#	resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue

.env.example

@@ -51,7 +51,3 @@ 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}"
-
-YD_API_CODE=''

.yarnrc.yml

@@ -1 +0,0 @@
-yarnPath: ".yarn/releases/yarn-berry.cjs"

app/Classes/General/Abstracts/AbstractControllerLogic.php

@@ -63,7 +63,7 @@ abstract class AbstractControllerLogic
 
         } catch (ErrorException|GeneralExceptions|TypeError  $exception){
             return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(),
-                !in_array($exception->getCode(), [0, 42000]) ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
+                $exception->getCode() ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
 
         }
     }

app/Classes/General/Eloquent/AbstractListRecord.php

@@ -39,11 +39,6 @@ abstract class AbstractListRecord extends AbstractGetRecord
             $query = $query->orderBy($filters->get('order_by')->column, $filters->get('order_by')->DESC ? 'DESC': 'ASC');
         }
 
-        if($filters->has('group_by')){
-            $query = $query->groupBy($filters->get('group_by')->column);
-        }
-
-        //dd($query->toSql());
         return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
 
     }

app/Classes/General/Eloquent/AbstractUpdateRecord.php

@@ -18,10 +18,7 @@ abstract class AbstractUpdateRecord
     public function handler(Model $model){
         try{
 
-            if($model->save()) {
-                
-                return $model;
-             }
+            if($model->save()){ return $model; }
 
         } catch (QueryException $exception){
             throw new MalformedRequestException($exception);

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

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

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

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use Illuminate\Database\Eloquent\Builder;
-
-class CreditTerm implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder;
-
-        return $builder->whereHas('packingLists.owner', function($query) use($value) {
-             $query->whereHas('companyModule.connections', function($query) use($value){
-                if ($value) {
-                     $query->whereHas('segments', function($query) {
-                         $query->where('segments.id' , 3);
-                    });
-                }else{
-                     $query->whereDoesntHave('segments', function($query) {
-                         $query->where('segments.id' , 3);
-                    });
-                }
-            });
-        });
-    }
-
-}

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

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Carbon;
-
-class Delivered implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereHas('packingList', function($packingList){
-            return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
-        })->whereHas('container',
-            function($container) {
-                return $container->where('containers.status', ApprovalStatus::COMPLETED);
-            }
-        )->whereHas('deliverySchedules',
-            function($schedule) {
-                return $schedule->where('eta', '<', Carbon::now())->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-            }
-        );
-    }
-}

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

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Builder;
-
-class DoesNotHaveTransactionType implements Filter
-{
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereDoesntHave('transactions', function (Builder $query) use($value) {
-            $query->where('type', $value);
-        })->whereHas('containers', function ($query){
-            return $query->whereDate('loading_date', '>=', Carbon::parse('20-09-2022'));
-        });
-    }
-}

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

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class HasInvoiceStatusIn implements Filter
-{
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereHas('transactions', function (Builder $query) use($value) {
-            $query->where('type', 1)->whereIn('status', $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/HasTransactionType.php

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

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

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Carbon;
-
-class InDestinationWarehouse implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereHas('packingList', function($packingList){
-            return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
-        })->whereHas('container',
-            function($container) {
-                return $container->where('containers.status', ApprovalStatus::COMPLETED);
-            }
-        )->whereDoesntHave('deliverySchedules',
-            function($schedule) {
-                return $schedule->where('etd', '<', Carbon::now())->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-            }
-        );
-    }
-}

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

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Carbon;
-
-class InOriginWarehouse implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereHas('packingList', function($packingList){
-            return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
-        })->whereDoesntHave('shippingSchedules',
-            function($schedule) {
-                return $schedule->where('etd', '<', Carbon::now())
-                    ->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-            }
-        );
-    }
-}

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

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Carbon;
-
-class InTransit implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereHas('packingList', function($packingList){
-            return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
-        })->whereHas('container',
-            function($container) {
-                return $container->where('containers.status', ApprovalStatus::PENDING_VERIFICATION);
-            }
-        )->whereHas('shippingSchedules',
-            function($schedule) {
-                return $schedule->where('etd', '<', Carbon::now())
-                    ->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-            }
-        );
-    }
-}

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

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

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

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

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

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

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

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use Illuminate\Support\Carbon;
-use Illuminate\Database\Eloquent\Builder;
-
-class PackingListDeliveryStatus implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $value == 1 ? $builder->whereHas('containers', function ($query){
-            $query->where('containers.status', ApprovalStatus::COMPLETED);
-        })->whereDoesntHave('transports') : ($value == 2 ? $builder->whereHas('transports', function (Builder $query) use ($value) {
-            $query->whereDoesntHave('schedules', function (Builder $query) use ($value) {
-                $query->where('status', '!=', ApprovalStatus::EXPIRED)->where('eta', '<=',  Carbon::now());
-            });
-        }) : $builder->whereHas('transports', function (Builder $query) use ($value) {
-            $query->whereHas('schedules', function (Builder $query) use ($value) {
-                $query->where('status', '!=', ApprovalStatus::EXPIRED)->where('eta', '<=',  Carbon::now());
-            });
-        }));
-    }
-}

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

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\PackingList;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\DB;
-
-class PackingListOrderedByInvoiceDate implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->select('packing_lists.*')->join('transactions', function($join){
-            $join->on('transactions.owner_id', '=', 'packing_lists.id');
-            $join->where('transactions.owner_type', '=', PackingList::class);
-            $join->where('transactions.status', '=', ApprovalStatus::APPROVED);
-        })->orderBy('transactions.updated_at', 'DESC');
-    }
-
-}

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/PaymentDay.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Builder;
-
-class PaymentDay implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereHas('transactions', function (Builder $query) use($value) {
-            $query->where('transactions.type', 1)->where('status', ApprovalStatus::APPROVED)->whereDate('updated_at', '<=', Carbon::now()->subdays($value));
-        });
-    }
-}

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

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

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

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

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

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

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

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

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

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use Illuminate\Database\Eloquent\Builder;
-
-class WarehouseParcels implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereHas('packingList', function ($query){
-            return $query->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->where('status', ApprovalStatus::APPROVED);
-        });
-    }
-}

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/LogData.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent;
-use Illuminate\Support\Facades\Schema;
-use DB;
-
-trait logData
-{
- 
-  public static function boot()
-  {
-      parent::boot();
-
-     
-      static::updating(function($model)
-      {
-
-        if (!Schema::hasTable(''.$model->table.'log')) {
-          DB::statement('CREATE TABLE '.$model->table.'log LIKE '.$model->table);  
-          DB::statement('ALTER TABLE '.$model->table.'log DROP COLUMN id');  
-          DB::statement('ALTER TABLE '.$model->table.'log ADD  id INTEGER FIRST');  
-        }
-    
-        DB::table(''.$model->table.'log')->insert($model->getRawOriginal());  
-      
-      });
-  }
-
-
-    public function logs($model){
-      $result = DB::table(''.$model->table.'log')
-       ->where('id',  $model->id)
-       ->get();
-        return $result;
-     }
-}

app/Classes/General/ExcelHandel.php

@@ -1,87 +0,0 @@
-<?php
-namespace App\Classes\General;
-
-use Illuminate\Support\Str;
-use Illuminate\Support\Facades\Cache;
-
-class ExcelHandel
-{
-	function __construct()
-	{
-
-	}
-
-	public static function generateFolder($path = '')
-    {
-    	$folder = \Storage::disk('public')->makeDirectory($path);
-        return $folder;
-    }
-
-	public static function insertExcel($path = '', $base64Set = [])
-	{
-    	$file_info = [];
-        $folder_path = ExcelHandel::generateFolder('excels/' . $path);
-
-        foreach ($base64Set as $key => $row) {
-
-	    	$exceldata = $row;
-	        $filename = (string) Str::uuid();
-
-	        $f = finfo_open();
-	        $mime_type = finfo_file($f, $exceldata, FILEINFO_MIME_TYPE);
-
-	        $extension = 'xls';
-
-	        switch ($mime_type) {
-	            case 'application/vnd.ms-excel':
-	                $extension = 'xls';
-	                break;
-	            case 'application/zip':
-	                $extension = 'xlsx';
-	                break;
-	        }
-
-	        if (empty($extension)) {
-	            return false;
-	        }
-
-	        $exceldata = explode('base64,', $exceldata);
-	        $exceldata = base64_decode($exceldata[1]);
-
-	        $filename_with_ext = $filename . '.' . $extension;
-
-	        $file = ExcelHandel::generateExcel($path, $exceldata, $filename, $extension);
-
-	        $file_info[] = [
-	            'path' => $path,
-	            'filename' => $filename_with_ext,
-	            'mime_type' => $mime_type,
-	            'extension' => $extension,
-	            'file_info' => empty($file) ? [] : $file,
-	        ];
-    	}
-
-        return $file_info;
-	}
-
-	public static function generateExcel($path = '', $exceldata = '', $filename = '', $extension = '')
-    {
-        $file_info = [];
-        $file = \Storage::disk('public')->put('excels/' . $path . '/' . $filename . '.' . $extension, $exceldata);
-        $file_info['original']['file'] = storage_path('app/public/excels/' . $path . '/' . $filename . '.' . $extension);
-        
-        return $file_info;
-    }
-
-    public static function removeExcel($excel_info = [])
-    {
-        $excel_info = json_decode(json_encode($excel_info), true);
-        foreach ($excel_info as $key => $row) {
-        	if (!empty($row['path'])) {
-	            \File::delete([$row['file_info']['original']['file']]);
-           }
-        }
-        return true;
-    }
-
-}

app/Classes/General/Interfaces/Notifiable.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Classes\General\Interfaces;
-
-
-use Illuminate\Database\Eloquent\Relations\MorphTo;
-
-interface Notifiable
-{
-    public function subject(): MorphTo;
-
-    public function target(): MorphTo;
-
-    public function causer(): MorphTo;
-}

app/Classes/General/Interfaces/Packable.php

@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 
 interface Packable
 {
+
     public function packingLists(): morphMany;
 
 }

app/Classes/General/Interfaces/Transactionable.php

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

app/Classes/Jobs/CurlContainerListJob.php

@@ -0,0 +1,94 @@
+<?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/FetchOrdersFromYDPortalJob.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class FetchOrdersFromYDPortalJob 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(FetchOrderListsFromYdPortalProcessor::class))->execute();
-    }
-
-}

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

@@ -1,78 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\ControllersLogic;
-
-use App\Classes\Exceptions\ResourceConflictException;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
-use App\Classes\Modules\Accounts\Processors\GenerateEmailVerificationAttemptProcessor;
-use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
-use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Http\Resources\UserResource;
-use Illuminate\Database\QueryException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class AddNewMemberLogic extends AbstractControllerLogic
-{
-
-    public function notification(): array
-    {
-        return [
-            'title' => 'Updated Email',
-            'message' => 'Successfully updated email'
-        ];
-    }
-
-    /**
-     * @var AssignEmployeeProcessor
-     */
-    private $assignEmployeeProcessor;
-
-    /**
-     * @var GenerateEmailVerificationAttemptProcessor
-     */
-    private $generateEmailVerificationAttemptProcessor;
-
-    /**
-     * AddNewMemberLogic constructor.
-     * @param AssignEmployeeProcessor $assignEmployeeProcessor
-     * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
-     */
-    public function __construct(AssignEmployeeProcessor $assignEmployeeProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor)
-    {
-        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
-        $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ResourceConflictException
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request): JsonResponse
-    {
-        try {
-            $user = Auth::user()->replicate();
-            $user->email = $request->input('email');
-            $user->status = ApprovalStatus::PENDING_VERIFICATION;
-            $user->save();
-        } catch (QueryException $exception){
-            throw new ResourceConflictException('Unable to change your email address as it already exists');
-        }
-
-        if($company = Auth::user()->companyModule()->first()){
-            $Object = new EmploymentObject($company, $user);
-            $this->assignEmployeeProcessor->execute($Object);
-        }
-
-        $this->generateEmailVerificationAttemptProcessor->execute($user);
-
-        return $this->resourceResponse(new UserResource($user));
-    }
-}

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

@@ -15,7 +15,6 @@ 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\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Documents\Processors\UploadIdentityDocumentProcessor;
@@ -77,9 +76,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
     /** @var GenerateEmailVerificationAttemptProcessor */
     private $generateEmailVerificationAttemptProcessor;
 
-    /** @var FetchesCompanyModule */
-    private $fetchesCompanyModule;
-
     /**
      * CreateCustomerLogic constructor.
      * @param CreateUserProcessor $createUserProcessor
@@ -92,9 +88,8 @@ class CreateCustomerLogic extends AbstractControllerLogic
      * @param UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor
      * @param AuthenticationProcessor $authenticationProcessor
      * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
-     * @param FetchesCompanyModule $fetchesCompanyModule
      */
-    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, AssignEmployeeProcessor $assignEmployeeProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor, FetchesCompanyModule $fetchesCompanyModule)
+    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, AssignEmployeeProcessor $assignEmployeeProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor)
     {
         $this->createUserProcessor = $createUserProcessor;
         $this->createCompanyProcessor = $createCompanyProcessor;
@@ -106,7 +101,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
         $this->uploadIdentityDocumentProcessor = $uploadIdentityDocumentProcessor;
         $this->authenticationProcessor = $authenticationProcessor;
         $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
-        $this->fetchesCompanyModule = $fetchesCompanyModule;
     }
 
     /**
@@ -132,9 +126,7 @@ class CreateCustomerLogic extends AbstractControllerLogic
         /** @var CompanyModule $companyModule */
         $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::IMPORTER);
 
-        $inviter = $this->fetchesCompanyModule->execute(['reference'=>'CIEF']);
-
-        $connectionObject = new CompanyConnectionObject($companyModule, $inviter, mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate(), 'CIEF');
+        $connectionObject = new CompanyConnectionObject($companyModule, 'CIEF', mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate());
 
         $connection = $this->createsCompanyConnection->execute($connectionObject);
 

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/GeneratePasswordResetLogic.php

@@ -12,7 +12,6 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\ValueObjects\Constants\Notifications;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
 
 class GeneratePasswordResetLogic extends AbstractControllerLogic
 {

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

@@ -27,6 +27,7 @@ class LogoutUserLogic extends AbstractControllerLogic
      */
     public function __construct(InvalidatesAuthenticationToken $invalidatesAuthenticationToken)
     {
+        logger("logout user logic");
         $this->invalidatesAuthenticationToken = $invalidatesAuthenticationToken;
     }
 

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/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/AuthenticationProcessor.php

@@ -67,4 +67,4 @@ class AuthenticationProcessor
 
     }
 
-}
+}

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

@@ -23,4 +23,4 @@ class AuthenticatesUser
 
     }
 
-}
+}

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

@@ -2,7 +2,6 @@
 
 namespace App\Classes\Modules\Accounts\Services;
 
-use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Models\User;
 
@@ -12,11 +11,6 @@ class AuthenticationRedirect
     public function url(User $user){
 
         if($user->type === RoleTypes::USER){
-
-            if (in_array($user->companyModule()->first()->type, [BusinessType::ONLINE_SELLER, BusinessType::LAST_MILE_DELIVERY_AGENT])) {
-                return route('last_mile_delivery.dashboard');
-            }
-
             return route('dashboard');
         }
 

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/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

@@ -68,11 +68,7 @@ class GeneratesAuthenticationToken {
             $companyModule = $user->companyModule()->first();
 
             $claims = array_merge($claims, [
-                'company_id' => $companyModule->company_id,
-                'company_module_id' => $companyModule->id,
-                'company_module_type' => $companyModule->type,
-                'company_name' => $companyModule->name,
-                'company_marking' => $companyModule->type !== 8 ? $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference : 'HWT',
+                'company_id' => $companyModule->company_id
             ]);
         }
 

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

@@ -4,19 +4,12 @@ namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\General\Interfaces\Contactable;
 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\Contacts\DataTransferObjects\ContactObject;
-use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
-use App\Models\Address;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -46,29 +39,19 @@ class CreateAddressLogic extends AbstractControllerLogic
     /** @var CreatesAddress */
     private $createsAddress;
 
-    /** @var CreateContactProcessor */
-    private $createContactProcessor;
-
-    /** @var CreateRemarkProcessor */
-    private $createRemarkProcessor;
-
     /**
      * CreateAddressLogic constructor.
      * @param CanCreateAddress $canCreateAddress
      * @param FetchesDistrict $fetchesDistrict
      * @param FetchesCompanyModule $fetchesCompanyModule
      * @param CreatesAddress $createsAddress
-     * @param CreateContactProcessor $createContactProcessor
-     * @param CreateRemarkProcessor $createRemarkProcessor
      */
-    public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompanyModule $fetchesCompanyModule, CreatesAddress $createsAddress, CreateContactProcessor $createContactProcessor, CreateRemarkProcessor $createRemarkProcessor)
+    public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompanyModule $fetchesCompanyModule, CreatesAddress $createsAddress)
     {
         $this->canCreateAddress = $canCreateAddress;
         $this->fetchesDistrict = $fetchesDistrict;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->createsAddress = $createsAddress;
-        $this->createContactProcessor = $createContactProcessor;
-        $this->createRemarkProcessor = $createRemarkProcessor;
     }
 
     /**
@@ -83,23 +66,12 @@ 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('type'), ApprovalStatus::APPROVED, $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'), $request->input('reference'));
 
         $this->canCreateAddress->passes($object);
 
-        /** @var Address $address */
         $address = $this->createsAddress->execute($this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]), $object);
 
-        if($request->input('phone')){
-            $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
-            $this->createContactProcessor->execute($contactObject, $address);
-        }
-
-        if($request->input('remark')){
-            $remarkObject = new RemarkObject($request->input('remark'), Auth()->user()->id);
-            $this->createRemarkProcessor->execute($address, $remarkObject);
-        }
-
         return $this->resourceResponse(new AddressResource($address));
 
     }

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

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Addresses\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Addresses\Services\ListsAddresses;
-use App\Classes\Modules\Addresses\Services\ListsStates;
-use App\Classes\Modules\Addresses\Standards\Rules\CanListAddresses;
-use App\Http\Resources\AddressResource;
-use App\Http\Resources\StateResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ListStatesLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Addresses',
-            'message' => 'You have successfully retrieved a list of Addresses'
-        ];
-    }
-
-    /** @var ListsStates */
-    private $listStates;
-
-    /**
-     * ListStatesLogic constructor.
-     * @param ListsStates $listStates
-     */
-    public function __construct(ListsStates $listStates)
-    {
-        $this->listStates = $listStates;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $query = $this->listStates->execute($this->listStates->deserializeFilters($request->input('filters')));
-
-        return $this->collectionResponse(StateResource::collection($query));
-
-    }
-
-}

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

@@ -9,14 +9,7 @@ use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesDistrict;
 use App\Classes\Modules\Addresses\Standards\Rules\CanUpdateAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
-use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
-use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
-use App\Classes\ValueObjects\Constants\AddressType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
-use App\Models\Address;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -45,31 +38,22 @@ class UpdateAddressLogic extends AbstractControllerLogic
     /** @var FetchesDistrict */
     private $fetchesDistrict;
 
-    /** @var CreateContactProcessor */
-    private $createContactProcessor;
-
-    /** @var CreateRemarkProcessor */
-    private $createRemarkProcessor;
-
     /**
      * UpdateAddressLogic constructor.
      * @param CanUpdateAddress $canUpdateAddress
      * @param UpdatesAddress $updatesAddress
      * @param FetchesAddress $fetchesAddress
      * @param FetchesDistrict $fetchesDistrict
-     * @param CreateContactProcessor $createContactProcessor
-     * @param CreateRemarkProcessor $createRemarkProcessor
      */
-    public function __construct(CanUpdateAddress $canUpdateAddress, UpdatesAddress $updatesAddress, FetchesAddress $fetchesAddress, FetchesDistrict $fetchesDistrict, CreateContactProcessor $createContactProcessor, CreateRemarkProcessor $createRemarkProcessor)
+    public function __construct(CanUpdateAddress $canUpdateAddress, UpdatesAddress $updatesAddress, FetchesAddress $fetchesAddress, FetchesDistrict $fetchesDistrict)
     {
         $this->canUpdateAddress = $canUpdateAddress;
         $this->updatesAddress = $updatesAddress;
         $this->fetchesAddress = $fetchesAddress;
         $this->fetchesDistrict = $fetchesDistrict;
-        $this->createContactProcessor = $createContactProcessor;
-        $this->createRemarkProcessor = $createRemarkProcessor;
     }
 
+
     /**
      * @param Request $request
      * @return JsonResponse
@@ -81,27 +65,14 @@ class UpdateAddressLogic 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'), AddressType::DELIVERY, ApprovalStatus::APPROVED, $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'), $request->input('reference'));
 
         $this->canUpdateAddress->passes($object);
 
         $address = $this->fetchesAddress->execute(['id' => $request->route('id')]);
 
-        /** @var Address $address */
         $address = $this->updatesAddress->execute($address, $object);
 
-        $address->contacts()->delete(); $address->remarks()->delete();
-
-        if($request->input('phone')){
-            $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
-            $this->createContactProcessor->execute($contactObject, $address);
-        }
-
-        if($request->input('remark')){
-            $remarkObject = new RemarkObject($request->input('remark'), Auth()->user()->id);
-            $this->createRemarkProcessor->execute($address, $remarkObject);
-        }
-
         return $this->resourceResponse(new AddressResource($address));
 
     }

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

@@ -26,12 +26,6 @@ class AddressObject implements DataTransferObject
     /** @var int */
     private $postCode;
 
-    /** @var int */
-    private $type;
-
-    /** @var int */
-    private $status;
-
     /** @var string|null */
     private $reference;
 
@@ -43,11 +37,9 @@ class AddressObject implements DataTransferObject
      * @param int $stateId
      * @param int $districtId
      * @param int $postCode
-     * @param int $type
-     * @param int $status
      * @param null|string $reference
      */
-    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode, int $type, int $status, ?string $reference = null)
+    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode, ?string $reference = null, ?int $status = ApprovalStatus::APPROVED)
     {
         $this->streetOne = $streetOne;
         $this->streetTwo = $streetTwo;
@@ -55,9 +47,8 @@ class AddressObject implements DataTransferObject
         $this->stateId = $stateId;
         $this->districtId = $districtId;
         $this->postCode = $postCode;
-        $this->type = $type;
-        $this->status = $status;
         $this->reference = $reference;
+        $this->status = $status;
     }
 
     /**
@@ -109,11 +100,11 @@ class AddressObject implements DataTransferObject
     }
 
     /**
-     * @return int
+     * @return null|string
      */
-    public function getType(): int
+    public function getReference(): ?string
     {
-        return $this->type;
+        return $this->reference;
     }
 
     /**
@@ -124,13 +115,5 @@ class AddressObject implements DataTransferObject
         return $this->status;
     }
 
-    /**
-     * @return null|string
-     */
-    public function getReference(): ?string
-    {
-        return $this->reference;
-    }
-
 
 }

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

@@ -10,8 +10,6 @@ namespace App\Classes\Modules\Addresses\Services;
 
 
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
-use App\Classes\ValueObjects\Constants\AddressType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Models\District;
 use App\Models\OldAddress;
 
@@ -33,7 +31,7 @@ class CleansOldAddress
             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, AddressType::DELIVERY, ApprovalStatus::APPROVED, 'Delivery Address');
+        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');
 
     }
 

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

@@ -29,7 +29,6 @@ class CreatesAddress extends AbstractUpdateRelationshipRecord
         $model->district_id = $object->getDistrictId();
         $model->postcode = $object->getPostCode();
         $model->status = $object->getStatus();
-        $model->type = $object->getType();
 
         return $this->handler($addressable->addresses(), $model);
 

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

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

app/Classes/Modules/Announcements/ControllersLogic/AssignAnnouncementToSegmentLogic.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Announcements\Services\FetchesAnnouncement;
-use App\Classes\Modules\Announcements\Processors\AssignAnnouncementToSegmentProcessor;
-
-use App\Http\Resources\AnnouncementResource;
-
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class AssignAnnouncementToSegmentLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Assign Announcement To Segment',
-            'message' => 'You have successfully assigned Announcement to segment'
-        ];
-    }
-
-    /** @var FetchesAnnouncement */
-    private $fetchesAnnouncement;
-
-    /** @var AssignAnnouncementToSegmentProcessor */
-    private $assignAnnouncementToSegmentProcessor;
-
-    /**
-     * AssignAnnouncementToSegmentLogic constructor.
-     * @param FetchesAnnouncement $fetchesAnnouncement
-     * @param AssignAnnouncementToSegmentProcessor $assignAnnouncementToSegmentProcessor
-     */
-    public function __construct(FetchesAnnouncement $fetchesAnnouncement, AssignAnnouncementToSegmentProcessor $assignAnnouncementToSegmentProcessor)
-    {
-        $this->fetchesAnnouncement = $fetchesAnnouncement;
-        $this->assignAnnouncementToSegmentProcessor = $assignAnnouncementToSegmentProcessor;
-    }
-
-    /**
-     * @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
-    {
-        $announcement = $this->fetchesAnnouncement->execute(['id' => $request->route('id')]);
-
-        $this->assignAnnouncementToSegmentProcessor->execute($announcement, $request->input('segment_id'));
-
-        return $this->resourceResponse(new AnnouncementResource($announcement));
-    }
-}

app/Classes/Modules/Announcements/ControllersLogic/CreateAnnouncementLogic.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
-use App\Classes\Modules\Announcements\Standards\Rules\CanCreateAnnouncement;
-use App\Classes\Modules\Announcements\Services\CreatesAnnouncement;
-use App\Classes\Modules\Announcements\Processors\AssignAnnouncementToSegmentProcessor;
-
-use App\Http\Resources\AnnouncementResource;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class CreateAnnouncementLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Created Annoucement',
-            'message' => 'You have successfully created a new Annoucements'
-        ];
-    }
-
-    /** @var CanCreateAnnouncement */
-    private $canCreateAnnouncement;
-
-    /** @var CreatesAnnoucement */
-    private $createsAnnoucement;
-
-    /** @var AssignAnnouncementToSegmentProcessor */
-    private $assignAnnouncementToSegmentProcessor;
-
-
-    /**
-     * CreateAnnouncementLogic constructor.
-     * @param CanCreateAnnoucement $canCreateAnnoucement
-     * @param CreatesAnnoucement $createsAnnoucement
-     * @param AssignAnnouncementToSegmentProcessor $assignAnnouncementToSegmentProcessor
-     */
-    public function __construct(
-        CanCreateAnnouncement $canCreateAnnouncement,
-        CreatesAnnouncement $createsAnnoucement,
-        AssignAnnouncementToSegmentProcessor $assignAnnouncementToSegmentProcessor
-    ) {
-        $this->canCreateAnnouncement = $canCreateAnnouncement;
-        $this->createsAnnoucement = $createsAnnoucement;
-        $this->assignAnnouncementToSegmentProcessor = $assignAnnouncementToSegmentProcessor;
-    }
-
-    /**
-     * @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
-    {
-        $annoucement_object = new AnnouncementObject(
-            $request->input('title'),
-            $request->input('description'),
-            $request->input('starting_on'),
-            $request->input('ending_on')
-        );
-
-        $this->canCreateAnnouncement->passes($annoucement_object);
-
-        $announcement = $this->createsAnnoucement->execute($annoucement_object);
-
-        $this->assignAnnouncementToSegmentProcessor->execute($announcement);
-
-        return $this->resourceResponse(new AnnouncementResource($announcement));
-    }
-}

app/Classes/Modules/Announcements/ControllersLogic/DeleteAnnouncementLogic.php

@@ -1,71 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Announcements\Standards\Rules\CanDeleteAnnouncement;
-use App\Classes\Modules\Announcements\Services\FetchesAnnouncement;
-use App\Classes\Modules\Announcements\Services\DeletesAnnouncement;
-
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class DeleteAnnouncementLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Delete Announcement',
-            'message' => 'You have successfully deleted the Announcement'
-        ];
-    }
-
-    /** @var CanDeleteAnnouncement */
-    private $canDeleteAnnouncement;
-
-    /** @var FetchesAnnouncement */
-    private $fetchesAnnouncement;
-
-    /** @var DeletesAnnouncement */
-    private $deletesAnnouncement;
-
-    /**
-     * DeleteAnnouncementLogic constructor.
-     * @param CanDeleteAnnouncement $canDeleteAnnouncement
-     * @param FetchesAnnouncement $fetchesAnnouncement
-     * @param DeletesAnnouncement $deletesAnnouncement
-     */
-    public function __construct(
-        CanDeleteAnnouncement $canDeleteAnnoucement,
-        FetchesAnnouncement $fetchesAnnoucement,
-        DeletesAnnouncement $deletesAnnoucement
-    ) {
-        $this->canDeleteAnnoucement = $canDeleteAnnoucement;
-        $this->fetchesAnnoucement = $fetchesAnnoucement;
-        $this->deletesAnnoucement = $deletesAnnoucement;
-    }
-
-    /**
-     * @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->canDeleteAnnoucement->passes();
-
-        $annoucement = $this->fetchesAnnoucement->execute(['id' => $request->route('id')]);
-
-        $this->deletesAnnoucement->execute($annoucement);
-
-        return $this->response([]);
-    }
-}

app/Classes/Modules/Announcements/ControllersLogic/ListAnnouncementsLogic.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Announcements\Services\ListsAnnouncements;
-use App\Classes\Modules\Announcements\Standards\Rules\CanListAnnouncements;
-use App\Http\Resources\AnnouncementResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ListAnnouncementsLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Retrieve Announcements',
-            'message' => 'You have successfully retrieved a list of Announcements'
-        ];
-    }
-
-    /** @var CanListAnnouncements */
-    private $canListAnnouncements;
-
-    /** @var ListsAnnouncements */
-    private $listsAnnouncements;
-
-    /**
-     * ListAnnouncementsLogic constructor.
-     * @param CanListAnnouncements $canListAnnouncements
-     * @param ListsAnnouncements $listsAnnouncements
-     */
-    public function __construct(CanListAnnouncements $canListAnnouncements, ListsAnnouncements $listsAnnouncements)
-    {
-        $this->canListAnnouncements = $canListAnnouncements;
-        $this->listsAnnouncements = $listsAnnouncements;
-    }
-
-
-    /**
-     * @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->canListAnnouncements->passes();
-
-        $annoucements = $this->listsAnnouncements->execute($this->listsAnnouncements->deserializeFilters($request->input('filters')));
-
-        return $this->collectionResponse(AnnouncementResource::collection($annoucements));
-    }
-}

app/Classes/Modules/Announcements/ControllersLogic/RemoveSegmentFromAnnouncementLogic.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Announcements\Services\FetchesAnnouncement;
-use App\Classes\Modules\Segments\Services\FetchesSegment;
-use App\Classes\Modules\Announcements\Services\RemovesAnnouncementFromSegment;
-
-use App\Http\Resources\AnnouncementResource;
-
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class RemoveSegmentFromAnnouncementLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Detach Announcement From Segment',
-            'message' => 'You have successfully detached Announcement from segment'
-        ];
-    }
-
-    /** @var FetchesAnnouncement */
-    private $fetchesAnnnouncement;
-
-    /** @var FetchesSegment */
-    private $fetchesSegment;
-
-    /** @var RemovesAnnouncementFromSegment */
-    private $removesAnnouncementFromSegment;
-
-    /**
-     * RemoveSegmentFromAnnouncementLogic constructor.
-     * @param FetchesAnnouncement $fetchesAnnnouncement
-     * @param FetchesSegment $fetchesSegment
-     * @param RemovesAnnouncementFromSegment $removesAnnouncementFromSegment
-     */
-    public function __construct(FetchesAnnouncement $fetchesAnnnouncement, FetchesSegment $fetchesSegment, RemovesAnnouncementFromSegment $removesAnnouncementFromSegment)
-    {
-        $this->fetchesAnnnouncement = $fetchesAnnnouncement;
-        $this->fetchesSegment = $fetchesSegment;
-        $this->removesAnnouncementFromSegment = $removesAnnouncementFromSegment;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request): JsonResponse
-    {
-
-        $announcement = $this->fetchesAnnnouncement->execute(['id' => $request->route('id')]);
-
-        $segment = $this->fetchesSegment->execute(['id' => $request->route('segment_id')]);
-
-        $this->removesAnnouncementFromSegment->execute($announcement, $segment);
-
-        return $this->resourceResponse(new AnnouncementResource($announcement));
-    }
-}

app/Classes/Modules/Announcements/ControllersLogic/UpdateAnnouncementLogic.php

@@ -1,83 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
-use App\Classes\Modules\Announcements\Standards\Rules\CanUpdateAnnouncement;
-use App\Classes\Modules\Announcements\Services\FetchesAnnouncement;
-use App\Classes\Modules\Announcements\Services\UpdatesAnnouncement;
-
-use App\Http\Resources\AnnouncementResource;
-
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-
-class UpdateAnnouncementLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Update Announcement',
-            'message' => 'You have successfully updated the Announcement'
-        ];
-    }
-
-    /** @var CanUpdateAnnouncement */
-    private $canUpdateAnnouncement;
-
-    /** @var FetchesAnnouncement */
-    private $fetchesAnnouncement;
-
-    /** @var UpdatesAnnouncement */
-    private $updatesAnnouncement;
-
-    /**
-     * UpdateAnnouncementLogic constructor.
-     * @param CanUpdateAnnouncement $canUpdateAnnouncement
-     * @param FetchesAnnouncement $fetchesAnnouncement
-     * @param UpdatesAnnouncement $updatesAnnouncement     
-     */
-    public function __construct(
-        CanUpdateAnnouncement $canUpdateAnnouncement,
-        FetchesAnnouncement $fetchesAnnouncement,
-        UpdatesAnnouncement $updatesAnnouncement        
-    ) {
-        $this->canUpdateAnnouncement = $canUpdateAnnouncement;
-        $this->fetchesAnnouncement = $fetchesAnnouncement;
-        $this->updatesAnnouncement = $updatesAnnouncement;        
-    }
-
-    /**
-     * @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
-    {
-        $annoucement_object = new AnnouncementObject(
-            $request->input('title'),
-            $request->input('description'),
-            $request->input('starting_on'),
-            $request->input('ending_on')
-        );
-
-        $this->canUpdateAnnouncement->passes($annoucement_object);
-
-        $annoucement = $this->fetchesAnnouncement->execute(['id' => $request->route('id')]);
-
-        $announcement_query = $this->updatesAnnouncement->execute($annoucement, $annoucement_object);
-
-        //$announcement_query->segments()->sync($request->input('segment_id'));
-
-        return $this->resourceResponse(new AnnouncementResource($announcement_query));
-    }
-}

app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php

@@ -1,69 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-class AnnouncementObject implements DataTransferObject
-{
-
-    /** @var string */
-    private $title;
-
-    /** @var string */
-    private $description;
-
-    /** @var string */
-    private $starting_on;
-
-    /** @var string */
-    private $ending_on;
-
-
-    /**
-     * AnnouncementObject constructor.
-     * @param string $title
-     * @param string $description
-     * @param string $start_date
-     * @param string $end_date
-     */
-
-    public function __construct(string $title, string $description, string $starting_on, string $ending_on)
-    {
-        $this->title = $title;
-        $this->description = $description;
-        $this->starting_on = $starting_on;
-        $this->ending_on = $ending_on;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTitle(): string
-    {
-        return $this->title;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescription(): string
-    {
-        return $this->description;
-    }
-
-    /**
-     * @return string
-     */
-    public function getStartingOn(): string
-    {
-        return $this->starting_on;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEndingOn(): string
-    {
-        return $this->ending_on;
-    }
-}

app/Classes/Modules/Announcements/Processors/AssignAnnouncementToSegmentProcessor.php

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

app/Classes/Modules/Announcements/Services/AssignsAnnouncementToSegment.php

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

app/Classes/Modules/Announcements/Services/CreatesAnnouncement.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
-use App\Models\Announcement;
-use DateTime;
-
-class CreatesAnnouncement extends AbstractUpdateRecord
-{
-    /**
-     * @param AnnouncementObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(AnnouncementObject $object)
-    {
-        $model = new Announcement();
-        $model->title = $object->getTitle();
-        $model->description = $object->getDescription();
-        // $model->starting_on = $object->getStartingOn();
-        $model->starting_on = $this->convertDateFormat($object->getStartingOn());
-        // $model->ending_on = $object->getEndingOn();
-        $model->ending_on = $this->convertDateFormat($object->getEndingOn());
-
-        return $this->handler($model);
-    }
-
-    public function convertDateFormat($value) {
-        $value = DateTime::createFromFormat('d-m-Y', $value)->format('Y-m-d H:i:s');
-
-        return $value;
-    }
-}

app/Classes/Modules/Announcements/Services/DeletesAnnouncement.php

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

app/Classes/Modules/Announcements/Services/FetchesAnnouncement.php

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

app/Classes/Modules/Announcements/Services/ListsAnnouncements.php

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

app/Classes/Modules/Announcements/Services/RemovesAnnouncementFromSegment.php

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

app/Classes/Modules/Announcements/Services/UpdatesAnnouncement.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
-use App\Models\Announcement;
-
-class UpdatesAnnouncement extends AbstractUpdateRecord
-{
-
-    /**
-     * @param Announcement $model
-     * @param AnnouncementObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Announcement $model, AnnouncementObject $object)
-    {
-        $model->title = $object->getTitle();
-        $model->description = $object->getDescription();
-        $model->starting_on = $object->getStartingOn();
-        $model->ending_on = $object->getEndingOn();
-
-        return $this->handler($model);
-    }
-}

app/Classes/Modules/Announcements/Standards/Rules/CanAssignSegment.php

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

app/Classes/Modules/Announcements/Standards/Rules/CanCreateAnnouncement.php

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

app/Classes/Modules/Announcements/Standards/Rules/CanDeleteAnnouncement.php

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

app/Classes/Modules/Announcements/Standards/Rules/CanListAnnouncements.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\Standards\Rules;
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
-
-class CanListAnnouncements extends AbstractRule
-{
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @param AnnouncementObject $object
-     * @return bool
-     */
-    protected function validators($object): bool
-    {
-        return true;
-    }
-
-    /**
-     * @param AnnouncementObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-}

app/Classes/Modules/Announcements/Standards/Rules/CanUpdateAnnouncement.php

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

app/Classes/Modules/Announcements/Standards/Validators/AnnouncementValidation.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\Standards\Validators;
-
-use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
-
-class AnnouncementValidation extends AbstractValidation
-{
-    /**
-     * @param AnnouncementObject $object
-     * @return array
-     */
-    protected function data($object): array 
-    {
-        return [
-            'title' => $object->getTitle(),
-            'description' => $object->getDescription(),
-            'starting_on' => $object->getStartingOn(),
-            'ending_on' => $object->getEndingOn()
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function rules(): array 
-    {
-        return [
-            'title' => 'required',
-            'description' => 'required',
-            'starting_on' => 'required',
-            'ending_on' => 'required'
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function messages(): array 
-    {
-        return [];
-    }
-}

app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php

@@ -1,138 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Billplzs\ControllersLogic;
-
-use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Services\UpdatesWallet;
-use App\Classes\Modules\Transactions\ControllersLogic\multipleInvoicesWithOnePaymentLogic;
-
-
-use App\Classes\Exceptions\ResourceNotFoundException;
-use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
-use App\Http\Resources\TransactionResource;
-use App\Models\Booking;
-use App\Models\User;
-use App\Models\Wallet;
-use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
-use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
-
-class CallbackBillplzLogic
-{
-    /** @var GetBillplzBill */
-    private $getBillplzBill;
-
-    /** @var FetchesTransaction */
-    private $fetchesTransaction;
-
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
-    /** @var UpdateDoFromVTPortalProcessor */
-    private $updateDoFromVTPortalProcessor;
-
-    /** @var UpdateDoFromYDPortalProcessor */
-    private $updateDoFromYDPortalProcessor ;
-
-
-    /** @var UpdateDoFromYDPortalProcessor */
-    private $multipleInvoicesWithOnePaymentLogic ;
-
-    /**
-     * CallbackBillplzLogic constructor.
-     * @param GetBillplzBill $getBillplzBill
-     * @param FetchesTransaction $fetchesTransaction
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
-     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
-     */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor,multipleInvoicesWithOnePaymentLogic $multipleInvoicesWithOnePaymentLogic)
-    {
-        $this->getBillplzBill = $getBillplzBill;
-        $this->fetchesTransaction = $fetchesTransaction;
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
-        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
-        $this->multipleInvoicesWithOnePaymentLogic= $multipleInvoicesWithOnePaymentLogic;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return bool|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     * @throws MalformedRequestException
-     * @throws ResourceNotFoundException
-     * @throws \App\Classes\Exceptions\InternalServerErrorException
-     * @throws \GuzzleHttp\Exception\GuzzleException
-     */
-    public function execute(Request $request)
-    {
-        $billplzXSignatureObject = new BillplzXSignatureObject($request);
-
-        if(!$billplzXSignatureObject->isValidSignature()){
-            throw new MalformedRequestException('Billplz Payment validation failed.');
-        }
-
-        $billPlz = $this->getBillplzBill->execute($billplzXSignatureObject->getBillPlzId());
-
-        if(!$billPlz) throw new ResourceNotFoundException('Billplz bill not found.');
-
-        $transaction = $this->fetchesTransaction->execute(['payment_reference' => $billplzXSignatureObject->getBillPlzId()]);
-
-
-        if ($transaction->type == 'topUp') {
-        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
-        $this->multipleInvoicesWithOnePaymentLogic->verifypayment($transaction->id, $transaction->amount);
-        }
-
-        $invoice = $transaction->owner;
-        $packingList = $invoice->owner;
-        $order = $packingList->owner;
-
-        $status = ApprovalStatus::PENDING_VERIFICATION;
-
-        
-        if($billPlz->state === 'paid') {
-            $status = ApprovalStatus::APPROVED;
-        }
-
-        if($billPlz->state === 'due') {
-            $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
-        }
-
-        $token = Auth::fromUser(User::find(1));
-        $request->headers->set('Authorization', 'Bearer '.$token);
-
-        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
-
-        if(($invoice->amount - $transaction->amount) < 0.01) {
-            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
-
-            $packingList->status = ApprovalStatus::APPROVED;
-            $packingList->save();
-
-            if(app()->environment('production')){
-                $this->updateDoFromVTPortalProcessor->execute($packingList);
-                $this->updateDoFromYDPortalProcessor->execute($packingList);
-            }
-        }
-
-
-
-
-
-        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference, 'transaction' => $transaction, 'status' => $status]);
-    }
-}

app/Classes/Modules/Billplzs/ControllersLogic/CreateBillplzBillLogic.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Billplzs\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
-
-use ErrorException;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class CreateBillplzBillLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Billplz Bill',
-            'message' => 'You have successfully created a new Bill'
-        ];
-    }
-
-    /** @var CreatesBillplzBill */
-    private $createsBillplzBill;
-
-    /**
-     * CreateBookingLogic constructor.
-     * @param CreatesBillplzBill $createsBillplzBill
-     */
-    public function __construct(CreatesBillplzBill $createsBillplzBill)
-    {
-        $this->createsBillplzBill = $createsBillplzBill;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $billPlz = $this->createsBillplzBill->execute($request->user()->name, $request->user()->email, $request->input('description'), 200, $request->input('bankName'));
-
-        if(!$billPlz) throw new MalformedRequestException('Unable to get correct response from billplz server.');
-        
-        return $this->response(['data' => $billPlz]);
-
-    }
-}

app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php

@@ -1,120 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Billplzs\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-use function PHPSTORM_META\map;
-
-class BillplzXSignatureObject implements DataTransferObject
-{
-
-    /** @var string */
-    private $billPlzId;
-
-    /** @var string */
-    private $status;
-
-    /** @var array */
-    private $billPlzConstructArray;
-
-    /** @var string */
-    private $billPlzConstructString;
-
-    /** @var string  */
-    private $billPlzComputedXSignature;
-
-    /** @var string */
-    private $type;
-
-    /** @var Request  */
-    private $request;
-
-    /** @var string  */
-    private $requestXSignature;
-
-    public function __construct(Request $request)
-    {
-
-        $this->type = $request->exists('billplz') ? 'redirect' : 'callback';
-
-        $this->request = $this->type === 'redirect' ? $request->input('billplz') : $request;
-
-        $this->billPlzId = $this->request['id'];
-
-        $this->status = $this->request['transaction_status'];
-
-        $this->requestXSignature = $this->request['x_signature'];
-
-        $this->_constructBillplzArray()->_natSortBillplzArray()->_constructBillplzString()->_computeBillplzXSignature();
-    }
-
-    private function _constructBillplzArray(){
-
-        $this->billPlzConstructArray = collect($this->request)->forget('x_signature')->map(function($item, $key){
-            return $this->type === 'redirect' ? 'billplz'.$key.$item : $key.$item;
-        })->toArray();
-
-        return $this;
-    }
-
-    private function _natCaseSortBillplzArray(){
-        natcasesort($this->billPlzConstructArray);
-        return $this;
-    }
-
-    private function _natSortBillplzArray(){
-        natsort($this->billPlzConstructArray);
-        return $this;
-    }
-
-    private function _constructBillplzString(){
-        $this->billPlzConstructString = implode('|', $this->billPlzConstructArray);
-        return $this;
-    }
-
-    private function _computeBillplzXSignature(){
-        $this->billPlzComputedXSignature = hash_hmac('sha256', $this->billPlzConstructString, config('billplz.x_signature_key'));
-        return $this;
-    }
-
-    public function getBillPlzId(): string
-    {
-        return $this->billPlzId;
-    }
-
-    public function getStatus(): string
-    {
-        return $this->status;
-    }
-
-    /**
-     * @return array
-     */
-    public function getBillPlzConstructArray(): array
-    {
-        return $this->billPlzConstructArray;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBillPlzConstructString(): string
-    {
-        return $this->billPlzConstructString;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBillPlzComputedXSignature(): string
-    {
-        return $this->billPlzComputedXSignature;
-    }
-
-    public function isValidSignature(): bool
-    {
-        return $this->billPlzComputedXSignature === $this->requestXSignature ? true : false;
-    }
-
-}

app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Billplzs\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-
-class CreatesBillplzBill
-{
-
-    /**
-     * @param string $name
-     * @param string $email
-     * @param string $description
-     * @param float $amount
-     * @param string $billNumber
-     * @param null|string $bankCode
-     * @param null|Boolean $wallet
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $name, string $email, string $description, float $amount, string $billNumber, ?string $bankCode = null, ?bool $wallet = null) {
-        try{
-//            config('billplz.maybank')
-            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [
-                'collection_id' => config('billplz.collection_id'),
-                'name' => $name,
-                'email' => $email,
-                'description' => $description,
-                'amount' => $this->finalizeAmount($amount),
-                'redirect_url' => route('online_payment.redirect'),
-                'callback_url' => route('api.online_payment.callback'),
-                'reference_1_label' => 'Bank Code',
-                'reference_1' => $bankCode ? $bankCode : '',
-                'reference_2_label' => 'Bill Number',
-                'reference_2' => $billNumber
-            ]);
-
-            if($response->successful()){
-                $data = $response->json();
-
-                $data['url'] = $data['url'].'?auto_submit=true';
-
-                return (object) $data;
-            }else{
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from billplz server' . $exception->getMessage());
-        }
-    }
-
-    protected function finalizeAmount($amount){
-        $number = round($amount, 2) * 100;
-        return (string) $number;
-    }
-}

app/Classes/Modules/Billplzs/Services/GetBillplzBill.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Billplzs\Services;
-
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Http;
-
-class GetBillplzBill
-{
-
-    /**
-     * @param string $billPlzId
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $billPlzId) {
-        try{
-            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$billPlzId);
-
-            if($response->successful()){
-                $data = $response->json();
-
-                return (object) $data;
-            }else{
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from billplz server');
-        }
-    }
-}

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

@@ -14,8 +14,6 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Documents\Services\FetchesDocument;
 
 use App\Classes\Modules\Documents\Services\ApprovesDocument;
-use App\Classes\Modules\Notifications\DataTransferObjects\NotificationObject;
-Use App\Classes\Modules\Notifications\Processors\CreateNotificationProcessor;
 
 use App\Models\Document;
 use Illuminate\Http\JsonResponse;
@@ -52,9 +50,6 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
     /** @var UpdatesOrdersStatus */
     private $updatesOrdersStatus;
 
-    /** @var CreateNotificationProcessor */
-    private $createNotificationProcessor;
-
     /**
      * ApproveIdentificationDocumentLogic constructor.
      * @param CanApproveDocument $canApproveDocument
@@ -63,9 +58,8 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
      * @param FetchesDocument $fetchesDocument
      * @param UpdatesCompanyStatus $updatesCompanyStatus
      * @param UpdatesOrdersStatus $updatesOrdersStatus
-     * @param CreateNotificationProcessor $createNotificationProcessor
      */
-    public function __construct(CanApproveDocument $canApproveDocument, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, UpdatesCompanyStatus $updatesCompanyStatus, UpdatesOrdersStatus $updatesOrdersStatus, CreateNotificationProcessor $createNotificationProcessor)
+    public function __construct(CanApproveDocument $canApproveDocument, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, UpdatesCompanyStatus $updatesCompanyStatus, UpdatesOrdersStatus $updatesOrdersStatus)
     {
         $this->canApproveDocument = $canApproveDocument;
         $this->approvesDocument = $approvesDocument;
@@ -73,7 +67,6 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
         $this->fetchesDocument = $fetchesDocument;
         $this->updatesCompanyStatus = $updatesCompanyStatus;
         $this->updatesOrdersStatus = $updatesOrdersStatus;
-        $this->createNotificationProcessor = $createNotificationProcessor;
     }
 
     /**
@@ -97,16 +90,6 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
 
         $this->updatesCompanyStatus->execute($document->owner, $status === 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
 
-//        $object = new NotificationObject(
-//            'ID Verification ' . ( $status === 'approve' ? 'Approved' : 'Rejected' ),
-//            ( $status === 'approve' ? 'Dear user, congratulations that your ' : 'Dear user, we are sorry to inform you that your ' ) . ( $document->type ===  'IDENTITY_CARD' ? 'IC' : 'SSM' ) . ( $status === 'approve' ? ' has been approved. Start your first order now!' : ' has been rejected due to ' . ( $request->input('rejectRemark') ?? '' ) . ', please resubmit it for further action.' ),
-//            $document->owner,
-//            $document->owner->companyModules()->first()->employees()->first(),
-//            $document,
-//        );
-//
-//        $this->createNotificationProcessor->execute($object);
-
         if($status === 'approve'){
             $orders = $this->updatesOrdersStatus->execute($document->owner, ApprovalStatus::APPROVED);
         }

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/ListCompanyModulesLogic.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Companies\Services\ListsCompanyModules;
-use App\Classes\Modules\Companies\Standards\Rules\CanListCompanies;
-use App\Http\Resources\CompanyModuleResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ListCompanyModulesLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Company Moduels',
-            'message' => 'You have successfully retrieved a list of Companies'
-        ];
-    }
-
-    /** @var CanListCompanies */
-    private $canListCompanies;
-
-    /** @var ListsCompanyModules */
-    private $listsCompanyModules;
-
-    /**
-     * ListCompaniesControllersLogic constructor.
-     * @param CanListCompanies $canListCompanies
-     * @param ListsCompanyModules $listsCompanyModules
-     */
-    public function __construct(CanListCompanies $canListCompanies, ListsCompanyModules $listsCompanyModules)
-    {
-        $this->canListCompanies = $canListCompanies;
-        $this->listsCompanyModules = $listsCompanyModules;
-    }
-
-
-    /**
-     * @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->canListCompanies->passes();
-
-        $query = $this->listsCompanyModules->execute($this->listsCompanyModules->deserializeFilters($request->input('filters')));
-        return $this->collectionResponse(CompanyModuleResource::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/ControllersLogic/UpdateCompanyLogic.php

@@ -5,7 +5,6 @@ namespace App\Classes\Modules\Companies\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Services\UpdatesCompany;
-use App\Classes\Modules\Companies\Services\UpdatesCompanyModuleName;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
 use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
@@ -36,22 +35,17 @@ class UpdateCompanyLogic extends AbstractControllerLogic
     /** @var FetchesCompany */
     private $fetchesCompany;
 
-    /** @var UpdatesCompanyModuleName */
-    private $updatesCompanyModuleName;
-
     /**
      * UpdateCompanyControllersLogic constructor.
      * @param CanUpdateCompany $canUpdateCompany
      * @param UpdatesCompany $updatesCompany
      * @param FetchesCompany $fetchesCompany
-     * @param UpdatesCompanyModuleName $updatesCompanyModuleName
      */
-    public function __construct(CanUpdateCompany $canUpdateCompany, UpdatesCompany $updatesCompany, FetchesCompany $fetchesCompany, UpdatesCompanyModuleName $updatesCompanyModuleName)
+    public function __construct(CanUpdateCompany $canUpdateCompany, UpdatesCompany $updatesCompany, FetchesCompany $fetchesCompany)
     {
         $this->canUpdateCompany = $canUpdateCompany;
         $this->updatesCompany = $updatesCompany;
         $this->fetchesCompany = $fetchesCompany;
-        $this->updatesCompanyModuleName = $updatesCompanyModuleName;
     }
 
 
@@ -62,17 +56,23 @@ class UpdateCompanyLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $object = new CompanyObject($request->input('name'), $request->input('reference'), $request->input('type'));
+        try {
 
-        $this->canUpdateCompany->passes($object);
+            $object = new CompanyObject($request->input('reference_no'), $request->input('name'), $request->input('type'));
 
-        $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+            $this->canUpdateCompany->passes($object);
 
-        $query = $this->updatesCompany->execute($query, $object);
+            $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
 
-        $this->updatesCompanyModuleName->execute($query->companyModules()->first(), $object->getName());
+            $query = $this->updatesCompany->execute($query, $object);
+
+            return $this->resourceResponse(new CompanyResource($query));
+
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
 
-        return $this->resourceResponse(new CompanyResource($query));
     }
 
 }

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

@@ -10,9 +10,6 @@ class CompanyConnectionObject implements DataTransferObject
 
     /** @var CompanyModule */
     private $invitee;
-    
-    /** @var CompanyModule */
-    private $inviter;
 
     /** @var string */
     private $inviterReference;
@@ -23,14 +20,12 @@ class CompanyConnectionObject implements DataTransferObject
     /**
      * CompanyConnectionObject constructor.
      * @param CompanyModule $invitee
-     * @param CompanyModule $inviter
      * @param string $inviterReference
      * @param string $inviteeReference
      */
-    public function __construct(CompanyModule $invitee, CompanyModule $inviter, string $inviteeReference, string $inviterReference)
+    public function __construct(CompanyModule $invitee, string $inviterReference, string $inviteeReference)
     {
         $this->invitee = $invitee;
-        $this->inviter = $inviter;
         $this->inviterReference = $inviterReference;
         $this->inviteeReference = $inviteeReference;
     }
@@ -43,14 +38,6 @@ class CompanyConnectionObject implements DataTransferObject
         return $this->invitee;
     }
 
-    /**
-     * @return CompanyModule
-     */
-    public function getInviter(): CompanyModule
-    {
-        return $this->inviter;
-    }
-
     /**
      * @return string
      */

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/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/AssignsCompanyToSegment.php

@@ -4,7 +4,6 @@ namespace App\Classes\Modules\Companies\Services;
 
 use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Models\Company;
 use App\Models\Segment;
 use Illuminate\Database\QueryException;
@@ -20,9 +19,8 @@ class AssignsCompanyToSegment extends AbstractUpdateRecord
     public function execute(Company $company, Segment $segment)
     {
         try {
-            $companyModule = $company->companyModules()->where('type', BusinessType::IMPORTER)->first();
-            $connection = $companyModule->connections()->where('inviter_reference', 'CIEF');
-            $connection->segments()->attach($segment);
+
+            $company->segments()->attach($segment);
 
             return $company;
 

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

@@ -30,8 +30,10 @@ class CreatesCompanyConnection extends AbstractUpdateRecord
     public function execute(CompanyConnectionObject $object)
     {
 
+        $companyModule = $this->fetchesCompany->execute(['id', 1])->companyModules()->first();
+
         $connection = new CompanyConnection();
-        $connection->inviter_id = $object->getInviter()->id;
+        $connection->inviter_id = $companyModule->id;
         $connection->invitee_id = $object->getInvitee()->id;
         $connection->inviter_reference = $object->getInviterReference();
         $connection->invitee_reference = $object->getInviteeReference();

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

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

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

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