Cleanup

Author: SOHELAHMED7

TODO.taskpaper

@@ -4,5 +4,5 @@ TODO.taskpaper
  ✔ Implement code generation for nested module in `x-route` and other pertinent place @done (25-03-26 11:38)
  ✔ implement default action `actionIndex()` in `DefaultController` in module generation @done (25-04-09 15:44)
  ✔ resolve all sub tasks of issue - Support for Yii Modules in x-route and pertinent places #14 @done (25-04-09 08:50)
- ☐ resolve all TODOs
+ ✔ resolve all TODOs @done (25-04-09 16:23)
  ☐ delete this file

src/lib/generators/JsonActionGenerator.php

@@ -77,7 +77,6 @@ protected function prepareAction(
         $actionId = $routeData->isNonCrudAction() ? trim("{$actionType}-{$routeData->action}", '-')
             : "$actionType{$routeData->action}";
         if (!empty($customRoute)) {
-            // $actionType = '';
             $parts = explode('/', $customRoute);
             $controllerId = $parts[count($parts) - 2];
             $actionId = $parts[count($parts) - 1];

src/lib/items/ActionHelperTrait.php

@@ -37,24 +37,6 @@ public function getOptionsRoute():string
         $r = explode('/', $r);
         array_pop($r);
         return implode('/', $r) . '/options';
-
-//        if (!empty($this->prefixSettings)) {
-//            if (isset($this->prefixSettings['module'])) {
-//                $prefix = $this->prefixSettings['module'];
-//                return static::finalOptionsRoute($prefix, $this->controllerId);
-//            } elseif (isset($this->prefixSettings['namespace']) && str_contains($this->prefixSettings['namespace'], '\modules\\')) { # if `module` not present then check in namespace and then in path
-//                $prefix = static::computeModule('\\', $this->prefixSettings['namespace']);
-//                if ($prefix) {
-//                    return static::finalOptionsRoute($prefix, $this->controllerId);
-//                }
-//            } elseif (isset($this->prefixSettings['path']) && str_contains($this->prefixSettings['path'], '/modules/')) {
-//                $prefix = static::computeModule('/', $this->prefixSettings['path']);
-//                if ($prefix) {
-//                    return static::finalOptionsRoute($prefix, $this->controllerId);
-//                }
-//            }
-//        }
-//        return $this->controllerId.'/options';
     }
 
     /**
@@ -96,28 +78,20 @@ public function getRoute(): string
         if (!empty($this->prefixSettings)) {
             if (isset($this->prefixSettings['module'])) {
                 $prefix = $this->prefixSettings['module'];
-//                return static::finalOptionsRoute($prefix, $this->controllerId);
                 return trim($prefix, '/') . '/' . $this->controllerId . ($this->id ? '/' . $this->id : '');
             } elseif (isset($this->prefixSettings['namespace']) && str_contains($this->prefixSettings['namespace'], '\modules\\')) { # if `module` not present then check in namespace and then in path
                 $prefix = static::computeModule('\\', $this->prefixSettings['namespace']);
                 if ($prefix) {
-//                    return static::finalOptionsRoute($prefix, $this->controllerId);
                     return trim($prefix, '/') . '/' . $this->controllerId . ($this->id ? '/' . $this->id : '');
                 }
             } elseif (isset($this->prefixSettings['path']) && str_contains($this->prefixSettings['path'], '/modules/')) {
                 $prefix = static::computeModule('/', $this->prefixSettings['path']);
                 if ($prefix) {
-//                    return static::finalOptionsRoute($prefix, $this->controllerId);
                     return trim($prefix, '/') . '/' . $this->controllerId . ($this->id ? '/' . $this->id : '');
                 }
             }
         }
 
-//        if (!empty($this->prefixSettings)) {
-//            $prefix = $this->prefixSettings['module'] ?? $this->prefix;
-//            return trim($prefix, '/') . '/' . $this->controllerId . '/' . $this->id;
-//        }
-
         return $this->controllerId . ($this->id ? '/' . $this->id : '');
     }
 }

src/lib/items/FractalAction.php

@@ -95,19 +95,6 @@ private function templateFactory():FractalActionTemplates
         return $this->templateFactory;
     }
 
-//    public function getRoute():string
-//    {
-//        if ($this->xRoute) {
-//            return $this->xRoute;
-//        }
-//
-//        if (!empty($this->prefixSettings)) {
-//            $prefix = $this->prefixSettings['module'] ?? $this->prefix;
-//            return trim($prefix, '/').'/'.$this->controllerId.'/'.$this->id;
-//        }
-//        return $this->controllerId.'/'.$this->id;
-//    }
-
     public function getBaseModelName():string
     {
         return $this->modelFqn ? StringHelper::basename($this->modelFqn) : '';

src/lib/items/RouteData.php

@@ -199,7 +199,6 @@ public function __construct(
             $parts = explode('/', $customRoute);
             array_pop($parts);
             array_pop($parts);
-            // $this->prefix = implode('/', $parts); # add everything (modules) except controller ID and action ID
 
             $modulesPathSection = $modulesPath = [];
             $container = $modulesNamespaceSection = '';
@@ -310,7 +309,7 @@ public function getPrefixSettings():array
     protected function detectUrlPattern():void
     {
         if ($this->path === '/') {
-            $this->type = self::TYPE_DEFAULT; //  issue is here https://github.com/php-openapi/yii2-openapi/issues/102
+            $this->type = self::TYPE_DEFAULT;
             $this->action = '';
             $this->controller = 'default';
             if (isset($this->operation->{CustomSpecAttr::ROUTE})) { # https://github.com/cebe/yii2-openapi/issues/144