Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into container-profile-forms-ui

# Conflicts:
#	routes/web.php

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

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

app/Http/Controllers/Accounts/CreateInvitedCustomerController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Accounts;
+
+use App\Classes\Modules\Accounts\ControllersLogic\CreateInvitedCustomerLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateInvitedCustomerController
+{
+    /**
+     * @param Request $request
+     * @param CreateInvitedCustomerLogic $createCustomerLogic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateInvitedCustomerLogic $createCustomerLogic): JsonResponse
+    {
+        return $createCustomerLogic->execute($request);
+    }
+}

app/Http/Resources/CompanyResource.php

@@ -11,6 +11,7 @@ use App\Models\CompanyModule;
 use App\Models\Currency;
 use App\Models\SegmentConstant;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Crypt;
 
 class CompanyResource extends JsonResource
 {
@@ -25,6 +26,7 @@ class CompanyResource extends JsonResource
         $companyModule = $this->companyModules()->where('type', '=', BusinessType::IMPORTER)->first();
         return [
             'id' => $this->id,
+            'hash_id' => Crypt::encryptString($this->id),
             'name' => $this->name,
             'reference' => $this->reference,
             'type' => (int) $this->type,

app/Http/Resources/ContainerResource.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\Classes\ValueObjects\Constants\ContainerTypes;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class ContainerResource extends JsonResource
@@ -17,7 +18,7 @@ class ContainerResource extends JsonResource
         return [
             'id' => $this->id,
             'container_reference' => $this->reference,
-            'container_type' => $this->container_type,
+            'container_specification' => ContainerTypes::CONTAINER_SPECIFICATION[$this->container_type],
             'container_number' => $this->container_number,
             'seal_reference' => $this->seal_reference,
             'transport' => new TransportResource($this->transports()->first()),