From 60e8eda488ddc0066f11d8061298fc378e297b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Raddaoui=20Mar=C3=ADn?=
 <raddaouimarin@gmail.com>
Date: Thu, 16 Jan 2025 20:57:41 +0100
Subject: [PATCH] Fix relative path after SIP extraction

[skip-codecov]
---
 internal/workflow/preprocessing.go | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/internal/workflow/preprocessing.go b/internal/workflow/preprocessing.go
index 2390767..61c56b7 100644
--- a/internal/workflow/preprocessing.go
+++ b/internal/workflow/preprocessing.go
@@ -168,16 +168,21 @@ func (w *PreprocessingWorkflow) Execute(
 	// Extract SIP.
 	ev := result.newEvent(ctx, "Extract SIP")
 	var archiveExtract archiveextract.Result
-	err := temporalsdk_workflow.ExecuteActivity(
+	e = temporalsdk_workflow.ExecuteActivity(
 		withFilesysActOpts(ctx),
 		archiveextract.Name,
 		&archiveextract.Params{SourcePath: localPath},
 	).Get(ctx, &archiveExtract)
-	if err != nil {
+	if e != nil {
 		result.systemError(ctx, e, ev, "Extracting the SIP has failed")
 		return result, nil
 	}
 	localPath = archiveExtract.ExtractPath
+	result.RelativePath, e = filepath.Rel(w.sharedPath, localPath)
+	if e != nil {
+		result.systemError(ctx, e, ev, "Extracting the SIP has failed")
+		return result, nil
+	}
 	ev.Succeed(ctx, "SIP extracted")
 
 	// Check if the SIP is a BagIt bag.
@@ -221,14 +226,13 @@ func (w *PreprocessingWorkflow) Execute(
 			result.systemError(ctx, e, ev, "Unbagging the SIP has failed")
 			return result, nil
 		}
-		ev.Succeed(ctx, "SIP unbagged")
-
 		localPath = unbagResult.Path
-		rp, err := filepath.Rel(w.sharedPath, localPath)
-		if err != nil {
-			return nil, fmt.Errorf("Invalid path")
+		result.RelativePath, e = filepath.Rel(w.sharedPath, localPath)
+		if e != nil {
+			result.systemError(ctx, e, ev, "Unbagging the SIP has failed")
+			return result, nil
 		}
-		result.RelativePath = rp
+		ev.Succeed(ctx, "SIP unbagged")
 	}
 
 	// Identify SIP.