feat(views): decouple buckets from projects

pkg/migration/20240315093418.go

@@ -0,0 +1,119 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-present Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public Licensee as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public Licensee for more details.
+//
+// You should have received a copy of the GNU Affero General Public Licensee
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package migration
+
+import (
+	"code.vikunja.io/api/pkg/config"
+	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
+)
+
+type buckets20240315093418 struct {
+	ID            int64 `xorm:"bigint autoincr not null unique pk"`
+	ProjectID     int64 `xorm:"bigint not null"`
+	ProjectViewID int64 `xorm:"bigint not null default 0"`
+}
+
+func (buckets20240315093418) TableName() string {
+	return "buckets"
+}
+
+func init() {
+	migrations = append(migrations, &xormigrate.Migration{
+		ID:          "20240315093418",
+		Description: "Relate buckets to views instead of projects",
+		Migrate: func(tx *xorm.Engine) (err error) {
+			err = tx.Sync2(buckets20240315093418{})
+			if err != nil {
+				return
+			}
+
+			buckets := []*buckets20240315093418{}
+			err = tx.Find(&buckets)
+			if err != nil {
+				return err
+			}
+
+			views := []*projectView20240313230538{}
+			err = tx.Find(&views)
+			if err != nil {
+				return err
+			}
+
+			viewMap := make(map[int64][]*projectView20240313230538)
+			for _, view := range views {
+				if _, has := viewMap[view.ProjectID]; !has {
+					viewMap[view.ProjectID] = []*projectView20240313230538{}
+				}
+
+				viewMap[view.ProjectID] = append(viewMap[view.ProjectID], view)
+			}
+
+			for _, bucket := range buckets {
+				for _, view := range viewMap[bucket.ProjectID] {
+					if view.ViewKind == 3 { // Kanban view
+
+						bucket.ProjectViewID = view.ID
+
+						_, err = tx.
+							Where("id = ?", bucket.ID).
+							Cols("project_view_id").
+							Update(bucket)
+						if err != nil {
+							return err
+						}
+					}
+				}
+			}
+
+			if config.DatabaseType.GetString() == "sqlite" {
+				_, err = tx.Exec(`
+create table buckets_dg_tmp
+(
+    id            INTEGER  not null
+        primary key autoincrement,
+    title         TEXT     not null,
+    "limit"       INTEGER default 0,
+    position      REAL,
+    created       DATETIME not null,
+    updated       DATETIME not null,
+    created_by_id INTEGER  not null,
+    project_view_id INTEGER  not null default 0
+);
+
+insert into buckets_dg_tmp(id, title, "limit", position, created, updated, created_by_id, project_view_id)
+select id, title, "limit", position, created, updated, created_by_id, project_view_id
+from buckets;
+
+drop table buckets;
+
+alter table buckets_dg_tmp
+    rename to buckets;
+
+create unique index UQE_buckets_id
+    on buckets (id);
+`)
+				return err
+			}
+
+			return dropTableColum(tx, "buckets", "project_id")
+		},
+		Rollback: func(tx *xorm.Engine) error {
+			return nil
+		},
+	})
+}

pkg/models/kanban.go

@@ -35,6 +35,8 @@ type Bucket struct {
 	Title string `xorm:"text not null" valid:"required" minLength:"1" json:"title"`
 	// The project this bucket belongs to.
 	ProjectID int64 `xorm:"bigint not null" json:"project_id" param:"project"`
+	// The project view this bucket belongs to.
+	ProjectViewID int64 `xorm:"bigint not null" json:"project_view_id" param:"view"`
 	// All tasks which belong to this bucket.
 	Tasks []*Task `xorm:"-" json:"tasks"`
 
@@ -167,13 +169,13 @@ func GetTasksInBucketsForView(s *xorm.Session, view *ProjectView, opts *taskSear
 	if view.BucketConfigurationMode == BucketConfigurationModeFilter {
 		for id, bc := range view.BucketConfiguration {
 			buckets = append(buckets, &Bucket{
-				ID:          int64(id),
+				ID:            int64(id),
-				Title:       bc.Title,
+				Title:         bc.Title,
-				ProjectID:   view.ProjectID,
+				ProjectViewID: view.ID,
-				Position:    float64(id),
+				Position:      float64(id),
-				CreatedByID: auth.GetID(),
+				CreatedByID:   auth.GetID(),
-				Created:     time.Now(),
+				Created:       time.Now(),
-				Updated:     time.Now(),
+				Updated:       time.Now(),
 			})
 		}
 	}

pkg/models/kanban_rights.go

@@ -23,8 +23,8 @@ import (
 
 // CanCreate checks if a user can create a new bucket
 func (b *Bucket) CanCreate(s *xorm.Session, a web.Auth) (bool, error) {
-	l := &Project{ID: b.ProjectID}
+	pv := &ProjectView{ID: b.ProjectViewID}
-	return l.CanWrite(s, a)
+	return pv.CanUpdate(s, a)
 }
 
 // CanUpdate checks if a user can update an existing bucket
@@ -43,6 +43,6 @@ func (b *Bucket) canDoBucket(s *xorm.Session, a web.Auth) (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	l := &Project{ID: bb.ProjectID}
+	pv := &ProjectView{ID: bb.ProjectViewID}
-	return l.CanWrite(s, a)
+	return pv.CanUpdate(s, a)
 }

pkg/models/project.go

@@ -777,19 +777,7 @@ func CreateProject(s *xorm.Session, project *Project, auth web.Auth, createBackl
 		}
 	}
 
-	if createBacklogBucket {
+	err = CreateDefaultViewsForProject(s, project, auth, createBacklogBucket)
-		// Create a new first bucket for this project
-		b := &Bucket{
-			ProjectID: project.ID,
-			Title:     "Backlog",
-		}
-		err = b.Create(s, auth)
-		if err != nil {
-			return
-		}
-	}
-
-	err = CreateDefaultViewsForProject(s, project, auth)
 	if err != nil {
 		return
 	}

pkg/models/project_view.go

@@ -295,7 +295,7 @@ func GetProjectViewByID(s *xorm.Session, id, projectID int64) (view *ProjectView
 	return
 }
 
-func CreateDefaultViewsForProject(s *xorm.Session, project *Project, a web.Auth) (err error) {
+func CreateDefaultViewsForProject(s *xorm.Session, project *Project, a web.Auth, createBacklogBucket bool) (err error) {
 	list := &ProjectView{
 		ProjectID: project.ID,
 		Title:     "List",
@@ -336,5 +336,18 @@ func CreateDefaultViewsForProject(s *xorm.Session, project *Project, a web.Auth)
 		Position:  400,
 	}
 	err = kanban.Create(s, a)
+	if err != nil {
+		return
+	}
+
+	if createBacklogBucket {
+		// Create a new first bucket for this project
+		b := &Bucket{
+			ProjectViewID: kanban.ID,
+			Title:         "Backlog",
+		}
+		err = b.Create(s, a)
+	}
+
 	return
 }

pkg/models/saved_filters.go

@@ -123,7 +123,7 @@ func (sf *SavedFilter) Create(s *xorm.Session, auth web.Auth) (err error) {
 		return
 	}
 
-	err = CreateDefaultViewsForProject(s, &Project{ID: getProjectIDFromSavedFilterID(sf.ID)}, auth)
+	err = CreateDefaultViewsForProject(s, &Project{ID: getProjectIDFromSavedFilterID(sf.ID)}, auth, false)
 	return err
 }