refactor(controller): pass owner to validation makers

KennethTrecy · Sep 23, 2023 · 7983ec7 · 7983ec7
1 parent 17199ef
commit 7983ec7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/app/Controllers/BaseOwnedResourceController.php b/app/Controllers/BaseOwnedResourceController.php
@@ -4,6 +4,7 @@
 
 use CodeIgniter\API\ResponseTrait;
 use CodeIgniter\Exceptions\HTTPExceptionInterface;
+use CodeIgniter\Shield\Entities\User;
 use CodeIgniter\Validation\Validation;
 
 use App\Contracts\OwnedResource;
@@ -23,8 +24,11 @@ abstract protected static function getIndividualName(): string;
     abstract protected static function getCollectiveName(): string;
     abstract protected static function getModelName(): string;
 
-    abstract protected static function makeCreateValidation(): Validation;
-    abstract protected static function makeUpdateValidation(int $id): Validation;
+    abstract protected static function makeCreateValidation(User $owner): Validation;
+    abstract protected static function makeUpdateValidation(
+        User $owner,
+        int $resource_id
+    ): Validation;
 
     public static function getInfo(): OwnedResourceInfo {
         return new OwnedResourceInfo(
@@ -133,8 +137,9 @@ public function show(int $id)
 
     public function create()
     {
+        $current_user = auth()->user();
         $controller = $this;
-        $validation = $this->makeCreateValidation();
+        $validation = static::makeCreateValidation($current_user);
         return $this
             ->useValidInputsOnly(
                 $validation,
@@ -185,8 +190,9 @@ function($request_data) use ($controller) {
 
     public function update(int $id)
     {
+        $current_user = auth()->user();
         $controller = $this;
-        $validation = $this->makeUpdateValidation($id);
+        $validation = $this->makeUpdateValidation($current_user, $id);
         return $this
             ->useValidInputsOnly(
                 $validation,

diff --git a/app/Controllers/CurrencyController.php b/app/Controllers/CurrencyController.php
@@ -2,6 +2,7 @@
 
 namespace App\Controllers;
 
+use CodeIgniter\Shield\Entities\User;
 use CodeIgniter\Validation\Validation;
 
 use App\Contracts\OwnedResource;
@@ -21,13 +22,12 @@ protected static function getModelName(): string {
         return CurrencyModel::class;
     }
 
-    protected static function makeCreateValidation(): Validation {
+    protected static function makeCreateValidation(User $owner): Validation {
         $validation = static::makeValidation();
         $individual_name = static::getIndividualName();
         $table_name = static::getCollectiveName();
 
-        $current_user = auth()->user();
-        $user_id = $current_user->id;
+        $user_id = $owner->id;
 
         $validation->setRule("$individual_name.code", "code", [
             "required",
@@ -59,13 +59,12 @@ protected static function makeCreateValidation(): Validation {
         return $validation;
     }
 
-    protected static function makeUpdateValidation(int $id): Validation {
+    protected static function makeUpdateValidation(User $owner, int $resource_id): Validation {
         $validation = static::makeValidation();
         $individual_name = static::getIndividualName();
         $table_name = static::getCollectiveName();
 
-        $current_user = auth()->user();
-        $user_id = $current_user->id;
+        $user_id = $owner->id;
 
         $validation->setRule("$individual_name.code", "code", [
             "required",
@@ -78,7 +77,7 @@ protected static function makeUpdateValidation(int $id): Validation {
                     "name->$individual_name.name",
                     "user_id=$user_id"
                 ]),
-                "id=$id"
+                "id=$resource_id"
             ])."]"
         ]);
         $validation->setRule("$individual_name.name", "name", [