Revert "refactor: delete in job"

This reverts commit 65bbf21.
bakaphp · Feb 8, 2024 · 37b4859 · 37b4859
1 parent 65bbf21
commit 37b4859
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 36 deletions.
diff --git a/app/GraphQL/Ecosystem/Mutations/Companies/CompanyManagementMutation.php b/app/GraphQL/Ecosystem/Mutations/Companies/CompanyManagementMutation.php
@@ -8,10 +8,10 @@
 use Illuminate\Support\Facades\Auth;
 use Kanvas\Apps\Models\Apps;
 use Kanvas\Companies\Actions\CreateCompaniesAction;
+use Kanvas\Companies\Actions\DeleteCompaniesAction;
 use Kanvas\Companies\Actions\UpdateCompaniesAction;
 use Kanvas\Companies\DataTransferObject\CompaniesPostData;
 use Kanvas\Companies\DataTransferObject\CompaniesPutData;
-use Kanvas\Companies\Jobs\DeleteCompanyJob;
 use Kanvas\Companies\Models\Companies;
 use Kanvas\Companies\Models\CompaniesBranches;
 use Kanvas\Companies\Repositories\CompaniesRepository;
@@ -65,7 +65,8 @@ public function deleteCompany(mixed $root, array $request): bool
         /**
          * @todo only super admin can do this
          */
-        DeleteCompanyJob::dispatch((int) $request['id'], Auth::user());
+        $companyDelete = new DeleteCompaniesAction(Auth::user());
+        $companyDelete->execute((int) $request['id']);
 
         return true;
     }

diff --git a/src/Kanvas/Companies/Actions/DeleteCompaniesAction.php b/src/Kanvas/Companies/Actions/DeleteCompaniesAction.php
@@ -36,7 +36,7 @@ public function execute(int $id): bool
     {
         $companies = Companies::getById($id);
 
-        if (! $companies->isOwner($this->user) && ! $this->user->isAdmin()) {
+        if (! $companies->isOwner($this->user)) {
             throw new AuthorizationException('User cant delete this company');
         }
 

diff --git a/src/Kanvas/Companies/Jobs/DeleteCompanyJob.php b/src/Kanvas/Companies/Jobs/DeleteCompanyJob.php