Resolve - Multiple PRs (#136)

 - Add docs to setup this project locally + fix #98 + enhance docs
- Enhance all code generation for x-db-type
#119 . E.g. x-db-type should
be reflected in model validation rules() + faker and other place where
relevant. PR: SOHELAHMED7#17
 - SOHELAHMED7#15

Author: cebe

Makefile

@@ -52,7 +52,9 @@ installdocker:
 testdocker:
 	docker-compose run --rm php sh -c 'vendor/bin/phpunit'
 
-.PHONY: all check-style fix-style install test clean clean_all up cli installdocker migrate testdocker
+efs: clean_all up migrate # Everything From Scratch
+
+.PHONY: all check-style fix-style install test clean clean_all up cli installdocker migrate testdocker efs
 
 
 # Docs:

README.md

@@ -60,6 +60,13 @@ if (YII_ENV_DEV) {
         'generators' => [
             // add ApiGenerator to Gii module
             'api' => \cebe\yii2openapi\generator\ApiGenerator::class,
+
+            // --------- OR ---------
+            // to disable generation of migrations files or with default config change
+            'api' => [
+              'class' => \cebe\yii2openapi\generator\ApiGenerator::class
+              'generateMigrations' => false # this config can also be applied in CLI command
+            ],
         ],
     ];
 }
@@ -71,7 +78,7 @@ To use the web generator, open `index.php?r=gii` and select the `REST API Genera
 
 On console you can run the generator with `./yii gii/api --openApiPath=@app/openapi.yaml`. Where `@app/openapi.yaml` should be the absolute path to your OpenAPI spec file. This can be JSON as well as YAML (see also [cebe/php-openapi](https://github.com/cebe/php-openapi/) for supported formats).
 
-Run `./yii gii/api --help` for all options.
+Run `./yii gii/api --help` for all options. Example: Disable generation of migrations files `./yii gii/api --generateMigrations=0`
 
 See [Petstore example](https://github.com/OAI/OpenAPI-Specification/blob/main/examples/v3.0/petstore.yaml) for example OpenAPI spec.
 
@@ -198,11 +205,12 @@ created_at:
 
 Also see: https://dev.mysql.com/doc/refman/8.0/en/data-type-defaults.html
 
-### Many-to-Many relation definition
+
+## Many-to-Many relation definition
 
 There are two ways for define many-to-many relations:
 
-#### Simple many-to-many without junction model
+### Simple many-to-many without junction model
 
    - property name for many-to-many relation should be equal lower-cased, pluralized related schema name
 
@@ -231,7 +239,7 @@ Tag:
         $ref: '#/components/schemas/Post'
 ```
   
-#### Many-to-many with junction model 
+### Many-to-many with junction model
 
 This way allowed creating multiple many-to-many relations between to models 
 
@@ -274,45 +282,7 @@ User:
  - see both examples here [tests/specs/many2many.yaml](tests/specs/many2many.yaml)
  
 
-## Assumptions
-
-When generating code from an OpenAPI description there are many possible ways to achive a fitting result. 
-Thus there are some assumptions and limitations that are currently applied to make this work.
-Here is a (possibly incomplete) list:
-
-- The current implementation works best with OpenAPI description that follows the [JSON:API](https://jsonapi.org/) guidelines.
-  - The request and response format/schema is currently not extracted from OpenAPI schema and may need to be adjusted manually if it does not follow JSON:API
-- column/field/property with name `id` is considered as Primary Key by this library and it is automatically handled by DB/Yii; so remove it from validation `rules()`
-  - other fields can currently be used as primary keys using the `x-pk` OpenAPI extension (see below) but it may not be work correctly in all cases, please report bugs if you find them.
-
-Other things to keep in mind:
-
-### Adding columns to existing tables
-
-When adding new fields in the API models, new migrations will be generated to add these fields to the table.
-For a project that is already in production, it should be considered to adjust the generated migration to add default
-values for existing data records.
-
-One case where this is important is the addition of a new column with `NOT NULL` contraint, which does not provide a default value.
-Such a migration will fail when the table is not empty:
-
-```php
-$this->addColumn('{{%company}}', 'name', $this->string(128)->notNull());
-```
-
-Fails on a PostgreSQL database with 
-
-> add column name string(128) NOT NULL to table {{%company}} ...Exception: SQLSTATE[23502]: Not null violation: 7 ERROR:  column "name" contains null values
-
-The solution would be to create the column, allowing NULL, set the value to a default and add the null constraint later.
-
-```php
-$this->addColumn('{{%company}}', 'name', $this->string(128)->null());
-$this->update('{{%company}}', ['name' => 'No name']);
-$this->alterColumn('{{%company}}', 'name', $this->string(128)->notNull());
-```
-
-### Handling of `NOT NULL` constraints
+## Handling of `NOT NULL` constraints
 
 `NOT NULL` in DB migrations is determined by `nullable` and `required` properties of the OpenAPI schema.
 e.g. attribute = 'my_property'.
@@ -360,7 +330,7 @@ e.g. attribute = 'my_property'.
         nullable: false
 ```
 
-### Handling of `enum` (#enum)
+## Handling of `enum` (#enum)
 It works on all 3 DB: MySQL, MariaDb and PgSQL.
 
  ```yaml
@@ -375,7 +345,7 @@ It works on all 3 DB: MySQL, MariaDb and PgSQL.
 
 Note: Change in enum values are not very simple. For Mysql and Mariadb, migrations will be generated but in many cases custom modification in it are required. For Pgsql migrations for change in enum values will not be generated. It should be handled manually.
 
-### Handling of `numeric` (#numeric, #MariaDb)
+## Handling of `numeric` (#numeric, #MariaDb)
 
 precision-default = 10
 scale-default = 2
@@ -408,6 +378,44 @@ DB-Result = decimal(12,2)
 DB-Result = decimal(10,2)
 
 
+## Assumptions
+
+When generating code from an OpenAPI description there are many possible ways to achive a fitting result.
+Thus there are some assumptions and limitations that are currently applied to make this work.
+Here is a (possibly incomplete) list:
+
+- The current implementation works best with OpenAPI description that follows the [JSON:API](https://jsonapi.org/) guidelines.
+  - The request and response format/schema is currently not extracted from OpenAPI schema and may need to be adjusted manually if it does not follow JSON:API
+- column/field/property with name `id` is considered as Primary Key by this library and it is automatically handled by DB/Yii; so remove it from validation `rules()`
+  - other fields can currently be used as primary keys using the `x-pk` OpenAPI extension (see below) but it may not be work correctly in all cases, please report bugs if you find them.
+
+Other things to keep in mind:
+
+### Adding columns to existing tables
+
+When adding new fields in the API models, new migrations will be generated to add these fields to the table.
+For a project that is already in production, it should be considered to adjust the generated migration to add default
+values for existing data records.
+
+One case where this is important is the addition of a new column with `NOT NULL` contraint, which does not provide a default value.
+Such a migration will fail when the table is not empty:
+
+```php
+$this->addColumn('{{%company}}', 'name', $this->string(128)->notNull());
+```
+
+Fails on a PostgreSQL database with
+
+> add column name string(128) NOT NULL to table {{%company}} ...Exception: SQLSTATE[23502]: Not null violation: 7 ERROR:  column "name" contains null values
+
+The solution would be to create the column, allowing NULL, set the value to a default and add the null constraint later.
+
+```php
+$this->addColumn('{{%company}}', 'name', $this->string(128)->null());
+$this->update('{{%company}}', ['name' => 'No name']);
+$this->alterColumn('{{%company}}', 'name', $this->string(128)->notNull());
+```
+
 ## Screenshots
 
 Gii Generator Form:
@@ -421,7 +429,25 @@ Generated files:
 
 # Development
 
-There commands are available to develop and check the tests. It is available inside the Docker container. To enter into bash shell of container, run `make cli` .
+To contribute or play around, steps to set up this project locally are:
+
+```bash
+# in your CLI
+git clone https://github.com/cebe/yii2-openapi.git
+cd yii2-openapi
+make clean_all
+make up
+make cli
+composer install
+make migrate
+
+# to check everything is setup up correctly ensure all tests passes
+./vendor/bin/phpunit
+
+# create new branch from master and Happy contributing!
+```
+
+These commands are available to develop and check the tests. It is available inside the Docker container. To enter into bash shell of container, run `make cli` .
 
 ```bash
 cd tests

src/lib/FakerStubResolver.php

@@ -51,6 +51,7 @@ public function resolve():?string
             case 'bool':
                 return '$faker->boolean';
             case 'int':
+            case 'integer':
                 return $this->fakeForInt($limits['min'], $limits['max']);
             case 'string':
                 return $this->fakeForString();
@@ -68,10 +69,17 @@ private function fakeForString():?string
     {
         $formats = [
             'date' => '$faker->dateTimeThisCentury->format(\'Y-m-d\')',
-            'date-time' => '$faker->dateTimeThisYear(\'now\', \'UTC\')->format(DATE_ATOM)', // ISO-8601
+            'date-time' => '$faker->dateTimeThisYear(\'now\', \'UTC\')->format(\'Y-m-d H:i:s\')', // DATE_ATOM=>ISO-8601
             'email' => '$faker->safeEmail',
+
+            // for x-db-type
+            'datetime' => '$faker->dateTimeThisYear(\'now\', \'UTC\')->format(\'Y-m-d H:i:s\')', // DATE_ATOM=>ISO-8601
+            'timestamp' => '$faker->dateTimeThisYear(\'now\', \'UTC\')->format(\'Y-m-d H:i:s\')', // DATE_ATOM=>ISO-8601
+            'time' => '$faker->time(\'H:i:s\')',
+            'year' => '$faker->year',
         ];
         $format = $this->property->getAttr('format');
+        $format = $format === null ? $this->property->getAttr('x-db-type') : $format;
         if ($format && isset($formats[$format])) {
             return $formats[$format];
         }
@@ -135,7 +143,11 @@ private function fakeForString():?string
         // TODO maybe also consider OpenAPI examples here
 
         if ($size) {
-            return 'substr($faker->text(' . $size . '), 0, ' . $size . ')';
+            $method = 'text';
+            if ($size < 5) {
+                $method = 'word';
+            }
+            return 'substr($faker->'.$method.'(' . $size . '), 0, ' . $size . ')';
         }
         return '$faker->sentence';
     }

src/lib/ValidationRulesBuilder.php

@@ -10,6 +10,8 @@
 use cebe\yii2openapi\lib\items\Attribute;
 use cebe\yii2openapi\lib\items\DbModel;
 use cebe\yii2openapi\lib\items\ValidationRule;
+use yii\helpers\VarDumper;
+use yii\validators\DateValidator;
 use function count;
 use function implode;
 use function in_array;
@@ -89,18 +91,33 @@ private function resolveAttributeRules(Attribute $attribute):void
         if ($attribute->isReadOnly()) {
             return;
         }
-        if ($attribute->phpType === 'bool') {
+        if ($attribute->phpType === 'bool' || $attribute->phpType === 'boolean') {
             $this->rules[$attribute->columnName . '_boolean'] = new ValidationRule([$attribute->columnName], 'boolean');
+            $this->defaultRule($attribute);
             return;
         }
 
         if (in_array($attribute->dbType, ['time', 'date', 'datetime'], true)) {
             $key = $attribute->columnName . '_' . $attribute->dbType;
-            $this->rules[$key] = new ValidationRule([$attribute->columnName], $attribute->dbType, []);
+            $params = [];
+            if ($attribute->dbType === 'date') {
+                $params['format'] = 'php:Y-m-d';
+            }
+            if ($attribute->dbType === 'datetime') {
+                $params['format'] = 'php:Y-m-d H:i:s';
+            }
+            if ($attribute->dbType === 'time') {
+                $params['format'] = 'php:H:i:s';
+            }
+
+            $this->rules[$key] = new ValidationRule([$attribute->columnName], $attribute->dbType, $params);
+            $this->defaultRule($attribute);
             return;
         }
-        if (in_array($attribute->phpType, ['int', 'double', 'float']) && !$attribute->isReference()) {
+
+        if (in_array($attribute->phpType, ['int', 'integer', 'double', 'float']) && !$attribute->isReference()) {
             $this->addNumericRule($attribute);
+            $this->defaultRule($attribute);
             return;
         }
         if ($attribute->phpType === 'string' && !$attribute->isReference()) {
@@ -110,8 +127,10 @@ private function resolveAttributeRules(Attribute $attribute):void
             $key = $attribute->columnName . '_in';
             $this->rules[$key] =
                 new ValidationRule([$attribute->columnName], 'in', ['range' => $attribute->enumValues]);
+            $this->defaultRule($attribute);
             return;
         }
+        $this->defaultRule($attribute);
         $this->addRulesByAttributeName($attribute);
     }
 
@@ -137,7 +156,7 @@ private function addRulesByAttributeName(Attribute $attribute):void
     private function addExistRules(array $relations):void
     {
         foreach ($relations as $attribute) {
-            if ($attribute->phpType === 'int') {
+            if ($attribute->phpType === 'int' || $attribute->phpType === 'integer') {
                 $this->addNumericRule($attribute);
             } elseif ($attribute->phpType === 'string') {
                 $this->addStringRule($attribute);
@@ -167,6 +186,21 @@ private function addStringRule(Attribute $attribute):void
         $this->rules[$key] = new ValidationRule([$attribute->columnName], 'string', $params);
     }
 
+    private function defaultRule(Attribute $attribute):void
+    {
+        if ($attribute->defaultValue === null) {
+            return;
+        }
+        if ($attribute->defaultValue instanceof \yii\db\Expression) {
+            return;
+        }
+
+        $params = [];
+        $params['value'] = $attribute->defaultValue;
+        $key = $attribute->columnName . '_default';
+        $this->rules[$key] = new ValidationRule([$attribute->columnName], 'default', $params);
+    }
+
     private function addNumericRule(Attribute $attribute):void
     {
         $params = [];
@@ -176,7 +210,7 @@ private function addNumericRule(Attribute $attribute):void
         if ($attribute->limits['max'] !== null) {
             $params['max'] = $attribute->limits['max'];
         }
-        $validator = $attribute->phpType === 'int' ? 'integer' : 'double';
+        $validator = ($attribute->phpType === 'int' || $attribute->phpType === 'integer') ? 'integer' : 'double';
         $key = $attribute->columnName . '_' . $validator;
         $this->rules[$key] = new ValidationRule([$attribute->columnName], $validator, $params);
     }
@@ -206,7 +240,7 @@ private function prepareTypeScope():void
                 continue;
             }
 
-            if (in_array($attribute->phpType, ['int', 'string', 'bool', 'float', 'double'])) {
+            if (in_array($attribute->phpType, ['int', 'integer', 'string', 'bool', 'boolean', 'float', 'double'])) {
                 continue;
             }
 

src/lib/items/DbModel.php

@@ -91,7 +91,17 @@ public function getValidationRules():string
         $rules = Yii::createObject(ValidationRulesBuilder::class, [$this])->build();
         $rules = array_map('strval', $rules);
         $rules = VarDumper::export($rules);
-        return str_replace([PHP_EOL, "\'", "'[[", "]',"], [PHP_EOL . '        ', "'", '[[', '],'], $rules);
+        return str_replace([
+            PHP_EOL,
+            "\'",
+            "'[[",
+            "]',"
+        ], [
+            PHP_EOL . '        ',
+            "'",
+            '[[',
+            '],'
+        ], $rules);
     }
 
     /**

src/lib/items/RouteData.php

@@ -194,16 +194,34 @@ public function init()
                     'type' => $pathParameters[$paramName]->schema->type ?? null,
                     //'model' => $additional ? SchemaResponseResolver::guessModelByRef($additional) : null,
                 ];
+                if (isset($pathParameters[$paramName]->schema->pattern)) {
+                    $this->params[$paramName]['pattern'] = $pathParameters[$paramName]->schema->pattern;
+                }
             } else {
                 $this->params[$paramName] = null;
             }
 
             $type = $this->params[$paramName]['type'] ?? null;
+            $patternInSpec = $this->params[$paramName]['pattern'] ?? null;
+
+            $defaultIntRegex = '\d';
+            $defaultStrRegex = '[\w-]';
+
+            $intRegex = $defaultIntRegex;
+            $strRegex = $defaultStrRegex;
+
+            if ($patternInSpec !== null) {
+                $patternInSpec = ltrim($patternInSpec, '^');
+                $patternInSpec = rtrim($patternInSpec, '$');
+                $intRegex = $patternInSpec;
+                $strRegex = $patternInSpec;
+            }
+
             //check minimum/maximum for routes like <year:\d{4}> ?
             if ($type === 'integer') {
-                $patternParts[$p] = '<' . $paramName . ':\d+>';
+                $patternParts[$p] = '<' . $paramName . ':'.$intRegex.'+>';
             } elseif ($type === 'string') {
-                $patternParts[$p] = '<' . $paramName . ':[\w-]+>';
+                $patternParts[$p] = '<' . $paramName . ':'.$strRegex.'+>';
             } else {
                 $patternParts[$p] = '<' . $paramName . '>';
             }