Merge pull request #45 from lepidus/stable-3_3_0

fix/check publication with type already exisits before registration (OMP 3.3.0)

Author: thiagolepidus

classes/repositories/ThothPublicationRepository.inc.php

@@ -34,6 +34,28 @@ public function get($thothPublicationId)
         return $this->thothClient->publication($thothPublicationId);
     }
 
+    public function getIdByType($thothWorkId, $thothPublicationType)
+    {
+        $query = <<<GRAPHQL
+        query(\$workId: Uuid!, \$publicationType: PublicationType!) {
+            work(workId: \$workId) {
+                publications(publicationTypes: [\$publicationType]) {
+                    publicationId
+                }
+            }
+        }
+        GRAPHQL;
+
+        $variables = [
+            'workId' => $thothWorkId,
+            'publicationType' => $thothPublicationType
+        ];
+
+        $result = $this->thothClient->rawQuery($query, $variables);
+        $thothPublications = $result['work']['publications'];
+        return !empty($thothPublications) ? $thothPublications[0]['publicationId'] : null;
+    }
+
     public function find($filter)
     {
         $thothPublications =  $this->thothClient->publications([

classes/services/ThothPublicationService.inc.php

@@ -38,7 +38,15 @@ public function register($publicationFormat, $thothWorkId, $chapterId = null)
             $thothPublication->setIsbn(null);
         }
 
-        $thothPublicationId = $this->repository->add($thothPublication);
+        $thothPublicationId = $this->repository->getIdByType(
+            $thothWorkId,
+            $thothPublication->getPublicationType()
+        );
+
+        if ($thothPublicationId === null) {
+            $thothPublicationId = $this->repository->add($thothPublication);
+        }
+
         $publicationFormat->setData('thothPublicationId', $thothPublicationId);
 
         ThothService::location()->registerByPublicationFormat($publicationFormat, $chapterId);
@@ -74,10 +82,22 @@ public function registerByChapter($chapter)
             return $submissionFile->getData('chapterId') == $chapter->getId();
         });
 
+        $publicationFormatIds = array_map(function ($file) {
+            return $file->getData('assocId');
+        }, $chapterSubmissionFiles);
+
         $thothChapterId = $chapter->getData('thothChapterId');
         $publicationFormatDao = DAORegistry::getDAO('PublicationFormatDAO');
-        foreach ($chapterSubmissionFiles as $chapterSubmissionFile) {
-            $publicationFormat = $publicationFormatDao->getById($chapterSubmissionFile->getData('assocId'));
+
+        $publicationFormats = [];
+        foreach (array_unique($publicationFormatIds) as $publicationFormatId) {
+            $publicationFormat = $publicationFormatDao->getById($publicationFormatId);
+            if ($publicationFormat) {
+                $publicationFormats[$publicationFormatId] = $publicationFormat;
+            }
+        }
+
+        foreach ($publicationFormats as $publicationFormat) {
             $this->register($publicationFormat, $thothChapterId, $chapter->getId());
         }
     }

tests/classes/repositories/ThothPublicationRepositoryTest.php

@@ -70,6 +70,31 @@ public function testGetPublication()
         $this->assertEquals($expectedThothPublication, $thothPublication);
     }
 
+    public function testGetPublicationByType()
+    {
+        $mockThothClient = $this->getMockBuilder(ThothClient::class)
+            ->setMethods(['rawQuery'])
+            ->getMock();
+        $mockThothClient->expects($this->any())
+            ->method('rawQuery')
+            ->will($this->returnValue([
+                'work' => ['publications' => [
+                    [
+                        'publicationId' => 'efac5d7a-2284-4432-ad50-02b70aadec49',
+                    ]
+                ]]
+            ]));
+
+        $repository = new ThothPublicationRepository($mockThothClient);
+
+        $thothPublicationId = $repository->getIdByType(
+            'a2c032c6-b09b-4911-a67b-17f97cb57cc1',
+            ThothPublication::PUBLICATION_TYPE_PDF
+        );
+
+        $this->assertEquals('efac5d7a-2284-4432-ad50-02b70aadec49', $thothPublicationId);
+    }
+
     public function testFindPublication()
     {
         $expectedThothPublication = new ThothPublication([

tests/classes/services/ThothPublicationServiceTest.php

@@ -50,11 +50,14 @@ public function testRegisterPublication()
 
         $mockRepository = $this->getMockBuilder(ThothPublicationRepository::class)
             ->setConstructorArgs([$this->getMockBuilder(ThothClient::class)->getMock()])
-            ->setMethods(['add'])
+            ->setMethods(['add', 'getIdByType'])
             ->getMock();
         $mockRepository->expects($this->once())
             ->method('add')
             ->will($this->returnValue('4296c934-0f05-4920-a208-a5ab214b908a'));
+        $mockRepository->expects($this->once())
+            ->method('getIdByType')
+            ->will($this->returnValue(null));
 
         $mockPubFormat = $this->getMockBuilder(PublicationFormat::class)->getMock();
 

version.xml

@@ -3,8 +3,8 @@
 <version>
 	<application>thoth</application>
 	<type>plugins.generic</type>
-	<release>0.1.10.3</release>
-	<date>2025-08-05</date>
+	<release>0.1.10.4</release>
+	<date>2025-08-11</date>
 	<lazy-load>1</lazy-load>
 	<class>ThothPlugin</class>
 </version>