Fix a bug in the resource-file:from-database command

Author: MikeAlhayek

src/DatabaseParsers/MysqlParser.php

@@ -248,7 +248,6 @@ protected function getTransfredFields(array $columns)
 
         foreach ($columns as $column) {
             $properties['name'] = $column->COLUMN_NAME;
-            $properties['labels'] = $this->getLabel($column->COLUMN_NAME);
             $properties['is-nullable'] = ($column->IS_NULLABLE == 'YES');
             $properties['data-value'] = $column->COLUMN_DEFAULT;
             $properties['data-type'] = $this->getDataType($column->DATA_TYPE, $column->COLUMN_TYPE);
@@ -260,7 +259,6 @@ protected function getTransfredFields(array $columns)
             $properties['comment'] = $column->COLUMN_COMMENT ?: null;
             $properties['options'] = $this->getHtmlOptions($column->DATA_TYPE, $column->COLUMN_TYPE);
             $properties['is-unsigned'] = (strpos($column->COLUMN_TYPE, 'unsigned') !== false);
-            $properties['html-type'] = $this->getHtmlType($column->DATA_TYPE);
 
             $constraint = $this->getForeignConstraint($column->COLUMN_NAME);
 
@@ -275,6 +273,7 @@ protected function getTransfredFields(array $columns)
         }
         $localeGroup = Helpers::makeLocaleGroup($this->tableName);
         $fields = FieldTransformer::fromArray($collection, $localeGroup, $this->languages);
+        $this->setHtmlType($fields);
 
         return $fields;
     }

src/DatabaseParsers/ParserBase.php

@@ -8,6 +8,8 @@
 use CrestApps\CodeGenerator\Support\Config;
 use CrestApps\CodeGenerator\Support\FieldsOptimizer;
 use CrestApps\CodeGenerator\Support\Helpers;
+use CrestApps\CodeGenerator\Support\ResourceMapper;
+use CrestApps\CodeGenerator\Support\Str;
 use CrestApps\CodeGenerator\Traits\CommonCommand;
 use Exception;
 
@@ -117,9 +119,7 @@ protected function getFields()
     public function getResource()
     {
         $resource = new Resource($this->getFields());
-
         $resource->indexes = $this->getIndexes();
-
         $resource->relations = $this->getRelations();
 
         return $resource;
@@ -156,7 +156,7 @@ protected function transfer(array $columns)
     }
 
     /**
-     * Set the html type for a giving field.
+     * Get the html type for a giving field.
      *
      * @param CrestApps\CodeGenerator\Models\Field $field
      * @param string $type
@@ -171,39 +171,22 @@ protected function getHtmlType($type)
             return $map[$type];
         }
 
-        return 'string';
+        return 'text';
     }
 
     /**
-     * Checks if the request requires languages.
-     *
-     * @return bool
-     */
-    protected function hasLanguages()
-    {
-        return !empty($this->languages);
-    }
-
-    /**
-     * Gets the label(s) from a giving name
+     * Set the html type for a giving field.
      *
-     * @param string $name
+     * @param CrestApps\CodeGenerator\Models\Field $field
+     * @param string $type
      *
-     * @return mix (string | array)
+     * @return string
      */
-    protected function getLabel($name)
+    protected function setHtmlType(array &$fields)
     {
-        if (!$this->hasLanguages()) {
-            return $this->getLabelName($name);
-        }
-        $labels = [];
-        $title = $this->getLabelName($name);
-
-        foreach ($this->languages as $language) {
-            $labels[$language] = $title;
+        foreach ($fields as $field) {
+            $field->htmlType = $this->getHtmlType($field->getEloquentDataMethod());
         }
-
-        return $labels;
     }
 
     /**
@@ -225,39 +208,9 @@ protected function getModelNamespace()
      */
     protected function getModelName($tableName)
     {
-        $file = base_path(Config::getResourceFilePath(Config::getDefaultMapperFileName()));
-
-        $fields = [];
-
-        if ($this->isFileExists($file)) {
-            $content = $this->getFileContent($file);
-
-            $maps = json_decode($content, true);
-
-            if (is_array($maps)) {
-                foreach ($maps as $map) {
-                    if (array_key_exists('table-name', $map)
-                        && $map['table-name'] == $tableName
-                        && array_key_exists('model-name', $map)
-                        && !empty($map['model-name'])
-                    ) {
-                        return $map['model-name'];
-                    }
-                }
-            }
-        }
+        $modelName = ResourceMapper::pluckFirst($tableName, 'table-name', 'model-name');
 
-        return $tableName;
-    }
-
-    /**
-     * Gets a labe field's label from a giving name.
-     *
-     * @return string
-     */
-    protected function getLabelName($name)
-    {
-        return trim(ucwords(str_replace(['-', '_'], ' ', $name)));
+        return $modelName ?: ucfirst(camel_case(Str::singular($tableName)));
     }
 
     /**

src/Support/ResourceMapper.php

@@ -29,20 +29,21 @@ public function __construct(Command $command)
     /**
      * Gets the first map with the giving model name
      *
-     * @param string $modelName
+     * @param string $value
+     * @param string $key
      *
      * @return mix (null | array)
      */
-    public static function first($modelName)
+    public static function first($value, $key = 'model-name')
     {
         $file = self::getMapper();
 
         if (File::Exists($file)) {
 
             $maps = self::getMaps($file);
 
-            return Collect($maps)->first(function ($map) use ($modelName) {
-                return $map['model-name'] == $modelName;
+            return Collect($maps)->first(function ($map) use ($key, $value) {
+                return $map[$key] == $value;
             });
         }
 
@@ -52,14 +53,15 @@ public static function first($modelName)
     /**
      * Gets the first map with the giving model name then get a specific property/key
      *
-     * @param string $modelName
+     * @param string $value
+     * @param string $key
      * @param string $propertyName
      *
      * @return string
      */
-    public static function pluckFirst($modelName, $propertyName = 'resource-file')
+    public static function pluckFirst($value, $key = 'model-name', $propertyName = 'resource-file')
     {
-        $first = self::first($modelName);
+        $first = self::first($value, $key);
 
         if (!is_null($first) && isset($first[$propertyName])) {
             return $first[$propertyName];