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

Feature/fix plugin issues (OMP 3.3.0)

Author: thiagolepidus

classes/api/ThothEndpoint.inc.php

@@ -91,10 +91,12 @@ public function register($slimRequest, $response, $args)
 
         $disableNotification = $params['disableNotification'] ?? false;
         try {
-            $thothBookId = ThothService::book()->register($publication, $thothImprintId);
+            $thothBookService = ThothService::book();
+            $thothBookId = $thothBookService->register($publication, $thothImprintId);
             $submission = Services::get('submission')->edit($submission, ['thothWorkId' => $thothBookId], $request);
             $this->handleNotification($request, $submission, true, $disableNotification);
         } catch (QueryException $e) {
+            $thothBookService->deleteRegisteredEntry();
             $this->handleNotification($request, $submission, false, $disableNotification, $e->getMessage());
             $failure['errors'][] = __('plugins.generic.thoth.register.error.log', ['reason' => $e->getMessage()]);
             return $response->withStatus(403)->withJson($failure);

classes/factories/ThothContributionFactory.inc.php

@@ -20,14 +20,14 @@
 
 class ThothContributionFactory
 {
-    public function createFromAuthor($author, $primaryContactId = null)
+    public function createFromAuthor($author, $seq, $primaryContactId = null)
     {
         $userGroupLocaleKey = $author->getUserGroup()->getData('nameLocaleKey');
 
         return new ThothContribution([
             'contributionType' => $this->getContributionTypeByUserGroupLocaleKey($userGroupLocaleKey),
             'mainContribution' => $this->isMainContribution($author, $primaryContactId),
-            'contributionOrdinal' => $author->getSequence() + 1,
+            'contributionOrdinal' => $seq + 1,
             'firstName' => $author->getLocalizedGivenName(),
             'lastName' => $author->getLocalizedData('familyName'),
             'fullName' => $author->getFullName(false),

classes/listeners/PublicationPublishListener.inc.php

@@ -53,10 +53,12 @@ public function registerThothBook($hookName, $args)
         $thothImprintId = $request->getUserVar('thothImprintId');
         $thothNotification = new ThothNotification();
         try {
-            $thothBookId = ThothService::book()->register($publication, $thothImprintId);
+            $thothBookService = ThothService::book();
+            $thothBookId = $thothBookService->register($publication, $thothImprintId);
             $submission = Services::get('submission')->edit($submission, ['thothWorkId' => $thothBookId], $request);
             $thothNotification->notifySuccess($request, $submission);
         } catch (QueryException $e) {
+            $thothBookService->deleteRegisteredEntry();
             $thothNotification->notifyError($request, $submission, $e->getMessage());
         }
 

classes/services/ThothBookService.inc.php

@@ -22,20 +22,32 @@ class ThothBookService
 {
     public $factory;
     public $repository;
+    private $registeredEntryId;
 
     public function __construct($factory, $repository)
     {
         $this->factory = $factory;
         $this->repository = $repository;
     }
 
+    public function getRegisteredEntryId()
+    {
+        return $this->registeredEntryId;
+    }
+
+    public function setRegisteredEntryId($registeredEntryId)
+    {
+        $this->registeredEntryId = $registeredEntryId;
+    }
+
     public function register($publication, $thothImprintId)
     {
         $thothBook = $this->factory->createFromPublication($publication);
         $thothBook->setImprintId($thothImprintId);
 
         $thothBookId = $this->repository->add($thothBook);
         $publication->setData('thothBookId', $thothBookId);
+        $this->setRegisteredEntryId($thothBookId);
 
         ThothService::contribution()->registerByPublication($publication);
         ThothService::publication()->registerByPublication($publication);
@@ -100,4 +112,14 @@ public function validate($publication)
 
         return $errors;
     }
+
+    public function deleteRegisteredEntry()
+    {
+        if ($this->getRegisteredEntryId() === null) {
+            return;
+        }
+
+        $this->repository->delete($this->getRegisteredEntryId());
+        $this->setRegisteredEntryId(null);
+    }
 }

classes/services/ThothContributionService.inc.php

@@ -27,9 +27,9 @@ public function __construct($factory, $repository)
         $this->repository = $repository;
     }
 
-    public function register($author, $thothWorkId, $primaryContactId = null)
+    public function register($author, $seq, $thothWorkId, $primaryContactId = null)
     {
-        $thothContribution = $this->factory->createFromAuthor($author, $primaryContactId);
+        $thothContribution = $this->factory->createFromAuthor($author, $seq, $primaryContactId);
         $thothContribution->setWorkId($thothWorkId);
 
         $filter = empty($author->getOrcid()) ? $author->getFullName(false) : $author->getOrcid();
@@ -64,18 +64,22 @@ public function registerByPublication($publication)
             return $author->getId() === $primaryContactId || !in_array($author->getId(), $chapterAuthorIds);
         });
 
+        $seq = 0;
         $thothBookId = $publication->getData('thothBookId');
         foreach ($authors as $author) {
-            $this->register($author, $thothBookId, $primaryContactId);
+            $this->register($author, $seq, $thothBookId, $primaryContactId);
+            $seq++;
         }
     }
 
     public function registerByChapter($chapter)
     {
+        $seq = 0;
         $thothChapterId = $chapter->getData('thothChapterId');
         $authors = $chapter->getAuthors()->toArray();
         foreach ($authors as $author) {
-            $this->register($author, $thothChapterId);
+            $this->register($author, $seq, $thothChapterId);
+            $seq++;
         }
     }
 }

tests/classes/factories/ThothContributionFactoryTest.php

@@ -80,7 +80,7 @@ public function testCreateThothContributionFromAuthor()
         $primaryContactId = 1;
 
         $factory = new ThothContributionFactory();
-        $thothContribution = $factory->createFromAuthor($mockAuthor, $primaryContactId);
+        $thothContribution = $factory->createFromAuthor($mockAuthor, 0, $primaryContactId);
 
         $this->assertEquals(new ThothContribution([
             'contributionType' => ThothContribution::CONTRIBUTION_TYPE_AUTHOR,

tests/classes/services/ThothContributionServiceTest.php

@@ -59,7 +59,7 @@ public function testRegisterContribution()
         $thothWorkId = '97fcc25c-361b-46f9-8c4b-016bfa36fb6d';
 
         $service = new ThothContributionService($mockFactory, $mockRepository);
-        $thothContributionId = $service->register($mockAuthor, $thothWorkId);
+        $thothContributionId = $service->register($mockAuthor, 0, $thothWorkId);
 
         $this->assertSame('e2d8dc3b-a5d9-4941-8ebd-52f0a70515bd', $thothContributionId);
     }

version.xml

@@ -3,8 +3,8 @@
 <version>
 	<application>thoth</application>
 	<type>plugins.generic</type>
-	<release>0.1.10.1</release>
-	<date>2025-05-16</date>
+	<release>0.1.10.2</release>
+	<date>2025-06-16</date>
 	<lazy-load>1</lazy-load>
 	<class>ThothPlugin</class>
 </version>