Detect module from namespace or path

Author: SOHELAHMED7

README.md

@@ -568,4 +568,3 @@ Professional support, consulting as well as software development services are av
 https://www.cebe.cc/en/contact
 
 Development of this library is sponsored by [cebe.:cloud: "Your Professional Deployment Platform"](https://cebe.cloud).
-

TODO.taskpaper

@@ -0,0 +1,10 @@
+TODO.taskpaper
+
+### Add validation rules by attribute name or pattern #30
+ ☐ Re-check 
+ ☐ create failing test
+ ☐ implement the solution
+ ☐ fix failing tests if any
+ ☐ resolve TODOs if any
+ ☐ review PR
+ ☐ delete this file and submit PR

src/lib/items/FractalAction.php

@@ -106,8 +106,21 @@ public function getOptionsRoute():string
     {
         //@TODO: re-check
         if ($this->prefix && !empty($this->prefixSettings)) {
-            $prefix = $this->prefixSettings['module'] ?? $this->prefix;
-            return trim($prefix, '/').'/'.$this->controllerId.'/options';
+//            $prefix = $this->prefixSettings['module'] ?? $this->prefix;
+            if (isset($this->prefixSettings['module'])) {
+                $prefix = $this->prefixSettings['module'];
+                return trim($prefix, '/') . '/' . $this->controllerId . '/options';
+            } elseif (isset($this->prefixSettings['namespace']) && str_contains($this->prefixSettings['namespace'], '\modules\\')) {
+                $prefix = static::computeModule('\\', $this->prefixSettings['namespace']);
+                if ($prefix) {
+                    return trim($prefix, '/') . '/' . $this->controllerId . '/options';
+                }
+            } elseif (isset($this->prefixSettings['path']) && str_contains($this->prefixSettings['path'], '/modules/')) {
+                $prefix = static::computeModule('/', $this->prefixSettings['path']);
+                if ($prefix) {
+                    return trim($prefix, '/') . '/' . $this->controllerId . '/options';
+                }
+            }
         }
         return $this->controllerId.'/options';
     }
@@ -251,4 +264,29 @@ public function getIdParamType(): string
         }
         return $this->params[$this->idParam]['type'] === 'integer' ? 'int' : 'string';
     }
+
+    /**
+     * @param string $separator
+     * @param string $entity path or namespace
+     * @return void
+     */
+    public static function computeModule(string $separator, string $entity): ?string
+    {
+        $parts = explode($separator . 'modules' . $separator, $entity);
+        if (empty($parts[1])) {
+            return null;
+        }
+        if (str_contains($parts[1], 'controller')) {
+            $result = explode($separator . 'controller', $parts[1]);
+            $result = array_map(function ($val) {
+                return str_replace('\\', '/', $val);
+            }, $result);
+        } else {
+            $result = explode($separator, $parts[1]);
+        }
+        if (empty($result[0])) {
+            return null;
+        }
+        return $result[0];
+    }
 }

tests/specs/petstore_urlprefixes.php

@@ -9,9 +9,12 @@
     ],
     'generateControllers' => true,
     'generateMigrations' => false,
+    'useJsonApi' => true,
     'urlPrefixes' => [
         'animals' => '',
         '/info' => ['module' =>'petinfo','namespace' => '\app\modules\petinfo\controllers'],
+        '/fgh' => ['namespace' => '\app\modules\fgh\controllers'],
+        '/fgh2' => ['path' => '@app/modules/fgh2/controllers', 'namespace' => '\app\fgh2\controllers'],
         '/api/v1' => ['path' => '@app/modules/api/v1/controllers', 'namespace' => '\app\api\v1\controllers']
     ]
 ];

tests/specs/petstore_urlprefixes.yaml

@@ -111,6 +111,18 @@ paths:
       responses:
         '200':
           description: list of details
+  /fgh/pet-detail2s:
+    get:
+      description: list all pet details
+      responses:
+        '200':
+          description: list of details
+  /fgh2/pet-detail3s:
+    get:
+      description: list all pet details
+      responses:
+        '200':
+          description: list of details
 
 components:
   schemas:

tests/unit/IssueFixTest.php

@@ -360,4 +360,19 @@ public function test158BugGiiapiGeneratedRulesEnumWithTrim()
         ]);
         $this->checkFiles($actualFiles, $expectedFiles);
     }
+
+
+    public function testRecheckFractalActionsOptionsRoute()
+    {
+        $this->changeDbToMariadb();
+        $testFile = Yii::getAlias("@specs/petstore_urlprefixes.php");
+        $this->runGenerator($testFile);
+//        $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
+//            'recursive' => true,
+//        ]);
+//        $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/158_bug_giiapi_generated_rules_enum_with_trim/maria"), [
+//            'recursive' => true,
+//        ]);
+//        $this->checkFiles($actualFiles, $expectedFiles);
+    }
 }