fix(total-size): calculation not accounting for database commas in li…

…sts (#296)
go-vela · Jun 14, 2023 · b1b57c0 · b1b57c0
1 parent 3317520
commit b1b57c0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/database/repo.go b/database/repo.go
@@ -278,7 +278,9 @@ func (r *Repo) Validate() error {
 	}
 
 	// verify the Favorites field is within the database constraints
-	if total > constants.TopicsMaxSize {
+	// len is to factor in number of comma separators included in the database field,
+	// removing 1 due to the last item not having an appended comma
+	if (total + len(r.Topics) - 1) > constants.TopicsMaxSize {
 		return ErrExceededTopicsLimit
 	}
 

diff --git a/database/user.go b/database/user.go
@@ -241,7 +241,9 @@ func (u *User) Validate() error {
 	}
 
 	// verify the Favorites field is within the database constraints
-	if total > constants.FavoritesMaxSize {
+	// len is to factor in number of comma separators included in the database field,
+	// removing 1 due to the last item not having an appended comma
+	if (total + len(u.Favorites) - 1) > constants.FavoritesMaxSize {
 		return ErrExceededFavoritesLimit
 	}
 

diff --git a/database/worker.go b/database/worker.go
@@ -142,7 +142,9 @@ func (w *Worker) Validate() error {
 	}
 
 	// verify the RunningBuildIds field is within the database constraints
-	if total > constants.RunningBuildIDsMaxSize {
+	// len is to factor in number of comma separators included in the database field,
+	// removing 1 due to the last item not having an appended comma
+	if (total + len(w.RunningBuildIDs) - 1) > constants.RunningBuildIDsMaxSize {
 		return ErrExceededRunningBuildIDsLimit
 	}