Fix DecisionToken to comply with MySQL8

artefactual-labs · Jul 28, 2023 · 87ac9e0 · 87ac9e0
1 parent d87b17d
commit 87ac9e0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/internal/collection/goa.go b/internal/collection/goa.go
@@ -394,7 +394,7 @@ func (w *goaWrapper) Decide(ctx context.Context, payload *goacollection.DecidePa
 		return err
 	}
 
-	if c.DecisionToken == "" || c.Status != StatusPending {
+	if len(c.DecisionToken) == 0 || c.Status != StatusPending {
 		return goacollection.MakeNotValid(errors.New("collection is not awaiting decision"))
 	}
 

diff --git a/internal/collection/types.go b/internal/collection/types.go
@@ -17,7 +17,7 @@ type Collection struct {
 	AIPID         string `db:"aip_id"`
 	OriginalID    string `db:"original_id"`
 	PipelineID    string `db:"pipeline_id"`
-	DecisionToken string `db:"decision_token"`
+	DecisionToken []byte `db:"decision_token"`
 	Status        Status `db:"status"`
 
 	// It defaults to CURRENT_TIMESTAMP(6) so populated as soon as possible.

diff --git a/internal/db/migrations/1690467272_task_token_encoding.down.sql b/internal/db/migrations/1690467272_task_token_encoding.down.sql
@@ -0,0 +1 @@
+ALTER TABLE collection CHANGE `decision_token` `decision_token` TEXT NOT NULL;
diff --git a/internal/db/migrations/1690467272_task_token_encoding.up.sql b/internal/db/migrations/1690467272_task_token_encoding.up.sql
@@ -0,0 +1 @@
+ALTER TABLE collection CHANGE `decision_token` `decision_token` VARBINARY(255);