Merge pull request #1253 from superdesk/SWP-2282

Output control loading fixes as part of SWP-2282
superdesk · Mar 25, 2024 · e3fcb36 · e3fcb36
2 parents b110482 + fb7e441
commit e3fcb36
Show file tree

Hide file tree

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

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;
@@ -86,6 +87,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');