uuids instead of int ids fore xternal product catalogs, test fixes, many to many working now

config/Migrations/20241122070040_CreateExternalProductCatalogs.php

@@ -14,7 +14,11 @@ class CreateExternalProductCatalogs extends AbstractMigration
      */
     public function change(): void
     {
-        $table = $this->table('external_product_catalogs');
+        $table = $this->table('external_product_catalogs', ['id' => false, 'primary_key' => ['id']]);
+        $table->addColumn('id', 'uuid', [
+            'default' => null,
+            'null' => false,
+        ]);
         $table->addColumn('product_catalog_id', 'uuid', [
             'default' => null,
             'null' => false,

config/Migrations/20250331030759_CreateExternalProductCatalogsProductCatalogs.php

@@ -15,9 +15,8 @@ class CreateExternalProductCatalogsProductCatalogs extends BaseMigration
     public function change(): void
     {
         $table = $this->table('external_product_catalogs_product_catalogs');
-        $table->addColumn('external_product_catalog_id', 'string', [
+        $table->addColumn('external_product_catalog_id', 'uuid', [
             'default' => null,
-            'limit' => 255,
             'null' => false,
         ]);
         $table->addColumn('product_catalog_id', 'uuid', [

src/Model/Table/ExternalProductCatalogsProductCatalogsTable.php

@@ -56,11 +56,13 @@ class ExternalProductCatalogsProductCatalogsTable extends Table
         $this->addBehavior('Timestamp');
 
         $this->belongsTo('ExternalProductCatalogs', [
-            'foreignKey' => 'external_product_catalog_id',
+            'className' => 'CakeProducts.ExternalProductCatalogs',
+//            'foreignKey' => 'external_product_catalog_id',
             'joinType' => 'INNER',
         ]);
         $this->belongsTo('ProductCatalogs', [
-            'foreignKey' => 'product_catalog_id',
+            'className' => 'CakeProducts.ProductCatalogs',
+//            'foreignKey' => 'product_catalog_id',
             'joinType' => 'INNER',
         ]);
     }
@@ -74,8 +76,7 @@ class ExternalProductCatalogsProductCatalogsTable extends Table
     public function validationDefault(Validator $validator): Validator
     {
         $validator
-            ->scalar('external_product_catalog_id')
+            ->uuid('external_product_catalog_id')
-            ->maxLength('external_product_catalog_id', 255)
             ->notEmptyString('external_product_catalog_id');
 
         $validator
@@ -99,8 +100,8 @@ class ExternalProductCatalogsProductCatalogsTable extends Table
      */
     public function buildRules(RulesChecker $rules): RulesChecker
     {
-        $rules->add($rules->existsIn(['external_product_catalog_id'], 'ExternalProductCatalogs'), ['errorField' => 'external_product_catalog_id']);
+//        $rules->add($rules->existsIn(['external_product_catalog_id'], 'ExternalProductCatalogs'), ['errorField' => 'external_product_catalog_id']);
-        $rules->add($rules->existsIn(['product_catalog_id'], 'ProductCatalogs'), ['errorField' => 'product_catalog_id']);
+//        $rules->add($rules->existsIn(['product_catalog_id'], 'ProductCatalogs'), ['errorField' => 'product_catalog_id']);
 
         return $rules;
     }

src/Model/Table/ExternalProductCatalogsTable.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace CakeProducts\Model\Table;
 
+use Cake\Core\Configure;
 use Cake\Datasource\EntityInterface;
 use Cake\Datasource\ResultSetInterface;
 use Cake\ORM\Association\BelongsTo;
@@ -54,12 +55,17 @@ class ExternalProductCatalogsTable extends Table
 
         $this->addBehavior('Timestamp');
 
+        $this->setEntityClass(
+            Configure::read('CakeProducts.ExternalProductCatalogs.entity', 'CakeProducts\Model\Entity\ExternalProductCatalog')
+        );
+
         $this->belongsToMany('ProductCatalogs', [
-            'through' => 'CakeProducts.ExternalProductCatalogsProductCatalogs',
+            'through' => 'ExternalProductCatalogsProductCatalogs',
             'className' => 'CakeProducts.ProductCatalogs',
         ]);
 
         $this->hasMany('ExternalProductCatalogsProductCatalogs', [
+            'foreignKey' => 'external_product_catalog_id',
             'className' => 'CakeProducts.ExternalProductCatalogsProductCatalogs',
         ]);
     }
@@ -72,10 +78,6 @@ class ExternalProductCatalogsTable extends Table
      */
     public function validationDefault(Validator $validator): Validator
     {
-        $validator
-            ->uuid('product_catalog_id')
-            ->notEmptyString('product_catalog_id');
-
         $validator
             ->scalar('base_url')
             ->maxLength('base_url', 255)
@@ -106,8 +108,6 @@ class ExternalProductCatalogsTable extends Table
      */
     public function buildRules(RulesChecker $rules): RulesChecker
     {
-        $rules->add($rules->existsIn(['product_catalog_id'], 'ProductCatalogs'), ['errorField' => 'product_catalog_id']);
-
         return $rules;
     }
 }

src/Model/Table/ProductCatalogsTable.php

@@ -54,7 +54,7 @@ class ProductCatalogsTable extends Table
             'className' => 'CakeProducts.ProductCategories',
         ]);
         $this->belongsToMany('ExternalProductCatalogs', [
-            'through' => 'CakeProducts.ExternalProductCatalogsProductCatalogs',
+            'through' => 'ExternalProductCatalogsProductCatalogs',
             'className' => 'CakeProducts.ExternalProductCatalogs',
         ]);
     }

tests/Fixture/ExternalProductCatalogsFixture.php

@@ -19,13 +19,11 @@ class ExternalProductCatalogsFixture extends TestFixture
     {
         $this->records = [
             [
-                'id' => 1,
+                'id' => '115153f3-2f59-4234-8ff8-e1b205769999',
-                'product_catalog_id' => '115153f3-2f59-4234-8ff8-e1b205761428',
                 'base_url' => 'http://localhost:8766',
                 'api_url' => 'http://localhost:8766/api',
                 'created' => '2024-11-22 09:39:37',
                 'deleted' => '2024-11-22 09:39:37',
-                'enabled' => 1,
             ],
         ];
         parent::init();

tests/Fixture/ExternalProductCatalogsProductCatalogsFixture.php

@@ -18,7 +18,12 @@ class ExternalProductCatalogsProductCatalogsFixture extends TestFixture
     public function init(): void
     {
         $this->records = [
-
+            [
+                'external_product_catalog_id' => '115153f3-2f59-4234-8ff8-e1b205769999',
+                'product_catalog_id' => '115153f3-2f59-4234-8ff8-e1b205761428',
+                'created' => '2024-11-22 09:39:37',
+                'enabled' => false,
+            ],
         ];
         parent::init();
     }

tests/TestCase/Controller/ExternalProductCatalogsControllerTest.php

@@ -32,6 +32,7 @@ class ExternalProductCatalogsControllerTest extends BaseControllerTest
      */
     protected array $fixtures = [
         'plugin.CakeProducts.ExternalProductCatalogs',
+        'plugin.CakeProducts.ExternalProductCatalogsProductCatalogs',
         'plugin.CakeProducts.ProductCatalogs',
     ];
 
@@ -96,7 +97,7 @@ class ExternalProductCatalogsControllerTest extends BaseControllerTest
     */
     public function testViewGet(): void
     {
-        $id = 1;
+        $id = '115153f3-2f59-4234-8ff8-e1b205769999';
         $this->loginUserByRole('admin');
         $url = [
             'plugin' => 'CakeProducts',
@@ -218,7 +219,7 @@ class ExternalProductCatalogsControllerTest extends BaseControllerTest
             'plugin' => 'CakeProducts',
             'controller' => 'ExternalProductCatalogs',
             'action' => 'edit',
-            1,
+            '115153f3-2f59-4234-8ff8-e1b205769999',
         ];
         $this->get($url);
         $this->assertResponseCode(200);
@@ -237,7 +238,7 @@ class ExternalProductCatalogsControllerTest extends BaseControllerTest
     public function testEditPutSuccess(): void
     {
         $this->loginUserByRole('admin');
-        $id = 1;
+        $id = '115153f3-2f59-4234-8ff8-e1b205769999';
         $before = $this->ExternalProductCatalogs->get($id);
         $url = [
             'plugin' => 'CakeProducts',
@@ -273,7 +274,7 @@ class ExternalProductCatalogsControllerTest extends BaseControllerTest
     public function testEditPutFailure(): void
     {
         $this->loginUserByRole('admin');
-        $id = 1;
+        $id = '115153f3-2f59-4234-8ff8-e1b205769999';
         $before = $this->ExternalProductCatalogs->get($id);
         $url = [
             'plugin' => 'CakeProducts',
@@ -313,7 +314,7 @@ class ExternalProductCatalogsControllerTest extends BaseControllerTest
             'plugin' => 'CakeProducts',
             'controller' => 'ExternalProductCatalogs',
             'action' => 'delete',
-            1,
+            '115153f3-2f59-4234-8ff8-e1b205769999',
         ];
         $this->delete($url);
         $this->assertResponseCode(302);

tests/TestCase/Controller/ExternalProductCatalogsProductCatalogsControllerTest.php

@@ -110,7 +110,7 @@ class ExternalProductCatalogsProductCatalogsControllerTest extends BaseControlle
         ];
         $this->delete($url);
         $this->assertResponseCode(302);
-        $this->assertRedirectContains('externalproductcatalogsproductcatalogs');
+        $this->assertRedirectContains('external-product-catalogs');
 
         $cntAfter = $this->ExternalProductCatalogsProductCatalogs->find()->count();
         $this->assertEquals($cntBefore - 1, $cntAfter);

tests/TestCase/Model/Table/ExternalProductCatalogsTableTest.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace CakeProducts\Test\TestCase\Model\Table;
 
+use Cake\ORM\Table;
 use Cake\TestSuite\TestCase;
 use CakeProducts\Model\Table\ExternalProductCatalogsTable;
 
@@ -14,7 +15,7 @@ class ExternalProductCatalogsTableTest extends TestCase
     /**
      * Test subject
      *
-     * @var \CakeProducts\Model\Table\ExternalProductCatalogsTable
+     * @var ExternalProductCatalogsTable
      */
     protected $ExternalProductCatalogs;
 
@@ -25,6 +26,7 @@ class ExternalProductCatalogsTableTest extends TestCase
      */
     protected array $fixtures = [
         'plugin.CakeProducts.ExternalProductCatalogs',
+        'plugin.CakeProducts.ExternalProductCatalogsProductCatalogs',
         'plugin.CakeProducts.ProductCatalogs',
     ];
 
@@ -56,13 +58,14 @@ class ExternalProductCatalogsTableTest extends TestCase
     * TestInitialize method
     *
     * @return void
-    * @uses \CakeProducts\Model\Table\ExternalProductCatalogsTable::initialize()
+    * @uses ExternalProductCatalogsTable::initialize
     */
     public function testInitialize(): void
     {
         // verify all associations loaded
         $expectedAssociations = [
             'ProductCatalogs',
+            'ExternalProductCatalogsProductCatalogs',
         ];
         $associations = $this->ExternalProductCatalogs->associations();
 
@@ -87,7 +90,7 @@ class ExternalProductCatalogsTableTest extends TestCase
     * Test validationDefault method
     *
     * @return void
-    * @uses \CakeProducts\Model\Table\ExternalProductCatalogsTable::validationDefault()
+    * @uses ExternalProductCatalogsTable::validationDefault
     */
     public function testValidationDefault(): void
     {
@@ -98,7 +101,7 @@ class ExternalProductCatalogsTableTest extends TestCase
     * Test buildRules method
     *
     * @return void
-    * @uses \CakeProducts\Model\Table\ExternalProductCatalogsTable::buildRules()
+    * @uses ExternalProductCatalogsTable::buildRules
     */
     public function testBuildRules(): void
     {

tests/TestCase/Model/Table/ProductCatalogsTableTest.php

@@ -26,6 +26,7 @@ class ProductCatalogsTableTest extends TestCase
      */
     protected array $fixtures = [
         'plugin.CakeProducts.ProductCatalogs',
+        'plugin.CakeProducts.ExternalProductCatalogsProductCatalogs',
         'plugin.CakeProducts.ProductCategories',
     ];