belongs to many external catalogs & catalogs

config/Migrations/20250331012424_RemoveCatalogIdFromExternalProductCatalogs.php

@@ -0,0 +1,22 @@
+<?php
+declare(strict_types=1);
+
+use Migrations\BaseMigration;
+
+class RemoveCatalogIdFromExternalProductCatalogs extends BaseMigration
+{
+    /**
+     * Change Method.
+     *
+     * More information on this method is available here:
+     * https://book.cakephp.org/migrations/4/en/migrations.html#the-change-method
+     * @return void
+     */
+    public function change(): void
+    {
+        $table = $this->table('external_product_catalogs');
+        $table->removeColumn('product_catalog_id');
+        $table->removeColumn('enabled');
+        $table->update();
+    }
+}

config/Migrations/20250331030759_CreateExternalProductCatalogsProductCatalogs.php

@@ -0,0 +1,37 @@
+<?php
+declare(strict_types=1);
+
+use Migrations\BaseMigration;
+
+class CreateExternalProductCatalogsProductCatalogs extends BaseMigration
+{
+    /**
+     * Change Method.
+     *
+     * More information on this method is available here:
+     * https://book.cakephp.org/migrations/4/en/migrations.html#the-change-method
+     * @return void
+     */
+    public function change(): void
+    {
+        $table = $this->table('external_product_catalogs_product_catalogs');
+        $table->addColumn('external_product_catalog_id', 'string', [
+            'default' => null,
+            'limit' => 255,
+            'null' => false,
+        ]);
+        $table->addColumn('product_catalog_id', 'uuid', [
+            'default' => null,
+            'null' => false,
+        ]);
+        $table->addColumn('created', 'datetime', [
+            'default' => null,
+            'null' => false,
+        ]);
+        $table->addColumn('enabled', 'boolean', [
+            'default' => null,
+            'null' => false,
+        ]);
+        $table->create();
+    }
+}

src/Model/Entity/ExternalProductCatalog.php

@@ -9,14 +9,12 @@ use Cake\ORM\Entity;
  * ExternalProductCatalog Entity
  *
  * @property int $id
- * @property string $product_catalog_id
  * @property string $base_url
  * @property string $api_url
  * @property \Cake\I18n\DateTime $created
  * @property \Cake\I18n\DateTime|null $deleted
- * @property bool $enabled
  *
- * @property \CakeProducts\Model\Entity\ProductCatalog $product_catalog
+ * @property \CakeProducts\Model\Entity\ProductCatalog[] $product_catalogs
  */
 class ExternalProductCatalog extends Entity
 {
@@ -30,12 +28,11 @@ class ExternalProductCatalog extends Entity
      * @var array<string, bool>
      */
     protected array $_accessible = [
-        'product_catalog_id' => true,
         'base_url' => true,
         'api_url' => true,
         'created' => true,
         'deleted' => true,
         'enabled' => true,
-        'product_catalog' => true,
+        'product_catalogs' => true,
     ];
 }

src/Model/Entity/ProductCatalog.php

@@ -13,8 +13,8 @@ use Cake\ORM\Entity;
  * @property string|null $catalog_description
  * @property bool $enabled
  *
- * @property \CakeProducts\Model\Entity\ProductCategory[] $product_categories
+ * @property ProductCategory[] $product_categories
- * @property \CakeProducts\Model\Entity\ExternalProductCatalog[] $external_product_catalogs
+ * @property ExternalProductCatalog[] $external_product_catalogs
  */
 class ProductCatalog extends Entity
 {

src/Model/Table/ExternalProductCatalogsTable.php

@@ -54,9 +54,8 @@ class ExternalProductCatalogsTable extends Table
 
         $this->addBehavior('Timestamp');
 
-        $this->belongsTo('ProductCatalogs', [
+        $this->belongsToMany('ProductCatalogs', [
-            'foreignKey' => 'product_catalog_id',
+            'through' => 'CakeProducts.ExternalProductCatalogsProductCatalogs',
-            'joinType' => 'INNER',
             'className' => 'CakeProducts.ProductCatalogs',
         ]);
     }
@@ -91,11 +90,6 @@ class ExternalProductCatalogsTable extends Table
             ->dateTime('deleted')
             ->allowEmptyDateTime('deleted');
 
-        $validator
-            ->boolean('enabled')
-            ->requirePresence('enabled', 'create')
-            ->notEmptyString('enabled');
-
         return $validator;
     }
 

src/Model/Table/ProductCatalogsTable.php

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

tests/TestCase/Controller/ExternalProductCatalogsControllerTest.php

@@ -156,7 +156,6 @@ class ExternalProductCatalogsControllerTest extends BaseControllerTest
             'action' => 'add',
         ];
         $data = [
-            'product_catalog_id' => 'f56f3412-ed23-490b-be6e-016208c415d2',
             'base_url' => 'http://localhost:8766',
             'api_url' => 'http://localhost:8766/api/v1/',
             'enabled' => true,