refactor: update stubs

apiato · Dec 14, 2023 · fdd36c2 · fdd36c2
1 parent d98bc35
commit fdd36c2
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 23 deletions.
diff --git a/Generator/Stubs/controllers/api/crud.stub b/Generator/Stubs/controllers/api/crud.stub
@@ -3,6 +3,7 @@
 namespace App\Containers\{{section-name}}\{{container-name}}\UI\{{user-interface}}\Controllers;
 
 use Apiato\Core\Exceptions\CoreInternalErrorException;
+use Apiato\Core\Exceptions\IncorrectIdException;
 use Apiato\Core\Exceptions\InvalidTransformerException;
 use App\Containers\{{section-name}}\{{container-name}}\Actions\Create{{model}}Action;
 use App\Containers\{{section-name}}\{{container-name}}\Actions\Delete{{model}}Action;
@@ -26,17 +27,18 @@ use Prettus\Repository\Exceptions\RepositoryException;
 class {{class-name}} extends {{base-controller}}
 {
     public function __construct(
-        private readonly Create{{model}}Action $create{{model}}Action
-        private readonly Update{{model}}Action $update{{model}}Action
-        private readonly Find{{model}}ByIdAction $find{{model}}ByIdAction
-        private readonly List{{models}}Action $list{{models}}Action
-        private readonly Delete{{model}}Action $delete{{model}}Action
+        private readonly Create{{model}}Action $create{{model}}Action,
+        private readonly Update{{model}}Action $update{{model}}Action,
+        private readonly Find{{model}}ByIdAction $find{{model}}ByIdAction,
+        private readonly List{{models}}Action $list{{models}}Action,
+        private readonly Delete{{model}}Action $delete{{model}}Action,
     ) {
     }
 
     /**
      * @throws InvalidTransformerException
      * @throws CreateResourceFailedException
+     * @throws IncorrectIdException
      */
     public function create{{model}}(Create{{model}}Request $request): JsonResponse
     {
@@ -69,7 +71,9 @@ class {{class-name}} extends {{base-controller}}
     }
 
     /**
+     * @throws IncorrectIdException
      * @throws InvalidTransformerException
+     * @throws NotFoundException
      * @throws UpdateResourceFailedException
      */
     public function update{{model}}(Update{{model}}Request $request): array
@@ -81,6 +85,7 @@ class {{class-name}} extends {{base-controller}}
 
     /**
      * @throws DeleteResourceFailedException
+     * @throws NotFoundException
      */
     public function delete{{model}}(Delete{{model}}Request $request): JsonResponse
     {

diff --git a/Generator/Stubs/tasks/create.stub b/Generator/Stubs/tasks/create.stub
@@ -6,7 +6,6 @@ use App\Containers\{{section-name}}\{{container-name}}\Data\Repositories\{{model
 use App\Containers\{{section-name}}\{{container-name}}\Models\{{model}};
 use App\Ship\Exceptions\CreateResourceFailedException;
 use App\Ship\Parents\Tasks\Task as ParentTask;
-use Exception;
 
 class {{class-name}} extends ParentTask
 {
@@ -22,7 +21,7 @@ class {{class-name}} extends ParentTask
     {
         try {
             return $this->repository->create($data);
-        } catch (Exception) {
+        } catch (\Exception) {
             throw new CreateResourceFailedException();
         }
     }

diff --git a/Generator/Stubs/tasks/delete.stub b/Generator/Stubs/tasks/delete.stub
@@ -6,7 +6,6 @@ use App\Containers\{{section-name}}\{{container-name}}\Data\Repositories\{{model
 use App\Ship\Exceptions\DeleteResourceFailedException;
 use App\Ship\Exceptions\NotFoundException;
 use App\Ship\Parents\Tasks\Task as ParentTask;
-use Exception;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 class {{class-name}} extends ParentTask
@@ -26,7 +25,7 @@ class {{class-name}} extends ParentTask
             return $this->repository->delete($id);
         } catch (ModelNotFoundException) {
             throw new NotFoundException();
-        } catch (Exception) {
+        } catch (\Exception) {
             throw new DeleteResourceFailedException();
         }
     }

diff --git a/Generator/Stubs/tasks/find.stub b/Generator/Stubs/tasks/find.stub
@@ -6,7 +6,6 @@ use App\Containers\{{section-name}}\{{container-name}}\Data\Repositories\{{model
 use App\Containers\{{section-name}}\{{container-name}}\Models\{{model}};
 use App\Ship\Exceptions\NotFoundException;
 use App\Ship\Parents\Tasks\Task as ParentTask;
-use Exception;
 
 class {{class-name}} extends ParentTask
 {
@@ -22,7 +21,7 @@ class {{class-name}} extends ParentTask
     {
         try {
             return $this->repository->find($id);
-        } catch (Exception) {
+        } catch (\Exception) {
             throw new NotFoundException();
         }
     }

diff --git a/Generator/Stubs/tasks/list.stub b/Generator/Stubs/tasks/list.stub
@@ -20,6 +20,6 @@ class {{class-name}} extends ParentTask
      */
     public function run(): mixed
     {
-        return $this->addRequestCriteria()->repository->paginate();
+        return $this->repository->addRequestCriteria()->paginate();
     }
 }
diff --git a/Generator/Stubs/tasks/update.stub b/Generator/Stubs/tasks/update.stub
@@ -7,7 +7,6 @@ use App\Containers\{{section-name}}\{{container-name}}\Models\{{model}};
 use App\Ship\Exceptions\NotFoundException;
 use App\Ship\Exceptions\UpdateResourceFailedException;
 use App\Ship\Parents\Tasks\Task as ParentTask;
-use Exception;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 class {{class-name}} extends ParentTask
@@ -27,7 +26,7 @@ class {{class-name}} extends ParentTask
             return $this->repository->update($data, $id);
         } catch (ModelNotFoundException) {
             throw new NotFoundException();
-        } catch (Exception) {
+        } catch (\Exception) {
             throw new UpdateResourceFailedException();
         }
     }

diff --git a/Generator/Stubs/tasks/with_event/create.stub b/Generator/Stubs/tasks/with_event/create.stub
@@ -7,7 +7,6 @@ use App\Containers\{{section-name}}\{{container-name}}\Events\{{event}};
 use App\Containers\{{section-name}}\{{container-name}}\Models\{{model}};
 use App\Ship\Exceptions\CreateResourceFailedException;
 use App\Ship\Parents\Tasks\Task as ParentTask;
-use Exception;
 
 class {{class-name}} extends ParentTask
 {
@@ -26,7 +25,7 @@ class {{class-name}} extends ParentTask
             {{event}}::dispatch(${{_model}});
 
             return ${{_model}};
-        } catch (Exception) {
+        } catch (\Exception) {
             throw new CreateResourceFailedException();
         }
     }

diff --git a/Generator/Stubs/tasks/with_event/delete.stub b/Generator/Stubs/tasks/with_event/delete.stub
@@ -7,7 +7,6 @@ use App\Containers\{{section-name}}\{{container-name}}\Events\{{event}};
 use App\Ship\Exceptions\DeleteResourceFailedException;
 use App\Ship\Exceptions\NotFoundException;
 use App\Ship\Parents\Tasks\Task as ParentTask;
-use Exception;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 class {{class-name}} extends ParentTask
@@ -30,7 +29,7 @@ class {{class-name}} extends ParentTask
             return $result;
         } catch (ModelNotFoundException) {
             throw new NotFoundException();
-        } catch (Exception) {
+        } catch (\Exception) {
             throw new DeleteResourceFailedException();
         }
     }

diff --git a/Generator/Stubs/tasks/with_event/find.stub b/Generator/Stubs/tasks/with_event/find.stub
@@ -7,7 +7,6 @@ use App\Containers\{{section-name}}\{{container-name}}\Events\{{event}};
 use App\Containers\{{section-name}}\{{container-name}}\Models\{{model}};
 use App\Ship\Exceptions\NotFoundException;
 use App\Ship\Parents\Tasks\Task as ParentTask;
-use Exception;
 
 class {{class-name}} extends ParentTask
 {
@@ -26,7 +25,7 @@ class {{class-name}} extends ParentTask
             {{event}}::dispatch(${{_model}});
 
             return ${{_model}};
-        } catch (Exception) {
+        } catch (\Exception) {
             throw new NotFoundException();
         }
     }

diff --git a/Generator/Stubs/tasks/with_event/list.stub b/Generator/Stubs/tasks/with_event/list.stub
@@ -21,7 +21,7 @@ class {{class-name}} extends ParentTask
      */
     public function run(): mixed
     {
-        $result = $this->addRequestCriteria()->repository->paginate();
+        $result = $this->repository->addRequestCriteria()->paginate();
         {{event}}::dispatch($result);
 
         return $result;

diff --git a/Generator/Stubs/tasks/with_event/update.stub b/Generator/Stubs/tasks/with_event/update.stub
@@ -8,7 +8,6 @@ use App\Containers\{{section-name}}\{{container-name}}\Models\{{model}};
 use App\Ship\Exceptions\NotFoundException;
 use App\Ship\Exceptions\UpdateResourceFailedException;
 use App\Ship\Parents\Tasks\Task as ParentTask;
-use Exception;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 class {{class-name}} extends ParentTask
@@ -31,7 +30,7 @@ class {{class-name}} extends ParentTask
             return ${{_model}};
         } catch (ModelNotFoundException) {
             throw new NotFoundException();
-        } catch (Exception) {
+        } catch (\Exception) {
             throw new UpdateResourceFailedException();
         }
     }