Add tests for user deletion

pkg/db/fixtures/lists.yml

@@ -232,3 +232,13 @@
   position: 23
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
+-
+  id: 24
+  title: Test24
+  description: Lorem Ipsum
+  identifier: test6
+  owner_id: 6
+  namespace_id: 6
+  position: 7
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12

pkg/models/user_delete.go

@@ -55,6 +55,11 @@ func deleteUsers() {
 	}
 
 	for _, u := range users {
+		if u.DeletionScheduledAt.Before(time.Now()) {
+			log.Debugf("User %d is not yet scheduled for deletion.", u.ID)
+			continue
+		}
+
 		err = s.Begin()
 		if err != nil {
 			log.Errorf("Could not start transaction: %s", err)
@@ -80,15 +85,9 @@ func deleteUsers() {
 // This action is irrevocable.
 // Public to allow deletion from the CLI.
 func DeleteUser(s *xorm.Session, u *user.User) (err error) {
-	if u.DeletionScheduledAt.Before(time.Now()) {
-		// TODO: Proper error
-		log.Debugf("User %d is not yet scheduled for deletion.", u.ID)
-		return nil
-	}
-
 	namespacesToDelete := []*Namespace{}
 	// Get all namespaces and lists this u has access to
-	nm := &Namespace{}
+	nm := &Namespace{IsArchived: true}
 	res, _, _, err := nm.ReadAll(s, u, "", 1, -1)
 	if err != nil {
 		return err
@@ -119,7 +118,7 @@ func DeleteUser(s *xorm.Session, u *user.User) (err error) {
 
 	// Get all lists to delete
 	listsToDelete := []*List{}
-	lm := &List{}
+	lm := &List{IsArchived: true}
 	res, _, _, err = lm.ReadAll(s, u, "", 0, -1)
 	if err != nil {
 		return err

pkg/models/user_delete_test.go

@@ -0,0 +1,47 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2021 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 models
+
+import (
+	"testing"
+
+	"code.vikunja.io/api/pkg/db"
+	"code.vikunja.io/api/pkg/notifications"
+	"code.vikunja.io/api/pkg/user"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestDeleteUser(t *testing.T) {
+	db.LoadAndAssertFixtures(t)
+	s := db.NewSession()
+	defer s.Close()
+	notifications.Fake()
+
+	u := &user.User{ID: 6}
+	err := DeleteUser(s, u)
+
+	assert.NoError(t, err)
+	db.AssertMissing(t, "users", map[string]interface{}{"id": u.ID})
+	db.AssertMissing(t, "lists", map[string]interface{}{"id": 24}) // only user6 had access to this list
+	db.AssertExists(t, "lists", map[string]interface{}{"id": 6}, false)
+	db.AssertExists(t, "lists", map[string]interface{}{"id": 7}, false)
+	db.AssertExists(t, "lists", map[string]interface{}{"id": 8}, false)
+	db.AssertExists(t, "lists", map[string]interface{}{"id": 9}, false)
+	db.AssertExists(t, "lists", map[string]interface{}{"id": 10}, false)
+	db.AssertExists(t, "lists", map[string]interface{}{"id": 11}, false)
+}

pkg/notifications/notification.go

@@ -48,6 +48,10 @@ type Notifiable interface {
 
 // Notify notifies a notifiable of a notification
 func Notify(notifiable Notifiable, notification Notification) (err error) {
+	if isUnderTest {
+		sentTestNotifications = append(sentTestNotifications, notification)
+		return nil
+	}
 
 	err = notifyMail(notifiable, notification)
 	if err != nil {

pkg/notifications/testing.go

@@ -0,0 +1,45 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2021 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 notifications
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+var (
+	isUnderTest           bool
+	sentTestNotifications []Notification
+)
+
+func Fake() {
+	isUnderTest = true
+	sentTestNotifications = nil
+}
+
+// AssertSent asserts a notification has been sent
+func AssertSent(t *testing.T, n Notification) {
+	var found bool
+	for _, testNotification := range sentTestNotifications {
+		if n.Name() == testNotification.Name() {
+			found = true
+			break
+		}
+	}
+
+	assert.True(t, found, "Failed to assert "+n.Name()+" has been sent.")
+}