feat: move done bucket setting to project

pkg/models/kanban.go

@@ -38,8 +38,6 @@ type Bucket struct {
 
 	// How many tasks can be at the same time on this board max
 	Limit int64 `xorm:"default 0" json:"limit" minimum:"0" valid:"range(0|9223372036854775807)"`
-	// If this bucket is the "done bucket". All tasks moved into this bucket will automatically marked as done. All tasks marked as done from elsewhere will be moved into this bucket.
-	IsDoneBucket bool `xorm:"BOOL" json:"is_done_bucket"`
 
 	// The number of tasks currently in this bucket
 	Count int64 `xorm:"-" json:"count"`
@@ -92,7 +90,7 @@ func getDefaultBucket(s *xorm.Session, projectID int64) (bucket *Bucket, err err
 func getDoneBucketForProject(s *xorm.Session, projectID int64) (bucket *Bucket, err error) {
 	bucket = &Bucket{}
 	exists, err := s.
-		Where("project_id = ? and is_done_bucket = ?", projectID, true).
+		Where("id = (select done_bucket_id from projects where id = ?)", projectID).
 		Get(bucket)
 	if err != nil {
 		return nil, err
@@ -287,29 +285,11 @@ func (b *Bucket) Create(s *xorm.Session, a web.Auth) (err error) {
 // @Failure 500 {object} models.Message "Internal error"
 // @Router /projects/{projectID}/buckets/{bucketID} [post]
 func (b *Bucket) Update(s *xorm.Session, _ web.Auth) (err error) {
-	doneBucket, err := getDoneBucketForProject(s, b.ProjectID)
-	if err != nil {
-		return err
-	}
-
-	if doneBucket != nil && doneBucket.IsDoneBucket && b.IsDoneBucket && doneBucket.ID != b.ID {
-		// When the current bucket will be the new done bucket, the old one should not be the done bucket anymore
-		doneBucket.IsDoneBucket = false
-		_, err = s.
-			Where("id = ?", doneBucket.ID).
-			Cols("is_done_bucket").
-			Update(doneBucket)
-		if err != nil {
-			return
-		}
-	}
-
 	_, err = s.
 		Where("id = ?", b.ID).
 		Cols(
 			"title",
 			"limit",
-			"is_done_bucket",
 			"position",
 		).
 		Update(b)

pkg/models/kanban_test.go

@@ -217,28 +217,4 @@ func TestBucket_Update(t *testing.T) {
 
 		testAndAssertBucketUpdate(t, b, s)
 	})
-	t.Run("old done bucket should be unset", func(t *testing.T) {
-		db.LoadAndAssertFixtures(t)
-		s := db.NewSession()
-		defer s.Close()
-
-		b := &Bucket{
-			ID:           1,
-			ProjectID:    1,
-			IsDoneBucket: true,
-		}
-
-		err := b.Update(s, &user.User{ID: 1})
-		assert.NoError(t, err)
-		db.AssertExists(t, "buckets", map[string]interface{}{
-			"id":             1,
-			"project_id":     1,
-			"is_done_bucket": true,
-		}, false)
-		db.AssertExists(t, "buckets", map[string]interface{}{
-			"id":             3,
-			"project_id":     1,
-			"is_done_bucket": false,
-		}, false)
-	})
 }

pkg/models/project.go

@@ -51,6 +51,11 @@ type Project struct {
 	ParentProjectID int64    `xorm:"bigint INDEX null" json:"parent_project_id"`
 	ParentProject   *Project `xorm:"-" json:"-"`
 
+	// The ID of the bucket where new tasks without a bucket are added to. By default, this is the leftmost bucket in a project.
+	DefaultBucketID int64 `xorm:"bigint INDEX null" json:"default_bucket_id"`
+	// If tasks are moved to the done bucket, they are marked as done. If they are marked as done individually, they are moved into the done bucket.
+	DoneBucketID int64 `xorm:"bigint INDEX null" json:"done_bucket_id"`
+
 	// The user who created this project.
 	Owner *user.User `xorm:"-" json:"owner" valid:"-"`
 

pkg/models/tasks.go

@@ -676,7 +676,12 @@ func setTaskBucket(s *xorm.Session, task *Task, originalTask *Task, doCheckBucke
 		}
 	}
 
-	if bucket.IsDoneBucket && originalTask != nil && !originalTask.Done {
+	project, err := GetProjectSimpleByID(s, task.ProjectID)
+	if err != nil {
+		return nil, err
+	}
+
+	if bucket.ID == project.DoneBucketID && originalTask != nil && !originalTask.Done {
 		task.Done = true
 	}
 
@@ -845,7 +850,11 @@ func (t *Task) Update(s *xorm.Session, a web.Auth) (err error) {
 
 	// If the task was moved into the done bucket and the task has a repeating cycle we should not update
 	// the bucket.
-	if targetBucket.IsDoneBucket && t.RepeatAfter > 0 {
+	project, err := GetProjectSimpleByID(s, t.ProjectID)
+	if err != nil {
+		return err
+	}
+	if targetBucket.ID == project.DoneBucketID && t.RepeatAfter > 0 {
 		t.Done = true // This will trigger the correct re-scheduling of the task (happening in updateDone later)
 		t.BucketID = ot.BucketID
 	}