Merge branch 'refactor-messaging-models' of github.com:bacalhau-proje…

…ct/bacalhau into refactor-messaging-models
bacalhau-project · Oct 31, 2024 · 8843862 · 8843862
2 parents b343e8d + 4116d38
commit 8843862
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/pkg/models/messages/metadata.go b/pkg/models/messages/metadata.go
@@ -13,8 +13,14 @@ type ExecutionMetadata struct {
 }
 
 func NewExecutionMetadata(execution *models.Execution) ExecutionMetadata {
-	return ExecutionMetadata{
-		ExecutionID: execution.ID,
-		JobID:       execution.Job.ID,
-	}
+    if execution == nil {
+        return ExecutionMetadata{}
+    }
+    if execution.Job == nil {
+        return ExecutionMetadata{ExecutionID: execution.ID}
+    }
+    return ExecutionMetadata{
+        ExecutionID: execution.ID,
+        JobID:       execution.Job.ID,
+    }
 }