From 8a6e3d5bd72bc8ea2a844e9150e907c484907d33 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Tue, 2 Apr 2024 12:42:07 +0200
Subject: [PATCH] fix(views): use correct assertion in test

---
 pkg/models/kanban.go       | 22 +++++++++++-----------
 pkg/models/kanban_test.go  |  4 ++--
 pkg/models/project_view.go |  4 ----
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/pkg/models/kanban.go b/pkg/models/kanban.go
index d420452ad..b45055965 100644
--- a/pkg/models/kanban.go
+++ b/pkg/models/kanban.go
@@ -384,27 +384,27 @@ func (b *Bucket) Delete(s *xorm.Session, a web.Auth) (err error) {
 	}
 
 	// Get the default bucket
-	p, err := GetProjectViewByIDAndProject(s, b.ProjectViewID, b.ProjectID)
+	pv, err := GetProjectViewByIDAndProject(s, b.ProjectViewID, b.ProjectID)
 	if err != nil {
 		return
 	}
-	var updateProject bool
-	if b.ID == p.DefaultBucketID {
-		p.DefaultBucketID = 0
-		updateProject = true
+	var updateProjectView bool
+	if b.ID == pv.DefaultBucketID {
+		pv.DefaultBucketID = 0
+		updateProjectView = true
 	}
-	if b.ID == p.DoneBucketID {
-		p.DoneBucketID = 0
-		updateProject = true
+	if b.ID == pv.DoneBucketID {
+		pv.DoneBucketID = 0
+		updateProjectView = true
 	}
-	if updateProject {
-		err = p.Update(s, a)
+	if updateProjectView {
+		err = pv.Update(s, a)
 		if err != nil {
 			return
 		}
 	}
 
-	defaultBucketID, err := getDefaultBucketID(s, p)
+	defaultBucketID, err := getDefaultBucketID(s, pv)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/models/kanban_test.go b/pkg/models/kanban_test.go
index 3ce8a08eb..4176d1d08 100644
--- a/pkg/models/kanban_test.go
+++ b/pkg/models/kanban_test.go
@@ -216,10 +216,10 @@ func TestBucket_Delete(t *testing.T) {
 		err := b.Delete(s, u)
 		require.NoError(t, err)
 
-		db.AssertMissing(t, "project_views", map[string]interface{}{
+		db.AssertExists(t, "project_views", map[string]interface{}{
 			"id":             b.ProjectViewID,
 			"done_bucket_id": 0,
-		})
+		}, false)
 	})
 }
 
diff --git a/pkg/models/project_view.go b/pkg/models/project_view.go
index 1f045ed9d..4788f9399 100644
--- a/pkg/models/project_view.go
+++ b/pkg/models/project_view.go
@@ -344,10 +344,6 @@ func (p *ProjectView) Update(s *xorm.Session, _ web.Auth) (err error) {
 			"done_bucket_id",
 		).
 		Update(p)
-	if err != nil {
-		return
-	}
-
 	return
 }