Solve merge conflict

superdesk · Mar 22, 2024 · 6ba6cc6 · 6ba6cc6
2 parents c82ffc8 + c986278
commit 6ba6cc6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/SWP/Bundle/CoreBundle/EventListener/OverrideArticleSlugListener.php b/src/SWP/Bundle/CoreBundle/EventListener/OverrideArticleSlugListener.php
@@ -64,8 +64,10 @@ public function overrideSlugIfNeeded(ArticleEvent $event): void
 
         if ($previousRoute && $overrideSlugOnCorrection && null !== $article->getSlug()) {
             $this->savePreviousRelativeUrl($article, $previousRoute);
-            $article->setSlug($package->getSlugline() ?? Transliterator::urlize($article->getTitle()));
-        }else if ($previousRoute) {
+            $slug = empty($package->getSlugline()) ?
+                $package->getSlugline() : Transliterator::urlize($article->getTitle());
+            $article->setSlug($slug);
+        } elseif ($previousRoute) {
             $this->savePreviousRelativeUrl($article, $previousRoute);
         }
     }

diff --git a/src/SWP/Bundle/CoreBundle/MessageHandler/AbstractContentPushHandler.php b/src/SWP/Bundle/CoreBundle/MessageHandler/AbstractContentPushHandler.php
@@ -16,6 +16,7 @@
 
 namespace SWP\Bundle\CoreBundle\MessageHandler;
 
+use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use Doctrine\DBAL\Exception\NotNullConstraintViolationException;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NonUniqueResultException;
@@ -88,6 +89,14 @@ public function execute(int $tenantId, PackageInterface $package): void
             }
 
             $this->doExecute($tenantId, $package);
+        } catch (UniqueConstraintViolationException $e) {
+            $this->logException($e, $package, 'UniqueConstraintViolationException exception');
+
+            $cacheDriver = $this->packageObjectManager->getConfiguration()->getMetadataCacheImpl();
+            $cacheDriver->flushAll();
+
+            throw $e;
+
         } catch (NonUniqueResultException | NotNullConstraintViolationException $e) {
             $this->logException($e, $package, 'Unhandled NonUnique or NotNullConstraint exception');