refactoring

GaziYucel · Mar 1, 2024 · 281d4c8 · 281d4c8
1 parent 8d212fb
commit 281d4c8
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/classes/External/OpenAlex/Enrich.php b/classes/External/OpenAlex/Enrich.php
@@ -66,7 +66,7 @@ public function execute(): bool
             if ($citation->isProcessed || empty($citation->doi) || !empty($citation->openalex_id))
                 continue;
 
-            $citation = $this->getWork($citation);
+            $citation = $this->getCitationWork($citation);
 
             if (!empty($citation->openalex_id)) $citation->isProcessed = true;
             $citation->openalex_id = OpenAlex::removePrefix($citation->openalex_id);
@@ -77,13 +77,30 @@ public function execute(): bool
         return true;
     }
 
+    /**
+     * Get openalex id for journal
+     *
+     * @param string|null $issn
+     * @param MetadataJournal $metadataJournal
+     * @return MetadataJournal
+     */
+    public function getJournal(?string $issn, MetadataJournal $metadataJournal): MetadataJournal
+    {
+        $source = $this->api->getSource($issn);
+
+        if (!empty($source) && !empty($source['id']) && !empty($source['issn_l'] && $source['issn_l'] === $issn))
+            $metadataJournal->openalex_id = OpenAlex::removePrefix($source['id']);
+
+        return $metadataJournal;
+    }
+
     /**
      * Get citation (work) from external service
      *
      * @param CitationModel $citation
      * @return CitationModel
      */
-    public function getWork(CitationModel $citation): CitationModel
+    public function getCitationWork(CitationModel $citation): CitationModel
     {
         $openAlexArray = $this->api->getWork(Doi::removePrefix($citation->doi));
 
@@ -93,7 +110,7 @@ public function getWork(CitationModel $citation): CitationModel
             switch ($key) {
                 case 'authors':
                     foreach ($openAlexArray['authorships'] as $index => $authorship) {
-                        $citation->authors[] = $this->getAuthor($authorship);
+                        $citation->authors[] = $this->getCitationAuthor($authorship);
                     }
                     break;
                 default:
@@ -110,30 +127,13 @@ public function getWork(CitationModel $citation): CitationModel
         return $citation;
     }
 
-    /**
-     * Get openalex id for journal
-     *
-     * @param string|null $issn
-     * @param MetadataJournal $metadataJournal
-     * @return MetadataJournal
-     */
-    public function getJournal(?string $issn, MetadataJournal $metadataJournal): MetadataJournal
-    {
-        $source = $this->api->getSource($issn);
-
-        if (!empty($source) && !empty($source['id']) && !empty($source['issn_l'] && $source['issn_l'] === $issn))
-            $metadataJournal->openalex_id = OpenAlex::removePrefix($source['id']);
-
-        return $metadataJournal;
-    }
-
     /**
      * Convert to AuthorModel with mappings
      *
      * @param array $authorIn Input values
      * @return AuthorModel
      */
-    private function getAuthor(array $authorIn): AuthorModel
+    private function getCitationAuthor(array $authorIn): AuthorModel
     {
         $authorOut = new AuthorModel();
         $mappings = Mappings::getAuthor();