Feedback

src/Actions/ProductModel/SaveProductModel.php

@@ -33,6 +33,7 @@ public function save(ProductModelData $productModelData): void
             $productModel->update = $productModel->isDirty(['checksum']);
         }
 
+        $productModel->resetFailures();
         $productModel->save();
     }
 

src/Actions/ProductModel/UpdateProductModel.php

@@ -22,8 +22,7 @@ public function update(ProductModel $productModel): void
 
         $productModel->modified_at = now();
         $productModel->update = false;
-        $productModel->fail_count = 0;
-        $productModel->failed_at = null;
+        $productModel->resetFailures();
         $productModel->save();
     }
 

src/Jobs/Product/SaveProductJob.php

@@ -55,9 +55,8 @@ public function failed(Throwable $throwable): void
             })
             ->useLog('error')
             ->withProperties([
-                'message' => $throwable->getMessage(),
                 'data' => $this->productData->toArray(),
             ])
-            ->log('Failed to save the product data');
+            ->log('Failed to save the product data: '.$throwable->getMessage());
     }
 }

src/Jobs/Product/UpdateProductJob.php

@@ -52,6 +52,6 @@ public function failed(Throwable $throwable): void
             ->withProperties([
                 'code' => $throwable->getCode(),
             ])
-            ->log('Failed to update product in Akeneo: ' . $throwable->getMessage());
+            ->log('Failed to update product in Akeneo: '.$throwable->getMessage());
     }
 }

src/Jobs/ProductModel/SaveProductModelJob.php

@@ -10,7 +10,6 @@
 use JustBetter\AkeneoProducts\Contracts\ProductModel\SavesProductModel;
 use JustBetter\AkeneoProducts\Data\ProductModelData;
 use JustBetter\AkeneoProducts\Models\ProductModel;
-use JustBetter\MagentoPrices\Models\Price;
 use Spatie\Activitylog\ActivityLogger;
 use Throwable;
 

src/Models/Product.php

@@ -28,8 +28,8 @@
  */
 class Product extends Model
 {
-    use SoftDeletes;
     use LogsActivity;
+    use SoftDeletes;
 
     protected $table = 'akeneo_products';
 

src/Models/ProductModel.php

@@ -28,8 +28,8 @@
  */
 class ProductModel extends Model
 {
-    use SoftDeletes;
     use LogsActivity;
+    use SoftDeletes;
 
     protected $table = 'akeneo_product_models';
 
@@ -73,6 +73,13 @@ public function failed(): void
         $this->save();
     }
 
+    public function resetFailures(): void
+    {
+        $this->synchronize = true;
+        $this->fail_count = 0;
+        $this->failed_at = null;
+    }
+
     public function getActivitylogOptions(): LogOptions
     {
         return LogOptions::defaults()

tests/Jobs/Product/SaveProductJobTest.php

@@ -6,7 +6,6 @@
 use JustBetter\AkeneoProducts\Contracts\Product\SavesProduct;
 use JustBetter\AkeneoProducts\Data\ProductData;
 use JustBetter\AkeneoProducts\Jobs\Product\SaveProductJob;
-use JustBetter\AkeneoProducts\Jobs\Product\UpdateProductJob;
 use JustBetter\AkeneoProducts\Models\Product;
 use JustBetter\AkeneoProducts\Tests\TestCase;
 use Mockery\MockInterface;

tests/Jobs/ProductModel/RetrieveProductModelJobTest.php

@@ -38,18 +38,18 @@ public function it_has_correct_tags_and_unique_id(): void
     #[Test]
     public function it_can_fail(): void
     {
-        /** @var ProductModel $product */
-        $product = ProductModel::query()->create([
+        /** @var ProductModel $productModel */
+        $productModel = ProductModel::query()->create([
             'code' => 'code',
             'data' => [],
         ]);
 
         $job = new RetrieveProductModelJob('code');
         $job->failed(new Exception);
 
-        $product->refresh();
+        $productModel->refresh();
 
-        $this->assertNotNull($product->failed_at);
+        $this->assertNotNull($productModel->failed_at);
     }
 
     #[Test]