Merge pull request #9 from ashutoshwebkul/dev

Dev

Author: Ashutosh Srivastva

Model/Generate/Model.php

@@ -124,10 +124,10 @@ public function createApiClass($dir, $data, $columns)
                     MethodGenerator::FLAG_INTERFACE,
                     null,
                     DocBlockGenerator::fromArray([
-                        'shortDescription' => 'set '.$fieldName,
+                        'shortDescription' => 'Set '.$fieldName,
                         'longDescription'  => null,
                         'tags'             => [
-                            new Tag\ParamTag($camelCase, [$column['type']]),
+                            new Tag\ParamTag($camelCase, [$this->helper->getReturnType($column['type'])]),
                             new Tag\ReturnTag([
                                 'datatype'  => $nameSpace.'\\'.$data['name'].'Interface',
                             ]),
@@ -140,11 +140,11 @@ public function createApiClass($dir, $data, $columns)
                     MethodGenerator::FLAG_INTERFACE,
                     null,
                     'docblock'   => DocBlockGenerator::fromArray([
-                        'shortDescription' => 'get '.$fieldName,
+                        'shortDescription' => 'Get '.$fieldName,
                         'longDescription'  => null,
                         'tags'             => [
                             new Tag\ReturnTag([
-                                'datatype'  => $nameSpace.'\\'.$data['name'].'Interface',
+                                'datatype'  => $this->helper->getReturnType($column['type']),
                             ]),
                         ],
                     ]),
@@ -280,10 +280,10 @@ public function createModelClass($dir, $data, $columns)
                 MethodGenerator::FLAG_PUBLIC,
                 'return $this->setData(self::'.strtoupper($field).', $'.$camelCase.');',
                 DocBlockGenerator::fromArray([
-                    'shortDescription' => 'set '.$fieldName,
+                    'shortDescription' => 'Set '.$fieldName,
                     'longDescription'  => null,
                     'tags'             => [
-                        new Tag\ParamTag($camelCase, [$column['type']]),
+                        new Tag\ParamTag($camelCase, [$this->helper->getReturnType($column['type'])]),
                         new Tag\ReturnTag([
                             'datatype'  => $nameSpace.'\\'.$data['name'].'Interface',
                         ]),
@@ -296,11 +296,11 @@ public function createModelClass($dir, $data, $columns)
                 MethodGenerator::FLAG_PUBLIC,
                 'return parent::getData(self::'.strtoupper($field).');',
                 'docblock'   => DocBlockGenerator::fromArray([
-                    'shortDescription' => 'get '.$fieldName,
+                    'shortDescription' => 'Get '.$fieldName,
                     'longDescription'  => null,
                     'tags'             => [
                         new Tag\ReturnTag([
-                            'datatype'  => $nameSpace.'\\'.$data['name'].'Interface',
+                            'datatype'  => $this->helper->getReturnType($column['type']),
                         ]),
                     ],
                 ]),

Model/Helper.php

@@ -38,6 +38,26 @@ public function getHeadDocBlock($moduleName)
         ]);
     }
 
+    /**
+     * Map valid database types
+     *
+     * @param string $type
+     * @return string
+     */
+    public function getReturnType($type = 'default')
+    {
+        $validTypes = [
+            'varchar' => 'string',
+            'text' => 'string',
+            'smallint' => 'int',
+            'int' => 'int',
+            'integer' => 'int',
+            'decimal' => 'float',
+            'boolean' => 'bool'
+        ];
+        return isset($validTypes[$type]) ? $validTypes[$type] : 'string';
+    }
+
     public static function createDirectory($dirPath, $permission = 0777)
     {
         if (!is_dir($dirPath)) {

README.md

@@ -4,13 +4,13 @@
 
 ``` composer require webkul/code-generator ```
 
-``` php -f bin/magento setup:update ```
+``` php -f bin/magento setup:upgrade ```
 
 # Usage
 
 - To create new Module
 
-``` php bin/magento generate:code Module_Name –type=new-module  ```
+``` php bin/magento generate:code Module_Name --type=new-module  ```
 
 - To create models