Fix issue and other failing tests

Author: SOHELAHMED7

README.md

@@ -568,4 +568,3 @@ Professional support, consulting as well as software development services are av
 https://www.cebe.cc/en/contact
 
 Development of this library is sponsored by [cebe.:cloud: "Your Professional Deployment Platform"](https://cebe.cloud).
-

TODO.taskpaper

@@ -0,0 +1,9 @@
+TODO.taskpaper
+
+### Bug: rules() "required" is generated before "*_default" #22
+ ✔ create failing test @done (24-08-18 19:21)
+ ✔ implement the solution @done (24-08-18 19:21)
+ ☐ fix failing tests if any
+ ☐ resolve TODOs if any
+ ☐ review PR
+ ☐ delete this file and submit PR

src/lib/ValidationRulesBuilder.php

@@ -10,8 +10,6 @@
 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;
@@ -53,9 +51,6 @@ public function build():array
             $this->rules['trim'] = new ValidationRule($this->typeScope['trim'], 'trim');
         }
 
-        if (!empty($this->typeScope['required'])) {
-            $this->rules['required'] = new ValidationRule($this->typeScope['required'], 'required');
-        }
         if (!empty($this->typeScope['ref'])) {
             $this->addExistRules($this->typeScope['ref']);
         }
@@ -77,6 +72,9 @@ public function build():array
         if (!empty($this->typeScope['safe'])) {
             $this->rules['safe'] = new ValidationRule($this->typeScope['safe'], 'safe');
         }
+        if (!empty($this->typeScope['required'])) {
+            $this->rules['required'] = new ValidationRule($this->typeScope['required'], 'required');
+        }
         return $this->rules;
     }
 

tests/DbTestCase.php

@@ -3,12 +3,12 @@
 namespace tests;
 
 use cebe\yii2openapi\generator\ApiGenerator;
+use SamIT\Yii2\MariaDb\Schema as MariaDbSchema;
 use Yii;
-use yii\di\Container;
 use yii\db\mysql\Schema as MySqlSchema;
 use yii\db\pgsql\Schema as PgSqlSchema;
-use \SamIT\Yii2\MariaDb\Schema as MariaDbSchema;
-use yii\helpers\{ArrayHelper, VarDumper, StringHelper, Console};
+use yii\di\Container;
+use yii\helpers\{ArrayHelper, StringHelper};
 use yii\helpers\FileHelper;
 
 class DbTestCase extends \PHPUnit\Framework\TestCase
@@ -127,6 +127,7 @@ protected function checkFiles(array $actual, array $expected)
                 );
             }
 
+            // exec('cp '.$file.' '.$expectedFilePath);
             $this->assertFileEquals($expectedFilePath, $file, "Failed asserting that file contents of\n$file\nare equal to file contents of\n$expectedFilePath \n\n cp $file $expectedFilePath \n\n ");
         }
     }

tests/specs/blog/models/base/Category.php

@@ -22,11 +22,11 @@ public function rules()
     {
         return [
             'trim' => [['title'], 'trim'],
-            'required' => [['title', 'active'], 'required'],
             'title_unique' => [['title'], 'unique'],
             'title_string' => [['title'], 'string', 'max' => 255],
             'active_boolean' => [['active'], 'boolean'],
             'active_default' => [['active'], 'default', 'value' => false],
+            'required' => [['title', 'active'], 'required'],
         ];
     }
 

tests/specs/blog/models/base/Comment.php

@@ -26,7 +26,6 @@ public function rules()
     {
         return [
             'trim' => [['post_id'], 'trim'],
-            'required' => [['post_id', 'author_id', 'message', 'created_at'], 'required'],
             'post_id_string' => [['post_id'], 'string', 'max' => 128],
             'post_id_exist' => [['post_id'], 'exist', 'targetRelation' => 'Post'],
             'author_id_integer' => [['author_id'], 'integer'],
@@ -35,6 +34,7 @@ public function rules()
             'meta_data_default' => [['meta_data'], 'default', 'value' => []],
             'created_at_integer' => [['created_at'], 'integer'],
             'safe' => [['message', 'meta_data'], 'safe'],
+            'required' => [['post_id', 'author_id', 'message', 'created_at'], 'required'],
         ];
     }
 

tests/specs/blog/models/base/Post.php

@@ -28,7 +28,6 @@ public function rules()
     {
         return [
             'trim' => [['title', 'slug', 'created_at'], 'trim'],
-            'required' => [['title', 'category_id', 'active'], 'required'],
             'category_id_integer' => [['category_id'], 'integer'],
             'category_id_exist' => [['category_id'], 'exist', 'targetRelation' => 'Category'],
             'created_by_id_integer' => [['created_by_id'], 'integer'],
@@ -40,6 +39,7 @@ public function rules()
             'active_boolean' => [['active'], 'boolean'],
             'active_default' => [['active'], 'default', 'value' => false],
             'created_at_date' => [['created_at'], 'date', 'format' => 'php:Y-m-d'],
+            'required' => [['title', 'category_id', 'active'], 'required'],
         ];
     }
 

tests/specs/blog/models/base/User.php

@@ -25,7 +25,6 @@ public function rules()
     {
         return [
             'trim' => [['username', 'email', 'password', 'role', 'created_at'], 'trim'],
-            'required' => [['username', 'email', 'password'], 'required'],
             'username_unique' => [['username'], 'unique'],
             'email_unique' => [['email'], 'unique'],
             'username_string' => [['username'], 'string', 'max' => 200],
@@ -37,6 +36,7 @@ public function rules()
             'flags_integer' => [['flags'], 'integer'],
             'flags_default' => [['flags'], 'default', 'value' => 0],
             'created_at_datetime' => [['created_at'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
+            'required' => [['username', 'email', 'password'], 'required'],
         ];
     }
 }

tests/specs/blog_v2/models/base/Category.php

@@ -23,10 +23,10 @@ public function rules()
     {
         return [
             'trim' => [['title', 'cover'], 'trim'],
-            'required' => [['title', 'cover', 'active'], 'required'],
             'title_string' => [['title'], 'string', 'max' => 100],
             'cover_string' => [['cover'], 'string'],
             'active_boolean' => [['active'], 'boolean'],
+            'required' => [['title', 'cover', 'active'], 'required'],
         ];
     }
 

tests/specs/blog_v2/models/base/Comment.php

@@ -26,7 +26,6 @@ public function rules()
     {
         return [
             'trim' => [['message', 'meta_data', 'created_at'], 'trim'],
-            'required' => [['post_id', 'message', 'created_at'], 'required'],
             'post_id_integer' => [['post_id'], 'integer'],
             'post_id_exist' => [['post_id'], 'exist', 'targetRelation' => 'Post'],
             'user_id_integer' => [['user_id'], 'integer'],
@@ -35,6 +34,7 @@ public function rules()
             'meta_data_string' => [['meta_data'], 'string', 'min' => 1, 'max' => 300],
             'meta_data_default' => [['meta_data'], 'default', 'value' => ''],
             'created_at_datetime' => [['created_at'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
+            'required' => [['post_id', 'message', 'created_at'], 'required'],
         ];
     }