Fix multiple bugs. Auto handles more validation rules

Author: MikeAlhayek

config/codegenerator.php

@@ -130,7 +130,7 @@
     | field's type will automaticly be set to datetime.
     |
     */
-    'common_datetime_patterns' => ['*_at'],
+    'common_datetime_patterns' => ['*_at','*_date'],
 
     /*
     |--------------------------------------------------------------------------

src/Commands/CreateModelCommand.php

@@ -312,7 +312,8 @@ protected function makeArrayString(array $names, $index = 0)
      */
     protected function getCommandInput()
     {
-        $table = trim($this->option('table-name')) ?: strtolower(str_plural(trim($this->argument('model-name'))));
+        $modelName = trim($this->argument('model-name'));
+        $table = trim($this->option('table-name')) ?: $this->makeTableName($modelName);
         $fillable = trim($this->option('fillable'));
         $primaryKey = trim($this->option('primary-key'));
         $relationships = !empty(trim($this->option('relationships'))) ? explode(',', trim($this->option('relationships'))) : [];
@@ -321,7 +322,6 @@ protected function getCommandInput()
         $fields = trim($this->option('fields'));
         $fieldsFile = trim($this->option('fields-file'));
         $template = $this->getTemplateName();
-        $modelName = ucfirst(str_singular($table));
 
         return (object) compact('table', 'fillable', 'primaryKey', 'relationships', 'useSoftDelete', 'useTimeStamps', 'fields', 'fieldsFile', 'template', 'modelName');
     }

src/Commands/CreateResourcesCommand.php

@@ -270,22 +270,23 @@ protected function createModel($input)
     protected function getCommandInput()
     {
         $modelName = trim($this->argument('model-name'));
-        $modelNamePlural = strtolower(str_plural($modelName));
+        //$modelNamePlural = strtolower(str_plural($modelName));
+        $madeupTableName = $this->makeTableName($modelName);
         $controllerName = trim($this->option('controller-name') ?: ucfirst(Helpers::postFixWith(str_plural($modelName), 'Controller')));
         $viewsDirectory = $this->option('views-directory');
         $prefix = $this->option('routes-prefix');
-        $prefix = $prefix == 'model-name-as-plural' ? $modelNamePlural : $prefix;
+        $prefix = $prefix == 'model-name-as-plural' ? $madeupTableName : $prefix;
         $perPage = intval($this->option('models-per-page'));
         $fields = $this->option('fields');
         $fieldsFile = $this->option('fields-file');
-        $languageFileName = $this->option('lang-file-name') ?: $modelNamePlural;
+        $languageFileName = $this->option('lang-file-name') ?: $madeupTableName;
         $formRequest = $this->option('with-form-request');
         $controllerDirectory = $this->option('controller-directory');
         $controllerExtends = $this->option('controller-extends') ?: null;
         $withoutMigration = $this->option('without-migration');
         $force = $this->option('force');
         $modelDirectory = $this->option('model-directory');
-        $table = $this->option('table-name') ?: $modelNamePlural;
+        $table = $this->option('table-name') ?: $madeupTableName;
         $fillable = $this->option('fillable');
         $primaryKey = $this->option('primary-key');
         $relationships = $this->option('relationships');

src/Models/Field.php

@@ -596,6 +596,7 @@ public function toArray()
             'is-inline-options' => $this->isInlineOptions,
             'is-multiple-answers' => $this->isMultipleAnswers,
             'is-date' => $this->isDate,
+            'date-format' => $this->dateFormat,
             'cast-as' => $this->castAs,
             'placeholder' => $this->placeHolder,
             'delimiter' => $this->optionsDelimiter,
@@ -705,6 +706,24 @@ public function isDateOrTime()
         return $this->isDate() || $this->isDateTime() || $this->isTime() || $this->isTimeStamp();
     }
 
+    /**
+     * Gets date validation rule for a datetime field.
+     *
+     * @return mix (null | string)
+     */
+    public function getDateValidationRule()
+    {
+        if ($this->isDateOrTime()) {
+            if (!empty($this->dateFormat)) {
+                return sprintf('date_format:%s', $this->dateFormat);
+            }
+
+            return 'date';
+        }
+
+        return null;
+    }
+    
     /**
      * Checks if the data type contains decimal.
      *

src/Support/.php_cs.cache

@@ -1 +1 @@
-{"php":"7.1.1","version":"2.3.1:v2.3.1#d5257f7433bb490299c4f300d95598fd911a8ab0","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"method_argument_space":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true},"hashes":{"FieldTransformer.php":-1158955351,"FieldOptimizer.php":718225636,"FieldsOptimizer.php":815514108,"Helpers.php":-2064356608,"ViewsCommand.php":516344620,"ValidationParser.php":-513830996,"CrestAppsTranslator.php":-558689661,"Config.php":1657619464}}
+{"php":"7.1.1","version":"2.3.1:v2.3.1#d5257f7433bb490299c4f300d95598fd911a8ab0","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"method_argument_space":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true},"hashes":{"FieldTransformer.php":-1158955351,"FieldOptimizer.php":1044313434,"FieldsOptimizer.php":815514108,"Helpers.php":-2064356608,"ViewsCommand.php":516344620,"ValidationParser.php":-513830996,"CrestAppsTranslator.php":-558689661,"Config.php":1657619464}}

src/Support/FieldOptimizer.php

@@ -104,7 +104,7 @@ protected function optimizeStringField()
     */
     protected function optimizeRequiredField()
     {
-        if ( !array_key_exists('is-nullable', $this->meta) && ($this->parser->isNullable() || !$this->parser->isRequired() || $this->parser->isConditionalRequired())) {
+        if (!array_key_exists('is-nullable', $this->meta) && ($this->parser->isNullable() || !$this->parser->isRequired() || $this->parser->isConditionalRequired())) {
             $this->field->isNullable = true;
         }
 
@@ -132,7 +132,7 @@ protected function optimizeDateFields()
     */
     protected function addPlaceHolder()
     {
-        if(empty($this->field->placeHolder) && $this->field->hasForeignRelation()) {
+        if (empty($this->field->placeHolder) && $this->field->hasForeignRelation()) {
             $this->field->placeHolder = 'Please select a ' . $this->field->getForeignRelation()->name;
         }
 
@@ -153,6 +153,14 @@ protected function optimizeValidations()
                 return $rule != 'required';
             });
         }
+        
+        if (!$this->field->isNullable && !in_array('required', $this->field->validationRules)) {
+            $this->field->validationRules[] = 'required';
+        }
+
+        if (($rule = $this->field->getDateValidationRule()) != null && !in_array($rule, $this->field->validationRules)) {
+            $this->field->validationRules[] = $rule;
+        }
 
         if (! $this->field->isOnFormView) {
             // At this point we know the field is not going to be on any request form

src/Support/FieldTransformer.php

@@ -234,11 +234,11 @@ protected function transferField(array $properties)
         $this->setPredefindProperties($field, $properties)
              ->setDataType($field, $properties)
              ->setOptionsProperty($field, $properties)
-             ->setValidationProperty($field, $properties)
              ->setLabelsProperty($field, $properties)
              ->setDataTypeParams($field, $properties)
              ->setMultipleAnswers($field, $properties)
              ->setUnsignedProperty($field, $properties)
+             ->setValidationProperty($field, $properties)
              ->setForeignRelation($field, $properties)
              ->setRange($field, $properties)
              ->setForeignConstraint($field, $properties);
@@ -731,6 +731,41 @@ protected function setValidationProperty(Field & $field, array $properties)
             $field->validationRules = is_array($properties['validation']) ? $properties['validation'] : Helpers::removeEmptyItems(explode('|', $properties['validation']));
         }
 
+        if (Helpers::isNewerThan('5.2') && $field->isNullable) {
+            $field->validationRules[] = 'nullable';
+        }
+
+        $params = [];
+
+        if ($this->isKeyExists($properties, 'data-type-params')) {
+            $params = $this->getDataTypeParams($field->dataType, (array) $properties['data-type-params']);
+        }
+
+        if (in_array($field->dataType, ['char','string']) 
+            && isset($params[0]) && ($length = intval($params[0])) > 0) {
+
+            if(!$this->inArraySearch($field->validationRules, 'digits_between')) {
+                $min = $field->isRequired() ? 1 : 0;
+                $field->validationRules[] = sprintf('digits_between:%s,%s', $min, $length);
+            }
+        }
+
+        if (in_array($field->dataType, ['decimal','double','float'])
+            && isset($params[0]) && ($length = intval($params[0])) > 0 && isset($params[1]) && ($decimal = intval($params[1])) > 0) {
+
+            if(!in_array('numeric', $field->validationRules)) {
+                $field->validationRules[] = 'numeric';
+            }
+
+            if(!$this->inArraySearch($field->validationRules, 'min')) {
+                $field->validationRules[] = sprintf('min:%s', $field->getMinValue());
+            }
+
+            if(!$this->inArraySearch($field->validationRules, 'max')) {
+                $field->validationRules[] = sprintf('max:%s', $field->getMaxValue());
+            }        
+        }
+
         return $this;
     }
 

src/Traits/CommonCommand.php

@@ -114,6 +114,18 @@ public function arguments()
 
         return parent::argument();
     }
+    
+    /**
+     * Makes the table name from the giving model name.
+     *
+     * @param  string  $modelName
+     *
+     * @return string
+     */
+    protected function makeTableName($modelName)
+    {
+        return snake_case(lcfirst(str_plural($modelName)));
+    }
 
     /**
      * Gets the indentation count.
@@ -125,7 +137,7 @@ public function arguments()
      */
     protected function getIndent($stub, $template)
     {
-        $lines = explode(PHP_EOL, $stub);
+        $lines = explode("\n", $stub);
 
         foreach ($lines as $line) {
             if (($index = strpos($line, $template)) !== false) {