Job processor updates.

anzusystems · Sep 26, 2024 · da4ffc2 · da4ffc2
1 parent 16dea16
commit da4ffc2
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 15 deletions.
diff --git a/src/Domain/Job/Processor/JobPodcastSynchronizerProcessor.php b/src/Domain/Job/Processor/JobPodcastSynchronizerProcessor.php
@@ -17,6 +17,7 @@
 use AnzuSystems\SerializerBundle\Exception\SerializerException;
 use DateTimeInterface;
 use Generator;
+use Throwable;
 
 final class JobPodcastSynchronizerProcessor extends AbstractJobProcessor
 {
@@ -45,10 +46,26 @@ public static function getSupportedJob(): string
 
     /**
      * @param JobPodcastSynchronizer $job
-     *
-     * @throws SerializerException
      */
     public function process(JobInterface $job): void
+    {
+        try {
+            $this->start($job);
+            $this->entityManager->beginTransaction();
+            $this->processPodcasts($job);
+            $this->entityManager->commit();
+        } catch (Throwable $throwable) {
+            if ($this->entityManager->getConnection()->isTransactionActive()) {
+                $this->entityManager->rollback();
+            }
+            $this->finishFail($job, $throwable);
+        }
+    }
+
+    /**
+     * @throws SerializerException
+     */
+    private function processPodcasts(JobPodcastSynchronizer $job): void
     {
         if ($job->isFullSync()) {
             $this->importFull(

diff --git a/src/Domain/Podcast/PodcastImportIterator.php b/src/Domain/Podcast/PodcastImportIterator.php
@@ -4,6 +4,7 @@
 
 namespace AnzuSystems\CoreDamBundle\Domain\Podcast;
 
+use AnzuSystems\CoreDamBundle\App;
 use AnzuSystems\CoreDamBundle\Entity\Podcast;
 use AnzuSystems\CoreDamBundle\Exception\InvalidArgumentException;
 use AnzuSystems\CoreDamBundle\HttpClient\RssClient;
@@ -18,6 +19,8 @@
 
 final readonly class PodcastImportIterator
 {
+    private const string MIN_IMPORT_FROM_MODIFIER = '- 3 months';
+
     public function __construct(
         private RssClient $client,
         private PodcastRssReader $reader,
@@ -74,7 +77,7 @@ public function iteratePodcast(PodcastSynchronizerPointer $pointer, Podcast $pod
 
             return;
         }
-        $startFromDate = $this->getImportFrom($pointer, $podcastToImport);
+        $startFromDate = $this->getImportFrom($pointer);
 
         foreach ($this->reader->readItems($startFromDate) as $podcastItem) {
             yield new PodcastImportIteratorDto(
@@ -85,18 +88,16 @@ public function iteratePodcast(PodcastSynchronizerPointer $pointer, Podcast $pod
         }
     }
 
-    private function getImportFrom(PodcastSynchronizerPointer $pointer, Podcast $podcast): ?DateTimeImmutable
+    private function getImportFrom(PodcastSynchronizerPointer $pointer): ?DateTimeImmutable
     {
-        if (null === $podcast->getDates()->getImportFrom()) {
-            return $pointer->getPubDate();
-        }
+        $minImportFrom = App::getAppDate()->modify(self::MIN_IMPORT_FROM_MODIFIER);
 
         if (null === $pointer->getPubDate()) {
-            return $podcast->getDates()->getImportFrom();
+            return $minImportFrom;
         }
 
-        return $podcast->getDates()->getImportFrom() > $pointer->getPubDate()
-            ? $podcast->getDates()->getImportFrom()
+        return $minImportFrom > $pointer->getPubDate()
+            ? $minImportFrom
             : $pointer->getPubDate();
     }
 

diff --git a/src/Elasticsearch/IndexFactory/AssetIndexFactory.php b/src/Elasticsearch/IndexFactory/AssetIndexFactory.php
@@ -9,11 +9,9 @@
 use AnzuSystems\CoreDamBundle\Entity\Asset;
 use AnzuSystems\CoreDamBundle\Entity\AssetSlot;
 use AnzuSystems\CoreDamBundle\Entity\AudioFile;
-use AnzuSystems\CoreDamBundle\Entity\Author;
 use AnzuSystems\CoreDamBundle\Entity\DocumentFile;
 use AnzuSystems\CoreDamBundle\Entity\ImageFile;
 use AnzuSystems\CoreDamBundle\Entity\Interfaces\ExtSystemIndexableInterface;
-use AnzuSystems\CoreDamBundle\Entity\Keyword;
 use AnzuSystems\CoreDamBundle\Entity\PodcastEpisode;
 use AnzuSystems\CoreDamBundle\Entity\VideoFile;
 use AnzuSystems\CoreDamBundle\Helper\CollectionHelper;

diff --git a/src/Elasticsearch/QueryFactory/AssetQueryFactory.php b/src/Elasticsearch/QueryFactory/AssetQueryFactory.php
@@ -72,13 +72,14 @@ protected function getFilter(SearchDtoInterface $searchDto): array
 
         if (UuidHelper::isUuid($searchDto->getText())) {
             $filter[] = $this->getAssetIdAndMainFileIdFilter([$searchDto->getText()]);
+
             // other filters should not be applied
             return $filter;
         }
 
-
         if (false === empty($searchDto->getAssetAndMainFileIds())) {
             $filter[] = $this->getAssetIdAndMainFileIdFilter($searchDto->getAssetAndMainFileIds());
+
             // other filters should not be applied
             return $filter;
         }

diff --git a/src/Elasticsearch/SearchDto/AssetAdmSearchDto.php b/src/Elasticsearch/SearchDto/AssetAdmSearchDto.php
@@ -659,6 +659,7 @@ public function getAuthorIds(): array
     public function setAuthorIds(array $authorIds): self
     {
         $this->authorIds = $authorIds;
+
         return $this;
     }
 
@@ -670,6 +671,7 @@ public function getMainFileIds(): array
     public function setMainFileIds(array $mainFileIds): self
     {
         $this->mainFileIds = $mainFileIds;
+
         return $this;
     }
 
@@ -681,6 +683,7 @@ public function getCreatedByIds(): array
     public function setCreatedByIds(array $createdByIds): self
     {
         $this->createdByIds = $createdByIds;
+
         return $this;
     }
 
@@ -692,6 +695,7 @@ public function getAssetAndMainFileIds(): array
     public function setAssetAndMainFileIds(array $assetAndMainFileIds): self
     {
         $this->assetAndMainFileIds = $assetAndMainFileIds;
+
         return $this;
     }
 }
diff --git a/src/Entity/Embeds/PodcastDates.php b/src/Entity/Embeds/PodcastDates.php
@@ -21,11 +21,17 @@ public function __construct()
         $this->setImportFrom(null);
     }
 
+    /**
+     * @deprecated
+     */
     public function getImportFrom(): ?DateTimeImmutable
     {
         return $this->importFrom;
     }
 
+    /**
+     * @deprecated
+     */
     public function setImportFrom(?DateTimeImmutable $importFrom): self
     {
         $this->importFrom = $importFrom;

diff --git a/src/Resources/config/elasticsearch/author.php b/src/Resources/config/elasticsearch/author.php
@@ -27,7 +27,7 @@
                             'type' => 'text',
                             'analyzer' => 'edgegrams',
                         ],
-                    ]
+                    ],
                 ],
                 'type' => [
                     'type' => 'keyword',

diff --git a/src/Resources/config/elasticsearch/keyword.php b/src/Resources/config/elasticsearch/keyword.php
@@ -24,7 +24,7 @@
                             'type' => 'text',
                             'analyzer' => 'edgegrams',
                         ],
-                    ]
+                    ],
                 ],
                 'createdAt' => [
                     'type' => 'date',