Merge pull request #44 from SauravKumar-Webkul/master

Master Dev Merge
webkul · May 13, 2024 · 5a87f2a · 5a87f2a
2 parents 566d31e + 3784b19
commit 5a87f2a
Show file tree

Hide file tree

Showing 24 changed files with 89 additions and 92 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/Api/GenerateInterface.php b/Api/GenerateInterface.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Ashutosh Srivastva
+ * @author    Webkul Software Pvt Ltd
  */
 
 namespace Webkul\CodeGenerator\Api;

diff --git a/Api/ValidatorInterface.php b/Api/ValidatorInterface.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Ashutosh Srivastva
+ * @author    Webkul Software Pvt Ltd
  */
 
 namespace Webkul\CodeGenerator\Api;

diff --git a/Console/Command/Generate.php b/Console/Command/Generate.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Ashutosh Srivastva
+ * @author    Webkul Software Pvt Ltd
  */
 
 namespace Webkul\CodeGenerator\Console\Command;
@@ -52,8 +52,6 @@ public function __construct(
         $this->validators = $validators;
         $this->optionsPool = \Magento\Framework\App\ObjectManager::getInstance()
         ->get(\Webkul\CodeGenerator\Model\OptionsPool::class);
-        $state = \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Framework\App\State::class);
-        $state->setAreaCode("adminhtml");
         parent::__construct();
     }
 
@@ -861,7 +859,10 @@ public function addFormField($input, $output, $questionHelper)
         }
 
         if (!$input->getOption('field_type')) {
-            $question = new Question('<question>Enter Field Type (input/select/multiselect/imageUploader):</question> ', 'input');
+            $question = new Question(
+                '<question>Enter Field Type (input/select/multiselect/imageUploader):</question> ',
+                'input'
+            );
             $this->addNotEmptyValidator($question);
             $input->setOption(
                 "field_type",

diff --git a/Model/Generate/Model.php b/Model/Generate/Model.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Ashutosh Srivastva
+ * @author    Webkul Software Pvt Ltd
  */
 
 namespace Webkul\CodeGenerator\Model\Generate;
@@ -17,6 +17,8 @@
 use Laminas\Code\Generator\ParameterGenerator;
 use Magento\Framework\Setup\Declaration\Schema\Declaration\ReaderComposite;
 use Webkul\CodeGenerator\Model\Helper;
+use Magento\Framework\Simplexml\Config;
+use Webkul\CodeGenerator\Model\XmlGeneratorFactory;
 
 /**
  * Generate Model.php
@@ -38,10 +40,12 @@ class Model implements GenerateInterface
      * __construct function
      *
      * @param ReaderComposite $readerComposite
+     * @param XmlGeneratorFactory $xmlGenerator
      * @param Helper $helper
      */
     public function __construct(
         ReaderComposite $readerComposite,
+        protected XmlGeneratorFactory $xmlGenerator,
         Helper $helper
     ) {
         $this->readerComposite = $readerComposite;
@@ -89,10 +93,15 @@ public function execute($data)
             $apiDataDirPath = $apiDataDirPath.DIRECTORY_SEPARATOR.'Data'
         );
 
+        $this->helper->createDirectory(
+            $etcDirPath = $path.DIRECTORY_SEPARATOR.'etc'
+        );
+
         $this->createApiClass($apiDataDirPath, $data, $columns);
         $this->createModelClass($modelDirPath, $data, $columns);
         $this->createResourceModelClass($rModelDirPath, $data, $identityColumn);
         $this->createCollectionClass($collectionDirPath, $data, $identityColumn);
+        $this->addDiXmlData($etcDirPath, $data);
 
         return ['status' => 'success', 'message' => "model generated successfully"];
     }
@@ -144,7 +153,7 @@ public function createApiClass($dir, $data, $columns)
                                 $column['type']
                             )]),
                             new Tag\ReturnTag([
-                                'datatype'  => $nameSpace.'\\'.$data['name'].'Interface',
+                                'datatype'  => '\\'.$nameSpace.'\\'.$data['name'].'Interface',
                             ]),
                         ],
                     ]),
@@ -205,8 +214,8 @@ public function createModelClass($dir, $data, $columns)
     {
         $moduleNamespace = explode('_', $data['module']);
         $nameSpace = $moduleNamespace[0].'\\'.$moduleNamespace[1].'\\Model';
-        $parentClass = "Magento\\Framework\\Model\\AbstractModel";
-        $parentInterface = "Magento\\Framework\\DataObject\\IdentityInterface";
+        $parentClass = "Magento".'\\'."Framework\\Model\\AbstractModel";
+        $parentInterface = "Magento".'\\'."Framework\\DataObject\\IdentityInterface";
         $apiInterface = $moduleNamespace[0].'\\'.$moduleNamespace[1].'\\Api\\Data\\'.$data['name'].'Interface';
         $resourceClass = '\\'.$nameSpace.'\\ResourceModel\\'.$data['name'];
         $modelClass      = new ClassGenerator();
@@ -229,7 +238,8 @@ public function createModelClass($dir, $data, $columns)
             // MethodGenerator::fromArray([
             //     'name'       => 'load',
             //     'parameters' => ['id', 'field'],
-            //     'body'       => 'if ($id === null) {'. "\n". 'return $this->noRouteReasons();'. "\n". '}'. "\n". 'return parent::load($id, $field);',
+            //     'body'       => 'if ($id === null) {'. "\n". 'return $this->noRouteReasons();'. "\n". '}'.
+            //     "\n". 'return parent::load($id, $field);',
             //     'docblock'   => DocBlockGenerator::fromArray([
             //         'shortDescription' => 'load model',
             //         'longDescription'  => "",
@@ -299,7 +309,7 @@ public function createModelClass($dir, $data, $columns)
                     'tags'             => [
                         new Tag\ParamTag($camelCase, [$this->helper->getReturnType($column['type'])]),
                         new Tag\ReturnTag([
-                            'datatype'  => $nameSpace.'\\'.$data['name'].'Interface',
+                            'datatype'  => '\\'.$nameSpace.'\\'.$data['name'].'Interface',
                         ]),
                     ],
                 ]),
@@ -466,4 +476,29 @@ public function createCollectionClass($collectionDirPath, $data, $identityColumn
             $file->generate()
         );
     }
+
+    /**
+     * Add di xml data
+     *
+     * @param string $etcDirPath
+     * @param array $data
+     * @return void
+     */
+    public function addDiXmlData($etcDirPath, $data)
+    {
+        $moduleName = $data['module'];
+        $data['model-class'] = str_replace('_', '\\', $moduleName).'\\'.'Model'.'\\'.$data['name'];
+        $data['api-class'] = str_replace('_', '\\', $moduleName).'\\'.'Api'.'\\'.$data['name'].'Interface';
+        $diXmlFile = $this->helper->getDiXmlFile($etcDirPath, $data);
+        $xmlObj = new Config($diXmlFile);
+        $diXml = $xmlObj->getNode();
+        $typeNode = $this->xmlGenerator->create()->addXmlNode(
+            $diXml,
+            'preference',
+            '',
+            ['for' => $data['api-class'], 'type' => $data['model-class']]
+        );
+        $xmlData = $this->xmlGenerator->create()->formatXml($diXml->asXml());
+        $this->helper->saveFile($diXmlFile, $xmlData);
+    }
 }
diff --git a/Model/Generate/Model/Validator.php b/Model/Generate/Model/Validator.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Ashutosh Srivastva
+ * @author    Webkul Software Pvt Ltd
  */
 
 namespace Webkul\CodeGenerator\Model\Generate\Model;

diff --git a/Model/Generate/NewModule.php b/Model/Generate/NewModule.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 
 namespace Webkul\CodeGenerator\Model\Generate;

diff --git a/Model/Generate/NewModule/Validator.php b/Model/Generate/NewModule/Validator.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 
 namespace Webkul\CodeGenerator\Model\Generate\NewModule;

diff --git a/Model/Generate/Repository.php b/Model/Generate/Repository.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Ashutosh Srivastva
+ * @author    Webkul Software Pvt Ltd
  */
 
 namespace Webkul\CodeGenerator\Model\Generate;

diff --git a/Model/Generate/Repository/Validator.php b/Model/Generate/Repository/Validator.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Ashutosh Srivastva
+ * @author    Webkul Software Pvt Ltd
  */
 
 namespace Webkul\CodeGenerator\Model\Generate\Repository;
@@ -21,9 +21,9 @@ public function validate($data)
         $module = $data['module'];
         $type = $data['type'];
         $name = $data['name'];
-        $path = $data['path']??null;
-        $modelClass = $data['model-class']??null;
-        $collectionClass = $data['collection-class']??null;
+        $path = $data['path'] ?? null;
+        $modelClass = $data['model-class'] ?? null;
+        $collectionClass = $data['collection-class'] ?? null;
         $response = [];
         $response['type'] = $type;
         if ($module) {

diff --git a/Model/Generate/Shipping.php b/Model/Generate/Shipping.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 
 namespace Webkul\CodeGenerator\Model\Generate;

diff --git a/Model/Generate/Shipping/Validator.php b/Model/Generate/Shipping/Validator.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 
 namespace Webkul\CodeGenerator\Model\Generate\Shipping;

diff --git a/Model/Generate/View.php b/Model/Generate/View.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 
 namespace Webkul\CodeGenerator\Model\Generate;

diff --git a/Model/Generate/View/Validator.php b/Model/Generate/View/Validator.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 namespace Webkul\CodeGenerator\Model\Generate\View;
 

diff --git a/Model/GeneratorPool.php b/Model/GeneratorPool.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Ashutosh Srivastva
+ * @author    Webkul Software Pvt Ltd
  */
 
 namespace Webkul\CodeGenerator\Model;

diff --git a/Model/Helper.php b/Model/Helper.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Ashutosh Srivastva
+ * @author    Webkul Software Pvt Ltd
  */
 
 namespace Webkul\CodeGenerator\Model;
@@ -15,6 +15,16 @@
 
 class Helper
 {
+    /**
+     * __construct function
+     *
+     * @param \Magento\Framework\Filesystem\Driver\File $driverFile
+     */
+    public function __construct(
+        protected \Magento\Framework\Filesystem\Driver\File $driverFile
+    ) {
+    }
+
     /**
      * Save File
      *
@@ -24,10 +34,7 @@ class Helper
      */
     public function saveFile($path, $content)
     {
-        file_put_contents(
-            $path,
-            $content
-        );
+        $this->driverFile->filePutContents($path, $content);
     }
 
     /**
@@ -46,7 +53,6 @@ public function getHeadDocBlock($moduleName)
                 new Tag\GenericTag('author', 'Webkul'),
                 new Tag\GenericTag('copyright', 'Copyright (c) Webkul Software Private Limited (https://webkul.com)'),
                 new Tag\LicenseTag('https://store.webkul.com/license.html', '')
-
             ],
         ]);
     }
@@ -80,8 +86,8 @@ public function getReturnType($type = 'default')
      */
     public function createDirectory($dirPath, $permission = 0777)
     {
-        if (!is_dir($dirPath)) {
-            mkdir($dirPath, $permission, true);
+        if (!$this->driverFile->isDirectory($dirPath)) {
+            $this->driverFile->createDirectory($dirPath, $permission);
         }
     }
 
@@ -93,7 +99,11 @@ public function createDirectory($dirPath, $permission = 0777)
      */
     public function getTemplatesFiles($template)
     {
-        return file_get_contents(dirname(dirname(__FILE__)). DIRECTORY_SEPARATOR. $template);
+        return $this->driverFile->fileGetContents(
+            $this->driverFile->getParentDirectory(
+                $this->driverFile->getParentDirectory(__FILE__)
+            ). DIRECTORY_SEPARATOR. $template
+        );
     }
 
     /**
@@ -108,7 +118,7 @@ public function getTemplatesFiles($template)
     public function loadTemplateFile($path, $fileName, $templatePath, $replace = [])
     {
         $filePath = $path.DIRECTORY_SEPARATOR.$fileName;
-        if (!file_exists($filePath)) {
+        if (!$this->driverFile->isExists($filePath)) {
             $data = $this->getTemplatesFiles($templatePath);
             if (!empty($replace) && is_array($replace)) {
                 foreach ($replace as $find => $value) {