Merge pull request #1152 from NFDI4Chem/sample-relatedidentifiers

fix: add related identifiers to the doi metadata of separate samples.
NFDI4Chem · Aug 1, 2024 · 5d09836 · 5d09836
2 parents 8536c26 + 7268148
commit 5d09836
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/app/Jobs/ProcessSubmission.php b/app/Jobs/ProcessSubmission.php
@@ -174,7 +174,7 @@ public function handle(AssignIdentifier $assigner, UpdateDOI $updater, PublishPr
                         $studyPublisher->publish($study);
                     }
                 }
-
+                $updater->update($_studies);
                 //Notification::send($this->prepareSendList($project), new StudyPublishNotification($_studies));
                 event(new StudyPublish($_studies, $this->prepareSendList($project)));
 

diff --git a/app/Models/HasDOI.php b/app/Models/HasDOI.php
@@ -273,12 +273,14 @@ public function addRelatedIdentifiers($doiService)
             $this->save();
 
         } elseif ($this instanceof Study) {
-            $relatedIdentifier = [
-                'relatedIdentifier' => $this->project->doi,
-                'relatedIdentifierType' => 'DOI',
-                'relationType' => 'IsPartOf',
-            ];
-            array_push($attributes['relatedIdentifiers'], $relatedIdentifier);
+            if ($this->project) {
+                $relatedIdentifier = [
+                    'relatedIdentifier' => $this->project->doi,
+                    'relatedIdentifierType' => 'DOI',
+                    'relationType' => 'IsPartOf',
+                ];
+                array_push($attributes['relatedIdentifiers'], $relatedIdentifier);
+            }
             foreach ($this->datasets as &$dataset) {
                 $relatedIdentifier = [
                     'relatedIdentifier' => $dataset->doi,
@@ -291,12 +293,15 @@ public function addRelatedIdentifiers($doiService)
             $this->datacite_schema = $doiResponse;
             $this->save();
         } elseif ($this instanceof Dataset) {
-            $relatedIdentifier = [
-                'relatedIdentifier' => $this->project->doi,
-                'relatedIdentifierType' => 'DOI',
-                'relationType' => 'IsPartOf',
-            ];
-            array_push($attributes['relatedIdentifiers'], $relatedIdentifier);
+            if ($this->project) {
+                $relatedIdentifier = [
+                    'relatedIdentifier' => $this->project->doi,
+                    'relatedIdentifierType' => 'DOI',
+                    'relationType' => 'IsPartOf',
+                ];
+                array_push($attributes['relatedIdentifiers'], $relatedIdentifier);
+            }
+
             $relatedIdentifier = [
                 'relatedIdentifier' => $this->study->doi,
                 'relatedIdentifierType' => 'DOI',