Merge branch 'v1-develop' into v1

baldwin-agency · Oct 23, 2021 · be8cd95 · be8cd95
2 parents 28b6cf1 + d1c799e
commit be8cd95
Show file tree

Hide file tree

Showing 7 changed files with 310 additions and 220 deletions.
diff --git a/Checker/Catalog/Category/UrlPath.php b/Checker/Catalog/Category/UrlPath.php
@@ -163,7 +163,9 @@ private function fetchAllCategoriesWithUrlPathCalculatedByUrlKey()
                     if (array_key_exists($id, $tempCatData)) {
                         $calculatedUrlPath[] = $tempCatData[$id]['url_key'];
                     } else {
-                        throw new LocalizedException(__("Can't find category with id: '$id'"));
+                        throw new LocalizedException(__(
+                            "Can't find category with id: '$id' (this id comes from a category's path attribute)"
+                        ));
                     }
                 }
 

diff --git a/Updater/Catalog/Category/UrlKey.php b/Updater/Catalog/Category/UrlKey.php
@@ -44,10 +44,17 @@ public function refresh(string $initiator): array
         $this->metaStorage->setErrorMessage($storageIdentifier, '');
         $this->metaStorage->setStartRefreshing($storageIdentifier, $initiator);
 
-        $categoryData = $this->urlKeyChecker->execute();
-        $this->storage->write($storageIdentifier, $categoryData);
+        try {
+            $categoryData = $this->urlKeyChecker->execute();
+            $this->storage->write($storageIdentifier, $categoryData);
 
-        $this->metaStorage->setFinishedRefreshing($storageIdentifier);
+            $this->metaStorage->setFinishedRefreshing($storageIdentifier);
+        } catch (\Throwable $ex) {
+            $this->metaStorage->clearStatus($storageIdentifier);
+            $this->metaStorage->setErrorMessage($storageIdentifier, $ex->getMessage());
+
+            throw $ex;
+        }
 
         return $categoryData;
     }

diff --git a/Updater/Catalog/Category/UrlPath.php b/Updater/Catalog/Category/UrlPath.php
@@ -44,10 +44,17 @@ public function refresh(string $initiator): array
         $this->metaStorage->setErrorMessage($storageIdentifier, '');
         $this->metaStorage->setStartRefreshing($storageIdentifier, $initiator);
 
-        $categoryData = $this->urlPathChecker->execute();
-        $this->storage->write($storageIdentifier, $categoryData);
+        try {
+            $categoryData = $this->urlPathChecker->execute();
+            $this->storage->write($storageIdentifier, $categoryData);
 
-        $this->metaStorage->setFinishedRefreshing($storageIdentifier);
+            $this->metaStorage->setFinishedRefreshing($storageIdentifier);
+        } catch (\Throwable $ex) {
+            $this->metaStorage->clearStatus($storageIdentifier);
+            $this->metaStorage->setErrorMessage($storageIdentifier, $ex->getMessage());
+
+            throw $ex;
+        }
 
         return $categoryData;
     }

diff --git a/Updater/Catalog/Product/UrlKey.php b/Updater/Catalog/Product/UrlKey.php
@@ -44,10 +44,17 @@ public function refresh(string $initiator): array
         $this->metaStorage->setErrorMessage($storageIdentifier, '');
         $this->metaStorage->setStartRefreshing($storageIdentifier, $initiator);
 
-        $productData = $this->urlKeyChecker->execute();
-        $this->storage->write($storageIdentifier, $productData);
+        try {
+            $productData = $this->urlKeyChecker->execute();
+            $this->storage->write($storageIdentifier, $productData);
 
-        $this->metaStorage->setFinishedRefreshing($storageIdentifier);
+            $this->metaStorage->setFinishedRefreshing($storageIdentifier);
+        } catch (\Throwable $ex) {
+            $this->metaStorage->clearStatus($storageIdentifier);
+            $this->metaStorage->setErrorMessage($storageIdentifier, $ex->getMessage());
+
+            throw $ex;
+        }
 
         return $productData;
     }

diff --git a/Updater/Catalog/Product/UrlPath.php b/Updater/Catalog/Product/UrlPath.php
@@ -44,10 +44,17 @@ public function refresh(string $initiator): array
         $this->metaStorage->setErrorMessage($storageIdentifier, '');
         $this->metaStorage->setStartRefreshing($storageIdentifier, $initiator);
 
-        $productData = $this->urlPathChecker->execute();
-        $this->storage->write($storageIdentifier, $productData);
+        try {
+            $productData = $this->urlPathChecker->execute();
+            $this->storage->write($storageIdentifier, $productData);
 
-        $this->metaStorage->setFinishedRefreshing($storageIdentifier);
+            $this->metaStorage->setFinishedRefreshing($storageIdentifier);
+        } catch (\Throwable $ex) {
+            $this->metaStorage->clearStatus($storageIdentifier);
+            $this->metaStorage->setErrorMessage($storageIdentifier, $ex->getMessage());
+
+            throw $ex;
+        }
 
         return $productData;
     }