processing wip

internal/workflow/processing.go

@@ -440,16 +440,6 @@ func (w *ProcessingWorkflow) SessionHandler(
 		return err
 	}
 
-	// Validate PREMIS.
-	activityOpts := withActivityOptsForRequest(sessCtx)
-	err := temporalsdk_workflow.ExecuteActivity(activityOpts, xmlvalidate.Name, xmlvalidate.Params{
-		XMLPath: filepath.Join(tinfo.TempPath, "data", "metadata", "premis.xml"),
-		XSDPath: w.cfg.ValidatePREMIS.XSDPath,
-	}).Get(activityOpts, nil)
-	if err != nil {
-		return err
-	}
-
 	// Classify the SIP.
 	{
 		activityOpts := withActivityOptsForLocalAction(sessCtx)
@@ -845,6 +835,11 @@ func (w *ProcessingWorkflow) transferA3m(
 	tinfo.SendToFailed.ActivityName = activities.SendToFailedPIPsName
 	tinfo.SendToFailed.NeedsZipping = true
 
+	err := w.validatePREMIS(sessCtx, filepath.Join(tinfo.Bundle.FullPath, "metadata", "premis.xml"))
+	if err != nil {
+		return err
+	}
+
 	// Send PIP to a3m for preservation.
 	{
 		activityOpts := temporalsdk_workflow.WithActivityOptions(sessCtx, temporalsdk_workflow.ActivityOptions{
@@ -894,6 +889,11 @@ func (w *ProcessingWorkflow) transferAM(ctx temporalsdk_workflow.Context, tinfo
 		tinfo.PackageType = enums.PackageTypeBagIt
 	}
 
+	err = w.validatePREMIS(ctx, filepath.Join(tinfo.TempPath, "data", "metadata", "premis.xml"))
+	if err != nil {
+		return err
+	}
+
 	// Zip PIP.
 	activityOpts := withActivityOptsForLocalAction(ctx)
 	var zipResult archivezip.Result
@@ -1199,3 +1199,21 @@ func (w *ProcessingWorkflow) sendToFailedBucket(
 
 	return nil
 }
+
+func (w *ProcessingWorkflow) validatePREMIS(
+	ctx temporalsdk_workflow.Context,
+	xmlPath string,
+) error {
+	// Validate PREMIS.
+	activityOpts := withActivityOptsForRequest(ctx)
+	err := temporalsdk_workflow.ExecuteActivity(activityOpts, xmlvalidate.Name, xmlvalidate.Params{
+		XMLPath: xmlPath,
+		XSDPath: w.cfg.ValidatePREMIS.XSDPath,
+	}).Get(activityOpts, nil)
+	if err != nil {
+		return err
+
+	}
+
+	return nil
+}