refactor code and fixes and issue with smart migration

Author: MikeAlhayek

src/Commands/Bases/ResourceFileCommandBase.php

@@ -5,6 +5,7 @@
 use CrestApps\CodeGenerator\Models\Resource;
 use CrestApps\CodeGenerator\Support\Config;
 use CrestApps\CodeGenerator\Support\FieldTransformer;
+use CrestApps\CodeGenerator\Support\Helpers;
 use CrestApps\CodeGenerator\Traits\CommonCommand;
 use Illuminate\Console\Command;
 
@@ -68,7 +69,6 @@ protected function getFields(array $fieldNames, array $transaltionFor)
 
                     if (str_contains($part, ':')) {
                         list($key, $value) = explode(':', $part);
-
                         $properties[$key] = $value;
 
                         if ($key == 'options') {
@@ -77,7 +77,7 @@ protected function getFields(array $fieldNames, array $transaltionFor)
                             $properties['options'] = [];
 
                             foreach ($options as $option) {
-                                $optionTitle = FieldTransformer::convertNameToLabel($option);
+                                $optionTitle = Helpers::convertNameToLabel($option);
 
                                 if (count($transaltionFor) == 0) {
                                     $properties['options'][$option] = $optionTitle;
@@ -90,6 +90,8 @@ protected function getFields(array $fieldNames, array $transaltionFor)
                                     $properties['options'][$lang][$option] = $optionTitle;
                                 }
                             }
+                        } else {
+                            $properties[$key] = $value;
                         }
                     } else {
                         $properties['name'] = $part;
@@ -101,7 +103,7 @@ protected function getFields(array $fieldNames, array $transaltionFor)
                 $properties['name'] = $fieldName;
             }
 
-            $label = FieldTransformer::convertNameToLabel($properties['name']);
+            $label = Helpers::convertNameToLabel($properties['name']);
 
             foreach ($transaltionFor as $lang) {
                 $properties['label'][$lang] = $label;

src/Commands/Bases/ResourceFileCreatorCommandBase.php

@@ -15,12 +15,12 @@ class ResourceFileCreatorCommandBase extends ResourceFileCommandBase
     protected function getCommandOptions($input)
     {
         return [
-            'model-name' => $input->modelName,
-            '--resource-filename' => $input->file,
-            '--fields' => implode(',', $input->fieldNames),
-            '--translation-for' => $input->translationFor,
-            '--relations' => implode(',', $input->relations),
-            '--indexes' => implode(',', $input->indexes),
+            'model-name' => $this->argument('model-name'),
+            '--resource-filename' => $this->option('resource-filename'),
+            '--fields' => $this->option('fields'),
+            '--translation-for' => $this->option('translation-for'),
+            '--relations' => $this->option('relations'),
+            '--indexes' => $this->option('indexes'),
         ];
     }
 
@@ -36,8 +36,8 @@ protected function getCommandInput()
         $file = $filename ? str_finish($filename, '.json') : Helpers::makeJsonFileName($modelName);
         $translationFor = array_unique(Helpers::convertStringToArray($this->option('translation-for')));
         $fieldNames = array_unique(Helpers::convertStringToArray($this->option('fields')));
-        $relations = Helpers::convertStringToArray(trim($this->option('relations')));
-        $indexes = Helpers::convertStringToArray(trim($this->option('indexes')));
+        $relations = Helpers::convertStringToArray($this->option('relations'));
+        $indexes = Helpers::convertStringToArray($this->option('indexes'));
 
         return (object) compact(
             'modelName',

src/Commands/CreateControllerCommand.php

@@ -760,7 +760,7 @@ protected function getWithRelationsStatement(array $relations)
     protected function isContainMultipleAnswers(array $fields)
     {
         $filtered = array_filter($fields, function ($field) {
-            return $field->isMultipleAnswers;
+            return $field->isMultipleAnswers();
         });
 
         return count($filtered) > 0;

src/Commands/CreateMigrationCommand.php

@@ -82,7 +82,6 @@ public function handle()
         } elseif (!Config::useSmartMigration() || (!$migration->isMigrated() && $migration->isCreate && !$migration->isVirtual)) {
             //At this point the current migration is the first one and is not migrated
             //Create update the migration using the current resource then recreate the migration file
-
             $migration->setResource($resource);
             $migration->path = $this->getMigrationFullName($migration->name, $input->tableName); // make sure we use the same path
             $tracker->updateMigration($capsule->tableName, $migration);
@@ -281,8 +280,9 @@ protected function getDestenationFile($tableName)
     /**
      * Creates the table properties.
      *
-     * @param array $fields
+     * @param CrestApps\CodeGenerator\Models\Resource $resource
      * @param CrestApps\CodeGenerator\Models\MigrationInput $input
+     *
      * @return string
      */
     protected function getCreateTableBlueprint(Resource $resource, MigrationInput $input)
@@ -296,12 +296,35 @@ protected function getCreateTableBlueprint(Resource $resource, MigrationInput $i
             ->addTimestamps($properties, $input->withoutTimestamps)
             ->addSoftDelete($properties, $input->withSoftDelete)
             ->addFieldProperties($properties, $resource->fields, $input->withoutTimestamps, $input->withSoftDelete)
-            ->addIndexes($properties, $resource->indexes)
+            ->addIndexes($properties, $resource->indexes, $this->getColumnsUsedInMigration($resource, $input))
             ->addForeignConstraints($properties, $constraints);
 
         return $properties;
     }
 
+    /**
+     * Gets a list of all column that are used in the giving migration
+     *
+     * @param CrestApps\CodeGenerator\Models\Resource $resource
+     * @param CrestApps\CodeGenerator\Models\MigrationInput $input
+     *
+     * @return string
+     */
+    protected function getColumnsUsedInMigration(Resource $resource, MigrationInput $input)
+    {
+        $columns = collect($resource->fields)->pluck('name')->toArray();
+
+        if (!$input->withoutTimestamps) {
+            $columns[] = 'created_at';
+            $columns[] = 'updated_at';
+        }
+
+        if ($input->withSoftDelete) {
+            $columns[] = 'deleted_at';
+        }
+
+        return $columns;
+    }
     /**
      * Adds foreign key constraint to a giving properties.
      *
@@ -430,7 +453,7 @@ protected function addOnUpdateConstraint(&$properties, ForeignConstraint $constr
      * @param array $indexes
      * @return $this
      */
-    protected function addIndexes(&$properties, array $indexes)
+    protected function addIndexes(&$properties, array $indexes, array $validColumns)
     {
         foreach ($indexes as $index) {
             if (!$index->hasColumns()) {
@@ -443,10 +466,22 @@ protected function addIndexes(&$properties, array $indexes)
             }
 
             if ($index->hasMultipleColumns()) {
+                $invalidColumns = array_diff($index->getColumns(), $validColumns);
+
+                if (count($invalidColumns) > 0) {
+                    throw new Exception('Non-Existing columns are being using an index. Invalid columns are "' . implode(',', $invalidColumns) . '"');
+                }
+
                 $columns = Helpers::wrapItems($index->getColumns());
+
                 $indexColumn = sprintf('[%s]', implode(',', $columns));
             } else {
-                $indexColumn = sprintf("'%s'", $index->getFirstColumn());
+                $column = $index->getFirstColumn();
+
+                if (!in_array($column, $validColumns)) {
+                    throw new Exception('Non-Existing column is being using an index. Invalid columns is ' . $column);
+                }
+                $indexColumn = sprintf("'%s'", $column);
             }
 
             $properties .= sprintf('%s(%s%s)', $this->getPropertyBase($index->getType()), $indexColumn, $indexName);
@@ -472,7 +507,8 @@ protected function addFieldProperties(&$properties, array $fields, $withoutTimes
         $primaryField = $this->getPrimaryField($fields);
 
         foreach ($fields as $field) {
-            if ($field instanceof Field && $field != $primaryField && !is_null($primaryField)) {
+
+            if ($field instanceof Field && $field != $primaryField) {
                 if (!$withoutTimestamps && $field->isAutoManagedOnUpdate()) {
                     continue;
                 }
@@ -1116,6 +1152,8 @@ protected function addPrimaryField(&$property, Field $field = null)
             $eloquentMethodName = $this->getPrimaryMethodName($field->getEloquentDataMethod());
             $property .= sprintf("%s('%s')", $this->getPropertyBase($eloquentMethodName), $field->name);
             $this->addFieldPropertyClousure($property);
+        } else {
+            $this->warn('Generating a migration without a primary key.');
         }
 
         return $this;

src/Commands/CreateModelCommand.php

@@ -369,7 +369,7 @@ protected function getAccessors(array $fields = null)
         $accessors = [];
 
         foreach ($fields as $field) {
-            if ($field->isMultipleAnswers) {
+            if ($field->isMultipleAnswers()) {
                 $content = $this->getStubContent('model-accessor-multiple-answers');
 
                 $accessors[] = $this->getAccessor($field, $content);
@@ -402,7 +402,7 @@ protected function getMutators(array $fields = null)
                 continue;
             }
 
-            if ($field->isMultipleAnswers) {
+            if ($field->isMultipleAnswers()) {
                 $content = $this->getStubContent('model-mutator-multiple-answers');
                 $this->replaceFieldName($content, $field->name);
 

src/Commands/ResourceFileFromDatabaseCommand.php

@@ -11,12 +11,15 @@
 use CrestApps\CodeGenerator\Support\Helpers;
 use CrestApps\CodeGenerator\Support\MigrationHistoryTracker;
 use CrestApps\CodeGenerator\Support\ResourceMapper;
+use CrestApps\CodeGenerator\Traits\Migration;
 use DB;
 use Exception;
 use File;
 
 class ResourceFileFromDatabaseCommand extends ResourceFileCommandBase
 {
+    use Migration;
+
     /**
      * The name and signature of the console command.
      *
@@ -221,8 +224,8 @@ protected function getMigrationCapsule($resource, $tableName)
         $migration->className = $this->makeCreateTableClassName(Helpers::makeTableName($tableName));
         $migration->isCreate = true;
         $migration->isVirtual = true;
-        $migration->withSoftDelete = $this->hasSoftDelete();
-        $migration->withoutTimestamps = !$this->hasTimeStamps();
+        $migration->withSoftDelete = $this->hasSoftDelete($resource->fields);
+        $migration->withoutTimestamps = !$this->hasTimeStamps($resource->fields);
 
         return $migration;
     }

src/DatabaseParsers/MysqlParser.php

@@ -9,6 +9,7 @@
 use CrestApps\CodeGenerator\Models\Index;
 use CrestApps\CodeGenerator\Support\Config;
 use CrestApps\CodeGenerator\Support\FieldTransformer;
+use CrestApps\CodeGenerator\Support\Helpers;
 use CrestApps\CodeGenerator\Support\Str;
 use DB;
 use Exception;
@@ -186,7 +187,7 @@ protected function getRelationTypeQuery($tableName, $columnName)
     protected function getRealtion($foreignTableName, $foreignColumn, $localColumn)
     {
         $modelName = $this->getModelName($foreignTableName);
-        $model = FieldTransformer::guessModelFullName($modelName, $this->getModelNamespace());
+        $model = Helpers::guessModelFullName($modelName, $this->getModelNamespace());
 
         $params = [
             $model,

src/HtmlGenerators/HtmlGeneratorBase.php

@@ -288,7 +288,7 @@ protected function getFieldAccessorValue(Field $field, $view)
             return sprintf("(%s) ? '%s' : '%s'", $fieldAccessor, $field->getTrueBooleanOption()->text, $field->getFalseBooleanOption()->text);
         }
 
-        if ($field->isMultipleAnswers) {
+        if ($field->isMultipleAnswers()) {
             return sprintf("implode('%s', %s)", $field->optionsDelimiter, $fieldAccessor);
         }
 
@@ -424,8 +424,8 @@ protected function getPickItemsHtmlField(Field $field, Label $option, Validation
     {
         $filename = sprintf('form-pickitems%s-field.blade', $field->isInlineOptions ? '-inline' : '');
         $stub = $this->getStubContent($filename, $this->template);
-        $fieldName = ($field->isMultipleAnswers) ? $this->getFieldNameAsArray($field->name) : $field->name;
-        $checkedItem = $this->getCheckedItemForPickItem($option->value, $field->name, $field->isMultipleAnswers, $field->htmlValue);
+        $fieldName = ($field->isMultipleAnswers()) ? $this->getFieldNameAsArray($field->name) : $field->name;
+        $checkedItem = $this->getCheckedItemForPickItem($option->value, $field->name, $field->isMultipleAnswers(), $field->htmlValue);
         $this->replaceFieldType($stub, $field->htmlType)
             ->replaceFieldName($stub, $fieldName)
             ->replaceOptionValue($stub, $option->value)
@@ -462,12 +462,12 @@ protected function getSelectHtmlField(Field $field, ValidationParser $parser)
     {
         $stub = $this->getStubContent('form-selectmenu-field.blade', $this->template);
 
-        $fieldName = ($field->isMultipleAnswers) ? $this->getFieldNameAsArray($field->name) : $field->name;
+        $fieldName = ($field->isMultipleAnswers()) ? $this->getFieldNameAsArray($field->name) : $field->name;
         $optionValue = $this->getFieldValue($field->htmlValue, $field->name);
 
         $this->replaceFieldName($stub, $fieldName)
             ->replaceFieldItems($stub, $this->getFieldItems($field))
-            ->replaceFieldMultiple($stub, $field->isMultipleAnswers)
+            ->replaceFieldMultiple($stub, $field->isMultipleAnswers())
             ->replaceFieldValue($stub, $optionValue)
             ->replaceSelectedValue($stub, $this->getSelectedValueForMenu($field))
             ->replaceFieldItem($stub, $this->getFieldItem($field))
@@ -554,7 +554,7 @@ protected function getSelectedValueForMenu(Field $field)
     {
         $valueAccessor = $this->getFieldValueAccessor($field);
 
-        if ($field->isMultipleAnswers) {
+        if ($field->isMultipleAnswers()) {
             return $this->getMultipleSelectedValue($field->name, $valueAccessor, $field->htmlValue);
         }
 

src/Models/.php_cs.cache

@@ -1 +1 @@
-{"php":"7.1.7","version":"2.6.0:v2.6.0#5642a36a60c11cdd01488d192541a89bb44a4abf","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":{"ensure_fully_multiline":true},"no_break_comment":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":[]}
+{"php":"7.1.7","version":"2.7.0:v2.7.0#e4e93a120117e879cfc1f231fbf29274707cd834","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":{"ensure_fully_multiline":true},"no_break_comment":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":[]}