METSUP:68: Fix url-conflict in import

techdivision · Apr 18, 2024 · c2c56ab · c2c56ab
1 parent ad12091
commit c2c56ab
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/src/Observers/UrlRewriteObserver.php b/src/Observers/UrlRewriteObserver.php
@@ -318,7 +318,16 @@ protected function process()
                         try {
                             $this->urlRewriteId = $this->persistUrlRewrite($urlRewrite);
                         } catch (\PDOException $pdoe) {
-                            $message = sprintf('%s with Urlrewrite Data %s "', $pdoe->getMessage(), $urlRewrite);
+                            $message = sprintf(
+                                'Is a PDO exception is thrown: with Urlrewrite Data \\n
+                            ("entity_id": "%s" && "request_path": "%s" && "target_path": "%s" && "entity_type": "%s" && "redirect_type": "%s" && "store_id": "%s")',
+                                $urlRewriteProductCategory[MemberNames::ENTITY_ID],
+                                $urlRewriteProductCategory[MemberNames::REQUEST_PATH],
+                                $urlRewriteProductCategory[MemberNames::TARGET_PATH],
+                                $urlRewriteProductCategory[MemberNames::ENTITY_TYPE],
+                                $urlRewriteProductCategory[MemberNames::REDIRECT_TYPE],
+                                $urlRewriteProductCategory[MemberNames::STORE_ID]
+                            );
                             if (!$this->getSubject()->isStrictMode()) {
                                 $this->getSubject()
                                     ->getSystemLogger()
@@ -360,7 +369,16 @@ protected function process()
                         try {
                             $this->persistUrlRewriteProductCategory($urlRewriteProductCategory);
                         } catch (\PDOException $pdoe) {
-                            $message = sprintf('%s with Urlrewrite Data %s "', $pdoe->getMessage(), $urlRewriteProductCategory);
+                            $message = sprintf(
+                                'Is a PDO exception is thrown: with Urlrewrite Data \\n
+                            ("entity_id": "%s" && "request_path": "%s" && "target_path": "%s" && "entity_type": "%s" && "redirect_type": "%s" && "store_id": "%s")',
+                                $urlRewriteProductCategory[MemberNames::ENTITY_ID],
+                                $urlRewriteProductCategory[MemberNames::REQUEST_PATH],
+                                $urlRewriteProductCategory[MemberNames::TARGET_PATH],
+                                $urlRewriteProductCategory[MemberNames::ENTITY_TYPE],
+                                $urlRewriteProductCategory[MemberNames::REDIRECT_TYPE],
+                                $urlRewriteProductCategory[MemberNames::STORE_ID]
+                            );
                             if (!$this->getSubject()->isStrictMode()) {
                                 $this->getSubject()
                                     ->getSystemLogger()

diff --git a/src/Observers/UrlRewriteUpdateObserver.php b/src/Observers/UrlRewriteUpdateObserver.php
@@ -135,7 +135,16 @@ protected function process()
                     $this->persistUrlRewrite($existingUrlRewrite);
                 } catch (\PDOException $pdoe) {
                     if (!$this->getSubject()->isStrictMode()) {
-                        $message = sprintf('%s with Urlrewrite Data %s "', $pdoe->getMessage(), $existingUrlRewrite);
+                        $message = sprintf(
+                            'Is a PDO exception is thrown: with Urlrewrite Data \\n
+                            ("entity_id": "%s" && "request_path": "%s" && "target_path": "%s" && "entity_type": "%s" && "redirect_type": "%s" && "store_id": "%s")',
+                            $existingUrlRewrite[MemberNames::ENTITY_ID],
+                            $existingUrlRewrite[MemberNames::REQUEST_PATH],
+                            $existingUrlRewrite[MemberNames::TARGET_PATH],
+                            $existingUrlRewrite[MemberNames::ENTITY_TYPE],
+                            $existingUrlRewrite[MemberNames::REDIRECT_TYPE],
+                            $existingUrlRewrite[MemberNames::STORE_ID]
+                        );
                         $this->getSubject()
                             ->getSystemLogger()
                             ->warning($this->getSubject()->appendExceptionSuffix($message));