Merge branch 'dev-5' into fix#2403

baserproject · Sep 28, 2023 · 6b28a6a · 6b28a6a
2 parents 84001ea + fc15731
commit 6b28a6a
Show file tree

Hide file tree

Showing 9 changed files with 136 additions and 8 deletions.
diff --git a/plugins/baser-core/src/Model/Validation/BcValidation.php b/plugins/baser-core/src/Model/Validation/BcValidation.php
@@ -583,4 +583,20 @@ public static function reserved($value): bool
         return true;
     }
 
+    /**
+     * 選択リストに同じ項目を複数登録するかをチェック
+     *
+     * @param $value
+     * @return bool
+     * @checked
+     * @notodo
+     * @unitTest
+     */
+    public static function checkSelectList($value): bool
+    {
+        $data = preg_split("/\r\n|\n|\r/", $value);
+        $result = max(array_count_values($data));
+        return ($result < 2);
+    }
+
 }
diff --git a/plugins/baser-core/tests/TestCase/Model/Validation/BcValidationTest.php b/plugins/baser-core/tests/TestCase/Model/Validation/BcValidationTest.php
@@ -584,4 +584,20 @@ public function testCheckHiragana()
         $this->assertEquals($result, false);
     }
 
+    /**
+     * test checkSelectList
+     */
+    public function test_checkSelectList()
+    {
+        //戻り＝falseケース
+        $str = "あ\rべ\r\nあ\nべ\ntest";
+        $result = $this->BcValidation->checkSelectList($str);
+        $this->assertFalse($result);
+        //戻り＝trueケース
+        $str = "あa\nべ\nあ";
+        $result = $this->BcValidation->checkSelectList($str);
+        $this->assertTrue($result);
+    }
+
+
 }
diff --git a/plugins/bc-custom-content/src/Model/Table/CustomEntriesTable.php b/plugins/bc-custom-content/src/Model/Table/CustomEntriesTable.php
@@ -140,6 +140,9 @@ public function createSearchDetail(CustomEntry $entity): string
      *
      * @param int $tableId
      * @return bool
+     * @checked
+     * @noTodo
+     * @unitTest
      */
     public function setUp(int $tableId, array $postData = [])
     {

diff --git a/plugins/bc-custom-content/src/Model/Table/CustomFieldsTable.php b/plugins/bc-custom-content/src/Model/Table/CustomFieldsTable.php
@@ -72,6 +72,14 @@ public function validationDefault(Validator $validator): Validator
         $validator
             ->scalar('type')
             ->notEmptyString('type', __d('baser_core', 'タイプを入力してください。'));
+        $validator
+            ->add('source', [
+                'checkSelectList' => [
+                    'provider' => 'bc',
+                    'rule' => ['checkSelectList'],
+                    'message' => __d('baser_core', '選択リストに同じ項目を複数登録できません。')
+                ]
+        ]);
         return $validator;
     }
 

diff --git a/plugins/bc-custom-content/src/Model/Table/CustomLinksTable.php b/plugins/bc-custom-content/src/Model/Table/CustomLinksTable.php
@@ -56,6 +56,9 @@ public function initialize(array $config): void
      *
      * @param Validator $validator
      * @return Validator
+     * @noTodo
+     * @checked
+     * @unitTest
      */
     public function validationDefault(Validator $validator): Validator
     {
@@ -88,6 +91,9 @@ public function validationDefault(Validator $validator): Validator
      * scope の設定のため、TreeBehavior より優先度を高くする
      *
      * @return array
+     * @noTodo
+     * @checked
+     * @unitTest
      */
     public function implementedEvents(): array
     {

diff --git a/plugins/bc-custom-content/src/Service/CustomEntriesService.php b/plugins/bc-custom-content/src/Service/CustomEntriesService.php
@@ -137,7 +137,7 @@ public function getIndex(array $queryParams = [])
             'limit' => null,
             'direction' => '',    // 並び方向
             'order' => '',    // 並び順対象のフィールド
-            'contain' => ['CustomTables' => ['CustomContents' => ['Contents']]],
+            'contain' => [],
             'status' => '',
             'use_api' => null
         ], $queryParams);
@@ -146,6 +146,10 @@ public function getIndex(array $queryParams = [])
             ->select($this->createSelect($options))
             ->contain($options['contain']);
 
+        if(array_key_exists('CustomTables', $options['contain']) || in_array('CustomTables', $options['contain'])) {
+            $query->select($this->CustomEntries->CustomTables);
+        }
+
         if ($options['order']) {
             $query->order($this->createOrder($options['order'], $options['direction']));
         }
@@ -222,7 +226,7 @@ public function createIndexConditions(Query $query, array $params)
         // 公開状態
         if ($params['status'] === 'publish') {
             $conditions = $this->CustomEntries->getConditionAllowPublish();
-            $params['contain'] = ['CustomTables' => ['CustomContents' => ['Contents']]];
+            $query->contain(['CustomTables' => ['CustomContents' => ['Contents']]]);
             $fields = $this->CustomEntries->getSchema()->columns();
             $query->select($fields);
             $conditions = array_merge_recursive(

diff --git a/plugins/bc-custom-content/tests/Factory/CustomFieldFactory.php b/plugins/bc-custom-content/tests/Factory/CustomFieldFactory.php
@@ -41,7 +41,23 @@ protected function getRootTableRegistryName(): string
     protected function setDefaultTemplate(): void
     {
         $this->setDefaultData(function (Generator $faker) {
-            return [];
+            return [
+                'title' => 'test',
+                'status' => 1,
+                'default_value' => '',
+                'validate' => '',
+                'regex' => '',
+                'regex_error_message' => '',
+                'counter' => 0,
+                'auto_convert' => '',
+                'placeholder' => '',
+                'size' => NULL,
+                'max_length' => NULL,
+                'source' => '',
+                'created' => '2023-01-30 06:22:47',
+                'modified' => '2023-02-20 11:18:32',
+                'line' => NULL
+            ];
         });
     }
 

diff --git a/plugins/bc-custom-content/tests/TestCase/Model/Table/CustomEntriesTableTest.php b/plugins/bc-custom-content/tests/TestCase/Model/Table/CustomEntriesTableTest.php
@@ -259,11 +259,34 @@ public function test_createSearchDetail()
     public function test_setUp()
     {
         //準備
-
+        $dataBaseService = $this->getService(BcDatabaseServiceInterface::class);
+        $customTable = $this->getService(CustomTablesServiceInterface::class);
+        CustomFieldFactory::make([
+            'name' => 'test',
+            'type' => 'text',
+        ])->persist();
+        CustomLinkFactory::make([
+            'custom_table_id' => 1,
+            'custom_field_id' => 1,
+            'name' => 'recruit_category',
+            'title' => '求人分類',
+            'display_admin_list' => 1,
+            'status' => 1,
+        ])->persist();
+        $customTable->create([
+            'id' => 1,
+            'name' => 'recruit',
+            'title' => '求人情報',
+            'type' => '1',
+            'display_field' => 'title',
+        ]);
         //正常系実行
-
-        //異常系実行
-
+        $result = $this->CustomEntriesTable->setUp(1, []);
+        $this->assertTrue($result);
+        $this->assertEquals(1, $this->CustomEntriesTable->tableId);
+        $this->assertEquals('recruit_category', $this->CustomEntriesTable->links[0]->name);
+        //不要なテーブルを削除
+        $dataBaseService->dropTable('custom_entry_1_recruit');
 
     }
 

diff --git a/plugins/bc-custom-content/tests/TestCase/Model/Table/CustomLinksTableTest.php b/plugins/bc-custom-content/tests/TestCase/Model/Table/CustomLinksTableTest.php
@@ -13,6 +13,7 @@
 
 use BaserCore\TestSuite\BcTestCase;
 use BcCustomContent\Model\Table\CustomLinksTable;
+use BcCustomContent\Test\Factory\CustomLinkFactory;
 
 /**
  * CustomTablesTableTest
@@ -54,6 +55,39 @@ public function test_initialize()
      */
     public function test_validationDefault()
     {
+        $validator = $this->CustomLinksTable->getValidator('default');
+        //入力フィールドのデータが超えた場合、
+        $errors = $validator->validate([
+            'name' => str_repeat('a', 256),
+            'title' => str_repeat('a', 256),
+        ]);
+        $this->assertEquals('255文字以内で入力してください。', current($errors['name']));
+        $this->assertEquals('255文字以内で入力してください。', current($errors['title']));
+        //入力フィールドのデータがない
+        $errors = $validator->validate([
+            'name' => '',
+            'title' => '',
+        ]);
+        $this->assertEquals('フィールド名を入力してください。', current($errors['name']));
+        $this->assertEquals('タイトルを入力してください。', current($errors['title']));
+        //nameは半角英数字以外の記号が含めるケース
+        $errors = $validator->validate([
+            'name' => 'aこんにちは',
+        ]);
+        $this->assertEquals('フィールド名は半角英数字とアンダースコアのみで入力してください。', current($errors['name']));
+        //システム予約名称のケース
+        $errors = $validator->validate([
+            'name' => 'option',
+        ]);
+        $this->assertEquals('group, rows, option はシステム予約名称のため利用できません。', current($errors['name']));
+        //既に登録のケース
+        CustomLinkFactory::make([
+            'name' => 'recruit_category',
+        ])->persist();
+        $errors = $validator->validate([
+            'name' => 'recruit_category',
+        ]);
+        $this->assertEquals('既に登録のあるフィールド名です。', current($errors['name']));
 
     }
 
@@ -62,7 +96,9 @@ public function test_validationDefault()
      */
     public function test_implementedEvents()
     {
-
+        $result = $this->CustomLinksTable->implementedEvents();
+        $this->assertArrayHasKey('Model.beforeSave', $result);
+        $this->assertArrayHasKey('Model.beforeDelete', $result);
     }
 
     /**