Merge branch 'fixNewDraftVersion340-760' into 'main'

Corrige problema com nova versão em rascunho - 3.4.0

See merge request softwares-pkp/plugins_ojs/dataverse!189

Author: JhonathanLepidus

api/v1/datasets/DatasetHandler.php

@@ -294,13 +294,13 @@ public function getCitation($slimRequest, $response, $args)
 
         try {
             $dataverseClient = new DataverseClient();
-            $citation = $dataverseClient->getDatasetActions()->getCitation($study->getPersistentId(), $datasetIsPublished);
+            $citationData = $dataverseClient->getDatasetActions()->getCitation($study->getPersistentId(), $datasetIsPublished);
         } catch (DataverseException $e) {
             error_log('Error getting citation: ' . $e->getMessage());
             return $response->withStatus($e->getCode())->withJsonError('api.error.researchDataCitationNotFound');
         }
 
-        return $response->withJson(['citation' => $citation], 200);
+        return $response->withJson(['citation' => $citationData['citation']], 200);
     }
 
     public function deleteFile($slimRequest, $response, $args)

classes/dispatchers/DatasetInformationDispatcher.php

@@ -28,9 +28,11 @@ public function addDatasetInformation(string $hookName, array $params): bool
             $dataverseClient = new DataverseClient();
 
             try {
-                $citation = $dataverseClient->getDatasetActions()->getCitation($study->getPersistentId(), null);
-                $templateMgr->assign('datasetInfo', $citation);
-                $output .= $templateMgr->fetch($this->plugin->getTemplateResource('dataCitation.tpl'));
+                $citationData = $dataverseClient->getDatasetActions()->getCitation($study->getPersistentId(), null);
+                if ($citationData['datasetIsPublished']) {
+                    $templateMgr->assign('datasetInfo', $citationData['citation']);
+                    $output .= $templateMgr->fetch($this->plugin->getTemplateResource('dataCitation.tpl'));
+                }
             } catch (DataverseException $e) {
                 error_log('Error getting citation: ' . $e->getMessage());
             }

classes/factories/JsonDatasetFactory.php

@@ -17,10 +17,26 @@ public function __construct(string $jsonContent)
         $this->jsonContent = $jsonContent;
     }
 
+    private function getCurrentDatasetVersion()
+    {
+        $datasetVersions = (json_decode($this->jsonContent))->data;
+        $currentVersion = $datasetVersions[0];
+
+        if (count($datasetVersions) > 1) {
+            foreach ($datasetVersions as $version) {
+                if ($version->versionState == 'RELEASED') {
+                    $currentVersion = $version;
+                    break;
+                }
+            }
+        }
+
+        return $currentVersion;
+    }
+
     protected function sanitizeProps(): array
     {
-        $responseData = json_decode($this->jsonContent);
-        $datasetVersion = $responseData->data->latestVersion;
+        $datasetVersion = $this->getCurrentDatasetVersion();
         $datasetData = $datasetVersion->metadataBlocks->citation->fields;
 
         $props = [];

dataverseAPI/actions/DatasetActions.php

@@ -16,14 +16,14 @@ class DatasetActions extends DataverseActions implements DatasetActionsInterface
     public function get(string $persistentId): Dataset
     {
         $args = '?persistentId=' . $persistentId;
-        $uri = $this->createNativeAPIURI('datasets', ':persistentId' . $args);
+        $uri = $this->createNativeAPIURI('datasets', ':persistentId', 'versions' . $args);
         $response = $this->nativeAPIRequest('GET', $uri);
 
         $datasetFactory = new JsonDatasetFactory($response->getBody());
         return $datasetFactory->getDataset();
     }
 
-    public function getCitation(string $persistentId, ?bool $datasetIsPublished): string
+    public function getCitation(string $persistentId, ?bool $datasetIsPublished): array
     {
         if (is_null($datasetIsPublished)) {
             $dataset = $this->get($persistentId);
@@ -43,21 +43,12 @@ public function getCitation(string $persistentId, ?bool $datasetIsPublished): st
                 '<a href="' . $persistentUrl . '">' . $persistentUrl . '</a>',
                 $citation
             );
-            return preg_replace('/,+.UNF[^]]+]/', '', $citation);
+            $citation = preg_replace('/,+.UNF[^]]+]/', '', $citation);
         } else {
-            return $this->getSWORDCitation($persistentId);
+            $citation = $this->getSWORDCitation($persistentId);
         }
-    }
 
-    public function getNativeCitation(string $persistentId): string
-    {
-        $args = '?persistentId=' . $persistentId;
-        $uri = $this->createNativeAPIURI('datasets', ':persistentId', 'versions', ':latest', 'citation' . $args);
-        $response = $this->nativeAPIRequest('GET', $uri);
-
-        $jsonContent = json_decode($response->getBody(), true);
-        $citation = $jsonContent['data']['message'];
-        return preg_replace('/,+.UNF[^]]+]/', '', $citation);
+        return ['datasetIsPublished' => $datasetIsPublished, 'citation' => $citation];
     }
 
     private function getSWORDCitation(string $persistentId): string

tests/factories/JsonDatasetFactoryTest.php

@@ -7,7 +7,7 @@ class JsonDatasetFactoryTest extends PKPTestCase
 {
     public function testCreateDataset()
     {
-        $jsonContent = file_get_contents(__DIR__ . '/../fixtures/datasetResponseExample.json');
+        $jsonContent = file_get_contents(__DIR__ . '/../fixtures/datasetVersionsResponseExample.json');
         $datasetFactory = new JsonDatasetFactory($jsonContent);
         $dataset = $datasetFactory->getDataset();
 
@@ -26,7 +26,7 @@ public function testCreateDataset()
         $this->assertEquals('Dataverse', $dataset->getContact()->getAffiliation());
         $this->assertEquals('Related publication', $dataset->getPubCitation());
         $this->assertEquals('Test, Depositor', $dataset->getDepositor());
-        $this->assertEquals('DRAFT', $dataset->getVersionState());
+        $this->assertEquals('RELEASED', $dataset->getVersionState());
 
         $this->assertEquals(9876543, $dataset->getFiles()[0]->getId());
         $this->assertEquals('sample.pdf', $dataset->getFiles()[0]->getFileName());