SCA & pint

justbetter · Nov 13, 2024 · 5434d53 · 5434d53
1 parent 10d4c3c
commit 5434d53
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/src/Jobs/Product/RetrieveProductJob.php b/src/Jobs/Product/RetrieveProductJob.php
@@ -49,7 +49,9 @@ public function failed(Throwable $throwable): void
         $model?->failed();
 
         activity()
-            ->when($model !== null, fn (ActivityLogger $logger): ActivityLogger => $logger->on($model))
+            ->when($model, function (ActivityLogger $logger, Product $product): ActivityLogger {
+                return $logger->on($product);
+            })
             ->useLog('error')
             ->log('Failed to retrieve the product: '.$throwable->getMessage());
     }

diff --git a/src/Jobs/Product/SaveProductJob.php b/src/Jobs/Product/SaveProductJob.php
@@ -50,7 +50,9 @@ public function failed(Throwable $throwable): void
         $model?->failed();
 
         activity()
-            ->when($model !== null, fn (ActivityLogger $logger): ActivityLogger => $logger->on($model))
+            ->when($model, function (ActivityLogger $logger, Product $product): ActivityLogger {
+                return $logger->on($product);
+            })
             ->useLog('error')
             ->withProperties([
                 'message' => $throwable->getMessage(),

diff --git a/src/Jobs/ProductModel/RetrieveProductModelJob.php b/src/Jobs/ProductModel/RetrieveProductModelJob.php
@@ -49,7 +49,9 @@ public function failed(Throwable $throwable): void
         $model?->failed();
 
         activity()
-            ->when($model !== null, fn (ActivityLogger $logger): ActivityLogger => $logger->on($model))
+            ->when($model, function (ActivityLogger $logger, ProductModel $productModel): ActivityLogger {
+                return $logger->on($productModel);
+            })
             ->useLog('error')
             ->log('Failed to retrieve the productmodel: '.$throwable->getMessage());
     }

diff --git a/src/Jobs/ProductModel/SaveProductModelJob.php b/src/Jobs/ProductModel/SaveProductModelJob.php
@@ -10,6 +10,7 @@
 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;
 
@@ -50,8 +51,10 @@ public function failed(Throwable $throwable): void
         $model?->failed();
 
         activity()
-            ->when($model !== null, fn (ActivityLogger $logger): ActivityLogger => $logger->on($model))
+            ->when($model, function (ActivityLogger $logger, ProductModel $productModel): ActivityLogger {
+                return $logger->on($productModel);
+            })
             ->useLog('error')
-            ->log('Failed to save the productmodel: ' . $throwable->getMessage());
+            ->log('Failed to save the productmodel: '.$throwable->getMessage());
     }
 }