vikunja
/
vikunja
6
43
Fork 70
Code Issues 150 Pull Requests 11 Packages Releases 32 Activity

chore: cleanup
continuous-integration/drone/pr Build is passing Details

This commit is contained in:
kolaente 2023-02-02 11:58:57 +01:00
parent 7cab3a77a9
commit 7a9611c2da
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/caldav/parsing_test.go
View File

@ -135,7 +135,7 @@ END:VCALENDAR`,
func TestGetCaldavTodosForTasks(t *testing.T) {
type args struct {
list *models.ListWithTasksAndBuckets
list *models.ProjectWithTasksAndBuckets
tasks []*models.TaskWithComments
}
tests := []struct {
@ -146,8 +146,8 @@ func TestGetCaldavTodosForTasks(t *testing.T) {
{
name: "Format single Task as Caldav",
args: args{
list: &models.ListWithTasksAndBuckets{
List: models.List{
list: &models.ProjectWithTasksAndBuckets{
Project: models.Project{
Title: "List title",
},
},

2
pkg/db/fixtures/buckets.yml
View File

@ -220,7 +220,7 @@
updated: 2020-04-18 21:13:52
- id: 36
title: testbucket36
list_id: 26
project_id: 26
created_by_id: 15
created: 2020-04-18 21:13:52
updated: 2020-04-18 21:13:52

2
pkg/db/fixtures/tasks.yml
View File

@ -362,7 +362,7 @@
priority: 3
done: false
created_by_id: 15
list_id: 26
project_id: 26
index: 39
due_date: 2023-03-01 15:00:00
created: 2018-12-01 01:12:04

2
pkg/db/fixtures/users_projects.yml
View File

@ -48,7 +48,7 @@
created: 2018-12-01 15:13:12
- id: 9
user_id: 15
list_id: 26
project_id: 26
right: 0
updated: 2018-12-02 15:13:12
created: 2018-12-01 15:13:12

8
pkg/integrations/caldav_test.go
View File

@ -41,8 +41,8 @@ END:VTODO
END:VCALENDAR`
func TestCaldav(t *testing.T) {
t.Run("Delivers VTODO for list", func(t *testing.T) {
rec, err := newCaldavTestRequestWithUser(t, http.MethodGet, caldav.ListHandler, &testuser15, ``, nil, map[string]string{"list": "26"})
t.Run("Delivers VTODO for project", func(t *testing.T) {
rec, err := newCaldavTestRequestWithUser(t, http.MethodGet, caldav.ProjectHandler, &testuser15, ``, nil, map[string]string{"project": "26"})
assert.NoError(t, err)
assert.Contains(t, rec.Body.String(), "BEGIN:VCALENDAR")
assert.Contains(t, rec.Body.String(), "PRODID:-//Vikunja Todo App//EN")
@ -52,12 +52,12 @@ func TestCaldav(t *testing.T) {
assert.Contains(t, rec.Body.String(), "END:VCALENDAR")
})
t.Run("Import VTODO", func(t *testing.T) {
rec, err := newCaldavTestRequestWithUser(t, http.MethodPut, caldav.TaskHandler, &testuser15, vtodo, nil, map[string]string{"list": "26", "task": "uid"})
rec, err := newCaldavTestRequestWithUser(t, http.MethodPut, caldav.TaskHandler, &testuser15, vtodo, nil, map[string]string{"project": "26", "task": "uid"})
assert.NoError(t, err)
assert.Equal(t, rec.Result().StatusCode, 201)
})
t.Run("Export VTODO", func(t *testing.T) {
rec, err := newCaldavTestRequestWithUser(t, http.MethodGet, caldav.TaskHandler, &testuser15, ``, nil, map[string]string{"list": "26", "task": "uid-caldav-test"})
rec, err := newCaldavTestRequestWithUser(t, http.MethodGet, caldav.TaskHandler, &testuser15, ``, nil, map[string]string{"project": "26", "task": "uid-caldav-test"})
assert.NoError(t, err)
assert.Contains(t, rec.Body.String(), "BEGIN:VCALENDAR")
assert.Contains(t, rec.Body.String(), "SUMMARY:Title Caldav Test")

2
pkg/models/prject_test.go
View File

@ -1,4 +1,4 @@
// Vikunja is a to-do project application to facilitate your life.
// 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

6
pkg/models/tasks.go
View File

@ -1210,7 +1210,7 @@ func (t *Task) Update(s *xorm.Session, a web.Auth) (err error) {
// Update all positions if the newly saved position is < 0.1
if ot.Position < 0.1 {
err = recalculateTaskPositions(s, t.ListID)
err = recalculateTaskPositions(s, t.ProjectID)
if err != nil {
return err
}
@ -1273,11 +1273,11 @@ func recalculateTaskKanbanPositions(s *xorm.Session, bucketID int64) (err error)
return
}
func recalculateTaskPositions(s *xorm.Session, listID int64) (err error) {
func recalculateTaskPositions(s *xorm.Session, projectID int64) (err error) {
allTasks := []*Task{}
err = s.
Where("list_id = ?", listID).
Where("project_id = ?", projectID).
OrderBy("position asc").
Find(&allTasks)
if err != nil {

2
pkg/models/tasks_test.go
View File

@ -380,7 +380,7 @@ func TestTask_Update(t *testing.T) {
time.Unix(1674745156, 0),
time.Unix(1674745156, 223),
},
ListID: 1,
ProjectID: 1,
}
err := task.Update(s, u)
assert.NoError(t, err)

2
pkg/modules/background/handler/background.go
View File

@ -341,7 +341,7 @@ func RemoveProjectBackground(c echo.Context) error {
return err
}
err = list.DeleteBackgroundFileIfExists()
err = project.DeleteBackgroundFileIfExists()
if err != nil {
return err
}