Version 1.3

app/GraphQL/ActionEngine/Builders/Engagements/TaskEngagementBuilder.php

@@ -26,6 +26,6 @@ public function getLeadTaskItems(
         $lead = Lead::getByIdFromCompanyApp($args['lead_id'], $company, $app);
         $leadId = $lead->getId();
 
-        return TaskEngagementItemRepository::getLeadsTaskItems($lead);
+        return TaskEngagementItemRepository::getLeadsTaskItems($lead, (int) ($args['task_list_id'] ?? null));
     }
 }

app/GraphQL/Ecosystem/Mutations/Companies/CompanyBranchManagementMutation.php

@@ -6,6 +6,7 @@
 
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Support\Facades\Auth;
+use Kanvas\Apps\Models\Apps;
 use Kanvas\Companies\Branches\Actions\CreateCompanyBranchActions;
 use Kanvas\Companies\Branches\Actions\DeleteCompanyBranchActions;
 use Kanvas\Companies\Branches\Actions\UpdateCompanyBranchActions;
@@ -14,10 +15,13 @@
 use Kanvas\Companies\Models\CompaniesBranches;
 use Kanvas\Companies\Repositories\CompaniesRepository;
 use Kanvas\Enums\StateEnums;
+use Kanvas\Filesystem\Traits\HasMutationUploadFiles;
 use Kanvas\Users\Models\Users;
 
 class CompanyBranchManagementMutation
 {
+    use HasMutationUploadFiles;
+
     /**
      * createCompaniesBranch
      *
@@ -27,7 +31,7 @@ public function createCompaniesBranch(mixed $root, array $request): CompaniesBra
     {
         $request['input']['users_id'] = Auth::user()->getKey();
         $dto = CompaniesBranchPostData::fromArray($request['input']);
-        $action = new  CreateCompanyBranchActions(Auth::user(), $dto);
+        $action = new CreateCompanyBranchActions(Auth::user(), $dto);
 
         return $action->execute();
     }
@@ -40,11 +44,29 @@ public function createCompaniesBranch(mixed $root, array $request): CompaniesBra
     public function updateCompanyBranch(mixed $root, array $request): CompaniesBranches
     {
         $dto = CompaniesBranchPutData::fromArray($request['input']);
-        $action = new  UpdateCompanyBranchActions(Auth::user(), $dto);
+        $action = new UpdateCompanyBranchActions(Auth::user(), $dto);
 
         return $action->execute((int) $request['id']);
     }
 
+    public function attachFileToCompany(mixed $root, array $request): CompaniesBranches
+    {
+        $app = app(Apps::class);
+        $user = auth()->user();
+        $companyBranch = CompaniesBranches::getById((int) $request['id']);
+
+        $company = $companyBranch->company()->first();
+
+        CompaniesRepository::userAssociatedToCompanyAndBranch($company, $companyBranch, $user);
+
+        return $this->uploadFileToEntity(
+            model: $companyBranch,
+            app: $app,
+            user: $user,
+            request: $request
+        );
+    }
+
     /**
      * deleteCompanyBranch
      */

app/GraphQL/Ecosystem/Mutations/Companies/CompanyManagementMutation.php

@@ -4,35 +4,43 @@
 
 namespace App\GraphQL\Ecosystem\Mutations\Companies;
 
+use Baka\Users\Contracts\UserInterface;
 use Exception;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Kanvas\Apps\Models\Apps;
 use Kanvas\Companies\Actions\CreateCompaniesAction;
 use Kanvas\Companies\Actions\UpdateCompaniesAction;
-use Kanvas\Companies\DataTransferObject\CompaniesPutData;
 use Kanvas\Companies\DataTransferObject\Company;
 use Kanvas\Companies\Jobs\DeleteCompanyJob;
 use Kanvas\Companies\Models\Companies;
 use Kanvas\Companies\Models\CompaniesBranches;
 use Kanvas\Companies\Repositories\CompaniesRepository;
 use Kanvas\Enums\StateEnums;
+use Kanvas\Filesystem\Actions\AttachFilesystemAction;
+use Kanvas\Filesystem\Services\FilesystemServices;
+use Kanvas\Filesystem\Traits\HasMutationUploadFiles;
 use Kanvas\Users\Actions\AssignRoleAction;
 use Kanvas\Users\Models\Users;
 use Kanvas\Users\Models\UsersAssociatedApps;
 use Kanvas\Users\Models\UsersAssociatedCompanies;
 use Kanvas\Users\Repositories\UsersRepository;
-use Kanvas\Filesystem\Actions\AttachFilesystemAction;
-use Kanvas\Filesystem\Services\FilesystemServices;
+use Nuwave\Lighthouse\Exceptions\AuthorizationException;
 
 class CompanyManagementMutation
 {
+    use HasMutationUploadFiles;
+
     /**
      * createCompany
      */
     public function createCompany(mixed $root, array $request): Companies
     {
+        if (! auth()->user()->isAdmin()) {
+            throw new AuthorizationException('Only admin can create companies, please contact your admin');
+        }
+
         if (auth()->user()->isAdmin() && key_exists('users_id', $request['input'])) {
             $user = Users::getById($request['input']['users_id']);
             UsersRepository::belongsToThisApp($user, app(Apps::class)) ;
@@ -45,27 +53,59 @@ public function createCompany(mixed $root, array $request): Companies
         return $action->execute();
     }
 
+    /**
+     * @todo move to service ?
+     */
+    protected function hasCompanyPermission(Companies $company, UserInterface $user): void
+    {
+        if (! $user->isAdmin() && $company->users_id != $user->getId()) {
+            throw new AuthorizationException('Your are not allowed to perform this action for company ' . $company->name);
+        }
+    }
+
     /**
      * updateCompany
      */
     public function updateCompany(mixed $root, array $request): Companies
     {
+        $company = Companies::getById((int) $request['id']);
+
+        $this->hasCompanyPermission($company, auth()->user());
+
         if (auth()->user()->isAdmin() && key_exists('users_id', $request['input'])) {
             $user = Users::getById($request['input']['users_id']);
-            UsersRepository::belongsToThisApp($user, app(Apps::class)) ;
+            UsersRepository::belongsToThisApp($user, app(Apps::class), $company) ;
         } else {
             $user = auth()->user();
         }
+
         $dto = Company::viaRequest($request['input'], $user);
-        $action = new UpdateCompaniesAction($user, $dto);
+        $action = new UpdateCompaniesAction($company, $user, $dto);
 
-        return $action->execute((int) $request['id']);
+        return $action->execute();
     }
 
+    public function attachFileToCompany(mixed $root, array $request): Companies
+    {
+        $app = app(Apps::class);
+        $company = Companies::getById((int) $request['id']);
+
+        $this->hasCompanyPermission($company, auth()->user());
+
+        return $this->uploadFileToEntity(
+            model: $company,
+            app: $app,
+            user: auth()->user(),
+            request: $request
+        );
+    }
 
     public function updatePhotoProfile(mixed $root, array $request): Companies
     {
         $company = Companies::getById($request['id']);
+
+        $this->hasCompanyPermission($company, auth()->user());
+
         if (! auth()->user()->isAdmin()) {
             $company = Companies::getById($request['id']);
             CompaniesRepository::userAssociatedToCompany(
@@ -98,6 +138,11 @@ public function deleteCompany(mixed $root, array $request): bool
         if (Users::where('default_company', $request['id'])->count()) {
             throw new Exception('You can not delete a company that has users associated');
         }
+
+        if (! auth()->user()->isAdmin()) {
+            throw new AuthorizationException('Only admin can delete companies, please contact your admin');
+        }
+
         DeleteCompanyJob::dispatch((int) $request['id'], Auth::user(), app(Apps::class));
 
         return true;
@@ -114,6 +159,8 @@ public function addUserToCompany($rootValue, array $request): bool
             auth()->user()
         );
 
+        $this->hasCompanyPermission($company, auth()->user());
+
         $branch = app(CompaniesBranches::class);
 
         $companyDefaultBranch = $company->defaultBranch()->first();
@@ -173,6 +220,8 @@ public function removeUserFromCompany($rootValue, array $request): bool
             auth()->user()
         );
 
+        $this->hasCompanyPermission($company, auth()->user());
+
         $branch = app(CompaniesBranches::class);
 
         $companyDefaultBranch = $company->defaultBranch()->first();

app/GraphQL/Ecosystem/Mutations/Config/ConfigManagement.php

@@ -24,10 +24,7 @@ public function setAppSetting(mixed $root, array $request): bool
     public function deleteAppSetting(mixed $root, array $request): bool
     {
         $app = app(Apps::class);
-        $app->set($request['input']['key'], $request['input']['value']);
-        $app->delete($request['input']['key']);
-
-        return true;
+        return $app->del($request['key']);
     }
 
     public function setCompanySetting(mixed $root, array $request): bool

app/GraphQL/Ecosystem/Mutations/Filesystem/FilesystemManagementMutation.php

@@ -12,6 +12,7 @@
 use Kanvas\Filesystem\Services\FilesystemServices;
 use Kanvas\SystemModules\DataTransferObject\SystemModuleEntityInput;
 use Kanvas\SystemModules\Repositories\SystemModulesRepository;
+use League\Csv\Reader;
 
 class FilesystemManagementMutation
 {
@@ -99,6 +100,25 @@ public function singleFile(mixed $rootValue, array $request): Filesystem
         return $filesystem->upload($file, auth()->user());
     }
 
+    public function uploadCsv(mixed $rootValue, array $request): array
+    {
+        $file = $request['file'];
+        $path = $file->store('csv/' . $file->getClientOriginalName() . uniqid(), 'local');
+        $path = storage_path('app/' . $path);
+        $csv = Reader::createFromPath($path, 'r');
+
+        $csv->setHeaderOffset(0);
+        $header = $csv->getHeader();
+
+        $fileSystems = $this->singleFile($rootValue, $request);
+
+        return [
+            'filesystem_id' => $fileSystems->id,
+            'row' => $csv->nth(0),
+            'header' => $header,
+        ];
+    }
+
     /**
      * Multiple Upload a file, store it on the server and return the path.
      */

app/GraphQL/Ecosystem/Mutations/Filesystem/FilesystemMapperMutation.php

@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\GraphQL\Ecosystem\Mutations\Filesystem;
+
+use Kanvas\Apps\Models\Apps;
+use Kanvas\Filesystem\Actions\CreateFileSystemImportAction;
+use Kanvas\Filesystem\Actions\CreateFilesystemMapperAction;
+use Kanvas\Filesystem\DataTransferObject\FilesystemImport;
+use Kanvas\Filesystem\DataTransferObject\FilesystemMapper;
+use Kanvas\Filesystem\Models\Filesystem;
+use Kanvas\Filesystem\Models\FilesystemImports;
+use Kanvas\Filesystem\Models\FilesystemMapper as ModelsFilesystemMapper;
+use Kanvas\Inventory\Regions\Models\Regions;
+use Kanvas\SystemModules\Models\SystemModules;
+
+class FilesystemMapperMutation
+{
+    public function create(mixed $root, array $req): ModelsFilesystemMapper
+    {
+        $req = $req['input'];
+        $app = app(Apps::class);
+        $user = auth()->user();
+        $branch = $user->getCurrentBranch();
+        $systemModule = SystemModules::getById($req['system_module_id'], $app);
+
+        $mapperDto = FilesystemMapper::viaRequest(
+            $app,
+            $branch,
+            $user,
+            $systemModule,
+            $req
+        );
+
+        return (new CreateFilesystemMapperAction($mapperDto))->execute();
+    }
+
+    public function process(mixed $root, array $req): FilesystemImports
+    {
+        $input = $req['input'];
+        $user = auth()->user();
+        $company = $user->getCurrentCompany();
+        $app = app(Apps::class);
+
+        $filesystem = Filesystem::getByIdFromCompanyApp($input['filesystem_id'], $company, $app);
+        $mapper = ModelsFilesystemMapper::getByIdFromCompanyApp($input['filesystem_mapper_id'], $company, $app);
+        $regions = Regions::getByIdFromCompanyApp($input['regions_id'], $company, $app);
+
+        $dto = FilesystemImport::from([
+            'app' => $app,
+            'users' => $user,
+            'companies' => $company,
+            'regions' => $regions,
+            'companiesBranches' => $user->getCurrentBranch(),
+            'filesystem' => $filesystem,
+            'filesystemMapper' => $mapper,
+        ]);
+
+        $import = (new CreateFilesystemImportAction($dto))->execute();
+
+        return $import;
+    }
+}

app/GraphQL/Ecosystem/Mutations/Filesystem/UploadMutation.php

@@ -4,6 +4,7 @@
 
 namespace App\GraphQL\Ecosystem\Mutations\Filesystem;
 
+use Kanvas\Apps\Models\Apps;
 use Kanvas\Filesystem\Actions\UploadFileAction;
 use Kanvas\Filesystem\Models\Filesystem;
 
@@ -16,8 +17,9 @@ public function singleFile(mixed $rootValue, array $request): Filesystem
     {
         /** @var \Illuminate\Http\UploadedFile $file */
         $file = $request['file'];
+        $app = app(Apps::class);
 
-        $uploadFile = new UploadFileAction(auth()->user());
+        $uploadFile = new UploadFileAction(auth()->user(), $app);
 
         return $uploadFile->execute($file);
     }
@@ -30,9 +32,10 @@ public function multiFile(mixed $rootValue, array $request): array
         /** @var \Illuminate\Http\UploadedFile $file */
         $files = $request['files'];
         $fileSystems = [];
+        $app = app(Apps::class);
 
         foreach ($files as $file) {
-            $uploadFile = new UploadFileAction(auth()->user());
+            $uploadFile = new UploadFileAction(auth()->user(), $app);
 
             $fileSystems[] = $uploadFile->execute($file);
         }