product variants table split off from category variants table, variant values table updated to reflect

src/Controller/ProductSkusController.php

@@ -53,7 +53,8 @@ class ProductSkusController extends AppController
         $productSku = $this->ProductSkus->get($id, contain: [
             'Products',
             'ProductSkuVariantValues',
-            'ProductSkuVariantValues.ProductCategoryVariants',
+            'ProductSkuVariantValues.ProductVariants',
+            'ProductSkuVariantValues.ProductVariants.ProductCategoryVariants',
             'ProductSkuVariantValues.ProductCategoryVariantOptions',
         ]);
         $this->set(compact('productSku'));
@@ -70,27 +71,50 @@ class ProductSkusController extends AppController
         $productSkus = [];
         $table = $this->getTable();
 
-        $productCategoryVariants = $table->Products->ProductCategoryVariants->find()
-            ->contain(['ProductCategoryVariantOptions'])
-            ->where(['product_id' => $productId])
-            ->toArray();
-        $optionMapping = Hash::combine($productCategoryVariants, '{n}.product_category_variant_options.{n}.id', '{n}.product_category_variant_options.{n}.variant_value');
-        $variantNameMapping = Hash::combine($productCategoryVariants, '{n}.id', '{n}.name');
-        foreach ($productCategoryVariants as $productCategoryVariant) {
-            $options = Hash::extract($productCategoryVariant->product_category_variant_options ?? [], '{n}.id');
-            $toGetCartesianProductsFrom[$productCategoryVariant->id] = $options;
+        $product = $table->Products->get($productId, contain: [
+            'ProductSkus',
+            'ProductSkus.ProductSkuVariantValues',
+            'ProductVariants',
+            'ProductVariants.ProductCategoryVariants',
+            'ProductVariants.ProductCategoryVariants.ProductCategoryVariantOptions',
+        ]);
+        $existingProductSkus = Hash::combine($product->product_skus ?? [], '{n}.id', '{n}');
+        $existingProductSkusForMapping = Hash::combine($product->product_skus ?? [], '{n}.id', '{n}.product_sku_variant_values');
+        $existingSkusForCartesianComparison = [];
+        foreach ($existingProductSkusForMapping as $existingProductSkuId => $existingProductSku) {
+            $existingSkusForCartesianComparison[$existingProductSkuId] = Hash::combine($existingProductSku, '{n}.product_category_variant_id', '{n}.product_category_variant_option_id');
         }
+        $productVariants = isset($product->product_variants) ? $product->product_variants : [];
+//        dd($productVariants);
+        $productVariantsMapping = Hash::combine($productVariants, '{n}.product_category_variant.id', '{n}.id');
+        $productCategoryVariants = Hash::extract($productVariants, '{n}.product_category_variant');
+//        dd($productCategoryVariants);
+        $optionMapping = Hash::combine($productCategoryVariants, '{n}.product_category_variant_options.{n}.id', '{n}.product_category_variant_options.{n}.variant_value');
+//        dd($optionMapping);
+
+        $variantNameMapping = Hash::combine($productCategoryVariants, '{n}.id', '{n}.name');
+//        dd($variantNameMapping);
+
+        foreach ($productCategoryVariants as $productCategoryVariant) {
+            $options = Hash::extract($productCategoryVariant['product_category_variant_options'] ?? [], '{n}.id');
+            $toGetCartesianProductsFrom[$productCategoryVariant['id']] = $options;
+        }
+//        dd($toGetCartesianProductsFrom);
+
         $numSkusToAdd = count(combinations($toGetCartesianProductsFrom));
         for ($i = 0; $i < $numSkusToAdd; $i++) {
             $productSkus[$i] = $this->getTable()->newEmptyEntity();
         }
         $this->set(compact(
+            'product',
             'productSkus',
             'productCategoryVariants',
             'toGetCartesianProductsFrom',
             'optionMapping',
             'variantNameMapping',
-            'numSkusToAdd'
+            'numSkusToAdd',
+            'existingProductSkus',
+            'existingSkusForCartesianComparison'
         ));
 
         if ($this->request->is('post')) {
@@ -109,9 +133,8 @@ class ProductSkusController extends AppController
                 ],
                 'associated' => [
                     'ProductSkuVariantValues' => [
-                        'validate' => false,
                         'fields' => [
-                            'product_category_variant_id',
+                            'product_variant_id',
                             'product_category_variant_option_id',
                         ],
                     ],
@@ -121,7 +144,7 @@ class ProductSkusController extends AppController
             $postedSkus = Hash::insert($postedSkus, '{n}.product_id', $productId);
 
             foreach ($postedSkus as $postedSkuCnt => $postedSku) {
-                if (!isset($postedSku['add']) || !$postedSku['add']) {
+                if (!isset($postedSku['sku']) || !$postedSku['sku']) {
                     unset($productSkus[$postedSkuCnt]);
 
                     continue;
@@ -133,7 +156,7 @@ class ProductSkusController extends AppController
 
                 return;
             }
-
+//            dd($finalPostData);
             $productSkus = $table->patchEntities($productSkus, $finalPostData, $saveOptions);
             $errors = [];
             $successes = [];
@@ -143,7 +166,7 @@ class ProductSkusController extends AppController
                 if (!$table->save($productSkuToSave, $saveOptions)) {
                     Log::debug(print_r('$productSkuToSave->getErrors()', true));
                     Log::debug(print_r($productSkuToSave->getErrors(), true));
-
+                    dd($productSkuToSave->getErrors());
                     continue;
                 }
                 $successes[] = $productSkuToSave;

src/Controller/ProductsController.php

@@ -58,8 +58,11 @@ class ProductsController extends AppController
             'ProductAttributes',
             'ProductAttributes.ProductCategoryAttributes',
             'ProductAttributes.ProductCategoryAttributeOptions',
-            'ProductCategoryVariants',
-            'ProductSkus'
+            'ProductVariants',
+            'ProductVariants.ProductCategoryVariants',
+            'ProductVariants.ProductCategoryVariants.ProductCategoryVariantOptions',
+            'ProductSkus',
+            'ProductPhotos',
         ]);
         $this->set(compact('product'));
     }

src/Model/Entity/ProductSkuVariantValue.php

@@ -10,7 +10,7 @@ use Cake\ORM\Entity;
  *
  * @property string $id
  * @property string $product_sku_id
- * @property string $product_category_variant_id
+ * @property string $product_variant_id
  * @property string $product_category_variant_option_id
  *
  * @property ProductSku $product_sku
@@ -30,12 +30,12 @@ class ProductSkuVariantValue extends Entity
      */
     protected array $_accessible = [
         'product_sku_id' => true,
-        'product_category_variant_id' => true,
+        'product_variant_id' => true,
         'product_category_variant_option_id' => true,
 
         // entities
         'product_skus' => true,
-        'product_category_variant' => true,
+        'product_variant' => true,
         'product_category_variant_option' => true,
     ];
 }

src/Model/Entity/ProductVariant.php

@@ -0,0 +1,39 @@
+<?php
+declare(strict_types=1);
+
+namespace CakeProducts\Model\Entity;
+
+use Cake\ORM\Entity;
+
+/**
+ * ProductVariant Entity
+ *
+ * @property string $id
+ * @property string $name
+ * @property string|null $product_category_variant_id
+ * @property string $product_id
+ * @property bool $enabled
+ *
+ * @property \App\Model\Entity\ProductCategoryVariant $product_category_variant
+ * @property \App\Model\Entity\Product $product
+ */
+class ProductVariant extends Entity
+{
+    /**
+     * Fields that can be mass assigned using newEntity() or patchEntity().
+     *
+     * Note that when '*' is set to true, this allows all unspecified fields to
+     * be mass assigned. For security purposes, it is advised to set '*' to false
+     * (or remove it), and explicitly make individual fields accessible as needed.
+     *
+     * @var array<string, bool>
+     */
+    protected array $_accessible = [
+        'name' => true,
+        'product_category_variant_id' => true,
+        'product_id' => true,
+        'enabled' => true,
+        'product_category_variant' => true,
+        'product' => true,
+    ];
+}

src/Model/Table/ProductCategoryVariantsTable.php

@@ -72,9 +72,9 @@ class ProductCategoryVariantsTable extends Table
             'cascadeCallbacks' => true,
         ]);
 
-        $this->hasMany('ProductSkuVariantValues', [
+        $this->hasMany('ProductVariants', [
             'foreignKey' => 'product_category_variant_id',
-            'className' => 'CakeProducts.ProductSkuVariantValues',
+            'className' => 'CakeProducts.ProductVariants',
             'dependent' => true,
             'cascadeCallbacks' => true,
         ]);

src/Model/Table/ProductSkuVariantValuesTable.php

@@ -56,9 +56,9 @@ class ProductSkuVariantValuesTable extends Table
             'foreignKey' => 'product_sku_id',
             'joinType' => 'INNER',
         ]);
-        $this->belongsTo('ProductCategoryVariants', [
-            'className' => 'CakeProducts.ProductCategoryVariants',
-            'foreignKey' => 'product_category_variant_id',
+        $this->belongsTo('ProductVariants', [
+            'className' => 'CakeProducts.ProductVariants',
+            'foreignKey' => 'product_variant_id',
             'joinType' => 'INNER',
         ]);
         $this->belongsTo('ProductCategoryVariantOptions', [
@@ -81,8 +81,8 @@ class ProductSkuVariantValuesTable extends Table
             ->notEmptyString('product_sku_id');
 
         $validator
-            ->uuid('product_category_variant_id')
-            ->notEmptyString('product_category_variant_id');
+            ->uuid('product_variant_id')
+            ->notEmptyString('product_variant_id');
 
         $validator
             ->uuid('product_category_variant_option_id')
@@ -103,8 +103,8 @@ class ProductSkuVariantValuesTable extends Table
         $rules->add($rules->existsIn(['product_sku_id'], 'ProductSkus'), ['errorField' => 'product_sku_id']);
 
         // @TODO why not working?? causing tests to fail / associated variant values not saving on product-skus/add
-//        $rules->add($rules->existsIn(['product_category_variant_id'], 'ProductCategoryVariants'), ['errorField' => 'product_category_variant_id']);
-//        $rules->add($rules->existsIn(['product_category_variant_option_id'], 'ProductCategoryVariantOptions'), ['errorField' => 'product_category_variant_option_id']);
+        $rules->add($rules->existsIn(['product_variant_id'], 'ProductVariants'), ['errorField' => 'product_variant_id']);
+        $rules->add($rules->existsIn(['product_category_variant_option_id'], 'ProductCategoryVariantOptions'), ['errorField' => 'product_category_variant_option_id']);
 
         return $rules;
     }

src/Model/Table/ProductSkusTable.php

@@ -73,6 +73,20 @@ class ProductSkusTable extends Table
             'dependent' => true,
             'cascadeCallbacks' => true,
         ]);
+
+        $this->hasMany('ProductPhotos', [
+            'foreignKey' => 'product_sku_id',
+            'className' => 'CakeProducts.ProductPhotos',
+            'dependent' => true,
+            'cascadeCallbacks' => true,
+        ]);
+
+        $this->hasOne('PrimaryProductPhotos', [
+            'foreignKey' => 'product_sku_id',
+            'conditions' => ['PrimaryProductPhotos.primary_photo' => true],
+            'className' => 'CakeProducts.ProductPhotos',
+            'dependent' => true,
+        ]);
     }
 
     /**

src/Model/Table/ProductVariantsTable.php

@@ -0,0 +1,115 @@
+<?php
+declare(strict_types=1);
+
+namespace CakeProducts\Model\Table;
+
+use CakeProducts\Model\Entity\ProductVariant;
+use CakeProducts\Model\Table\ProductCategoryVariantsTable;
+use CakeProducts\Model\Table\ProductsTable;
+use Cake\Datasource\EntityInterface;
+use Cake\Datasource\ResultSetInterface;
+use Cake\ORM\Association\BelongsTo;
+use Cake\ORM\Query\SelectQuery;
+use Cake\ORM\RulesChecker;
+use Cake\ORM\Table;
+use Cake\Validation\Validator;
+use Closure;
+use Psr\SimpleCache\CacheInterface;
+
+/**
+ * ProductVariants Model
+ *
+ * @property ProductCategoryVariantsTable&BelongsTo $ProductCategoryVariants
+ * @property ProductsTable&BelongsTo $Products
+ *
+ * @method ProductVariant newEmptyEntity()
+ * @method ProductVariant newEntity(array $data, array $options = [])
+ * @method array<ProductVariant> newEntities(array $data, array $options = [])
+ * @method ProductVariant get(mixed $primaryKey, array|string $finder = 'all', CacheInterface|string|null $cache = null, Closure|string|null $cacheKey = null, mixed ...$args)
+ * @method ProductVariant findOrCreate($search, ?callable $callback = null, array $options = [])
+ * @method ProductVariant patchEntity(EntityInterface $entity, array $data, array $options = [])
+ * @method array<ProductVariant> patchEntities(iterable $entities, array $data, array $options = [])
+ * @method ProductVariant|false save(EntityInterface $entity, array $options = [])
+ * @method ProductVariant saveOrFail(EntityInterface $entity, array $options = [])
+ * @method iterable<ProductVariant>|ResultSetInterface<ProductVariant>|false saveMany(iterable $entities, array $options = [])
+ * @method iterable<ProductVariant>|ResultSetInterface<ProductVariant> saveManyOrFail(iterable $entities, array $options = [])
+ * @method iterable<ProductVariant>|ResultSetInterface<ProductVariant>|false deleteMany(iterable $entities, array $options = [])
+ * @method iterable<ProductVariant>|ResultSetInterface<ProductVariant> deleteManyOrFail(iterable $entities, array $options = [])
+ */
+class ProductVariantsTable extends Table
+{
+    /**
+     * Initialize method
+     *
+     * @param array<string, mixed> $config The configuration for the Table.
+     * @return void
+     */
+    public function initialize(array $config): void
+    {
+        parent::initialize($config);
+
+        $this->setTable('product_variants');
+        $this->setDisplayField('name');
+        $this->setPrimaryKey('id');
+
+        $this->belongsTo('ProductCategoryVariants', [
+            'className' => 'CakeProducts.ProductCategoryVariants',
+            'foreignKey' => 'product_category_variant_id',
+        ]);
+        $this->belongsTo('Products', [
+            'className' => 'CakeProducts.Products',
+            'foreignKey' => 'product_id',
+            'joinType' => 'INNER',
+        ]);
+
+        $this->hasMany('ProductCategoryVariantOptions', [
+            'className' => 'CakeProducts.Products',
+            'foreignKey' => 'product_category_variant_id',
+        ]);
+    }
+
+    /**
+     * Default validation rules.
+     *
+     * @param Validator $validator Validator instance.
+     * @return Validator
+     */
+    public function validationDefault(Validator $validator): Validator
+    {
+        $validator
+            ->scalar('name')
+            ->maxLength('name', 255)
+            ->requirePresence('name', 'create')
+            ->notEmptyString('name');
+
+        $validator
+            ->uuid('product_category_variant_id')
+            ->allowEmptyString('product_category_variant_id');
+
+        $validator
+            ->uuid('product_id')
+            ->notEmptyString('product_id');
+
+        $validator
+            ->boolean('enabled')
+            ->requirePresence('enabled', 'create')
+            ->notEmptyString('enabled');
+
+        return $validator;
+    }
+
+    /**
+     * Returns a rules checker object that will be used for validating
+     * application integrity.
+     *
+     * @param RulesChecker $rules The rules object to be modified.
+     * @return RulesChecker
+     */
+    public function buildRules(RulesChecker $rules): RulesChecker
+    {
+        $rules->add($rules->existsIn(['product_category_variant_id'], 'ProductCategoryVariants'), ['errorField' => 'product_category_variant_id']);
+        $rules->add($rules->existsIn(['product_id'], 'Products'), ['errorField' => 'product_id']);
+
+        return $rules;
+    }
+}

src/Model/Table/ProductsTable.php

@@ -69,9 +69,9 @@ class ProductsTable extends Table
             'cascadeCallbacks' => true,
         ]);
 
-        $this->hasMany('ProductCategoryVariants', [
+        $this->hasMany('ProductVariants', [
             'foreignKey' => 'product_id',
-            'className' => 'CakeProducts.ProductCategoryVariants',
+            'className' => 'CakeProducts.ProductVariants',
             'dependent' => true,
             'cascadeCallbacks' => true,
         ]);