Merge pull request #1166 from NFDI4Chem/remove-duplicated-code

refactor: remove redundancy and duplicates
NFDI4Chem · Nov 8, 2024 · 7bc5702 · 7bc5702
2 parents 79bd14c + 7866fe2
commit 7bc5702
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/app/Models/HasDOI.php b/app/Models/HasDOI.php
@@ -24,7 +24,7 @@ public function generateDOI($doiService)
 
                     if ($this->project) {
                         $projectIdentifier = $this->getIdentifier($this->project, 'identifier');
-                        $suffix = 'P'.$projectIdentifier.'.'.'S'.$identifier;
+                        $suffix = 'P'.$projectIdentifier.'.S'.$identifier;
                     } else {
                         $suffix = 'S'.$identifier;
                     }
@@ -36,16 +36,14 @@ public function generateDOI($doiService)
                     $studyIdentifier = $this->getIdentifier($this->study, 'identifier');
                     if ($this->project) {
                         $projectIdentifier = $this->getIdentifier($this->project, 'identifier');
-                        $suffix = 'P'.$projectIdentifier.'.'.'S'.$studyIdentifier.'.'.'D'.$identifier;
+                        $suffix = 'P'.$projectIdentifier.'.S'.$studyIdentifier.'.D'.$identifier;
                     } else {
-                        $suffix = 'S'.$studyIdentifier.'.'.'D'.$identifier;
+                        $suffix = 'S'.$studyIdentifier.'.D'.$identifier;
                     }
                     $url = $url.'D'.$identifier;
                     $resourceType = 'Dataset';
                 }
 
-                $attributes = $this->getMetadata();
-                $attributes['url'] = $url;
                 $attributes = $this->getMetadata();
                 $attributes['url'] = $url;
                 $attributes['types'] = [