fix(metadata): wrap abstract and biography content

Refs: documentacao-e-tarefas/desenvolvimento_e_infra#1176

Author: thiagolepidus

classes/factories/ThothAbstractFactory.inc.php

@@ -46,7 +46,7 @@ private function create($entity, string $workId, ?string $preferredLocale = null
             $thothAbstracts[$this->getLocaleKey($localeCode)] = new ThothAbstract([
                 'workId' => $workId,
                 'localeCode' => $localeCode,
-                'content' => $abstract,
+                'content' => $this->wrapInParagraph($abstract),
                 'canonical' => $locale === $canonicalLocale,
                 'abstractType' => 'LONG',
             ]);
@@ -108,4 +108,14 @@ private function logUnsupportedLocale(string $entityType, ?string $locale): void
             $normalizedLocaleCode
         ));
     }
+
+    private function wrapInParagraph($content)
+    {
+        $content = trim($content);
+        if (preg_match('/^<p\b[^>]*>.*<\/p>$/is', $content) === 1) {
+            return $content;
+        }
+
+        return sprintf('<p>%s</p>', $content);
+    }
 }

classes/factories/ThothBiographyFactory.inc.php

@@ -36,7 +36,7 @@ public function createFromAuthor($author, string $contributionId, ?string $prefe
             $thothBiographies[$this->getLocaleKey($localeCode)] = new ThothBiography([
                 'contributionId' => $contributionId,
                 'localeCode' => $localeCode,
-                'content' => $biography,
+                'content' => $this->wrapInParagraph($biography),
                 'canonical' => $locale === $canonicalLocale,
             ]);
         }
@@ -97,4 +97,14 @@ private function logUnsupportedLocale(string $entityType, ?string $locale): void
             $normalizedLocaleCode
         ));
     }
+
+    private function wrapInParagraph($content)
+    {
+        $content = trim($content);
+        if (preg_match('/^<p\b[^>]*>.*<\/p>$/is', $content) === 1) {
+            return $content;
+        }
+
+        return sprintf('<p>%s</p>', $content);
+    }
 }

classes/factories/ThothBookFactory.inc.php

@@ -70,7 +70,7 @@ public function getWorkTypeBySubmissionWorkType($submissionWorkType)
             Submission::WORK_TYPE_AUTHORED_WORK => ThothWork::WORK_TYPE_MONOGRAPH
         ];
 
-        return $workTypeMapping[$submissionWorkType];
+        return $workTypeMapping[$submissionWorkType] ?? ThothWork::WORK_TYPE_MONOGRAPH;
     }
 
     public function getWorkStatusByDatePublished($datePublished)

classes/notification/ThothNotification.inc.php

@@ -28,6 +28,7 @@ public function notifySuccess($request, $submission)
 
     public function notifyError($request, $submission, $error)
     {
+        $error = $this->normalizeError($error);
         error_log("Failed to send the request to Thoth: {$error}");
         $this->notify(
             $request,
@@ -53,6 +54,7 @@ public function notify($request, $submission, $notificationType, $messageKey, $e
 
     public function logInfo($request, $submission, $messageKey, $error = null)
     {
+        $error = $this->normalizeError($error);
         $currentUser = $request->getUser();
         $eventLog = Repo::eventLog()->newDataObject([
             'assocType' => Application::ASSOC_TYPE_SUBMISSION,
@@ -67,6 +69,23 @@ public function logInfo($request, $submission, $messageKey, $error = null)
         Repo::eventLog()->add($eventLog);
     }
 
+    protected function normalizeError($error)
+    {
+        if ($error === null || is_scalar($error)) {
+            return $error;
+        }
+
+        if ($error instanceof Throwable) {
+            return $error->getMessage();
+        }
+
+        if (is_object($error) && method_exists($error, 'getMessage')) {
+            return $error->getMessage();
+        }
+
+        return json_encode($error);
+    }
+
     public function addJavaScriptData($request, $templateMgr)
     {
         $data = ['notificationUrl' => $request->url(null, 'notification', 'fetchNotification')];

tests/classes/factories/ThothAbstractFactoryTest.php

@@ -0,0 +1,48 @@
+<?php
+
+use PKP\tests\PKPTestCase;
+
+import('plugins.generic.thoth.classes.factories.ThothAbstractFactory');
+
+class ThothAbstractFactoryTest extends PKPTestCase
+{
+    public function testCreateFromPublicationWrapsAbstractWithoutParagraph()
+    {
+        $publication = new class () {
+            public function getData($key)
+            {
+                $values = [
+                    'locale' => 'en_US',
+                    'abstract' => ['en_US' => 'English abstract'],
+                ];
+
+                return $values[$key] ?? null;
+            }
+        };
+
+        $factory = new ThothAbstractFactory();
+        $thothAbstracts = $factory->createFromPublication($publication, 'work-id', 'en_US');
+
+        $this->assertSame('<p>English abstract</p>', $thothAbstracts['EN_US']->getContent());
+    }
+
+    public function testCreateFromPublicationPreservesAbstractAlreadyWrappedInParagraph()
+    {
+        $publication = new class () {
+            public function getData($key)
+            {
+                $values = [
+                    'locale' => 'en_US',
+                    'abstract' => ['en_US' => '<p>English abstract</p>'],
+                ];
+
+                return $values[$key] ?? null;
+            }
+        };
+
+        $factory = new ThothAbstractFactory();
+        $thothAbstracts = $factory->createFromPublication($publication, 'work-id', 'en_US');
+
+        $this->assertSame('<p>English abstract</p>', $thothAbstracts['EN_US']->getContent());
+    }
+}

tests/classes/factories/ThothBiographyFactoryTest.php

@@ -0,0 +1,48 @@
+<?php
+
+use PKP\tests\PKPTestCase;
+
+import('plugins.generic.thoth.classes.factories.ThothBiographyFactory');
+
+class ThothBiographyFactoryTest extends PKPTestCase
+{
+    public function testCreateFromAuthorWrapsBiographyWithoutParagraph()
+    {
+        $author = new class () {
+            public function getData($key)
+            {
+                $values = [
+                    'locale' => 'en_US',
+                    'biography' => ['en_US' => 'English biography'],
+                ];
+
+                return $values[$key] ?? null;
+            }
+        };
+
+        $factory = new ThothBiographyFactory();
+        $thothBiographies = $factory->createFromAuthor($author, 'contribution-id', 'en_US');
+
+        $this->assertSame('<p>English biography</p>', $thothBiographies['EN_US']->getContent());
+    }
+
+    public function testCreateFromAuthorPreservesBiographyAlreadyWrappedInParagraph()
+    {
+        $author = new class () {
+            public function getData($key)
+            {
+                $values = [
+                    'locale' => 'en_US',
+                    'biography' => ['en_US' => '<p>English biography</p>'],
+                ];
+
+                return $values[$key] ?? null;
+            }
+        };
+
+        $factory = new ThothBiographyFactory();
+        $thothBiographies = $factory->createFromAuthor($author, 'contribution-id', 'en_US');
+
+        $this->assertSame('<p>English biography</p>', $thothBiographies['EN_US']->getContent());
+    }
+}