Resolved conflict with Master branch

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

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

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

@@ -110,7 +110,7 @@ class CreateCustomerLogic extends AbstractControllerLogic
 
         $this->createContactProcessor->execute($request, $company);
 
-        $companyModule = $this->createCompanyModuleProcessor->execute($company);
+        $companyModule = $this->createCompanyModuleProcessor->execute($company, $request->input('business_type'));
 
         $Object = new EmploymentObject($companyModule, $user);
         $this->assignEmployeeProcessor->execute($Object);

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

@@ -5,6 +5,7 @@ namespace App\Classes\Modules\Companies\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
+use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\CompanyType;
@@ -17,10 +18,12 @@ class CreateCompanyLogic extends AbstractControllerLogic
     /**
      * CreateCompanyLogic constructor.
      * @param CreateCompanyProcessor $createCompanyProcessor
+     * @param CreateCompanyModuleProcessor $createCompanyModuleProcessor
      */
-    public function __construct(CreateCompanyProcessor $createCompanyProcessor)
+    public function __construct(CreateCompanyProcessor $createCompanyProcessor ,CreateCompanyModuleProcessor $createCompanyModuleProcessor)
     {
         $this->createCompanyProcessor = $createCompanyProcessor;
+        $this->createCompanyModuleProcessor = $createCompanyModuleProcessor;
     }
 
     /**
@@ -46,7 +49,10 @@ class CreateCompanyLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $company = $this->createCompanyProcessor->execute($request, BusinessType::CURRENCY_VENDOR, CompanyType::COMPANY_BUSINESS, ApprovalStatus::APPROVED);
+        $company = $this->createCompanyProcessor->execute($request, $request->input('type'), ApprovalStatus::PENDING_SUBMISSION);
+
+        $this->createCompanyModuleProcessor->execute($company , $request->input('business_type'));
+
         return $this->resourceResponse(new CompanyResource($company));
     }
 

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

@@ -5,6 +5,8 @@ namespace App\Classes\Modules\Companies\Processors;
 use App\Classes\Modules\Companies\DataTransferObjects\CompanyModuleObject;
 use App\Classes\Modules\Companies\Services\CreatesCompanyModule;
 
+use App\Classes\ValueObjects\Constants\BusinessType;
+
 use Illuminate\Database\Eloquent\Model;
 
 use App\Models\Company;
@@ -28,12 +30,12 @@ class CreateCompanyModuleProcessor
      * @param Company $company
      * @return Model
      */
-    public function execute(Company $company): Model
+    public function execute(Company $company , ?int $businessType): Model
     {
         $company_module_object = new CompanyModuleObject(
             $company->id,
-            $company->type,
-            $company->status
+            $businessType??BusinessType::IMPORTER,
+            $company->status,
         );
 
         return $this->createsCompanyModule->execute($company_module_object);

app/Models/Company.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace App\Models;
+
 use App\Classes\General\Interfaces\Documentable;
 use App\Classes\General\Interfaces\Contactable;
 use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceConfigurationsObject;
@@ -42,6 +43,14 @@ class Company extends AbstractModel implements Documentable, Contactable
         return $this->morphMany(Address::class, 'owner');
     }
 
+    /**
+     * @return belongsToMany
+     */
+    public function companyModule(): hasMany
+    {
+        return $this->hasMany(CompanyModule::class);
+    }
+
     /**
      * @return belongsToMany
      */

app/Models/CompanyModule.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -23,6 +24,14 @@ class CompanyModule extends AbstractModel
 
     protected $dates = ['deleted_at'];
 
+    /**
+     * @return BelongsTo
+     */
+    public function company(): BelongsTo
+    {
+        return $this->BelongsTo(Company::class, 'company_id', 'id');
+    }
+
     /**
      * @return MorphMany
      */

app/Models/User.php

@@ -63,7 +63,7 @@ class User extends AbstractModel implements
      */
     public function companyModule(): belongsToMany
     {
-        return $this->belongsToMany(companyModule::class, (new CompanyEmployee())->getTable(), 'user_id', 'company_module_id');
+        return $this->belongsToMany(CompanyModule::class, (new CompanyEmployee())->getTable(), 'user_id', 'company_module_id');
     }
 
     /**

database/seeders/CompaniesTableSeeder.php

@@ -3,10 +3,13 @@
 namespace Database\Seeders;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\CompanyType;
 use App\Classes\ValueObjects\Constants\BusinessType;
 
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Facades\DB;
+
+use App\Models\Company;
+use App\Models\CompanyModule;
 
 class CompaniesTableSeeder extends Seeder
 {
@@ -17,19 +20,36 @@ class CompaniesTableSeeder extends Seeder
      */
     public function run()
     {
-        DB::table('companies')->insert([
+
+        $companies = [
             [
                 'name' => 'Guang Zhou',
-                'reference' => 'guangzhou',
-                'type' => BusinessType::WAREHOUSE,
+                'reference' => 'guangzhouwarehouse',
+                'type' => CompanyType::COMPANY_BUSINESS,
                 'status' => ApprovalStatus::APPROVED,
             ],
             [
                 'name' => 'Yiwu',
-                'reference' => 'yiwu',
-                'type' => BusinessType::WAREHOUSE,
+                'reference' => 'yiwuwarehouse',
+                'type' => CompanyType::COMPANY_BUSINESS,
                 'status' => ApprovalStatus::APPROVED,
             ]
-        ]);
+        ];
+
+
+        if (!empty($companies)) {
+            foreach ($companies as $company) {
+
+                $company = Company::create($company);
+
+                CompanyModule::create(
+                    [
+                        'company_id' => $company->id,
+                        'type' => BusinessType::WAREHOUSE,
+                        'status' => ApprovalStatus::APPROVED,
+                    ]
+                );
+            }
+        }
     }
 }