chore(deps): update alpine docker tag to v3.18

Related discussion: https://community.vikunja.io/t/importing-tasks-from-todoist/322

.drone.yml

@@ -121,12 +121,23 @@ steps:
     when:
       event: [ push, tag, pull_request ]
 
-  - name: build
+  - name: prepare-build
     image: vikunja/golang-build:latest
     pull: always
     environment:
       GOPROXY: 'https://goproxy.kolaente.de'
     depends_on: [ mage ]
+    commands:
+      - ./mage-static do-the-swag
+    when:
+      event: [ push, tag, pull_request ]
+
+  - name: build
+    image: vikunja/golang-build:latest
+    pull: always
+    environment:
+      GOPROXY: 'https://goproxy.kolaente.de'
+    depends_on: [ prepare-build ]
     commands:
       - ./mage-static build:build
     when:
@@ -141,8 +152,8 @@ steps:
     commands:
       - export "GOROOT=$(go env GOROOT)"
       - apk --no-cache add build-base git
-      - wget -O - -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.49.0
-      - ./mage-static check:all
+      - wget -O - -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.52.1
+      - ./mage-static check:golangci
     when:
       event: [ push, tag, pull_request ]
 
@@ -219,7 +230,7 @@ steps:
       GOPROXY: 'https://goproxy.kolaente.de'
     commands:
       - ./mage-static test:unit
-    depends_on: [ fetch-tags, mage ]
+    depends_on: [ fetch-tags, prepare-build ]
     when:
       event: [ push, tag, pull_request ]
 
@@ -236,7 +247,7 @@ steps:
         path: /db
     commands:
       - ./mage-static test:unit
-    depends_on: [ fetch-tags, mage ]
+    depends_on: [ fetch-tags, prepare-build ]
     when:
       event: [ push, tag, pull_request ]
 
@@ -253,7 +264,7 @@ steps:
       VIKUNJA_DATABASE_DATABASE: vikunjatest
     commands:
       - ./mage-static test:unit
-    depends_on: [ fetch-tags, mage ]
+    depends_on: [ fetch-tags, prepare-build ]
     when:
       event: [ push, tag, pull_request ]
 
@@ -271,7 +282,7 @@ steps:
       VIKUNJA_DATABASE_SSLMODE: disable
     commands:
       - ./mage-static test:unit
-    depends_on: [ fetch-tags, mage ]
+    depends_on: [ fetch-tags, prepare-build ]
     when:
       event: [ push, tag, pull_request ]
 
@@ -282,7 +293,7 @@ steps:
       GOPROXY: 'https://goproxy.kolaente.de'
     commands:
       - ./mage-static test:integration
-    depends_on: [ fetch-tags, mage ]
+    depends_on: [ fetch-tags, prepare-build ]
     when:
       event: [ push, tag, pull_request ]
 
@@ -299,7 +310,7 @@ steps:
         path: /db
     commands:
       - ./mage-static test:integration
-    depends_on: [ fetch-tags, mage ]
+    depends_on: [ fetch-tags, prepare-build ]
     when:
       event: [ push, tag, pull_request ]
 
@@ -316,7 +327,7 @@ steps:
       VIKUNJA_DATABASE_DATABASE: vikunjatest
     commands:
       - ./mage-static test:integration
-    depends_on: [ fetch-tags, mage ]
+    depends_on: [ fetch-tags, prepare-build ]
     when:
       event: [ push, tag, pull_request ]
 
@@ -334,7 +345,7 @@ steps:
       VIKUNJA_DATABASE_SSLMODE: disable
     commands:
       - ./mage-static test:integration
-    depends_on: [ fetch-tags, mage ]
+    depends_on: [ fetch-tags, prepare-build ]
     when:
       event: [ push, tag, pull_request ]
 
@@ -385,6 +396,7 @@ steps:
       - export PATH=$PATH:$GOPATH/bin
       - go install github.com/magefile/mage
       - ./mage-static release:dirs
+      - ./mage-static do-the-swag
     depends_on: [ fetch-tags, mage ]
 
   - name: static-build-windows
@@ -506,7 +518,7 @@ steps:
 
   # Build os packages and push it to our bucket
   - name: build-os-packages-unstable
-    image: goreleaser/nfpm:v2.24.0
+    image: goreleaser/nfpm:v2.28.0
     pull: always
     commands:
       - apk add git go
@@ -522,7 +534,7 @@ steps:
     depends_on: [ after-build-compress ]
 
   - name: build-os-packages-version
-    image: goreleaser/nfpm:v2.24.0
+    image: goreleaser/nfpm:v2.28.0
     pull: always
     commands:
       - apk add git go
@@ -731,6 +743,6 @@ steps:
         - failure
 ---
 kind: signature
-hmac: 8255925defaacaa9e67871cf8376628925da0ff0996752b71bb6c3c2c5e9b8eb
+hmac: 7bade2fc44072cf5730f7f15b5be18058ce47d216853c8c39c692f967c640e20
 
 ...

.github/FUNDING.yml

@@ -1,2 +1,3 @@
 github: kolaente
-custom: https://www.buymeacoffee.com/kolaente
+open_collective: vikunja
+custom: ["https://vikunja.cloud", "https://www.buymeacoffee.com/kolaente"]

.gitignore

@@ -27,3 +27,4 @@ vikunja-dump*
 vendor/
 os-packages/
 mage_output_file.go
+pkg/swagger/*

.golangci.yml

@@ -79,6 +79,7 @@ issues:
     - path: pkg/routes/api/v1/docs.go
       linters:
         - goheader
+        - misspell
     - text: "Missed string"
       linters:
         - goheader
@@ -88,3 +89,6 @@ issues:
     - path: pkg/models/favorites\.go
       linters:
         - nilerr
+    - path: pkg/models/events\.go
+      linters:
+        - musttag

CHANGELOG.md

@@ -7,6 +7,190 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 All releases can be found on https://code.vikunja.io/api/releases.
 
+## [0.20.4] - 2023-03-12
+
+### Bug Fixes
+
+* *(docker)* Allow non-unique group id
+
+### Documentation
+
+* Add link to tutorial for installing Vikunja on Synology ([4de0efe](4de0efec1dd7da95dbf936728d7e23791396a63a))
+
+
+## [0.20.3] - 2023-03-10
+
+### Bug Fixes
+
+* *(build)* Downgrade xgo to 1.19.2 so that builds work again
+* *(caldav)* Add Z suffix to dates make it clear dates are in UTC
+* *(caldav)* Use const for repeat modes
+* *(caldav)* Make sure only labels where the user has permission to use them are used
+* *(ci)* Pipeline dependency
+* *(ci)* Pin nfpm container version and binary location
+* *(ci)* Set release path to /source
+* *(ci)* Tagging logic for release docker images
+* *(ci)* Save generated .tags file to correctly tag docker releases
+* *(ci)* Sign drone config
+* *(docd)* Update Subdirectory Documentation (#1363)
+* *(docker)* Cross compilation with buildx
+* *(docker)* Re-add expose
+* *(docker)* Passing environment variables into the container
+* *(docker)* Make sure the vikunja user always exists and only modify the uid instead of recreating the user
+* *(docs)* Add docs about cli user delete
+* *(docs)* Old helm charts url (#1344)
+* *(docs)* Fix a few minor typos (#59)
+* *(docs)* Fix traefik v2 example (#65)
+* *(docs)* Clarify support for caldav reccurrence
+* *(drone)* Add type, fix pull, remove group (#1355)
+* *(dump)* Make sure null dates are properly set when restoring from a dump
+* *(export)* Ignore file size for export files
+* *(list)* Return lists for a namespace id even if that namespace is deleted
+* *(list)* When list background is removed, delete file from file system and DB (#1372)
+* *(mailer)* Forcessl config (#60)
+* *(migration)* Use Todoist v9 api to migrate tasks from them
+* *(migration)* Import TickTick data by column name instead of index (#1356)
+* *(migration)* Use the proper authorization method for Todoist's api, fix issues with importing deleted items
+* *(migration)* Remove unused todoist parameters
+* *(migration)* Todoist pagination now avoids too many loops
+* *(migration)* Don't try to add nonexistent tasks as related
+* *(migration)* Make sure trello checklists are properly imported
+* *(reminders)* Overdue tasks join condition
+* *(reminders)* Make sure an overdue reminder is sent when there is only one overdue task
+* *(reminders)* Prevent duplicate reminders when updating task details
+* *(restore)* Check if we're really dealing with a string
+* *(task)* Make sure the task's last updated timestamp is always updated when releated entities changed
+* *(task)* Correctly load tasks by id and uuid in caldav
+* *(tasks)* Don't include undone overdue tasks from archived lists or namespaces in notification mails
+* *(tasks)* Don't reset the kanban bucket when updating a task and not providing one
+* *(tasks)* Don't set a repeating task done when moving it do the done bucket
+* *(tasks)* Recalculate position of all tasks in a list or bucket when it would hit 0
+* *(tasks)* Make sure tasks are sorted by position before recalculating them
+* *(user)* Make reset the user's name to empty actually work
+* Swagger docs ([96b5e93](96b5e933796275e87f3007e31db0623688dbdb3a))
+* Restore notifications table from dump when it already had the correct format ([8c67be5](8c67be558f697ab52740c51ab453092c0f8f7c14))
+* Make sure labels are always exported as caldav (#1412) ([1afc72e](1afc72e1906c02b093bb6d9748235b93ab0eb181))
+* Lint ([491a142](491a1423788b76f236d070071cb46f5b2f5d3fd0))
+* Lint ([20a5994](20a5994b1717e7751750f14a9a164825a8e6ade6))
+* Lint ([077baba](077baba2eaff2f10b97384f07375ece7f51ec0fa))
+* Lint ([9f14466](9f14466dfa8660362a4e51b3c8c6810bf8d66a22))
+
+
+### Dependencies
+
+* *(deps)* Update module github.com/yuin/goldmark to v1.5.3 (#1317)
+* *(deps)* Update module golang.org/x/crypto to v0.2.0 (#1315)
+* *(deps)* Update module github.com/spf13/afero to v1.9.3 (#1320)
+* *(deps)* Update module golang.org/x/crypto to v0.3.0 (#1321)
+* *(deps)* Update github.com/arran4/golang-ical digest to a677353 (#1323)
+* *(deps)* Update module github.com/wneessen/go-mail to v0.3.5 (#1325)
+* *(deps)* Update github.com/arran4/golang-ical digest to 1093469 (#1326)
+* *(deps)* Update module github.com/golang-jwt/jwt/v4 to v4.4.3 (#1328)
+* *(deps)* Update module github.com/go-sql-driver/mysql to v1.7.0 (#1332)
+* *(deps)* Update module golang.org/x/sys to v0.3.0 (#1333)
+* *(deps)* Update module golang.org/x/term to v0.3.0 (#1336)
+* *(deps)* Update module golang.org/x/image to v0.2.0 (#1335)
+* *(deps)* Update module golang.org/x/oauth2 to v0.2.0 (#1316)
+* *(deps)* Update module golang.org/x/oauth2 to v0.3.0 (#1337)
+* *(deps)* Update module github.com/getsentry/sentry-go to v0.16.0 (#1338)
+* *(deps)* Update module golang.org/x/crypto to v0.4.0 (#1339)
+* *(deps)* Update module github.com/pquerna/otp to v1.4.0 (#1341)
+* *(deps)* Update module github.com/swaggo/swag to v1.8.9 (#1327)
+* *(deps)* Update module github.com/wneessen/go-mail to v0.3.6 (#1342)
+* *(deps)* Update module github.com/labstack/echo/v4 to v4.10.0 (#1343)
+* *(deps)* Update module github.com/wneessen/go-mail to v0.3.7 (#1348)
+* *(deps)* Update module github.com/coreos/go-oidc/v3 to v3.5.0 (#1349)
+* *(deps)* Update module golang.org/x/sys to v0.4.0 (#1351)
+* *(deps)* Update module golang.org/x/image to v0.3.0 (#1350)
+* *(deps)* Update module golang.org/x/term to v0.4.0 (#1352)
+* *(deps)* Update module golang.org/x/crypto to v0.5.0 (#1353)
+* *(deps)* Update goreleaser/nfpm docker tag to v2.23.0 (#1347)
+* *(deps)* Update module github.com/wneessen/go-mail to v0.3.8 (#1357)
+* *(deps)* Update module src.techknowlogick.com/xgo to v1.6.0+1.19.5 (#1358)
+* *(deps)* Update klakegg/hugo docker tag to v0.107.0 (#1272)
+* *(deps)* Update module github.com/getsentry/sentry-go to v0.17.0 (#1361)
+* *(deps)* Update module src.techknowlogick.com/xgo to v1.7.0+1.19.5 (#1364)
+* *(deps)* Update module github.com/spf13/viper to v1.15.0 (#1365)
+* *(deps)* Update module github.com/labstack/echo-jwt/v4 to v4.0.1 (#1369)
+* *(deps)* Update module golang.org/x/oauth2 to v0.4.0 (#1354)
+* *(deps)* Update github.com/gocarina/gocsv digest to 763e25b (#1370)
+* *(deps)* Update goreleaser/nfpm docker tag to v2.24.0 (#1367)
+* *(deps)* Update module github.com/swaggo/swag to v1.8.10 (#1371)
+* *(deps)* Update module github.com/go-redis/redis/v8 to v9 (#1377)
+* *(deps)* Update module github.com/labstack/echo-jwt/v4 to v4.1.0
+* *(deps)* Update module github.com/ulule/limiter/v3 to v3.11.0 (#1378)
+* *(deps)* Update module github.com/redis/go-redis/v9 to v9.0.2
+* *(deps)* Update goreleaser/nfpm docker tag to v2.25.0 (#1382)
+* *(deps)* Upgrade golangci-lint to 1.51.0
+* *(deps)* Update module github.com/yuin/goldmark to v1.5.4
+* *(deps)* Update module go to 1.20
+* *(deps)* Update xgo to 1.20
+* *(deps)* Update module golang.org/x/sys to v0.5.0
+* *(deps)* Update module github.com/getsentry/sentry-go to v0.18.0 (#1386)
+* *(deps)* Update module golang.org/x/term to v0.5.0
+* *(deps)* Update module golang.org/x/crypto to v0.6.0
+* *(deps)* Update module golang.org/x/oauth2 to v0.5.0
+* *(deps)* Update module golang.org/x/image to v0.4.0
+* *(deps)* Update goreleaser/nfpm docker tag to v2.26.0 (#1394)
+* *(deps)* Update github.com/arran4/golang-ical digest to 07c6aad
+* *(deps)* Update module github.com/threedotslabs/watermill to v1.2.0 (#1384)
+* *(deps)* Update module golang.org/x/image to v0.5.0 (#1396)
+* *(deps)* Update golang.org/x/net to 0.7.0
+* *(deps)* Update module github.com/golang-jwt/jwt/v4 to v4.5.0 (#1399)
+* *(deps)* Update github.com/gocarina/gocsv digest to bcce7dc
+* *(deps)* Update golangci-lint to 1.51.2
+* *(deps)* Update module github.com/labstack/echo/v4 to v4.10.1
+* *(deps)* Update github.com/gocarina/gocsv digest to bee85ea
+* *(deps)* Update module github.com/labstack/echo/v4 to v4.10.2
+* *(deps)* Update module github.com/spf13/afero to v1.9.4
+* *(deps)* Update github.com/gocarina/gocsv digest to dc4ee9d
+* *(deps)* Update module github.com/stretchr/testify to v1.8.2
+* *(deps)* Update github.com/gocarina/gocsv digest to 70c27cb
+* *(deps)* Update module golang.org/x/sys to v0.6.0
+* *(deps)* Update module golang.org/x/term to v0.6.0
+* *(deps)* Update module golang.org/x/crypto to v0.7.0
+* *(deps)* Update module golang.org/x/oauth2 to v0.6.0
+* *(deps)* Update module golang.org/x/image to v0.6.0
+* *(deps)* Update github.com/kolaente/caldav-go digest to 2a4eb8b
+* *(deps)* Remove fsnotify replacement
+* *(deps)* Update github.com/vectordotdev/go-datemath digest to f3954d0
+* *(deps)* Update src.techknowlogick.com/xgo digest to 44f7e66
+* *(deps)* Update module github.com/getsentry/sentry-go to v0.19.0
+* *(deps)* Update module github.com/spf13/afero to v1.9.5
+* *(deps)* Update module github.com/ulule/limiter/v3 to v3.11.1
+* *(deps)* Update src.techknowlogick.com/xgo digest to b607086
+* *(deps)* Update module github.com/gabriel-vasile/mimetype to v1.4.2
+
+### Features
+
+* *(background)* Add Last-Modified header (#1376)
+* *(caldav)* Add support for repeating tasks
+* *(caldav)* Export Labels to CalDAV (#1409)
+* *(caldav)* Import caldav categories as Labels (#1413)
+* *(migrators)* Remove wunderlist (#1346)
+* *(release)* Use compressed binaries for package releases
+* Use docker buildx to build multiarch images ([a6e214b](a6e214b654f28836cc8b93683dbfd5999282d11c))
+* Provide logout url for openid providers (#1340) ([a79b1de](a79b1de2d0247a424f49cecaa267d30e8fa70a83))
+* Refactored Dockerfile (#1375) ([522bf7d](522bf7d2fc3cc1704f58299b6435baccc7add533))
+* Disable events log by default ([da9d25c](da9d25cf727c56acd7394b4b74e17a2959ee5242))
+  - **BREAKING**: events log level is now off unless explicitly enabled
+
+
+### Miscellaneous Tasks
+
+* *(docs)* Adjust docs about frontend docker container
+* *(docs)* Remove sponsors
+* *(task)* Add test to check if a task's reminders are duplicated
+* Remove custom gitea bug template in favor of githubs ([4fa45bf](4fa45bf9dcbaa8a41a53fc2305c4c2c1aa15691c))
+* 0.20.2 release preperations ([d19fc80](d19fc80b8be08673136d84e10187cadb293822bf))
+* Update funding links ([aa25ccd](aa25ccdc917684583a9bff4b7cb272004386f0fa))
+
+
+### Other
+
+* *(other)* Added Google & Google Workspace to OpenId examples (#1319)
+
+
 ## [0.20.2] - 2023-01-24
 
 ### Bug Fixes
@@ -1243,7 +1427,7 @@ All releases can be found on https://code.vikunja.io/api/releases.
 * Add option to disable totp for everyone
 * Add plausible to docs
 * Add restarting commands to all example docker compose files
-* Add seperate docker pipeline for amd64 and arm
+* Add separate docker pipeline for amd64 and arm
 * Add test mail command (#571)
 * Add todoist migrator to available migrators in info endpoint if it is enabled
 * Add unsplash image proxy for images and thumbnails
@@ -1436,7 +1620,7 @@ All releases can be found on https://code.vikunja.io/api/releases.
 * Update Renovate Configuration (#161)
 * Update src.techknowlogick.com/xgo commit hash to bb0faa3 (#279)
 * Update src.techknowlogick.com/xgo commit hash to c43d4c4 (#224)
-* Update xorm redis cacher to use the xorm logger instead of a special seperate one
+* Update xorm redis cacher to use the xorm logger instead of a special separate one
 * Update xorm to v1 (#323)
 
 ## [0.12] - 2020-04-04
@@ -1577,7 +1761,7 @@ All releases can be found on https://code.vikunja.io/api/releases.
 
 ### Added
 
-* Better Caldav support (#73)
+* Better CalDAV support (#73)
 * Added settings for max open/idle connections and max connection lifetime (#74)
 * /info endpoint (#85)
 * Added http endpoint to list all users on a list (#87)

Dockerfile

@@ -3,7 +3,7 @@
 #  │─││ │││  │ │
 #  ┘─┘┘─┘┘┘─┘┘─┘
 
-FROM techknowlogick/xgo:go-1.19.2 AS builder
+FROM --platform=$BUILDPLATFORM techknowlogick/xgo:go-1.20.x AS builder
 
 RUN go install github.com/magefile/mage@latest && \
     mv /go/bin/mage /usr/local/go/bin
@@ -13,7 +13,8 @@ COPY . ./
 
 ARG TARGETOS TARGETARCH TARGETVARIANT
 
-RUN mage build:clean && \
+RUN export PATH=$PATH:$GOPATH/bin && \
+	mage build:clean && \
     mage release:xgo "${TARGETOS}/${TARGETARCH}/${TARGETVARIANT}"
 
 #  ┬─┐┬ ┐┌┐┐┌┐┐┬─┐┬─┐
@@ -23,16 +24,19 @@ RUN mage build:clean && \
 # The actual image
 # Note: I wanted to use the scratch image here, but unfortunatly the go-sqlite bindings require cgo and
 # because of this, the container would not start when I compiled the image without cgo.
-FROM alpine:3.17 AS runner
+FROM alpine:3.18 AS runner
 LABEL maintainer="maintainers@vikunja.io"
 WORKDIR /app/vikunja
 ENTRYPOINT [ "/sbin/tini", "-g", "--", "/entrypoint.sh" ]
+EXPOSE 3456
 
 ENV VIKUNJA_SERVICE_ROOTPATH=/app/vikunja/
 ENV PUID 1000
 ENV PGID 1000
 
-RUN apk --update --no-cache add tzdata tini
+RUN apk --update --no-cache add tzdata tini shadow && \
+    addgroup vikunja && \
+    adduser -s /bin/sh -D -G vikunja vikunja -h /app/vikunja -H
 COPY docker/entrypoint.sh /entrypoint.sh
 RUN chmod 0755 /entrypoint.sh && mkdir files
 

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://drone.kolaente.de/api/badges/vikunja/api/status.svg)](https://drone.kolaente.de/vikunja/api)
 [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](LICENSE)
-[![Download](https://img.shields.io/badge/download-v0.20.2-brightgreen.svg)](https://dl.vikunja.io)
+[![Download](https://img.shields.io/badge/download-v0.20.4-brightgreen.svg)](https://dl.vikunja.io)
 [![Docker Pulls](https://img.shields.io/docker/pulls/vikunja/api.svg)](https://hub.docker.com/r/vikunja/api/)
 [![Swagger Docs](https://img.shields.io/badge/swagger-docs-brightgreen.svg)](https://try.vikunja.io/api/v1/docs)
 [![Go Report Card](https://goreportcard.com/badge/kolaente.dev/vikunja/api)](https://goreportcard.com/report/kolaente.dev/vikunja/api)
@@ -56,10 +56,6 @@ See [the roadmap](https://my.vikunja.cloud/share/QFyzYEmEYfSyQfTOmIRSwLUpkFjboaB
 
 Fork -> Push -> Pull-Request. Also see the [dev docs](https://vikunja.io/docs/development/) for more info.
 
-## Sponsors
-
-[![Relm](https://vikunja.io/images/sponsors/relm.png)](https://relm.us)
-
 ## License
 
 This project is licensed under the AGPLv3 License. See the [LICENSE](LICENSE) file for the full license text.

config.yml.sample

@@ -3,7 +3,7 @@ service:
   # Default is a random token which will be generated at each startup of vikunja.
   # (This means all already issued tokens will be invalid once you restart vikunja)
   JWTSecret: "<jwt-secret>"
-  # The duration of the issed JWT tokens in seconds.
+  # The duration of the issued JWT tokens in seconds.
   # The default is 259200 seconds (3 Days).
   jwtttl: 259200
   # The duration of the "remember me" time in seconds. When the login request is made with 
@@ -30,7 +30,7 @@ service:
   enablecaldav: true
   # Set the motd message, available from the /info endpoint
   motd: ""
-  # Enable sharing of lists via a link
+  # Enable sharing of project via a link
   enablelinksharing: true
   # Whether to let new users registering themselves or not
   enableregistration: true
@@ -46,7 +46,7 @@ service:
   sentrydsn: ''
   # If not empty, this will enable `/test/{table}` endpoints which allow to put any content in the database.
   # Used to reset the db before frontend tests. Because this is quite a dangerous feature allowing for lots of harm,
-  # each request made to this endpoint neefs to provide an `Authorization: <token>` header with the token from below. <br/>
+  # each request made to this endpoint needs to provide an `Authorization: <token>` header with the token from below. <br/>
   # **You should never use this unless you know exactly what you're doing**
   testingtoken: ''
   # If enabled, vikunja will send an email to everyone who is either assigned to a task or created it when a task reminder
@@ -77,7 +77,7 @@ database:
   maxopenconnections: 100
   # Sets the maximum number of idle connections to the db.
   maxidleconnections: 50
-  # The maximum lifetime of a single db connection in miliseconds.
+  # The maximum lifetime of a single db connection in milliseconds.
   maxconnectionlifetime: 10000
   # Secure connection mode. Only used with postgres.
   # (see https://pkg.go.dev/github.com/lib/pq?tab=doc#hdr-Connection_String_Parameters)
@@ -96,7 +96,7 @@ cache:
   enabled: false
   # Cache type. Possible values are "keyvalue", "memory" or "redis".
   # When choosing "keyvalue" this setting follows the one configured in the "keyvalue" section.
-  # When choosing "redis" you will need to configure the redis connection seperately.
+  # When choosing "redis" you will need to configure the redis connection separately.
   type: keyvalue
   # When using memory this defines the maximum size an element can take
   maxelementsize: 1000
@@ -106,14 +106,14 @@ redis:
   enabled: false
   # The host of the redis server including its port.
   host: 'localhost:6379'
-  # The password used to authenicate against the redis server
+  # The password used to authenticate against the redis server
   password: ''
   # 0 means default database
   db: 0
 
 cors:
   # Whether to enable or disable cors headers.
-  # Note: If you want to put the frontend and the api on seperate domains or ports, you will need to enable this.
+  # Note: If you want to put the frontend and the api on separate domains or ports, you will need to enable this.
   #       Otherwise the frontend won't be able to make requests to the api through the browser.
   enable: true
   # A list of origins which may access the api. These need to include the protocol (`http://` or `https://`) and port, if any.
@@ -165,9 +165,13 @@ log:
   # Echo has its own logging which usually is unnecessary, which is why it is disabled by default. Possible values are stdout, stderr, file or off to disable standard logging.
   echo: "off"
   # Whether or not to log events. Useful for debugging. Possible values are stdout, stderr, file or off to disable events logging.
-  events: "stdout"
+  events: "off"
   # The log level for event log messages. Possible values (case-insensitive) are ERROR, INFO, DEBUG.
   eventslevel: "info"
+  # Whether or not to log mail log messages. This will not log mail contents. Possible values are stdout, stderr, file or off to disable mail-related logging.
+  mail: "off"
+  # The log level for mail log messages. Possible values (case-insensitive) are ERROR, WARNING, INFO, DEBUG.
+  maillevel: "info"
 
 ratelimit:
   # whether or not to enable the rate limit
@@ -206,7 +210,7 @@ migration:
     # Note that the vikunja frontend expects this to be /migrate/todoist
     redirecturl: <frontend url>/migrate/todoist
   trello:
-    # Wheter to enable the trello migrator or not
+    # Whether to enable the trello migrator or not
     enable: false
     # The client id, required for making requests to the trello api
     # You need to register your vikunja instance at https://trello.com/app-key (log in before you visit that link) to get this
@@ -222,7 +226,7 @@ migration:
     enable: false
     # The client id, required for making requests to the microsoft graph api
     # See https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app#register-an-application
-    # for information about how to register your vikuinja instance.
+    # for information about how to register your Vikunja instance.
     clientid:
     # The client secret, also required for making requests to the microsoft graph api
     clientsecret:
@@ -238,14 +242,14 @@ avatar:
   gravatarexpiration: 3600
 
 backgrounds:
-  # Whether to enable backgrounds for lists at all.
+  # Whether to enable backgrounds for projects at all.
   enabled: true
   providers:
     upload:
-      # Whethere to enable uploaded list backgrounds
+      # Whether to enable uploaded project backgrounds
       enabled: true
     unsplash:
-      # Whether to enable setting backgrounds from unsplash as list backgrounds
+      # Whether to enable setting backgrounds from unsplash as project backgrounds
       enabled: false
       # You need to create an application for your installation at https://unsplash.com/oauth/applications/new
       # and set the access token below.
@@ -265,7 +269,7 @@ legal:
 # Key Value Storage settings
 # The Key Value Storage is used for different kinds of things like metrics and a few cache systems.
 keyvalue:
-  # The type of the storage backend. Can be either "memory" or "redis". If "redis" is chosen it needs to be configured seperately.
+  # The type of the storage backend. Can be either "memory" or "redis". If "redis" is chosen it needs to be configured separately.
   type: "memory"
 
 auth:
@@ -280,7 +284,7 @@ auth:
   # If the email is not public in those cases, authenticating will fail.
   # **Note 2:** The frontend expects to be redirected after authentication by the third party
   # to <frontend-url>/auth/openid/<auth key>. Please make sure to configure the redirect url with your third party
-  # auth service accordingy if you're using the default vikunja frontend.
+  # auth service accordingly if you're using the default vikunja frontend.
   # Take a look at the [default config file](https://kolaente.dev/vikunja/api/src/branch/main/config.yml.sample) for more information about how to configure openid authentication.
   openid:
     # Enable or disable OpenID Connect authentication
@@ -306,7 +310,7 @@ auth:
 
 # Prometheus metrics endpoint
 metrics:
-  # If set to true, enables a /metrics endpoint for prometheus to collect metrics about Vikunja.
+  # If set to true, enables a /metrics endpoint for prometheus to collect metrics about Vikunja. You can query it from `/api/v1/metrics`.
   enabled: false
   # If set to a non-empty value the /metrics endpoint will require this as a username via basic auth in combination with the password below.
   username:
@@ -329,8 +333,8 @@ defaultsettings:
   overdue_tasks_reminders_enabled: true
   # When to send the overdue task reminder email.
   overdue_tasks_reminders_time: 9:00
-  # The id of the default list. Make sure users actually have access to this list when setting this value.
-  default_list_id: 0
+  # The id of the default project. Make sure users actually have access to this project when setting this value.
+  default_project_id: 0
   # Start of the week for the user. `0` is sunday, `1` is monday and so on.
   week_start: 0
   # The language of the user interface. Must be an ISO 639-1 language code. Will default to the browser language the user uses when signing up.

docker/entrypoint.sh

@@ -4,12 +4,12 @@ set -e
 if [ -n "$PUID" ] && [ "$PUID" -ne 0 ] && \
    [ -n "$PGID" ] && [ "$PGID" -ne 0 ] ; then
   echo "info: creating the new user vikunja with $PUID:$PGID"
-  addgroup -g "$PGID" vikunja
-  adduser -s /bin/sh -D -G vikunja -u "$PUID" vikunja -h /app/vikunja -H
-  chown -R vikunja:vikunja ./
-  su -pc /app/vikunja/vikunja - vikunja "$@"
+  groupmod -g "$PGID" -o vikunja
+  usermod -u "$PUID" -o vikunja
+  chown -R vikunja:vikunja ./files/
+  chown vikunja:vikunja .
+  exec su vikunja -c /app/vikunja/vikunja "$@"
 else
   echo "info: creation of non-root user is skipped"
   exec /app/vikunja/vikunja "$@"
 fi
-

docs/config.yml

@@ -28,7 +28,7 @@ markup:
 menu:
   page:
     - name: Home
-      url: https://vikunja.io/en/
+      url: https://vikunja.io/
       weight: 10
     - name: Features
       url: https://vikunja.io/features
@@ -36,6 +36,9 @@ menu:
     - name: Download
       url: https://vikunja.io/download
       weight: 30
+    - name: Blog
+      url: https://vikunja.io/blog/
+      weight: 35
     - name: Docs
       url: https://vikunja.io/docs
       weight: 40
@@ -45,6 +48,16 @@ menu:
     - name: Community
       url: https://community.vikunja.io/
       weight: 60
+    - name: Stickers
+      url: https://vikunja.cloud/stickers?utm_source=io&utm_medium=io&utm_campaign=menu
+      weight: 65
     - name: Get it Hosted
       url: https://vikunja.cloud/?utm_source=io&utm_medium=io&utm_campaign=menu
       weight: 70
+  sidebar:
+    - name: setup
+      weight: 10
+    - name: usage
+      weight: 20
+    - name: development
+      weight: 30

docs/content/doc/_index.md

@@ -22,4 +22,4 @@ and [available configuration options]({{< ref "./setup/config.md">}}).
 
 ## Developing
 
-If you want to start contributing to Vikunja, take a look at [the development docs]({{< ref "./development/development.md">}}).
+If you want to start contributing to Vikunja, take a look at [the development docs]({{< ref "./development/development.md">}}).

docs/content/doc/development/cli.md

@@ -12,10 +12,10 @@ menu:
 
 All cli-related functions are located in `pkg/cmd`.
 Each cli command usually calls a function in another package.
-For example, the `vikunja migrate` command calls `migration.Migrate()`. 
+For example, the `vikunja migrate` command calls `migration.Migrate()`.
 
 Vikunja uses the amazing [cobra](https://github.com/spf13/cobra) library for its cli.
-Please refer to its documentation for informations about how to use flags etc.
+Please refer to its documentation for information about how to use flags etc.
 
 To add a new cli command, add something like the following:
 

docs/content/doc/development/config.md

@@ -29,7 +29,7 @@ Then run `mage generate-docs` to generate the configuration docs from the sample
 
 ## Getting Configuration Values
 
-To retreive a configured value call the key with a getter for the type you need.
+To retrieve a configured value call the key with a getter for the type you need.
 For example:
 
 {{< highlight golang >}}

docs/content/doc/development/cron.md

@@ -12,9 +12,7 @@ menu:
 Cron jobs are tasks which run on a predefined schedule.
 Vikunja uses these through a light wrapper package around the excellent [github.com/robfig/cron](https://github.com/robfig/cron) package.
 
-The package exposes a `cron.Schedule` method with two arguments: The first one to define the schedule when the cron task 
-should run, and the second one with the actual function to run at the schedule.
-You would then create a new function to register your the actual cron task in your package.
+The package exposes a `cron.Schedule` method with two arguments: The first one to define the schedule when the cron task should run, and the second one with the actual function to run at the schedule. You would then create a new function to register your the actual cron task in your package.
 
 A basic function to register a cron task looks like this:
 

docs/content/doc/development/database.md

@@ -26,8 +26,7 @@ To add a new table to the database, create the struct and [add a migration for i
 
 To learn more about how to configure your struct to create "good" tables, refer to [the xorm documentaion](https://xorm.io/docs/).
 
-In most cases you will also need to implement the `TableName() string` method on the new struct to make sure the table 
-name matches the rest of the tables - plural.
+In most cases you will also need to implement the `TableName() string` method on the new struct to make sure the table name matches the rest of the tables - plural.
 
 ## Adding data to test fixtures
 
@@ -36,5 +35,4 @@ Adding data for test fixtures can be done via `yaml` files in `pkg/models/fixtur
 The name of the yaml file should match the table name in the database.
 Adding values to it is done via array definition inside it.
 
-**Note**: Table and column names need to be in snake_case as that's what is used internally in the database 
-and for mapping values from the database to xorm so your structs can use it.
+**Note**: Table and column names need to be in snake_case as that's what is used internally in the database and for mapping values from the database to xorm so your structs can use it.

docs/content/doc/development/db-migrations.md

@@ -25,7 +25,7 @@ All migrations are stored in `pkg/migrations` and files should have the same nam
 Each migration should have a function to apply and roll it back, as well as a numeric id (the datetime)
 and a more in-depth description of what the migration actually does.
 
-To easily get a new id, run the following on any unix system: 
+To easily get a new id, run the following on any unix system:
 
 {{< highlight bash >}}
 date +%Y%m%d%H%M%S
@@ -75,4 +75,4 @@ func init() {
 }
 {{< /highlight >}}
 
-You should always copy the changed parts of the struct you're changing when adding migraitons.
+You should always copy the changed parts of the struct you're changing when adding migrations.

docs/content/doc/development/development.md

@@ -48,7 +48,7 @@ A release gets tagged from the main branch with the version name as tag name.
 
 Backports and point-releases should go to a `release/version` branch, based on the tag they are building on top of.
 
-## Conventional commits
+## Conventional Commits
 
 We're using [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) because they greatly simplify generating release notes.
 

docs/content/doc/development/errors.md

@@ -13,14 +13,14 @@ menu:
 All custom errors are defined in `pkg/models/errors.go`.
 You should add new ones in this file.
 
-Custom errors usually have fields for the http return code, a [vikunja-specific error code]({{< ref "../usage/errors.md">}}) 
+Custom errors usually have fields for the http return code, a [Vikunja-specific error code]({{< ref "../usage/errors.md">}}) 
 and a human-readable error message about what went wrong.
 
 An error consists of multiple functions and definitions:
 
 {{< highlight golang >}}
 // This struct holds any information about this specific error.
-// In this case, it contains the user ID of a nonexistand user.
+// In this case, it contains the user ID of a nonexistent user.
 // This type should always be a struct, even if it has no values in it.
 
 // ErrUserDoesNotExist represents a "UserDoesNotExist" kind of error.
@@ -44,21 +44,21 @@ func (err ErrUserDoesNotExist) Error() string {
 	return fmt.Sprintf("User does not exist [user id: %d]", err.UserID)
 }
 
-// This const holds the vikunja error code used to be able to identify this error without having to 
+// This const holds the Vikunja error code used to be able to identify this error without having to 
 // rely on an error string.
 // This needs to be unique, so you should check whether the error code exists or not.
 // The general convention for error codes is as follows:
 // * Every "group" errors lives in a thousend something. For example all user issues are 1000-something, all 
-//   list errors are 3000-something and so on.
+//   project errors are 3000-something and so on.
 // * New error codes should be the current max error code + 1. Don't take free numbers to prevent old errors
-//   which are depricated and removed from being "new ones". For example, if there are error codes 1001, 1002, 1004,
+//   which are deprecated and removed from being "new ones". For example, if there are error codes 1001, 1002, 1004,
 //   a new error should be 1005 and not 1003.
 
 // ErrCodeUserDoesNotExist holds the unique world-error code of this error
 const ErrCodeUserDoesNotExist = 1005
 
 // This is the implementation which returns an http error which is then passed to the client.
-// Here you define the http status code with which one the error will be returned, the vikunja error code and 
+// Here you define the http status code with which one the error will be returned, the Vikunja error code and 
 // a human-readable error message.
 
 // HTTPError holds the http error description

docs/content/doc/development/events-and-listeners.md

@@ -42,7 +42,7 @@ You then get the event with all its data back in the listener, see below.
 #### Naming Convention
 
 Event names should roughly have the entity they're dealing with on the left and the action on the right of the name, separated by `.`.
-There's no limit to how "deep" or specifig an event name can be.
+There's no limit to how "deep" or specific an event name can be.
 
 The name should have the most general concept it's describing at the left, getting more specific on the right of it.
 
@@ -104,7 +104,7 @@ func createTask(s *xorm.Session, t *Task, a web.Auth, updateAssignees bool) (err
 }
 {{< /highlight >}}
 
-As you can see, the curent task and doer are injected into it.
+As you can see, the current task and doer are injected into it.
 
 ### Special Events
 
@@ -133,7 +133,7 @@ type Listener interface {
 The `Handle` method is executed when the event this listener listens on is dispatched. 
 * As the single parameter, it gets the payload of the event, which is the event struct when it was dispatched decoded as json object and passed as a slice of bytes.
 To use it you'll need to unmarshal it. Unfortunately there's no way to pass an already populated event object to the function because we would not know what type it has when parsing it.
-* If the handler returns an error, the listener is retried 5 times, with an exponentional back-off period in between retries.
+* If the handler returns an error, the listener is retried 5 times, with an exponential back-off period in between retries.
 If it still fails after the fifth retry, the event is nack'd and it's up to the event dispatcher to resend it.
 You can learn more about this mechanism in the [watermill documentation](https://watermill.io/docs/middlewares/#retry).
 
@@ -148,7 +148,7 @@ The easiest way to create a new listener for an event is with mage:
 mage dev:make-listener <listener-name> <event-name> <package>
 ```
 
-This will create a new listener type in the `pkg/<package>/listners.go` file and implement the `Handle` and `Name` methods.
+This will create a new listener type in the `pkg/<package>/listeners.go` file and implement the `Handle` and `Name` methods.
 It will also pre-generate some boilerplate code to unmarshal the event from the payload.
 
 Furthermore, it will register the listener for its event in the `RegisterListeners()` method of the same file.
@@ -157,7 +157,7 @@ This function is called at startup and has to contain all events you want to lis
 ### Listening for Events
 
 To listen for an event, you need to register the listener for the event it should be called for.
-This usually happens in the `RegisterListeners()` method in `pkg/<package>/listners.go` which is called at start up.
+This usually happens in the `RegisterListeners()` method in `pkg/<package>/listeners.go` which is called at start up.
 
 The listener will never be executed if it hasn't been registered.
 
@@ -179,7 +179,7 @@ func (s *IncreaseTaskCounter) Name() string {
     return "task.counter.increase"
 }
 
-// Hanlde is executed when the event IncreaseTaskCounter listens on is fired
+// Handle is executed when the event IncreaseTaskCounter listens on is fired
 func (s *IncreaseTaskCounter) Handle(payload message.Payload) (err error) {
     return keyvalue.IncrBy(metrics.TaskCountKey, 1)
 }

docs/content/doc/development/feature.md

@@ -26,8 +26,8 @@ It returns the `limit` (max-length) and `offset` parameters needed for SQL-Queri
 You can feed this function directly into xorm's `Limit`-Function like so:
 
 {{< highlight golang >}}
-lists := []List{}
-err := x.Limit(getLimitFromPageIndex(pageIndex, itemsPerPage)).Find(&lists)
+projects := []*Project{}
+err := x.Limit(getLimitFromPageIndex(pageIndex, itemsPerPage)).Find(&projects)
 {{< /highlight >}}
 
 // TODO: Add a full example from start to finish, like a tutorial on how to create a new endpoint?

docs/content/doc/development/mage.md

@@ -31,7 +31,7 @@ go install github.com/magefile/mage
 There are multiple categories of subcommands in the magefile:
 
 * `build`: Contains commands to build a single binary
-* `check`: Contains commands to statically check the source code 
+* `check`: Contains commands to statically check the source code
 * `release`: Contains commands to release Vikunja with everything that's required
 * `test`: Contains commands to run all kinds of tests
 * `dev`: Contains commands to run development tasks
@@ -114,7 +114,7 @@ binary to be able to use it.
 * `mage release:check` creates sha256 checksums for each binary which will be included in the zip file
 * `mage release:os-package` bundles a binary with the `sha256` checksum file, a sample `config.yml` and a copy of the license in a folder for each architecture
 * `mage release:compress` compresses all build binaries with `upx` to save space
-* `mage release:zip` paclages a zip file for the files created by `release:os-package`
+* `mage release:zip` packages a zip file for the files created by `release:os-package`
 
 ### Build os packages
 
@@ -168,7 +168,7 @@ Runs all integration tests.
 mage dev:create-migration
 {{< /highlight >}}
 
-Creates a new migration with the current date. 
+Creates a new migration with the current date.
 Will ask for the name of the struct you want to create a migration for.
 
 See also [migration docs]({{< ref "mage.md" >}}).

docs/content/doc/development/metrics.md

@@ -34,14 +34,13 @@ promauto.NewGaugeFunc(prometheus.GaugeOpts{
 })
 {{< /highlight >}}
 
-Then you'll need to set the metrics initial value on every startup of vikunja.
+Then you'll need to set the metrics initial value on every startup of Vikunja.
 This is done in `pkg/routes/routes.go` to avoid cyclic imports.
 If metrics are enabled, it checks if a redis connection is available and then sets the initial values.
 A convenience function is available if the metric is based on a database struct.
 
 Because metrics are stored in redis, you are responsible to increase or decrease these based on criteria you define.
-To do this, use `metrics.UpdateCount(value, key)` where `value` is the amount you want to cange it (you can pass
-negative values to decrease it) and `key` it the redis key used to define the metric.
+To do this, use `metrics.UpdateCount(value, key)` where `value` is the amount you want to change it (you can pass negative values to decrease it) and `key` it the redis key used to define the metric.
 
 ## Using it
 

docs/content/doc/development/migration.md

@@ -17,12 +17,9 @@ In general, each migrator implements a migrator interface which is then called f
 The interface makes it possible to use helper methods which handle http and focus only on the implementation of the migrator itself.
 
 There are two ways of migrating data from another service:
-1. Through the auth-based flow where the user gives you access to their data at the third-party service through an 
-   oauth flow. You can then call the service's api on behalf of your user to get all the data.
-   The Todoist, Trello and Microsoft To-Do Migrators use this pattern.
-2. A file migration where the user uploads a file obtained from some third-party service. In your migrator, you need 
-   to parse the file and create the lists, tasks etc.
-   The Vikunja File Import uses this pattern.
+
+1. Through the auth-based flow where the user gives you access to their data at the third-party service through an oauth flow. You can then call the service's api on behalf of your user to get all the data. The Todoist, Trello and Microsoft To-Do Migrators use this pattern.
+2. A file migration where the user uploads a file obtained from some third-party service. In your migrator, you need to parse the file and create the projects, tasks etc. The Vikunja File Import uses this pattern.
 
 To differentiate the two, there are two different interfaces you must implement.
 
@@ -43,7 +40,7 @@ type Migrator interface {
 	// Name holds the name of the migration.
 	// This is used to show the name to users and to keep track of users who already migrated.
 	Name() string
-	// Migrate is the interface used to migrate a user's tasks from another platform to vikunja.
+	// Migrate is the interface used to migrate a user's tasks from another platform to Vikunja.
 	// The user object is the user who's tasks will be migrated.
 	Migrate(user *models.User) error
 	// AuthURL returns a url for clients to authenticate against.
@@ -61,7 +58,7 @@ type FileMigrator interface {
 	// Name holds the name of the migration.
 	// This is used to show the name to users and to keep track of users who already migrated.
 	Name() string
-	// Migrate is the interface used to migrate a user's tasks, list and other things from a file to vikunja.
+	// Migrate is the interface used to migrate a user's tasks, projects and other things from a file to Vikunja.
 	// The user object is the user who's tasks will be migrated.
 	Migrate(user *user.User, file io.ReaderAt, size int64) error
 }
@@ -102,35 +99,32 @@ You should also document the routes with [swagger annotations]({{< ref "swagger-
 
 ## Insertion helper method
 
-There is a method available in the `migration` package which takes a fully nested Vikunja structure and creates it with all relations. 
-This means you start by adding a namespace, then add lists inside of that namespace, then tasks in the lists and so on.
+There is a method available in the `migration` package which takes a fully nested Vikunja structure and creates it with all relations.
+This means you start by adding a namespace, then add projects inside that namespace, then tasks in the lists and so on.
 
-The root structure must be present as `[]*models.NamespaceWithListsAndTasks`. It allows to represent all of Vikunja's 
-hierachie as a single data structure.
+The root structure must be present as `[]*models.NamespaceWithProjectsAndTasks`. It allows to represent all of Vikunja's hierarchy as a single data structure.
 
 Then call the method like so:
 
 ```go
-fullVikunjaHierachie, err := convertWunderlistToVikunja(wContent)
+fullVikunjaHierarchy, err := convertWunderlistToVikunja(wContent)
 if err != nil {
     return
 }
 
-err = migration.InsertFromStructure(fullVikunjaHierachie, user)
+err = migration.InsertFromStructure(fullVikunjaHierarchy, user)
 ```
 
 ## Configuration
 
 If your migrator is an oauth-based one, you should add at least an option to enable or disable it.
-Chances are, you'll need some more options for things like client ID and secret 
-(if the other service uses oAuth as an authentication flow).
+Chances are, you'll need some more options for things like client ID and secret (if the other service uses oAuth as an authentication flow).
 
-The easiest way to implement an on/off switch is to check whether your migration service is enabled or not when 
-registering the routes, and then simply don't registering the routes in case it is disabled.
+The easiest way to implement an on/off switch is to check whether your migration service is enabled or not when registering the routes, and then simply don't registering the routes in case it is disabled.
 
 File based migrators can always be enabled.
 
-### Making the migrator public in `/info` 
+### Making the migrator public in `/info`
 
 You should make your migrator available in the `/info` endpoint so that frontends can display options to enable them or not.
 To do this, add an entry to the `AvailableMigrators` field in `pkg/routes/api/v1/info.go`.

docs/content/doc/development/notifications.md

@@ -10,7 +10,7 @@ menu:
 
 # Notifications
 
-Vikunjs provides a simple abstraction to send notifications per mail and in the database.
+Vikunja provides a simple abstraction to send notifications per mail and in the database.
 
 {{< table_of_contents >}}
 
@@ -39,7 +39,7 @@ A list of chainable functions is available to compose a mail:
 mail := NewMail(). 
     // The optional sender of the mail message.
     From("test@example.com").
-	// The optional receipient of the mail message. Uses the mail address of the notifiable if omitted.
+	// The optional recipient of the mail message. Uses the mail address of the notifiable if omitted.
     To("test@otherdomain.com").
 	// The subject of the mail to send.
     Subject("Testmail").
@@ -49,7 +49,7 @@ mail := NewMail().
     Line("This is a line of text").
 	// An action can contain a title and a url. It gets rendered as a big button in the mail.
 	// Note that you can have only one action per mail.
-	// All lines added before an action will appearr in the mail before the button, all lines 
+	// All lines added before an action will appear in the mail before the button, all lines
 	// added afterwards will appear after it.
     Action("The Action", "https://example.com").
 	// Another line of text.
@@ -60,8 +60,7 @@ If not provided, the `from` field of the mail contains the value configured in [
 
 ### Database notifications
 
-All data returned from the `ToDB()` method is serialized to json and saved into the database, along with the id of the 
-notifiable, the name of the notification and a time stamp.
+All data returned from the `ToDB()` method is serialized to json and saved into the database, along with the id of the notifiable, the name of the notification and a time stamp.
 If you don't use the database notification, the `Name()` function can return an empty string.
 
 ## Creating a new notification

docs/content/doc/development/releasing.md

@@ -12,10 +12,10 @@ menu:
 This checklist is a collection of all steps usually involved when releasing a new version of Vikunja.
 Not all steps are necessary for every release.
 
-* Website update :
+* Website update
 	* New Features: If there are new features worth mentioning the feature page should be updated.
-	* New Screenshots: If an overhaul of an existing feature happend so that it now looks different from the existing screenshot, a new one is required.
-* Generate changelogs: (with git-cliff)
+	* New Screenshots: If an overhaul of an existing feature happened so that it now looks different from the existing screenshot, a new one is required.
+* Generate changelogs (with git-cliff)
 	* Frontend
 	* API
 	* Desktop
@@ -23,11 +23,11 @@ Not all steps are necessary for every release.
 	* Frontend
 	* API
 	* Desktop
-	* Once built: Prune the cloudflare cache so that the new versions show up at dl.vikunja.io
-* Release Highlights Blogpost:
+	* Once built: Prune the cloudflare cache so that the new versions show up at [dl.vikunja.io](https://dl.vikunja.io/)
+* Release Highlights Blogpost
 	* Include a section about Vikunja in general (totally fine to copy one from the earlier blog posts)
-	* New Features & Improvements: Mention bigger features, potentially with screenshots. Things like refactoring are sometimes also worth mentioneing.
-* Publish:
+	* New Features & Improvements: Mention bigger features, potentially with screenshots. Things like refactoring are sometimes also worth mentioning.
+* Publish
 	* Reddit
 	* Twitter
 	* Mastodon
@@ -36,4 +36,3 @@ Not all steps are necessary for every release.
 	* Forum
 	* If features in the release were sponsored, send an email to relevant stakeholders
 * Update Vikunja Cloud version and other instances
-

docs/content/doc/development/structure.md

@@ -64,7 +64,7 @@ See [integration tests]({{< ref "test.md" >}}#integration-tests) for more detail
 
 ### log
 
-Similar to `config`, this will set up the logging, based on differen logging backends.
+Similar to `config`, this will set up the logging, based on different logging backends.
 This init is called in `main.go` after the config init is done.
 
 ### mail
@@ -108,7 +108,7 @@ Contains all possible avatar providers a user can choose to set their avatar.
 
 #### background
 
-All list background providers are in sub-packages of this package.
+All project background providers are in sub-packages of this package.
 
 #### dump
 
@@ -126,7 +126,7 @@ See [writing a migrator]({{< ref "migration.md" >}}).
 ### red (redis)
 
 This package initializes a connection to a redis server.
-This inizialization is automatically done at the startup of vikunja.
+This initialization is automatically done at the startup of Vikunja.
 
 It also has a function (`GetRedis()`) which returns a redis client object you can then use in your package 
 to talk to redis.
@@ -138,7 +138,7 @@ In most cases, using the `keyvalue` package is a better fit.
 
 ### routes
 
-This package defines all routes which are available for vikunja clients to use.
+This package defines all routes which are available for Vikunja clients to use.
 To add a new route, see [adding a new route]({{< ref "feature.md">}}).
 
 #### api/v1
@@ -148,7 +148,7 @@ Every handler function which does not use the standard web handler should live h
 
 ### swagger
 
-This is where the [generated]({{< ref "mage.md#generate-swagger-definitions-from-code-comments">}} [api docs]({{< ref "../usage/api.md">}}) live. 
+This is where the [generated]({{< ref "mage.md#generate-swagger-definitions-from-code-comments">}}) [api docs]({{< ref "../usage/api.md">}}) live. 
 You usually don't need to touch this package.
 
 ### user
@@ -162,10 +162,9 @@ A small package, containing some helper functions:
 * `MakeRandomString`: Generates a random string of a given length.
 * `Sha256`: Calculates a sha256 hash from a given string.
 
-See their function definitions for instructions on how to use them. 
+See their function definitions for instructions on how to use them.
 
 ### version
 
-The single purpouse of this package is to hold the current vikunja version which gets overridden through build flags 
-each time `mage release` or `mage build` is run.
-It is a seperate package to avoid import cycles with other packages.
+The single purpose of this package is to hold the current Vikunja version which gets overridden through build flags each time `mage release` or `mage build` is run.
+It is a separate package to avoid import cycles with other packages.

docs/content/doc/development/swagger-docs.md

@@ -19,29 +19,51 @@ The api documentation is generated using [swaggo](https://github.com/swaggo/swag
 You should always comment every field which will be exposed as a json in the api.
 These comments will show up in the documentation, it'll make it easier for developers using the api.
 
-As an example, this is the definition of a list with all comments:
+As an example, this is the definition of a project with all comments:
 
 {{< highlight golang >}}
-// List represents a list of tasks
-type List struct {
-	// The unique, numeric id of this list.
-	ID int64 `xorm:"bigint autoincr not null unique pk" json:"id" param:"list"`
-	// The title of the list. You'll see this in the namespace overview.
-	Title string `xorm:"varchar(250)" json:"title" valid:"required,runelength(3|250)" minLength:"3" maxLength:"250"`
-	// The description of the list.
-	Description string `xorm:"varchar(1000)" json:"description" valid:"runelength(0|1000)" maxLength:"1000"`
-	OwnerID     int64  `xorm:"bigint INDEX" json:"-"`
-	NamespaceID int64  `xorm:"bigint INDEX" json:"-" param:"namespace"`
+type Project struct {
+	// The unique, numeric id of this project.
+	ID int64 `xorm:"bigint autoincr not null unique pk" json:"id" param:"project"`
+	// The title of the project. You'll see this in the namespace overview.
+	Title string `xorm:"varchar(250) not null" json:"title" valid:"required,runelength(1|250)" minLength:"1" maxLength:"250"`
+	// The description of the project.
+	Description string `xorm:"longtext null" json:"description"`
+	// The unique project short identifier. Used to build task identifiers.
+	Identifier string `xorm:"varchar(10) null" json:"identifier" valid:"runelength(0|10)" minLength:"0" maxLength:"10"`
+	// The hex color of this project
+	HexColor string `xorm:"varchar(6) null" json:"hex_color" valid:"runelength(0|6)" maxLength:"6"`
 
-	// The user who created this list.
-	Owner User `xorm:"-" json:"owner" valid:"-"`
-	// An array of tasks which belong to the list.
-	Tasks []*ListTask `xorm:"-" json:"tasks"`
+	OwnerID     int64 `xorm:"bigint INDEX not null" json:"-"`
+	NamespaceID int64 `xorm:"bigint INDEX not null" json:"namespace_id" param:"namespace"`
 
-	// A unix timestamp when this list was created. You cannot change this value.
-	Created int64 `xorm:"created" json:"created"`
-	// A unix timestamp when this list was last updated. You cannot change this value.
-	Updated int64 `xorm:"updated" json:"updated"`
+	// The user who created this project.
+	Owner *user.User `xorm:"-" json:"owner" valid:"-"`
+
+	// Whether or not a project is archived.
+	IsArchived bool `xorm:"not null default false" json:"is_archived" query:"is_archived"`
+
+	// The id of the file this project has set as background
+	BackgroundFileID int64 `xorm:"null" json:"-"`
+	// Holds extra information about the background set since some background providers require attribution or similar. If not null, the background can be accessed at /projects/{projectID}/background
+	BackgroundInformation interface{} `xorm:"-" json:"background_information"`
+	// Contains a very small version of the project background to use as a blurry preview until the actual background is loaded. Check out https://blurha.sh/ to learn how it works.
+	BackgroundBlurHash string `xorm:"varchar(50) null" json:"background_blur_hash"`
+
+	// True if a project is a favorite. Favorite projects show up in a separate namespace. This value depends on the user making the call to the api.
+	IsFavorite bool `xorm:"-" json:"is_favorite"`
+
+	// The subscription status for the user reading this project. You can only read this property, use the subscription endpoints to modify it.
+	// Will only returned when retrieving one project.
+	Subscription *Subscription `xorm:"-" json:"subscription,omitempty"`
+
+	// The position this project has when querying all projects. See the tasks.position property on how to use this.
+	Position float64 `xorm:"double null" json:"position"`
+
+	// A timestamp when this project was created. You cannot change this value.
+	Created time.Time `xorm:"created not null" json:"created"`
+	// A timestamp when this project was last updated. You cannot change this value.
+	Updated time.Time `xorm:"updated not null" json:"updated"`
 
 	web.CRUDable `xorm:"-" json:"-"`
 	web.Rights   `xorm:"-" json:"-"`

docs/content/doc/development/test.md

@@ -46,10 +46,10 @@ To run integration tests, use `mage test:integration`.
 
 ### Running tests with config
 
-You can run tests with all available config variables if you want, enabeling you to run tests for a lot of scenarios.
+You can run tests with all available config variables if you want, enabling you to run tests for a lot of scenarios.
 We use this in CI to run all tests with different databases.
 
-To use the normal config set the enviroment variable `VIKUNJA_TESTS_USE_CONFIG=1`.
+To use the normal config set the environment variable `VIKUNJA_TESTS_USE_CONFIG=1`.
 
 ### Showing sql queries
 

docs/content/doc/development/translations.md

@@ -21,7 +21,7 @@ Currently, only the frontend (and by extension, the desktop app) is translatable
 
 ## Translation Instructions
 
-> These are the instructions for translating Vikunja in another language. 
+> These are the instructions for translating Vikunja in another language.
 > For information about how to add new translation strings, see below.
 
 For all languages these translation guidelines should be applied when translating:
@@ -44,7 +44,7 @@ Instead, translate it to reflect the original meaning in the translated string b
 
 All translation strings are stored in `src/i18n/lang/`.
 New strings should be added only in the `en.json` file.
-Strings in other languages will be synced through weblate and should not be added directly as a PR/commit in the frontend repo.
+Strings in other languages will be synced through [crowdin](https://crowdin.com/project/vikunja) and should not be added directly as a PR/commit in the frontend repo.
 
 ## Requesting a new language
 

docs/content/doc/setup/backups.md

@@ -56,4 +56,4 @@ For more information, please visit the [relevant PostgreSQL documentation](https
 
 ### SQLite
 
-To back up sqllite databases, it is enough to copy the [database file]({{< ref "config.md" >}}#path) to somwhere else.
+To back up sqllite databases, it is enough to copy the [database file]({{< ref "config.md" >}}#path) to somewhere else.

docs/content/doc/setup/build-from-source.md

@@ -19,14 +19,10 @@ To completely build Vikunja from source, you need to build the api and frontend.
 The Vikunja API has no other dependencies than go itself.
 That means compiling it boils down to these steps:
 
-1. Make sure [Go](https://golang.org/doc/install) is properly installed on your system. You'll need at least Go `1.17`.
+1. Make sure [Go](https://golang.org/doc/install) is properly installed on your system. You'll need at least Go `1.19`.
 2. Make sure [Mage](https://magefile.org) is properly installed on your system.
 3. Clone the repo with `git clone https://code.vikunja.io/api` and switch into the directory.
-4. Run `mage build:build` in the source of this repo. This will build a binary in the root of the repo which will be able to run on your system.
-
-*Note:* Static ressources such as email templates are built into the binary.
-For these to work, you may need to run `mage build:generate` before building the vikunja binary.
-When builing entirely with `mage`, you dont need to do this, `mage build:generate` will be run automatically when running `mage build:build`.
+4. Run `mage build` in the source of this repo. This will build a binary in the root of the repo which will be able to run on your system.
 
 ### Build for different architectures
 

docs/content/doc/setup/config.md

@@ -10,8 +10,7 @@ menu:
 
 # Configuration options
 
-You can either use a `config.yml` file in the root directory of vikunja or set almost all config option with 
-environment variables. If you have both, the value set in the config file is used.
+You can either use a `config.yml` file in the root directory of vikunja or set almost all config option with environment variables. If you have both, the value set in the config file is used.
 Right now it is not possible to configure openid authentication via environment variables.
 
 Variables are nested in the `config.yml`, these nested variables become `VIKUNJA_FIRST_CHILD` when configuring via
@@ -31,7 +30,7 @@ first:
 # Formats
 
 Vikunja supports using `toml`, `yaml`, `hcl`, `ini`, `json`, envfile, env variables and Java Properties files.
-We reccomend yaml or toml, but you're free to use whatever you want.
+We recommend yaml or toml, but you're free to use whatever you want.
 
 Vikunja provides a default [`config.yml`](https://kolaente.dev/vikunja/api/src/branch/main/config.yml.sample) file which you can use as a starting point.
 
@@ -56,7 +55,7 @@ If you don't provide a value in your config file, their default will be used.
 Most config variables are nested under some "higher-level" key.
 For example, the `interface` config variable is a child of the `service` key.
 
-The docs below aim to reflect that leveling, but please also have a lookt at [the default config](https://code.vikunja.io/api/src/branch/main/config.yml.sample) file
+The docs below aim to reflect that leveling, but please also have a look at [the default config](https://code.vikunja.io/api/src/branch/main/config.yml.sample) file
 to better grasp how the nesting looks like.
 
 <!-- Generated config will be injected here -->
@@ -82,7 +81,7 @@ Environment path: `VIKUNJA_SERVICE_JWTSECRET`
 
 ### jwtttl
 
-The duration of the issed JWT tokens in seconds.
+The duration of the issued JWT tokens in seconds.
 The default is 259200 seconds (3 Days).
 
 Default: `259200`
@@ -208,7 +207,7 @@ Environment path: `VIKUNJA_SERVICE_MOTD`
 
 ### enablelinksharing
 
-Enable sharing of lists via a link
+Enable sharing of project via a link
 
 Default: `true`
 
@@ -287,7 +286,7 @@ Environment path: `VIKUNJA_SERVICE_SENTRYDSN`
 
 If not empty, this will enable `/test/{table}` endpoints which allow to put any content in the database.
 Used to reset the db before frontend tests. Because this is quite a dangerous feature allowing for lots of harm,
-each request made to this endpoint neefs to provide an `Authorization: <token>` header with the token from below. <br/>
+each request made to this endpoint needs to provide an `Authorization: <token>` header with the token from below. <br/>
 **You should never use this unless you know exactly what you're doing**
 
 Default: `<empty>`
@@ -430,7 +429,7 @@ Environment path: `VIKUNJA_DATABASE_MAXIDLECONNECTIONS`
 
 ### maxconnectionlifetime
 
-The maximum lifetime of a single db connection in miliseconds.
+The maximum lifetime of a single db connection in milliseconds.
 
 Default: `10000`
 
@@ -516,7 +515,7 @@ Environment path: `VIKUNJA_CACHE_ENABLED`
 
 Cache type. Possible values are "keyvalue", "memory" or "redis".
 When choosing "keyvalue" this setting follows the one configured in the "keyvalue" section.
-When choosing "redis" you will need to configure the redis connection seperately.
+When choosing "redis" you will need to configure the redis connection separately.
 
 Default: `keyvalue`
 
@@ -566,7 +565,7 @@ Environment path: `VIKUNJA_REDIS_HOST`
 
 ### password
 
-The password used to authenicate against the redis server
+The password used to authenticate against the redis server
 
 Default: `<empty>`
 
@@ -595,7 +594,7 @@ Environment path: `VIKUNJA_REDIS_DB`
 ### enable
 
 Whether to enable or disable cors headers.
-Note: If you want to put the frontend and the api on seperate domains or ports, you will need to enable this.
+Note: If you want to put the frontend and the api on separate domains or ports, you will need to enable this.
       Otherwise the frontend won't be able to make requests to the api through the browser.
 
 Default: `true`
@@ -853,7 +852,7 @@ Environment path: `VIKUNJA_LOG_ECHO`
 
 Whether or not to log events. Useful for debugging. Possible values are stdout, stderr, file or off to disable events logging.
 
-Default: `stdout`
+Default: `off`
 
 Full path: `log.events`
 
@@ -871,6 +870,28 @@ Full path: `log.eventslevel`
 Environment path: `VIKUNJA_LOG_EVENTSLEVEL`
 
 
+### mail
+
+Whether or not to log mail log messages. This will not log mail contents. Possible values are stdout, stderr, file or off to disable mail-related logging.
+
+Default: `off`
+
+Full path: `log.mail`
+
+Environment path: `VIKUNJA_LOG_MAIL`
+
+
+### maillevel
+
+The log level for mail log messages. Possible values (case-insensitive) are ERROR, WARNING, INFO, DEBUG.
+
+Default: `info`
+
+Full path: `log.maillevel`
+
+Environment path: `VIKUNJA_LOG_MAILLEVEL`
+
+
 ---
 
 ## ratelimit
@@ -1021,7 +1042,7 @@ Environment path: `VIKUNJA_AVATAR_GRAVATAREXPIRATION`
 
 ### enabled
 
-Whether to enable backgrounds for lists at all.
+Whether to enable backgrounds for projects at all.
 
 Default: `true`
 
@@ -1077,7 +1098,7 @@ The Key Value Storage is used for different kinds of things like metrics and a f
 
 ### type
 
-The type of the storage backend. Can be either "memory" or "redis". If "redis" is chosen it needs to be configured seperately.
+The type of the storage backend. Can be either "memory" or "redis". If "redis" is chosen it needs to be configured separately.
 
 Default: `memory`
 
@@ -1112,7 +1133,7 @@ The provider needs to support the `openid`, `profile` and `email` scopes.<br/>
 If the email is not public in those cases, authenticating will fail.
 **Note 2:** The frontend expects to be redirected after authentication by the third party
 to <frontend-url>/auth/openid/<auth key>. Please make sure to configure the redirect url with your third party
-auth service accordingy if you're using the default vikunja frontend.
+auth service accordingly if you're using the default vikunja frontend.
 Take a look at the [default config file](https://kolaente.dev/vikunja/api/src/branch/main/config.yml.sample) for more information about how to configure openid authentication.
 
 Default: `<empty>`
@@ -1132,7 +1153,7 @@ Prometheus metrics endpoint
 
 ### enabled
 
-If set to true, enables a /metrics endpoint for prometheus to collect metrics about Vikunja.
+If set to true, enables a /metrics endpoint for prometheus to collect metrics about Vikunja. You can query it from `/api/v1/metrics`.
 
 Default: `false`
 
@@ -1248,15 +1269,15 @@ Full path: `defaultsettings.overdue_tasks_reminders_time`
 Environment path: `VIKUNJA_DEFAULTSETTINGS_OVERDUE_TASKS_REMINDERS_TIME`
 
 
-### default_list_id
+### default_project_id
 
-The id of the default list. Make sure users actually have access to this list when setting this value.
+The id of the default project. Make sure users actually have access to this project when setting this value.
 
 Default: `0`
 
-Full path: `defaultsettings.default_list_id`
+Full path: `defaultsettings.default_project_id`
 
-Environment path: `VIKUNJA_DEFAULTSETTINGS_DEFAULT_LIST_ID`
+Environment path: `VIKUNJA_DEFAULTSETTINGS_DEFAULT_PROJECT_ID`
 
 
 ### week_start

docs/content/doc/setup/docker-start-to-finish.md

@@ -76,7 +76,7 @@ This defines four services, each with their own container:
 
 * An api service which runs the vikunja api. Most of the core logic lives here.
 * The frontend which will make vikunja actually usable for most people.
-* A database container which will store all lists, tasks, etc. We're using mariadb here, but you're free to use mysql or postgres if you want.
+* A database container which will store all projects, tasks, etc. We're using mariadb here, but you're free to use mysql or postgres if you want.
 * A proxy service which makes the frontend and api available on the same port, redirecting all requests to `/api` to the api container. 
 If you already have a proxy on your host, you may want to check out the [reverse proxy examples]() to use that.
 By default, it uses port 80 on the host.
@@ -201,7 +201,6 @@ You should see something like this:
   "max_file_size": "20MB",
   "registration_enabled": true,
   "available_migrators": [
-    "wunderlist",
     "todoist"
   ],
   "task_attachments_enabled": true

docs/content/doc/setup/full-docker-example.md

@@ -16,7 +16,7 @@ It uses an nginx container or traefik on the host to proxy backend and frontend
 For all available configuration options, see [configuration]({{< ref "config.md">}}).
 
 <div class="notification is-warning">
-<b>NOTE:</b> If you intend to run Vikunja with mysql and/or to use non-latin characters 
+<b>NOTE:</b> If you intend to run Vikunja with mysql and/or to use non-latin characters
 <a href="{{< ref "utf-8.md">}}">make sure your db is utf-8 compatible</a>.<br/>
 All examples on this page already reflect this and do not require additional work.
 </div>
@@ -25,8 +25,7 @@ All examples on this page already reflect this and do not require additional wor
 
 ## Redis
 
-While Vikunja has support to use redis as a caching backend, you'll probably not need it unless you're using Vikunja 
-with more than a handful of users.
+While Vikunja has support to use redis as a caching backend, you'll probably not need it unless you're using Vikunja with more than a handful of users.
 
 To use redis, you'll need to add this to the config examples below:
 
@@ -66,19 +65,45 @@ db:
 You'll also need to change the `VIKUNJA_DATABASE_TYPE` to `postgres` on the api container declaration.
 
 <div class="notification is-warning">
-<b>NOTE:</b> The mariadb container can sometimes take a while to initialize, especially on the first run. 
-During this time, the api container will fail to start at all. It will automatically restart every few seconds.
+<b>NOTE:</b> The mariadb container can sometimes take a while to initialize, especially on the first run. During this time, the api container will fail to start at all. It will automatically restart every few seconds.
+</div>
+
+## Sqlite
+
+Vikunja supports postgres, mysql and sqlite as a database backend. The examples on this page use mysql with a mariadb container.
+To use sqlite as a database backend, change the `api` section of the examples to this:
+
+{{< highlight yaml >}}
+api:
+  image: vikunja/api
+  environment:
+    VIKUNJA_SERVICE_JWTSECRET: <a super secure random secret>
+    VIKUNJA_SERVICE_FRONTENDURL: http://<your public frontend url with slash>/
+    # Note the default path is /app/vikunja/vikunja.db This moves to a different folder so you can use a volume and store this outside of the container so state is persisted even if container destroyed.
+    VIKUNJA_DATABASE_PATH: /db/vikunja.db
+  ports:
+    - 3456:3456
+  volumes:
+    - ./files:/app/vikunja/files
+    - ./db:/db
+  restart: unless-stopped
+{{< /highlight >}}
+
+The default path Vikunja uses for sqlite is relative to the binary, which in the docker container would be `/app/vikunja/vikunja.db`. This config moves to a different folder using `VIKUNJA_DATABASE_PATH` so you can use a volume at `/db` and store this outside of the container so state is persisted even if container destroyed.
+
+You'll also need to remove or change the `VIKUNJA_DATABASE_TYPE` to `sqlite` on the api container declaration.
+
+You can also remove the db section.
+
+<div class="notification is-warning">
+<b>NOTE:</b> If you'll use your instance with more than a handful of users, we recommend using mysql or postgres.
 </div>
 
 ## Example without any proxy
 
-This example lets you host Vikunja without any reverse proxy in front of it. This is the absolute minimum configuration 
-you need to get something up and running. If you want to host Vikunja on one single port instead of two different ones 
-or need tls termination, check out one of the other examples.
+This example lets you host Vikunja without any reverse proxy in front of it. This is the absolute minimum configuration you need to get something up and running. If you want to host Vikunja on one single port instead of two different ones or need tls termination, check out one of the other examples.
 
-Note that you need to change the `VIKUNJA_API_URL` environment variable to the ip (the docker host you're running this on) 
-is reachable at. Because the browser you'll use to access the Vikunja frontend uses that url to make the requests, it 
-has to be able to reach that ip + port from the outside. Putting everything in a private network won't work.
+Note that you need to change the `VIKUNJA_API_URL` environment variable to the ip (the docker host you're running this on) is reachable at. Because the browser you'll use to access the Vikunja frontend uses that url to make the requests, it has to be able to reach that ip + port from the outside. Putting everything in a private network won't work.
 
 {{< highlight yaml >}}
 version: '3'
@@ -235,7 +260,7 @@ services:
     image: mariadb:10
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     environment:
-      MYSQL_ROOT_PASSWORD: supersupersecret 
+      MYSQL_ROOT_PASSWORD: supersupersecret
       MYSQL_USER: vikunja
       MYSQL_PASSWORD: supersecret
       MYSQL_DATABASE: vikunja
@@ -343,7 +368,7 @@ services:
     image: mariadb:10
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     environment:
-      MYSQL_ROOT_PASSWORD: supersecret 
+      MYSQL_ROOT_PASSWORD: supersecret
       MYSQL_USER: vikunja
       MYSQL_PASSWORD: secret
       MYSQL_DATABASE: vikunja
@@ -360,7 +385,7 @@ services:
       VIKUNJA_DATABASE_DATABASE: vikunja
       VIKUNJA_SERVICE_JWTSECRET: <a super secure random secret>
       VIKUNJA_SERVICE_FRONTENDURL: https://<your public frontend url with slash>/
-    volumes: 
+    volumes:
       - ./files:/app/vikunja/files
     depends_on:
       - db
@@ -406,8 +431,8 @@ To do that, you can
 * without activating SSH as a "custom script" (go to Control Panel / Task Scheduler / Create / Scheduled Task / User-defined script)
 * without activating SSH, by using Portainer (you have to install first, check out [this tutorial](https://www.portainer.io/blog/how-to-install-portainer-on-a-synology-nas) for exmple):
   1. Go to **Dashboard / Stacks** click the button **"Add Stack"**
-  2. Give it the name Vikunja and paste the adapted docker compose file 
-  3. Deploy the Stack with the "Deploy Stack" button: 
+  2. Give it the name Vikunja and paste the adapted docker compose file
+  3. Deploy the Stack with the "Deploy Stack" button:
 
 ![Portainer Stack deploy](/docs/synology-proxy-2.png)
 
@@ -459,4 +484,3 @@ You may want to change the volumes to match the rest of your setup.
 Once deployed, you might want to change the [`PUID` and `GUID` settings]({{< ref "install-backend.md">}}#setting-user-and-group-id-of-the-user-running-vikunja) or [set the time zone]({{< ref "config.md">}}#timezone).
 
 After registering all your users, you might also want to [disable the user registration]({{<ref "config.md">}}#enableregistration).
-

docs/content/doc/setup/install-backend.md

@@ -102,7 +102,7 @@ It will automatically run all necessary database migrations.
 
 ## Docker
 
-(Note: this assumes some familarity with docker)
+(Note: this assumes some familiarity with docker)
 
 Usage with docker is pretty straightforward:
 
@@ -119,7 +119,7 @@ You can mount a local configuration like so:
 docker run -p 3456:3456 -v /path/to/config/on/host.yml:/app/vikunja/config.yml:ro vikunja/api
 {{< /highlight >}}
 
-Though it is recommended to use eviroment variables or `.env` files to configure Vikunja in docker.
+Though it is recommended to use environment variables or `.env` files to configure Vikunja in docker.
 See [config]({{< ref "config.md">}}) for a list of available configuration options.
 
 ### Files volume
@@ -129,7 +129,7 @@ You should mount the volume somewhere to the host to permanently store the files
 
 ### Setting user and group id of the user running vikunja
 
-You can set the user and group id of the user running vikunja with the `PUID` and `PGID` evironment variables.
+You can set the user and group id of the user running vikunja with the `PUID` and `PGID` environment variables.
 This follows the pattern used by [the linuxserver.io](https://docs.linuxserver.io/general/understanding-puid-and-pgid) docker images.
 
 This is useful to solve general permission problems when host-mounting volumes such as the volume used for task attachments.
@@ -164,7 +164,7 @@ services:
       - ./db:/var/lib/mysql
 {{< /highlight >}}
 
-See [full docker example]({{< ref "full-docker-example.md">}}) for more varations of this config.
+See [full docker example]({{< ref "full-docker-example.md">}}) for more variations of this config.
 
 ## Debian packages
 

docs/content/doc/setup/install-frontend.md

@@ -24,8 +24,7 @@ You also need to configure a rewrite condition to internally redirect all reques
 By default, the frontend assumes it can reach the api at `/api/v1` relative to the frontend url.
 This means that if you make the frontend available at, say `https://vikunja.example.com`, it tries to reach the api
 at `https://vikunja.example.com/api/v1`.
-In this scenario it is not possible for the frontend and the api to live on seperate servers or even just seperate 
-ports on the same server with [the use of a reverse proxy]({{< ref "reverse-proxies.md">}}).
+In this scenario it is not possible for the frontend and the api to live on separate servers or even just separate ports on the same server with [the use of a reverse proxy]({{< ref "reverse-proxies.md">}}).
 
 To make configurations like this possible, the api url can be set in the `index.html` file of the frontend releases.
 Just open the file with a text editor - there are comments which will explain how to set the url.
@@ -45,7 +44,7 @@ docker run -p 80:80 vikunja/frontend
 
 which will run the docker image and expose port 80 on the host.
 
-See [full docker example]({{< ref "full-docker-example.md">}}) for more varations of this config.
+See [full docker example]({{< ref "full-docker-example.md">}}) for more variations of this config.
 
 The docker container runs as an unprivileged user and does not mount anything.
 

docs/content/doc/setup/install.md

@@ -56,3 +56,4 @@ A third-party Helm Chart is available from the k8s-at-home project [here](https:
 * [Install Vikunja in Docker for self-hosted Task Tracking](https://smarthomepursuits.com/install-vikunja-in-docker-for-self-hosted-task-tracking/)
 * [Self-Hosted To-Do List with Vikunja in Docker](https://www.youtube.com/watch?v=DqyqDWpEvKI) (Youtube)
 * [Vikunja self-hosted (step by step)](https://nguyenminhhung.com/vikunja-self-hosted-step-by-step/)
+* [How to Install Vikunja on Your Synology NAS](https://mariushosting.com/how-to-install-vikunja-on-your-synology-nas/)

docs/content/doc/setup/k8s.md

@@ -8,8 +8,15 @@ menu:
     parent: "setup"
 ---
 
+# Hosting Vikunja with k8s
+
+We have an official Helm Chart for Vikunja.
+
+Check out [the repo](https://kolaente.dev/vikunja/helm-chart/) for more information about how to use it.
+
+## Third-party Helm Charts
+
 There are two third-party Helm-Charts which can be used to host Vikunja with k8s:
 
 * [Truecharts](https://truecharts.org/charts/stable/vikunja/)
 * [k8s at Home](https://github.com/k8s-at-home/charts)
-

docs/content/doc/setup/openid-examples.md

@@ -61,8 +61,8 @@ openid:
 
 Google config:
 
-  - Navigate to https://console.cloud.google.com/apis/credentials in the target project
-  - Create a new OAuth client ID
-  - Configure an authorized redirect URI of https://vikunja.mydomain.com/auth/openid/google
+- Navigate to `https://console.cloud.google.com/apis/credentials` in the target project
+- Create a new OAuth client ID
+- Configure an authorized redirect URI of `https://vikunja.mydomain.com/auth/openid/google`
 
-Note that there currently seems to be no way to stop creation of new users, even when enableregistration is false in the configuration. This means that this approach works well only with an "Internal Organization" app for Google Workspace, which limits the allowed users to organizational accounts only. External / public applications will potentially allow every Google user to register.
+Note that there currently seems to be no way to stop creation of new users, even when `enableregistration` is `false` in the configuration. This means that this approach works well only with an "Internal Organization" app for Google Workspace, which limits the allowed users to organizational accounts only. External / public applications will potentially allow every Google user to register.

docs/content/doc/setup/reverse-proxies.md

@@ -86,15 +86,15 @@ server {
 2. Verify that the page will pull up in your browser. (Do not bother trying to log in. It won't work. Trust me.)
 3. Now, we'll work with the NPM container, so you need to identify the container name for your NPM installation. e.g. NGINX-PM
 4. From the command line, enter `sudo docker exec -it [NGINX-PM container name] /bin/bash` and navigate to the proxy hosts folder where the `.conf` files are stashed. Probably `/data/nginx/proxy_host`. (This folder is a persistent folder created in the NPM container and mounted by NPM.)
-5. Locate the `.conf` file where the server_name inside the file matches your Vikunja Proxy Host. Once found, add the following code, unchanged, just above the existing location block in that file. (They are listed by number, not name.)  
-```
+5. Locate the `.conf` file where the server_name inside the file matches your Vikunja Proxy Host. Once found, add the following code, unchanged, just above the existing location block in that file. (They are listed by number, not name.)
+```nginx
 location ~* ^/(api|dav|\.well-known)/ {
-        proxy_pass http://api:3456;
-        client_max_body_size 20M;
-    }
+		proxy_pass http://api:3456;
+		client_max_body_size 20M;
+	}
 ```
-6. After saving the edited file, return to NPM's UI browser window and refresh the page to verify your Proxy Host for Vikunja is still online. 
-7. Now, switch over to your Vikunja browswer window and hit refresh. If you configured your URL correctly in original Vikunja container, you should be all set and the browser will correctly show Vikunja. If not, you'll need to adjust the address in the top of the login subscreen to match your proxy address.
+6. After saving the edited file, return to NPM's UI browser window and refresh the page to verify your Proxy Host for Vikunja is still online.
+7. Now, switch over to your Vikunja browser window and hit refresh. If you configured your URL correctly in original Vikunja container, you should be all set and the browser will correctly show Vikunja. If not, you'll need to adjust the address in the top of the login subscreen to match your proxy address.
 
 ## Apache
 

docs/content/doc/setup/subdirectory.md

@@ -17,15 +17,27 @@ However, you can still run it in a subdirectory but need to build the frontend y
 First, make sure you're able to build the frontend from source.
 Check [the guide about building from source]({{< ref "build-from-source.md">}}#frontend) about that.
 
-Then, run 
+### Dynamicly set with build command
+
+Run the build with the `VIKUNJA_FRONTEND_BASE` variable specified.
 
 ```
-pnpm vite build --base=/SUBPATH
-pnpm workbox copyLibraries dist/
+VIKUNJA_FRONTEND_BASE=/SUBPATH/ pnpm run build
 ```
 
 Where `SUBPATH` is the subdirectory you want to run Vikunja on.
 
+### Set via .env.local
+
+* Copy `.env.local.example` to `.env.local`
+* Uncomment `VIKUNJA_FRONTEND_BASE` and set `/subpath/` to the desired path.
+
+After saving, build Vikunja as normal.
+
+```
+pnpm run build
+```
+
 Once you have the build files you can deploy them as usual.
 Note that when deploying in docker you'll need to put the files in a web container yourself, you 
 can't use the `Dockerfile` in the repo without modifications.

docs/content/doc/setup/utf-8.md

@@ -11,11 +11,9 @@ menu:
 # UTF-8 Settings
 
 Vikunja itself is always fully capable of handling utf-8 characters.
-However, your database might be not. 
-Vikunja itself will work just fine until you want to use non-latin characters in your tasks/lists/etc.
+However, your database might be not. Vikunja itself will work just fine until you want to use non-latin characters in your tasks/projects/etc.
 
-On this page, you will find information about how to fully ensure non-latin characters like aüäß or emojis work 
-with your installation.
+On this page, you will find information about how to fully ensure non-latin characters like *aüäß* or emojis work with your installation.
 
 {{< table_of_contents >}}
 
@@ -57,8 +55,7 @@ Before attempting any conversion, please [back up your database]({{< ref "backup
 
 ### 1. Create a pre-conversion script
 
-Copy the following sql statements in a file called `preAlterTables.sql` and replace all occurences of `vikunja` with 
-the name of your database:
+Copy the following sql statements in a file called `preAlterTables.sql` and replace all occurrences of `vikunja` with the name of your database:
 
 {{< highlight sql >}}
 use information_schema;

docs/content/doc/setup/versions.md

@@ -19,7 +19,7 @@ The Vikunja api and frontend are available in two different release flavors.
 Stable releases have a fixed version number like `0.18.2` and are published at irregular intervals whenever a new version is ready.
 They receive few bugfixes and security patches.
 
-We use [Semantic Versioning](#) for these releases.
+We use [Semantic Versioning](https://semver.org) for these releases.
 
 ## Unstable
 

docs/content/doc/usage/api.md

@@ -10,10 +10,10 @@ menu:
 
 # API Documentation
 
-You can find the api docs under `http://vikunja.tld/api/v1/docs` of your instance. 
+You can find the api docs under `http://vikunja.tld/api/v1/docs` of your instance.<br  />
 A public instance is available on [try.vikunja.io](https://try.vikunja.io/api/v1/docs).
 
-These docs are autgenerated from annotations in the code with swagger.
+These docs are autogenerated from annotations in the code with swagger.
 
 The specification is hosted at `http://vikunja.tld/api/v1/docs.json`.
-You can use this to embed it into other openapi compatible applications if you want.
+You can use this to embed it into other OpenAPI compatible applications if you want.

docs/content/doc/usage/caldav.md

@@ -1,6 +1,6 @@
 ---
 date: "2019-05-12:00:00+01:00"
-title: "Caldav"
+title: "CalDAV"
 draft: false
 type: "doc"
 menu:
@@ -8,11 +8,11 @@ menu:
     parent: "usage"
 ---
 
-# Caldav
+# CalDAV
 
-> **Warning:** The caldav integration is in an early alpha stage and has bugs. 
+> **Warning:** The CalDAV integration is in an early alpha stage and has bugs.
 > It works well with some clients while having issues with others.
-> If you encounter issues, please [report them](https://code.vikunja.io/api/issues/new?body=[caldav]) 
+> If you encounter issues, please [report them](https://code.vikunja.io/api/issues/new?body=[caldav])
 
 Vikunja supports managing tasks via the [caldav VTODO](https://tools.ietf.org/html/rfc5545#section-3.6.2) extension.
 
@@ -24,10 +24,10 @@ All urls are located under the `/dav` subspace.
 
 Urls are:
 
-* `/principals/<username>/`: Returns urls for list discovery. *Use this url to initially make connections to new clients.*
-* `/lists/`: Used to manage lists
-* `/lists/<List ID>/`: Used to manage a single list
-* `/lists/<List ID>/<Task UID>`: Used to manage a task on a list
+* `/principals/<username>/`: Returns urls for project discovery. *Use this url to initially make connections to new clients.*
+* `/projects/`: Used to manage projects
+* `/projects/<List ID>/`: Used to manage a single project
+* `/projects/<List ID>/<Task UID>`: Used to manage a task on a project
 
 ## Supported properties
 
@@ -37,49 +37,50 @@ Vikunja currently supports the following properties:
 * `SUMMARY`
 * `DESCRIPTION`
 * `PRIORITY`
+* `CATEGORIES`
 * `COMPLETED`
+* `CREATED` (only Vikunja → Client)
 * `DUE`
-* `DTSTART`
 * `DURATION`
-* `ORGANIZER`
-* `RELATED-TO`
-* `CREATED`
 * `DTSTAMP`
-* `LAST-MODIFIED`
+* `DTSTART`
+* `LAST-MODIFIED` (only Vikunja → Client)
+* `RRULE` (Recurrence) (only Vikunja → Client)
+* `VALARM` (Reminders)
 
 Vikunja **currently does not** support these properties:
 
 * `ATTACH`
-* `CATEGORIES`
 * `CLASS`
 * `COMMENT`
+* `CONTACT`
 * `GEO`
 * `LOCATION`
+* `ORGANIZER` (disabled)
 * `PERCENT-COMPLETE`
-* `RESOURCES`
-* `STATUS`
-* `CONTACT`
 * `RECURRENCE-ID`
-* `URL`
-* Recurrence
+* `RELATED-TO`
+* `RESOURCES`
 * `SEQUENCE`
+* `STATUS`
+* `URL`
 
 ## Tested Clients
 
 ### Working
 
 * [Evolution](https://wiki.gnome.org/Apps/Evolution/)
-* [OpenTasks](https://opentasks.app/) + [DAVx⁵](https://www.davx5.com/)
+* [OpenTasks](https://opentasks.app/) & [DAVx⁵](https://www.davx5.com/)
 * [Tasks (Android)](https://tasks.org/)
 
 ### Not working
 
 * [Thunderbird (68)](https://www.thunderbird.net/)
-* iOS calDAV Sync (See [#753](https://kolaente.dev/vikunja/api/issues/753))
+* iOS CalDAV Sync (See [#753](https://kolaente.dev/vikunja/api/issues/753))
 
 ## Dev logs
 
-The whole thing is not optimized at all and probably pretty inefficent.
+The whole thing is not optimized at all and probably pretty inefficient.
 
 Request body and headers are logged if the debug output is enabled.
 
@@ -140,6 +141,4 @@ Requests from the app:::
 And then it just stops.
 ... and complains about not being able to find the home set
 ... without even requesting it...
-
-
 ```

docs/content/doc/usage/cli.md

@@ -10,7 +10,7 @@ menu:
 
 # Command line interface
 
-You can interact with Vikunja using its `cli` interface. 
+You can interact with Vikunja using its `cli` interface.<br />
 The following commands are available:
 
 * [dump](#dump)
@@ -31,7 +31,7 @@ All commands use the same standard [config file]({{< ref "../setup/config.md">}}
 When running Vikunja in docker, you'll need to execute all commands in the `api` container.
 Instead of running the `vikunja` binary directly, run it like this:
 
-```
+```sh
 docker exec <name of the vikunja api container> /app/vikunja/vikunja <subcommand>
 ```
 
@@ -80,12 +80,12 @@ Roll migrations back until a certain point.
 
 Usage:
 {{< highlight bash >}}
-$ vikunja migrate rollback [flags]    
+$ vikunja migrate rollback [flags]
 {{< /highlight >}}
 
 Flags:
 * `-n`, `--name` string: The id of the migration you want to roll back until.
- 
+
 ### `restore`
 
 Restores a previously created dump from a zip file, see `dump`.
@@ -138,9 +138,9 @@ Flags:
 
 #### `user delete`
 
-Start the user deletion process. 
+Start the user deletion process.
 If called without the `--now` flag, this command will only trigger an email to the user in order for them to confirm and start the deletion process (this is the same behavoir as if the user requested their deletion via the web interface).
-With the flag the user is deleted **immediately**. 
+With the flag the user is deleted **immediately**.
 
 **USE WITH CAUTION.**
 
@@ -194,7 +194,7 @@ This is either the semantic version (something like `0.7`) or version + git comm
 
 Usage:
 {{< highlight bash >}}
-$ vikunja version    
+$ vikunja version
 {{< /highlight >}}
 
 ### `web`
@@ -203,5 +203,5 @@ Starts Vikunja's REST api server.
 
 Usage:
 {{< highlight bash >}}
-$ vikunja web    
+$ vikunja web
 {{< /highlight >}}

docs/content/doc/usage/errors.md

@@ -24,24 +24,26 @@ This document describes the different errors Vikunja can return.
 
 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
-| 1001 | 400 | A user with this username already exists. |
-| 1002 | 400 | A user with this email address already exists. |
-| 1004 | 400 | No username and password specified. |
-| 1005 | 404 | The user does not exist. |
-| 1006 | 400 | Could not get the user id. |
-| 1008 | 412 | No password reset token provided. |
-| 1009 | 412 | Invalid password reset token. |
-| 1010 | 412 | Invalid email confirm token. |
-| 1011 | 412 | Wrong username or password. |
-| 1012 | 412 | Email address of the user not confirmed. |
-| 1013 | 412 | New password is empty. |
-| 1014 | 412 | Old password is empty. |
-| 1015 | 412 | Totp is already enabled for this user. |
-| 1016 | 412 | Totp is not enabled for this user. |
-| 1017 | 412 | The provided Totp passcode is invalid. |
-| 1018 | 412 | The provided user avatar provider type setting is invalid. |
-| 1019 | 412 | No openid email address was provided. |
-| 1020 | 412 | This user account is disabled. |
+| 1001      | 400 | A user with this username already exists. |
+| 1002      | 400 | A user with this email address already exists. |
+| 1004      | 400 | No username and password specified. |
+| 1005      | 404 | The user does not exist. |
+| 1006      | 400 | Could not get the user id. |
+| 1008      | 412 | No password reset token provided. |
+| 1009      | 412 | Invalid password reset token. |
+| 1010      | 412 | Invalid email confirm token. |
+| 1011      | 412 | Wrong username or password. |
+| 1012      | 412 | Email address of the user not confirmed. |
+| 1013      | 412 | New password is empty. |
+| 1014      | 412 | Old password is empty. |
+| 1015      | 412 | Totp is already enabled for this user. |
+| 1016      | 412 | Totp is not enabled for this user. |
+| 1017      | 412 | The provided Totp passcode is invalid. |
+| 1018      | 412 | The provided user avatar provider type setting is invalid. |
+| 1019      | 412 | No openid email address was provided. |
+| 1020      | 412 | This user account is disabled. |
+| 1021      | 412 | This account is managed by a third-party authentication provider. |
+| 1021      | 412 | The username must not contain spaces. |
 
 ## Validation
 
@@ -50,32 +52,32 @@ This document describes the different errors Vikunja can return.
 | 2001 | 400 | ID cannot be empty or 0. |
 | 2002 | 400 | Some of the request data was invalid. The response contains an aditional array with all invalid fields. |
 
-## List
+## Project
 
 | ErrorCode | HTTP Status Code | Description                                                                                                                   |
 |-----------|------------------|-------------------------------------------------------------------------------------------------------------------------------|
-| 3001      | 404 | The list does not exist.                                                                                                      |
-| 3004      | 403 | The user needs to have read permissions on that list to perform that action.                                                  |
-| 3005      | 400 | The list title cannot be empty.                                                                                               |
-| 3006      | 404 | The list share does not exist.                                                                                                |
-| 3007      | 400 | A list with this identifier already exists.                                                                                   |
-| 3008      | 412 | The list is archived and can therefore only be accessed read only. This is also true for all tasks associated with this list. |
-| 3009      | 412 | The list cannot belong to a dynamically generated namespace like "Favorites".                                                 |
-| 3010      | 412 | The list must belong to a namespace.                                                                                          |
+| 3001      | 404 | The project does not exist.                                                                                                      |
+| 3004      | 403 | The user needs to have read permissions on that project to perform that action.                                                  |
+| 3005      | 400 | The project title cannot be empty.                                                                                               |
+| 3006      | 404 | The project share does not exist.                                                                                                |
+| 3007      | 400 | A project with this identifier already exists.                                                                                   |
+| 3008      | 412 | The project is archived and can therefore only be accessed read only. This is also true for all tasks associated with this project. |
+| 3009      | 412 | The project cannot belong to a dynamically generated namespace like "Favorites".                                                 |
+| 3010      | 412 | The project must belong to a namespace.                                                                                          |
 
 ## Task
 
 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
-| 4001 | 400 | The list task text cannot be empty. |
-| 4002 | 404 | The list task does not exist. |
-| 4003 | 403 | All bulk editing tasks must belong to the same list. |
+| 4001 | 400 | The project task text cannot be empty. |
+| 4002 | 404 | The project task does not exist. |
+| 4003 | 403 | All bulk editing tasks must belong to the same project. |
 | 4004 | 403 | Need at least one task when bulk editing tasks. |
 | 4005 | 403 | The user does not have the right to see the task. |
 | 4006 | 403 | The user tried to set a parent task as the task itself. |
 | 4007 | 400 | The user tried to create a task relation with an invalid kind of relation. |
 | 4008 | 409 | The user tried to create a task relation which already exists. |
-| 4009 | 404 | The task relation does not exist. | 
+| 4009 | 404 | The task relation does not exist. |
 | 4010 | 400 | Cannot relate a task with itself. |
 | 4011 | 404 | The task attachment does not exist. |
 | 4012 | 400 | The task attachment is too large. |
@@ -88,12 +90,13 @@ This document describes the different errors Vikunja can return.
 | 4019 | 400 | Invalid task filter value. |
 | 4020 | 400 | The provided attachment does not belong to that task. |
 | 4021 | 400 | This user is already assigned to that task. |
+| 4022 | 400 | The task has a relative reminder which does not specify relative to what. |
 
 ## Namespace
 
 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
-| 5001 | 404 | The namspace does not exist. | 
+| 5001 | 404 | The namespace does not exist. |
 | 5003 | 403 | The user does not have access to the specified namespace. |
 | 5006 | 400 | The namespace name cannot be empty. |
 | 5009 | 403 | The user needs to have namespace read access to perform that action. |
@@ -105,19 +108,19 @@ This document describes the different errors Vikunja can return.
 
 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
-| 6001 | 400 | The team name cannot be emtpy. |
+| 6001 | 400 | The team name cannot be empty. |
 | 6002 | 404 | The team does not exist. |
-| 6004 | 409 | The team already has access to that namespace or list. |
+| 6004 | 409 | The team already has access to that namespace or project. |
 | 6005 | 409 | The user is already a member of that team. |
 | 6006 | 400 | Cannot delete the last team member. |
-| 6007 | 403 | The team does not have access to the list to perform that action. |
+| 6007 | 403 | The team does not have access to the project to perform that action. |
 
-## User List Access
+## User Project Access
 
 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
-| 7002 | 409 | The user already has access to that list. |
-| 7003 | 403 | The user does not have access to that list. |
+| 7002 | 409 | The user already has access to that project. |
+| 7003 | 403 | The user does not have access to that project. |
 
 ## Label
 
@@ -131,24 +134,24 @@ This document describes the different errors Vikunja can return.
 
 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
-| 9001 | 403 | The right is invalid. | 
+| 9001 | 403 | The right is invalid. |
 
 ## Kanban
 
 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
 | 10001 | 404 | The bucket does not exist. |
-| 10002 | 400 | The bucket does not belong to that list. |
-| 10003 | 412 | You cannot remove the last bucket on a list. |
+| 10002 | 400 | The bucket does not belong to that project. |
+| 10003 | 412 | You cannot remove the last bucket on a project. |
 | 10004 | 412 | You cannot add the task to this bucket as it already exceeded the limit of tasks it can hold. |
-| 10005 | 412 | There can be only one done bucket per list. |
+| 10005 | 412 | There can be only one done bucket per project. |
 
 ## Saved Filters
 
 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
 | 11001 | 404 | The saved filter does not exist. |
-| 11002 | 412 | Saved filters are not available for link shares. | 
+| 11002 | 412 | Saved filters are not available for link shares. |
 
 ## Subscriptions
 
@@ -159,7 +162,8 @@ This document describes the different errors Vikunja can return.
 
 ## Link Shares
 
-| ErrorCode | HTTP Status Code | Description |
-|-----------|------------------|-------------|
+| ErrorCode | HTTP Status Code | Description                                                                    |
+|-----------|------------------|--------------------------------------------------------------------------------|
 | 13001 | 412 | This link share requires a password for authentication, but none was provided. |
-| 13002 | 403 | The provided link share password was invalid. |
+| 13002 | 403 | The provided link share password is invalid.                                   |
+| 13003 | 400 | The provided link share token is invalid.                                      |

docs/content/doc/usage/relation_kinds.md

@@ -10,16 +10,16 @@ menu:
 
 # Available task relation kinds
 
-| Code | Description |
-|------|-------------|
-| subtask | Task is a subtask of the other task. This is the opposite of `parenttask`. |
-| parenttask | Task is a parent task of the other task. This is the opposite of `subtask`. |
-| related | Both tasks are related to each other. How is not more specified. |
-| duplicateof | Task is a duplicate of the other task. This is the opposite of `duplicates`. |
-| duplicates | Task duplicates the other task. This is the opposite of `duplicateof`. |
-| blocking | Task is blocking the other task. This is the opposite of `blocked`. |
-| blocked | Task is blocked by the other task. This is the opposite of `blocking`. |
-| precedes | Task precedes the other task. This is the opposite of `follows`. |
-| follows | Task follows the other task. This is the opposite of `precedes`. |
-| copiedfrom | Task is copied from the other task. This is the opposite of `copiedto`. |
-| copiedto | Task is copied to the other task. This is the opposite of `copiedfrom`. |
+| Code | Description | Opposite of |
+|------|-------------|-------------|
+| `subtask` | Task is a subtask of the other task.       | `parenttask` |
+| `parenttask` | Task is a parent task of the other task. | `subtask` |
+| `related` | Both tasks are related to each other.<br  /> How is not more specified. | ⸺ |
+| `duplicateof` | Task is a duplicate of the other task. | `duplicates` |
+| `duplicates` | Task duplicates the other task. | `duplicateof` |
+| `blocking` | Task is blocking the other task. | `blocked` |
+| `blocked` | Task is blocked by the other task. | `blocking` |
+| `precedes` | Task precedes the other task. | `follows` |
+| `follows` | Task follows the other task. | `precedes` |
+| `copiedfrom` | Task is copied from the other task. | `copiedto` |
+| `copiedto` | Task is copied to the other task. | `copiedfrom` |

docs/content/doc/usage/rights.md

@@ -8,22 +8,22 @@ menu:
     parent: "usage"
 ---
 
-# List and namespace rights for teams and users
+# Project and namespace rights for teams and users
 
-Whenever you share a list or namespace with a user or team, you can specify a `rights` parameter. 
+Whenever you share a project or namespace with a user or team, you can specify a `rights` parameter.
 This parameter controls the rights that team or user is going to have (or has, if you request the current sharing status).
 
 Rights are being specified using integers.
 
 The following values are possible:
 
-| Right (int) | Meaning |
-|-------------|---------|
-| 0 (Default) | Read only. Anything which is shared with this right cannot be edited. |
-| 1 | Read and write. Namespaces or lists shared with this right can be read and written to by the team or user. |
-| 2 | Admin. Can do anything like read and write, but can additionally manage sharing options. |
+| Right (int) | Meaning                                                                                                       |
+|-------------|---------------------------------------------------------------------------------------------------------------|
+| 0 (Default) | Read only. Anything which is shared with this right cannot be edited.                                         |
+| 1           | Read and write. Namespaces or projects shared with this right can be read and written to by the team or user. |
+| 2           | Admin. Can do anything like read and write, but can additionally manage sharing options.                      |
 
 ## Team admins
 
 When adding or querying a team, every member has an additional boolean value stating if it is admin or not.
-A team admin can also add and remove team members and also change whether a user in the team is admin or not.
+A team admin can also add and remove team members and also change whether a user in the team is admin or not.

go.mod

@@ -19,9 +19,9 @@ module code.vikunja.io/api
 require (
 	code.vikunja.io/web v0.0.0-20210706160506-d85def955bd3
 	gitea.com/xorm/xorm-redis-cache v0.2.0
-	github.com/ThreeDotsLabs/watermill v1.1.1
+	github.com/ThreeDotsLabs/watermill v1.2.0
 	github.com/adlio/trello v1.10.0
-	github.com/arran4/golang-ical v0.0.0-20221122102835-109346913e54
+	github.com/arran4/golang-ical v0.0.0-20230425234049-f69e132f2b0c
 	github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef
 	github.com/bbrks/go-blurhash v1.1.1
 	github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b
@@ -30,62 +30,65 @@ require (
 	github.com/d4l3k/messagediff v1.2.1
 	github.com/disintegration/imaging v1.6.2
 	github.com/dustinkirkland/golang-petname v0.0.0-20191129215211-8e5a1ed0cff0
-	github.com/gabriel-vasile/mimetype v1.4.1
-	github.com/getsentry/sentry-go v0.17.0
-	github.com/go-sql-driver/mysql v1.7.0
-	github.com/go-testfixtures/testfixtures/v3 v3.8.1
-	github.com/gocarina/gocsv v0.0.0-20230123225133-763e25b40669
-	github.com/golang-jwt/jwt/v4 v4.4.3
+	github.com/gabriel-vasile/mimetype v1.4.2
+	github.com/getsentry/sentry-go v0.21.0
+	github.com/go-sql-driver/mysql v1.7.1
+	github.com/go-testfixtures/testfixtures/v3 v3.9.0
+	github.com/gocarina/gocsv v0.0.0-20230406101422-6445c2b15027
+	github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/google/uuid v1.3.0
 	github.com/iancoleman/strcase v0.2.0
-	github.com/imdario/mergo v0.3.13
+	github.com/imdario/mergo v0.3.15
 	github.com/jinzhu/copier v0.3.5
-	github.com/labstack/echo-jwt/v4 v4.0.1
-	github.com/labstack/echo/v4 v4.10.0
+	github.com/labstack/echo-jwt/v4 v4.1.0
+	github.com/labstack/echo/v4 v4.10.2
 	github.com/labstack/gommon v0.4.0
-	github.com/lib/pq v1.10.7
+	github.com/lib/pq v1.10.9
 	github.com/magefile/mage v1.14.0
 	github.com/mattn/go-sqlite3 v1.14.16
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/pquerna/otp v1.4.0
-	github.com/prometheus/client_golang v1.14.0
-	github.com/redis/go-redis/v9 v9.0.1
+	github.com/prometheus/client_golang v1.15.1
+	github.com/redis/go-redis/v9 v9.0.4
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/samedi/caldav-go v3.0.0+incompatible
-	github.com/spf13/afero v1.9.3
-	github.com/spf13/cobra v1.6.1
+	github.com/spf13/afero v1.9.5
+	github.com/spf13/cobra v1.7.0
 	github.com/spf13/viper v1.15.0
-	github.com/stretchr/testify v1.8.1
-	github.com/swaggo/swag v1.8.10
+	github.com/stretchr/testify v1.8.2
+	github.com/swaggo/swag v1.8.12
 	github.com/tkuchiki/go-timezone v0.2.2
-	github.com/ulule/limiter/v3 v3.10.0
-	github.com/vectordotdev/go-datemath v0.1.1-0.20211214182920-0a4ac8742b93
-	github.com/wneessen/go-mail v0.3.8
-	github.com/yuin/goldmark v1.5.3
-	golang.org/x/crypto v0.5.0
-	golang.org/x/image v0.3.0
-	golang.org/x/oauth2 v0.4.0
-	golang.org/x/sync v0.1.0
-	golang.org/x/sys v0.4.0
-	golang.org/x/term v0.4.0
+	github.com/ulule/limiter/v3 v3.11.1
+	github.com/vectordotdev/go-datemath v0.1.1-0.20220323213446-f3954d0b18ae
+	github.com/wneessen/go-mail v0.3.9
+	github.com/yuin/goldmark v1.5.4
+	golang.org/x/crypto v0.9.0
+	golang.org/x/image v0.7.0
+	golang.org/x/oauth2 v0.8.0
+	golang.org/x/sync v0.2.0
+	golang.org/x/sys v0.8.0
+	golang.org/x/term v0.8.0
 	gopkg.in/d4l3k/messagediff.v1 v1.2.1
 	gopkg.in/yaml.v3 v3.0.1
-	src.techknowlogick.com/xgo v1.7.1-0.20230117190652-94aee174ab86
+	src.techknowlogick.com/xgo v1.7.1-0.20230502175921-52d704db7dce
 	src.techknowlogick.com/xormigrate v1.5.0
 	xorm.io/builder v0.3.12
 	xorm.io/xorm v1.3.2
 )
 
 require (
+	github.com/ClickHouse/ch-go v0.55.0 // indirect
+	github.com/ClickHouse/clickhouse-go/v2 v2.9.1 // indirect
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/andybalholm/brotli v1.0.5 // indirect
 	github.com/beevik/etree v1.1.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
-	github.com/cenkalti/backoff/v3 v3.0.0 // indirect
+	github.com/cenkalti/backoff/v3 v3.2.2 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
@@ -93,7 +96,9 @@ require (
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/garyburd/redigo v1.6.0 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-chi/chi v4.0.2+incompatible // indirect
+	github.com/go-chi/chi/v5 v5.0.8 // indirect
+	github.com/go-faster/city v1.0.1 // indirect
+	github.com/go-faster/errors v0.6.1 // indirect
 	github.com/go-jose/go-jose/v3 v3.0.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.19.6 // indirect
@@ -101,35 +106,40 @@ require (
 	github.com/go-openapi/swag v0.19.15 // indirect
 	github.com/goccy/go-json v0.9.11 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/hashicorp/errwrap v1.0.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.0 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/inconshreveable/mousetrap v1.0.1 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.16.5 // indirect
 	github.com/laurent22/ical-go v0.1.1-0.20181107184520-7e5d6ade8eef // indirect
-	github.com/lithammer/shortuuid/v3 v3.0.4 // indirect
+	github.com/lithammer/shortuuid/v3 v3.0.7 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/onsi/ginkgo v1.16.4 // indirect
 	github.com/onsi/gomega v1.16.0 // indirect
+	github.com/paulmach/orb v0.9.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+	github.com/pierrec/lz4/v4 v4.1.17 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/segmentio/asm v1.2.0 // indirect
+	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
@@ -138,21 +148,19 @@ require (
 	github.com/urfave/cli/v2 v2.3.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/net v0.5.0 // indirect
-	golang.org/x/text v0.6.0 // indirect
+	go.opentelemetry.io/otel v1.15.0 // indirect
+	go.opentelemetry.io/otel/trace v1.15.0 // indirect
+	golang.org/x/mod v0.9.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.1.12 // indirect
+	golang.org/x/tools v0.7.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 
-replace (
-	github.com/samedi/caldav-go => github.com/kolaente/caldav-go v3.0.1-0.20190524174923-9e5cd1688227+incompatible // Branch: feature/dynamic-supported-components, PR: https://github.com/samedi/caldav-go/pull/6 and https://github.com/samedi/caldav-go/pull/7
-	github.com/ulule/limiter/v3 => github.com/kolaente/go-limiter/v3 v3.0.0-20230131162509-7193d1e06b18 // PR: https://github.com/ulule/limiter/pull/214
-	gopkg.in/fsnotify.v1 => github.com/kolaente/fsnotify v1.4.10-0.20200411160148-1bc3c8ff4048 // See https://github.com/fsnotify/fsnotify/issues/328 and https://github.com/golang/go/issues/26904
-)
+replace github.com/samedi/caldav-go => github.com/kolaente/caldav-go v3.0.1-0.20190610114120-2a4eb8b5dcc9+incompatible // Branch: feature/dynamic-supported-components, PR: https://github.com/samedi/caldav-go/pull/6 and https://github.com/samedi/caldav-go/pull/7
 
-go 1.19
+go 1.20

go.sum

@@ -49,6 +49,10 @@ gitea.com/xorm/xorm-redis-cache v0.2.0/go.mod h1:juYdjkmIKvLbPkdfBVKGVJ2daFQIJAg
 gitee.com/travelliu/dm v1.8.11192/go.mod h1:DHTzyhCrM843x9VdKVbZ+GKXGRbKM2sJ4LxihRxShkE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/ClickHouse/ch-go v0.55.0 h1:jw4Tpx887YXrkyL5DfgUome/po8MLz92nz2heOQ6RjQ=
+github.com/ClickHouse/ch-go v0.55.0/go.mod h1:kQT2f+yp2p+sagQA/7kS6G3ukym+GQ5KAu1kuFAFDiU=
+github.com/ClickHouse/clickhouse-go/v2 v2.9.1 h1:IeE2bwVvAba7Yw5ZKu98bKI4NpDmykEy6jUaQdJJCk8=
+github.com/ClickHouse/clickhouse-go/v2 v2.9.1/go.mod h1:teXfZNM90iQ99Jnuht+dxQXCuhDZ8nvvMoTJOFrcmcg=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
@@ -60,8 +64,8 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
-github.com/ThreeDotsLabs/watermill v1.1.1 h1:+9NXqWQvplzxBru2CIInvVOZeKUnM+Nysg42fInl5sY=
-github.com/ThreeDotsLabs/watermill v1.1.1/go.mod h1:Qd1xNFxolCAHCzcMrm6RnjW0manbvN+DJVWc1MWRFlI=
+github.com/ThreeDotsLabs/watermill v1.2.0 h1:TU3TML1dnQ/ifK09F2+4JQk2EKhmhXe7Qv7eb5ZpTS8=
+github.com/ThreeDotsLabs/watermill v1.2.0/go.mod h1:IuVxGk/kgCN0cex2S94BLglUiB0PwOm8hbUhm6g2Nx4=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
 github.com/adlio/trello v1.10.0 h1:ia/rzoBwJJKr4IqnMlrU6n09CVqeyaahSkEVcV5/gPc=
 github.com/adlio/trello v1.10.0/go.mod h1:I4Lti4jf2KxjTNgTqs5W3lLuE78QZZdYbbPnQQGwjOo=
@@ -70,15 +74,20 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
+github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
+github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/arran4/golang-ical v0.0.0-20221122102835-109346913e54 h1:HfAA5Vxbo64UTckj+EW/hfBjvvcUcbcwWCASvypy8JU=
-github.com/arran4/golang-ical v0.0.0-20221122102835-109346913e54/go.mod h1:BSTTrYHuM12oAL8jDdcmPdw02SBThKYWNFHQlvEG6b0=
+github.com/arran4/golang-ical v0.0.0-20230213232137-07c6aad5e4f0 h1:VVPogIxPiZ6WK5G4Pve5VSQ4HEFiJ8GChpqRjo1gN2c=
+github.com/arran4/golang-ical v0.0.0-20230213232137-07c6aad5e4f0/go.mod h1:BSTTrYHuM12oAL8jDdcmPdw02SBThKYWNFHQlvEG6b0=
+github.com/arran4/golang-ical v0.0.0-20230318005454-19abf92700cc h1:up1aDcTCZ3KrL2ukKxNqjMRx/CCaXyn9Wl6N7ea3EWc=
+github.com/arran4/golang-ical v0.0.0-20230318005454-19abf92700cc/go.mod h1:BSTTrYHuM12oAL8jDdcmPdw02SBThKYWNFHQlvEG6b0=
+github.com/arran4/golang-ical v0.0.0-20230425234049-f69e132f2b0c h1:bmHPCBB1T8YZpQI+Ch0RuICrozVFmPAjiBQZvAjtpRI=
+github.com/arran4/golang-ical v0.0.0-20230425234049-f69e132f2b0c/go.mod h1:BSTTrYHuM12oAL8jDdcmPdw02SBThKYWNFHQlvEG6b0=
 github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
 github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef h1:46PFijGLmAjMPwCCCo7Jf0W6f9slllCkkv7vyc1yOSg=
 github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
@@ -102,11 +111,10 @@ github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b h1:6+ZFm0flnudZzdS
 github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M=
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
-github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c=
-github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
+github.com/cenkalti/backoff/v3 v3.2.2 h1:cfUAAO3yvKMYKPrvhDuHSwQnhZNk/RMHKdZqKTxfm6M=
+github.com/cenkalti/backoff/v3 v3.2.2/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
@@ -173,15 +181,27 @@ github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/gabriel-vasile/mimetype v1.4.1 h1:TRWk7se+TOjCYgRth7+1/OYLNiRNIotknkFtf/dnN7Q=
 github.com/gabriel-vasile/mimetype v1.4.1/go.mod h1:05Vi0w3Y9c/lNvJOdmIwvrrAhX3rYhfQQCaf9VJcv7M=
+github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
+github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
 github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc=
 github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
-github.com/getsentry/sentry-go v0.17.0 h1:UustVWnOoDFHBS7IJUB2QK/nB5pap748ZEp0swnQJak=
-github.com/getsentry/sentry-go v0.17.0/go.mod h1:B82dxtBvxG0KaPD8/hfSV+VcHD+Lg/xUS4JuQn1P4cM=
+github.com/getsentry/sentry-go v0.18.0 h1:MtBW5H9QgdcJabtZcuJG80BMOwaBpkRDZkxRkNC1sN0=
+github.com/getsentry/sentry-go v0.18.0/go.mod h1:Kgon4Mby+FJ7ZWHFUAZgVaIa8sxHtnRJRLTXZr51aKQ=
+github.com/getsentry/sentry-go v0.19.0 h1:BcCH3CN5tXt5aML+gwmbFwVptLLQA+eT866fCO9wVOM=
+github.com/getsentry/sentry-go v0.19.0/go.mod h1:y3+lGEFEFexZtpbG1GUE2WD/f9zGyKYwpEqryTOC/nE=
+github.com/getsentry/sentry-go v0.20.0 h1:bwXW98iMRIWxn+4FgPW7vMrjmbym6HblXALmhjHmQaQ=
+github.com/getsentry/sentry-go v0.20.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY=
+github.com/getsentry/sentry-go v0.21.0 h1:c9l5F1nPF30JIppulk4veau90PK6Smu3abgVtVQWon4=
+github.com/getsentry/sentry-go v0.21.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-chi/chi v4.0.2+incompatible h1:maB6vn6FqCxrpz4FqWdh4+lwpyZIQS7YEAUcHlgXVRs=
-github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
+github.com/go-chi/chi/v5 v5.0.8 h1:lD+NLqFcAi1ovnVZpsnObHGW4xb4J8lNmoYVfECH1Y0=
+github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
+github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw=
+github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw=
+github.com/go-faster/errors v0.6.1 h1:nNIPOBkprlKzkThvS/0YaX8Zs9KewLCOSFQS5BU06FI=
+github.com/go-faster/errors v0.6.1/go.mod h1:5MGV2/2T9yvlrbhe9pD9LO5Z/2zCSq2T8j+Jpi2LAyY=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -190,12 +210,9 @@ github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxF
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
-github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
-github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
@@ -212,12 +229,20 @@ github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
 github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
+github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-testfixtures/testfixtures/v3 v3.8.1 h1:uonwvepqRvSgddcrReZQhojTlWlmOlHkYAb9ZaOMWgU=
 github.com/go-testfixtures/testfixtures/v3 v3.8.1/go.mod h1:Kdu7YeMC0KRXVHdaQ91Vmx3pcjoTF63h4f1qTJDdXLA=
-github.com/gocarina/gocsv v0.0.0-20230123225133-763e25b40669 h1:MvZzCA/mduVWoBSVKJeMdv+AqXQmZZ8i6p8889ejt/Y=
-github.com/gocarina/gocsv v0.0.0-20230123225133-763e25b40669/go.mod h1:5YoVOkjYAQumqlV356Hj3xeYh4BdZuLE0/nRkf2NKkI=
+github.com/go-testfixtures/testfixtures/v3 v3.9.0 h1:938g5V+GWLVejm3Hc+nWCuEXRlcglZDDlN/t1gWzcSY=
+github.com/go-testfixtures/testfixtures/v3 v3.9.0/go.mod h1:cdsKD2ApFBjdog9jRsz6EJqF+LClq/hrwE9K/1Dzo4s=
+github.com/gocarina/gocsv v0.0.0-20230226133904-70c27cb2918a h1:/5o1ejt5M0fNAN2lU1NBLtPzUSZru689EWJq01ptr+E=
+github.com/gocarina/gocsv v0.0.0-20230226133904-70c27cb2918a/go.mod h1:5YoVOkjYAQumqlV356Hj3xeYh4BdZuLE0/nRkf2NKkI=
+github.com/gocarina/gocsv v0.0.0-20230325173030-9a18a846a479 h1:KaCpc4e48emF9hYmMB9INyfpGJHAZxEAS9EqWFkpTig=
+github.com/gocarina/gocsv v0.0.0-20230325173030-9a18a846a479/go.mod h1:5YoVOkjYAQumqlV356Hj3xeYh4BdZuLE0/nRkf2NKkI=
+github.com/gocarina/gocsv v0.0.0-20230406101422-6445c2b15027 h1:LCGzZb4kMUUjMUzLxxqSJBwo9szUO0tK8cOxnEOT4Jc=
+github.com/gocarina/gocsv v0.0.0-20230406101422-6445c2b15027/go.mod h1:5YoVOkjYAQumqlV356Hj3xeYh4BdZuLE0/nRkf2NKkI=
 github.com/goccy/go-json v0.8.1/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk=
 github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
@@ -227,10 +252,11 @@ github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFG
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
-github.com/golang-jwt/jwt/v4 v4.4.3 h1:Hxl6lhQFj4AnOX6MLrsCb/+7tCj7DxP7VA+2rDIq5AU=
-github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
+github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
@@ -265,6 +291,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
@@ -300,8 +328,8 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
@@ -317,14 +345,15 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
 github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
-github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
+github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI=
-github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
+github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
@@ -348,9 +377,15 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
 github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
+github.com/imdario/mergo v0.3.14 h1:fOqeC1+nCuuk6PKQdg9YmosXX7Y7mHX6R/0ZldI9iHo=
+github.com/imdario/mergo v0.3.14/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
+github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
+github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
 github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
@@ -420,45 +455,43 @@ github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
+github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI=
+github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/kolaente/caldav-go v3.0.1-0.20190524174923-9e5cd1688227+incompatible h1:PkEEpmbrFXlMul8cOplR8nkcIM/NDbx+H6fq2+vaKAA=
 github.com/kolaente/caldav-go v3.0.1-0.20190524174923-9e5cd1688227+incompatible/go.mod h1:y1UhTNI4g0hVymJrI6yJ5/ohy09hNBeU8iJEZjgdDOw=
-github.com/kolaente/fsnotify v1.4.10-0.20200411160148-1bc3c8ff4048/go.mod h1:dv6KyzAg9UuJWiE1pwkvvB2i0TvcQM6QhdsXLZ7K5KI=
-github.com/kolaente/go-limiter/v3 v3.0.0-20230131162509-7193d1e06b18 h1:xCbkxyNuaQBcpThTYhQ7uIwohYMEQRUh3Vwklok1/gs=
-github.com/kolaente/go-limiter/v3 v3.0.0-20230131162509-7193d1e06b18/go.mod h1:QG+pcTRP1DFo27hHiokKFQP1qWBTAsCcfFzwXaSwp+Y=
+github.com/kolaente/caldav-go v3.0.1-0.20190610114120-2a4eb8b5dcc9+incompatible h1:q7DbyV+sFjEoTuuUdRDNl2nlyfztkZgxVVCV7JhzIkY=
+github.com/kolaente/caldav-go v3.0.1-0.20190610114120-2a4eb8b5dcc9+incompatible/go.mod h1:y1UhTNI4g0hVymJrI6yJ5/ohy09hNBeU8iJEZjgdDOw=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/labstack/echo-jwt/v4 v4.0.1 h1:rxFj0gUPv+1EEhbyfpv463FunuNvW+6MDRGYve7LUxM=
-github.com/labstack/echo-jwt/v4 v4.0.1/go.mod h1:DHSSaL6cTgczdPXjf8qrTHRbrau2flcddV7CPMs2U/Y=
+github.com/labstack/echo-jwt/v4 v4.1.0 h1:eYGBxauPkyzBM78KJbR5OSz5uhKMDkhJZhTTIuoH6Pg=
+github.com/labstack/echo-jwt/v4 v4.1.0/go.mod h1:DHSSaL6cTgczdPXjf8qrTHRbrau2flcddV7CPMs2U/Y=
 github.com/labstack/echo/v4 v4.1.16/go.mod h1:awO+5TzAjvL8XpibdsfXxPgHr+orhtXZJZIQCVjogKI=
-github.com/labstack/echo/v4 v4.10.0 h1:5CiyngihEO4HXsz3vVsJn7f8xAlWwRr3aY6Ih280ZKA=
-github.com/labstack/echo/v4 v4.10.0/go.mod h1:S/T/5fy/GigaXnHTkh0ZGe4LpkkQysvRjFMSUTkDRNQ=
+github.com/labstack/echo/v4 v4.10.2 h1:n1jAhnq/elIFTHr1EYpiYtyKgx4RW9ccVgkqByZaN2M=
+github.com/labstack/echo/v4 v4.10.2/go.mod h1:OEyqf2//K1DFdE57vw2DRgWY0M7s65IVQO2FzvI4J5k=
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
 github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
@@ -472,10 +505,14 @@ github.com/lib/pq v1.7.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
 github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.10.8 h1:3fdt97i/cwSU83+E0hZTC/Xpc9mTZxc6UWSCRcSbxiE=
+github.com/lib/pq v1.10.8/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
 github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
-github.com/lithammer/shortuuid/v3 v3.0.4 h1:uj4xhotfY92Y1Oa6n6HUiFn87CdoEHYUlTy0+IgbLrs=
-github.com/lithammer/shortuuid/v3 v3.0.4/go.mod h1:RviRjexKqIzx/7r1peoAITm6m7gnif/h+0zmolKJjzw=
+github.com/lithammer/shortuuid/v3 v3.0.7 h1:trX0KTHy4Pbwo/6ia8fscyHoGA+mf1jWbPJVuvyJQQ8=
+github.com/lithammer/shortuuid/v3 v3.0.7/go.mod h1:vMk8ke37EmiewwolSO1NLW8vP4ZaKlRuDIi8tWWmAts=
 github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
 github.com/magefile/mage v1.14.0 h1:6QDX3g6z1YvJ4olPhT1wksUcSa/V0a1B+pJb73fBjyo=
 github.com/magefile/mage v1.14.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
@@ -504,8 +541,9 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-oci8 v0.0.0-20191108001511-cbd8d5bc1da0/go.mod h1:/M9VLO+lUPmxvoOK2PfWRZ8mTtB4q1Hy9lEGijv9Nr8=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
@@ -515,8 +553,9 @@ github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71
 github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
 github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
-github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
@@ -534,8 +573,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
 github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
 github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
@@ -543,7 +582,6 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE
 github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
 github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
@@ -577,12 +615,18 @@ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
 github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/paulmach/orb v0.9.0 h1:MwA1DqOKtvCgm7u9RZ/pnYejTeDJPnr0+0oFajBbJqk=
+github.com/paulmach/orb v0.9.0/go.mod h1:SudmOk85SXtmXAB3sLGyJ6tZy/8pdfrV0o6ef98Xc30=
+github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU=
 github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
 github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
 github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
+github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=
+github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -599,39 +643,39 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
-github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
-github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
 github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
 github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
+github.com/prometheus/client_golang v1.15.0 h1:5fCgGYogn0hFdhyhLbw7hEsWxufKtY9klyvdNfFlFhM=
+github.com/prometheus/client_golang v1.15.0/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
+github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI=
+github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
 github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
-github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
-github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE=
-github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
+github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI=
+github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y=
+github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM=
+github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
-github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
+github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=
+github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/redis/go-redis/v9 v9.0.1 h1:L1B0L2Y7dQMnKxwfzSwemceGlQwVUsqJ1kjkdaoNhts=
-github.com/redis/go-redis/v9 v9.0.1/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps=
+github.com/redis/go-redis/v9 v9.0.2 h1:BA426Zqe/7r56kCcvxYLWe1mkaz71LKF77GwgFzSxfE=
+github.com/redis/go-redis/v9 v9.0.2/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps=
+github.com/redis/go-redis/v9 v9.0.3 h1:+7mmR26M0IvyLxGZUHxu4GiBkJkVDid0Un+j4ScYu4k=
+github.com/redis/go-redis/v9 v9.0.3/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
+github.com/redis/go-redis/v9 v9.0.4 h1:FC82T+CHJ/Q/PdyLW++GeCO+Ol59Y4T7R4jbgjvktgc=
+github.com/redis/go-redis/v9 v9.0.4/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
@@ -649,26 +693,33 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb
 github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
+github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v0.0.0-20191009025716-f1972eb1d1f5/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
+github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
-github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk=
-github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
+github.com/spf13/afero v1.9.4 h1:Sd43wM1IWz/s1aVXdOBkjJvuP8UdyqioeE4AmM0QsBs=
+github.com/spf13/afero v1.9.4/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
+github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
+github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
 github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
 github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
 github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
+github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
+github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
@@ -692,17 +743,27 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/swaggo/swag v1.8.10 h1:eExW4bFa52WOjqRzRD58bgWsWfdFJso50lpbeTcmTfo=
 github.com/swaggo/swag v1.8.10/go.mod h1:ezQVUUhly8dludpVk+/PuwJWvLLanB13ygV5Pr9enSk=
+github.com/swaggo/swag v1.8.11 h1:Fp1dNNtDvbCf+8kvehZbHQnlF6AxHGjmw6H/xAMrZfY=
+github.com/swaggo/swag v1.8.11/go.mod h1:2GXgpNI9iy5OdsYWu8zXfRAGnOAPxYxTWTyM0XOTYZQ=
+github.com/swaggo/swag v1.8.12 h1:pctzkNPu0AlQP2royqX3apjKCQonAnf7KGoxeO4y64w=
+github.com/swaggo/swag v1.8.12/go.mod h1:lNfm6Gg+oAq3zRJQNEMBE66LIJKM44mxFqhEEgy2its=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
+github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tkuchiki/go-timezone v0.2.2 h1:MdHR65KwgVTwWFQrota4SKzc4L5EfuH5SdZZGtk/P2Q=
 github.com/tkuchiki/go-timezone v0.2.2/go.mod h1:oFweWxYl35C/s7HMVZXiA19Jr9Y0qJHMaG/J2TES4LY=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/ulule/limiter/v3 v3.11.0 h1:9hXMyS0K8Z+EYfrtwPMwmWYflPimswsC/EOMsO2sHx4=
+github.com/ulule/limiter/v3 v3.11.0/go.mod h1:OiKIiMs9dXLMk5TwtIBZlswhPigov9fGmwO4xYbmFkY=
+github.com/ulule/limiter/v3 v3.11.1 h1:wm6YaA2JwIXc0S+z8TK8/neWMOTf4m20I5jL1dwLRcw=
+github.com/ulule/limiter/v3 v3.11.1/go.mod h1:4nk/9RHEJthkjD+mmkqYxaPfD4pkB91PTH7k8ozB80g=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
@@ -717,20 +778,29 @@ github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQ
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/vectordotdev/go-datemath v0.1.1-0.20211214182920-0a4ac8742b93 h1:bT0ZMfsMi2Xh8dopgxhFT+OJH88QITHpdppdkG1rXJQ=
 github.com/vectordotdev/go-datemath v0.1.1-0.20211214182920-0a4ac8742b93/go.mod h1:PnwzbSst7KD3vpBzzlntZU5gjVa455Uqa5QPiKSYJzQ=
+github.com/vectordotdev/go-datemath v0.1.1-0.20220323213446-f3954d0b18ae h1:oyiy3uBj1F4O3AaFh7hUGBrJjAssJhKyAbwxtkslxqo=
+github.com/vectordotdev/go-datemath v0.1.1-0.20220323213446-f3954d0b18ae/go.mod h1:PnwzbSst7KD3vpBzzlntZU5gjVa455Uqa5QPiKSYJzQ=
 github.com/wneessen/go-mail v0.3.8 h1:ja5D/o/RVwrtRIYFlrO7GmtcjDNeMakGQuwQRZYv0JM=
 github.com/wneessen/go-mail v0.3.8/go.mod h1:m25lkU2GYQnlVr6tdwK533/UXxo57V0kLOjaFYmub0E=
+github.com/wneessen/go-mail v0.3.9 h1:Q4DbCk3htT5DtDWKeMgNXCiHc4bBY/vv/XQPT6XDXzc=
+github.com/wneessen/go-mail v0.3.9/go.mod h1:zxOlafWCP/r6FEhAaRgH4IC1vg2YXxO0Nar9u0IScZ8=
+github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
+github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
+github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/yuin/goldmark v1.5.3 h1:3HUJmBFbQW9fhQOzMgseU134xfi6hU+mjWywx5Ty+/M=
-github.com/yuin/goldmark v1.5.3/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yuin/goldmark v1.5.4 h1:2uY/xC0roWy8IBEGLgB1ywIoEJFGmRrX21YQcvGZzjU=
+github.com/yuin/goldmark v1.5.4/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
+go.mongodb.org/mongo-driver v1.11.1/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
@@ -739,6 +809,10 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
+go.opentelemetry.io/otel v1.15.0 h1:NIl24d4eiLJPM0vKn4HjLYM+UZf6gSfi9Z+NmCxkWbk=
+go.opentelemetry.io/otel v1.15.0/go.mod h1:qfwLEbWhLPk5gyWrne4XnF0lC8wtywbuJbgfAE3zbek=
+go.opentelemetry.io/otel/trace v1.15.0 h1:5Fwje4O2ooOxkfyqI/kJwxWotggDLix4BSAvpE1wlpo=
+go.opentelemetry.io/otel/trace v1.15.0/go.mod h1:CUsmE2Ht1CRkvE8OsMESvraoZrrcgD1J2W8GV1ev0Y4=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
@@ -771,8 +845,14 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
-golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
+golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
+golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
+golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
+golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -786,8 +866,10 @@ golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMk
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.3.0 h1:HTDXbdK9bjfSWkPzDJIw89W8CAtfFGduujWs33NLLsg=
-golang.org/x/image v0.3.0/go.mod h1:fXd9211C/0VTlYuAcOhW8dY/RtEJqODXOWBDpmYBf+A=
+golang.org/x/image v0.6.0 h1:bR8b5okrPI3g/gyZakLZHeWxAR8Dn5CyxXv1hLH5g/4=
+golang.org/x/image v0.6.0/go.mod h1:MXLdDR43H7cDJq5GEGXEVeeNhPgi+YYEQ2pC1byI1x0=
+golang.org/x/image v0.7.0 h1:gzS29xtG1J5ybQlv0PuyfE3nmc6R4qB73m6LUUmvFuw=
+golang.org/x/image v0.7.0/go.mod h1:nd/q4ef1AKKYl/4kft7g+6UyGbdiqWqTP1ZAbRoV7Rg=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -809,8 +891,11 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
+golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -854,15 +939,18 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
 golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
-golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
-golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
+golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -872,11 +960,13 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/oauth2 v0.3.0/go.mod h1:rQrIauxkUhJ6CuwEXwymO2/eh4xz2ZWF1nBkcxS+tGk=
-golang.org/x/oauth2 v0.4.0 h1:NF0gk8LVPg1Ml7SSbGyySuoxdsXitj7TvgvuRxIMc/M=
-golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec=
+golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw=
+golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
+golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g=
+golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=
+golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
+golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -887,9 +977,12 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
+golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -919,7 +1012,6 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -933,8 +1025,6 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -945,33 +1035,39 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
+golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
-golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg=
-golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
+golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ=
+golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
+golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -981,8 +1077,11 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1036,6 +1135,7 @@ golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
@@ -1046,10 +1146,14 @@ golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
+golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1157,19 +1261,24 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.29.1 h1:7QBf+IK2gx70Ap/hDsOmam3GE0v9HicjfEdAxE62UoM=
+google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
+google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/d4l3k/messagediff.v1 v1.2.1 h1:70AthpjunwzUiarMHyED52mj9UwtAnE89l1Gmrt3EU0=
 gopkg.in/d4l3k/messagediff.v1 v1.2.1/go.mod h1:EUzikiKadqXWcD1AzJLagx0j/BeeWGtn++04Xniyg44=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
@@ -1183,7 +1292,6 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
@@ -1317,6 +1425,16 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
 src.techknowlogick.com/xgo v1.7.1-0.20230117190652-94aee174ab86 h1:VybPMHRdCLbdCttI8fMXOaGpoJGSG9+W/5cfRgr1Xjc=
 src.techknowlogick.com/xgo v1.7.1-0.20230117190652-94aee174ab86/go.mod h1:31CE1YKtDOrKTk9PSnjTpe6YbO6W/0LTYZ1VskL09oU=
+src.techknowlogick.com/xgo v1.7.1-0.20230214195350-44f7e66f9b20 h1:Wye8Ljlv2AZvYPW1twGbW9sQWGtjurbQECnnkNx6gd0=
+src.techknowlogick.com/xgo v1.7.1-0.20230214195350-44f7e66f9b20/go.mod h1:31CE1YKtDOrKTk9PSnjTpe6YbO6W/0LTYZ1VskL09oU=
+src.techknowlogick.com/xgo v1.7.1-0.20230307171022-b60708668fc7 h1:nPPnMdR4wih62PSsnHK/SlYM1lOZk/St0k7DkJadMV4=
+src.techknowlogick.com/xgo v1.7.1-0.20230307171022-b60708668fc7/go.mod h1:31CE1YKtDOrKTk9PSnjTpe6YbO6W/0LTYZ1VskL09oU=
+src.techknowlogick.com/xgo v1.7.1-0.20230404174715-bff48e481f81 h1:GNyJiosmWbazA1OYNZ1yF+GWOjIW0ZfJmkwEJDiU18g=
+src.techknowlogick.com/xgo v1.7.1-0.20230404174715-bff48e481f81/go.mod h1:31CE1YKtDOrKTk9PSnjTpe6YbO6W/0LTYZ1VskL09oU=
+src.techknowlogick.com/xgo v1.7.1-0.20230426011930-e65295a11a0f h1:4/OzEYNoSOP1s3v0cBolS7uSR/AceOtwXcZ1Iqusrbw=
+src.techknowlogick.com/xgo v1.7.1-0.20230426011930-e65295a11a0f/go.mod h1:31CE1YKtDOrKTk9PSnjTpe6YbO6W/0LTYZ1VskL09oU=
+src.techknowlogick.com/xgo v1.7.1-0.20230502175921-52d704db7dce h1:gxVOs4LYBv+/gGImaYvs8p14kOTbVLl6835JYKAzUaw=
+src.techknowlogick.com/xgo v1.7.1-0.20230502175921-52d704db7dce/go.mod h1:31CE1YKtDOrKTk9PSnjTpe6YbO6W/0LTYZ1VskL09oU=
 src.techknowlogick.com/xormigrate v1.5.0 h1:6mWTh8d0sWjMTLUgJqiLe0e0Teu+1j+RgI7ErAeOEV0=
 src.techknowlogick.com/xormigrate v1.5.0/go.mod h1:QOCnBeWralVncPn9eZlM4w/rglFK8o1vYpemzPenkBM=
 xorm.io/builder v0.3.7/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=

magefile.go

@@ -177,6 +177,9 @@ func init() {
 // Some variables have external dependencies (like git) which may not always be available.
 func initVars() {
 	Tags = os.Getenv("TAGS")
+	if !strings.Contains(Tags, "swagger") {
+		Tags += " swagger"
+	}
 	setVersion()
 	setBinLocation()
 	setPkgVersion()
@@ -195,7 +198,11 @@ func runAndStreamOutput(cmd string, args ...string) {
 	stdout, _ := c.StdoutPipe()
 	errbuf := bytes.Buffer{}
 	c.Stderr = &errbuf
-	c.Start()
+	err := c.Start()
+	if err != nil {
+		fmt.Printf("Could not start: %s\n", err)
+		os.Exit(1)
+	}
 
 	reader := bufio.NewReader(stdout)
 	line, err := reader.ReadString('\n')
@@ -337,9 +344,16 @@ func Fmt() {
 	runAndStreamOutput("gofmt", args...)
 }
 
+const swaggerDocsFolderLocation = `./pkg/swagger/`
+
 // Generates the swagger docs from the code annotations
 func DoTheSwag() {
 	mg.Deps(initVars)
+	if _, err := os.Stat(swaggerDocsFolderLocation + "swagger.json"); err == nil {
+		fmt.Println("Swagger docs already generated, not generating. Remove the files in " + swaggerDocsFolderLocation + " and run this command again to regenerate them.")
+		return
+	}
+
 	checkAndInstallGoTool("swag", "github.com/swaggo/swag/cmd/swag")
 	runAndStreamOutput("swag", "init", "-g", "./pkg/routes/routes.go", "--parseDependency", "-d", RootPath, "-o", RootPath+"/pkg/swagger")
 }
@@ -405,7 +419,7 @@ func checkGolangCiLintInstalled() {
 	mg.Deps(initVars)
 	if err := exec.Command("golangci-lint").Run(); err != nil && strings.Contains(err.Error(), "executable file not found") {
 		fmt.Println("Please manually install golangci-lint by running")
-		fmt.Println("curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.47.3")
+		fmt.Println("curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.52.1")
 		os.Exit(1)
 	}
 }
@@ -446,12 +460,16 @@ func (Build) Clean() error {
 	if err := os.RemoveAll(BinLocation); err != nil && !os.IsNotExist(err) {
 		return err
 	}
+	if err := os.RemoveAll(swaggerDocsFolderLocation); err != nil && !os.IsNotExist(err) {
+		return err
+	}
 	return nil
 }
 
 // Builds a vikunja binary, ready to run
 func (Build) Build() {
 	mg.Deps(initVars)
+	mg.Deps(DoTheSwag)
 	runAndStreamOutput("go", "build", Goflags[0], "-tags", Tags, "-ldflags", "-s -w "+Ldflags, "-o", Executable)
 }
 
@@ -461,6 +479,7 @@ type Release mg.Namespace
 func (Release) Release(ctx context.Context) error {
 	mg.Deps(initVars)
 	mg.Deps(Release.Dirs)
+	mg.Deps(DoTheSwag)
 
 	// Run compiling in parallel to speed it up
 	errs, _ := errgroup.WithContext(ctx)
@@ -502,6 +521,7 @@ func (Release) Dirs() error {
 
 func runXgo(targets string) error {
 	mg.Deps(initVars)
+	mg.Deps(DoTheSwag)
 	checkAndInstallGoTool("xgo", "src.techknowlogick.com/xgo")
 
 	extraLdflags := `-linkmode external -extldflags "-static" `

pkg/caldav/caldav.go

@@ -31,19 +31,6 @@ import (
 // DateFormat is the caldav date format
 const DateFormat = `20060102T150405`
 
-// Event holds a single caldav event
-type Event struct {
-	Summary     string
-	Description string
-	UID         string
-	Alarms      []Alarm
-	Color       string
-
-	Timestamp time.Time
-	Start     time.Time
-	End       time.Time
-}
-
 // Todo holds a single VTODO
 type Todo struct {
 	// Required
@@ -58,13 +45,14 @@ type Todo struct {
 	Priority     int64 // 0-9, 1 is highest
 	RelatedToUID string
 	Color        string
-
-	Start       time.Time
-	End         time.Time
-	DueDate     time.Time
-	Duration    time.Duration
-	RepeatAfter int64
-	RepeatMode  models.TaskRepeatMode
+	Categories   []string
+	Start        time.Time
+	End          time.Time
+	DueDate      time.Time
+	Duration     time.Duration
+	RepeatAfter  int64
+	RepeatMode   models.TaskRepeatMode
+	Alarms       []Alarm
 
 	Created time.Time
 	Updated time.Time // last-mod
@@ -73,6 +61,8 @@ type Todo struct {
 // Alarm holds infos about an alarm from a caldav event
 type Alarm struct {
 	Time        time.Time
+	Duration    time.Duration
+	RelativeTo  models.ReminderRelation
 	Description string
 }
 
@@ -100,58 +90,6 @@ X-OUTLOOK-COLOR:` + color + `
 X-FUNAMBOL-COLOR:` + color
 }
 
-// ParseEvents parses an array of caldav events and gives them back as string
-func ParseEvents(config *Config, events []*Event) (caldavevents string) {
-	caldavevents += `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:` + config.Name + `
-PRODID:-//` + config.ProdID + `//EN` + getCaldavColor(config.Color)
-
-	for _, e := range events {
-
-		if e.UID == "" {
-			e.UID = makeCalDavTimeFromTimeStamp(e.Timestamp) + utils.Sha256(e.Summary)
-		}
-
-		formattedDescription := ""
-		if e.Description != "" {
-			re := regexp.MustCompile(`\r?\n`)
-			formattedDescription = re.ReplaceAllString(e.Description, "\\n")
-		}
-
-		caldavevents += `
-BEGIN:VEVENT
-UID:` + e.UID + `
-SUMMARY:` + e.Summary + getCaldavColor(e.Color) + `
-DESCRIPTION:` + formattedDescription + `
-DTSTAMP:` + makeCalDavTimeFromTimeStamp(e.Timestamp) + `
-DTSTART:` + makeCalDavTimeFromTimeStamp(e.Start) + `
-DTEND:` + makeCalDavTimeFromTimeStamp(e.End)
-
-		for _, a := range e.Alarms {
-			if a.Description == "" {
-				a.Description = e.Summary
-			}
-
-			caldavevents += `
-BEGIN:VALARM
-TRIGGER:` + calcAlarmDateFromReminder(e.Start, a.Time) + `
-ACTION:DISPLAY
-DESCRIPTION:` + a.Description + `
-END:VALARM`
-		}
-		caldavevents += `
-END:VEVENT`
-	}
-
-	caldavevents += `
-END:VCALENDAR` // Need a line break
-
-	return
-}
-
 func formatDuration(duration time.Duration) string {
 	seconds := duration.Seconds() - duration.Minutes()*60
 	minutes := duration.Minutes() - duration.Hours()*60
@@ -239,9 +177,14 @@ RRULE:FREQ=SECONDLY;INTERVAL=` + strconv.FormatInt(t.RepeatAfter, 10)
 			}
 		}
 
+		if len(t.Categories) > 0 {
+			caldavtodos += `
+CATEGORIES:` + strings.Join(t.Categories, ",")
+		}
+
 		caldavtodos += `
 LAST-MODIFIED:` + makeCalDavTimeFromTimeStamp(t.Updated)
-
+		caldavtodos += ParseAlarms(t.Alarms, t.Summary)
 		caldavtodos += `
 END:VTODO`
 	}
@@ -252,19 +195,42 @@ END:VCALENDAR` // Need a line break
 	return
 }
 
+func ParseAlarms(alarms []Alarm, taskDescription string) (caldavalarms string) {
+	for _, a := range alarms {
+		if a.Description == "" {
+			a.Description = taskDescription
+		}
+
+		caldavalarms += `
+BEGIN:VALARM`
+		switch a.RelativeTo {
+		case models.ReminderRelationStartDate:
+			caldavalarms += `
+TRIGGER;RELATED=START:` + makeCalDavDuration(a.Duration)
+		case models.ReminderRelationEndDate, models.ReminderRelationDueDate:
+			caldavalarms += `
+TRIGGER;RELATED=END:` + makeCalDavDuration(a.Duration)
+		default:
+			caldavalarms += `
+TRIGGER;VALUE=DATE-TIME:` + makeCalDavTimeFromTimeStamp(a.Time)
+		}
+		caldavalarms += `
+ACTION:DISPLAY
+DESCRIPTION:` + a.Description + `
+END:VALARM`
+	}
+	return caldavalarms
+}
+
 func makeCalDavTimeFromTimeStamp(ts time.Time) (caldavtime string) {
 	return ts.In(time.UTC).Format(DateFormat) + "Z"
 }
 
-func calcAlarmDateFromReminder(eventStart, reminder time.Time) (alarmTime string) {
-	diff := reminder.Sub(eventStart)
-	diffStr := strings.ToUpper(diff.String())
-	if diff < 0 {
-		alarmTime += `-`
-		// We append the - at the beginning of the caldav flag, that would get in the way if the minutes
-		// themselves are also containing it
-		diffStr = diffStr[1:]
+func makeCalDavDuration(duration time.Duration) (caldavtime string) {
+	if duration < 0 {
+		duration = duration.Abs()
+		caldavtime = "-"
 	}
-	alarmTime += `PT` + diffStr
+	caldavtime += "PT" + strings.ToUpper(duration.Truncate(time.Millisecond).String())
 	return
 }

pkg/caldav/caldav_test.go

@@ -26,275 +26,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestParseEvents(t *testing.T) {
-	type args struct {
-		config *Config
-		events []*Event
-	}
-	tests := []struct {
-		name             string
-		args             args
-		wantCaldavevents string
-	}{
-		{
-			name: "Test caldavparsing without reminders",
-			args: args{
-				config: &Config{
-					Name:   "test",
-					ProdID: "RandomProdID which is not random",
-					Color:  "ffffff",
-				},
-				events: []*Event{
-					{
-						Summary:     "Event #1",
-						Description: "Lorem Ipsum",
-						UID:         "randommduid",
-						Timestamp:   time.Unix(1543626724, 0).In(config.GetTimeZone()),
-						Start:       time.Unix(1543626724, 0).In(config.GetTimeZone()),
-						End:         time.Unix(1543627824, 0).In(config.GetTimeZone()),
-						Color:       "affffe",
-					},
-					{
-						Summary:   "Event #2",
-						UID:       "randommduidd",
-						Timestamp: time.Unix(1543726724, 0).In(config.GetTimeZone()),
-						Start:     time.Unix(1543726724, 0).In(config.GetTimeZone()),
-						End:       time.Unix(1543738724, 0).In(config.GetTimeZone()),
-					},
-					{
-						Summary:   "Event #3 with empty uid",
-						UID:       "20181202T0600242aaef4a81d770c1e775e26bc5abebc87f1d3d7bffaa83",
-						Timestamp: time.Unix(1543726824, 0).In(config.GetTimeZone()),
-						Start:     time.Unix(1543726824, 0).In(config.GetTimeZone()),
-						End:       time.Unix(1543727000, 0).In(config.GetTimeZone()),
-					},
-				},
-			},
-			wantCaldavevents: `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:test
-PRODID:-//RandomProdID which is not random//EN
-X-APPLE-CALENDAR-COLOR:#ffffffFF
-X-OUTLOOK-COLOR:#ffffffFF
-X-FUNAMBOL-COLOR:#ffffffFF
-BEGIN:VEVENT
-UID:randommduid
-SUMMARY:Event #1
-X-APPLE-CALENDAR-COLOR:#affffeFF
-X-OUTLOOK-COLOR:#affffeFF
-X-FUNAMBOL-COLOR:#affffeFF
-DESCRIPTION:Lorem Ipsum
-DTSTAMP:20181201T011204Z
-DTSTART:20181201T011204Z
-DTEND:20181201T013024Z
-END:VEVENT
-BEGIN:VEVENT
-UID:randommduidd
-SUMMARY:Event #2
-DESCRIPTION:
-DTSTAMP:20181202T045844Z
-DTSTART:20181202T045844Z
-DTEND:20181202T081844Z
-END:VEVENT
-BEGIN:VEVENT
-UID:20181202T0600242aaef4a81d770c1e775e26bc5abebc87f1d3d7bffaa83
-SUMMARY:Event #3 with empty uid
-DESCRIPTION:
-DTSTAMP:20181202T050024Z
-DTSTART:20181202T050024Z
-DTEND:20181202T050320Z
-END:VEVENT
-END:VCALENDAR`,
-		},
-		{
-			name: "Test caldavparsing with reminders",
-			args: args{
-				config: &Config{
-					Name:   "test2",
-					ProdID: "RandomProdID which is not random",
-				},
-				events: []*Event{
-					{
-						Summary:     "Event #1",
-						Description: "Lorem Ipsum",
-						UID:         "randommduid",
-						Timestamp:   time.Unix(1543626724, 0).In(config.GetTimeZone()),
-						Start:       time.Unix(1543626724, 0).In(config.GetTimeZone()),
-						End:         time.Unix(1543627824, 0).In(config.GetTimeZone()),
-						Alarms: []Alarm{
-							{Time: time.Unix(1543626524, 0).In(config.GetTimeZone())},
-							{Time: time.Unix(1543626224, 0).In(config.GetTimeZone())},
-							{Time: time.Unix(1543626024, 0)},
-						},
-					},
-					{
-						Summary:   "Event #2",
-						UID:       "randommduidd",
-						Timestamp: time.Unix(1543726724, 0).In(config.GetTimeZone()),
-						Start:     time.Unix(1543726724, 0).In(config.GetTimeZone()),
-						End:       time.Unix(1543738724, 0).In(config.GetTimeZone()),
-						Alarms: []Alarm{
-							{Time: time.Unix(1543626524, 0).In(config.GetTimeZone())},
-							{Time: time.Unix(1543626224, 0).In(config.GetTimeZone())},
-							{Time: time.Unix(1543626024, 0).In(config.GetTimeZone())},
-						},
-					},
-					{
-						Summary:   "Event #3 with empty uid",
-						Timestamp: time.Unix(1543726824, 0).In(config.GetTimeZone()),
-						Start:     time.Unix(1543726824, 0).In(config.GetTimeZone()),
-						End:       time.Unix(1543727000, 0).In(config.GetTimeZone()),
-						Alarms: []Alarm{
-							{Time: time.Unix(1543626524, 0).In(config.GetTimeZone())},
-							{Time: time.Unix(1543626224, 0).In(config.GetTimeZone())},
-							{Time: time.Unix(1543626024, 0).In(config.GetTimeZone())},
-							{Time: time.Unix(1543826824, 0).In(config.GetTimeZone())},
-						},
-					},
-					{
-						Summary:   "Event #4 without any",
-						Timestamp: time.Unix(1543726824, 0),
-						Start:     time.Unix(1543726824, 0),
-						End:       time.Unix(1543727000, 0),
-					},
-				},
-			},
-			wantCaldavevents: `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:test2
-PRODID:-//RandomProdID which is not random//EN
-BEGIN:VEVENT
-UID:randommduid
-SUMMARY:Event #1
-DESCRIPTION:Lorem Ipsum
-DTSTAMP:20181201T011204Z
-DTSTART:20181201T011204Z
-DTEND:20181201T013024Z
-BEGIN:VALARM
-TRIGGER:-PT3M20S
-ACTION:DISPLAY
-DESCRIPTION:Event #1
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT8M20S
-ACTION:DISPLAY
-DESCRIPTION:Event #1
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT11M40S
-ACTION:DISPLAY
-DESCRIPTION:Event #1
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
-UID:randommduidd
-SUMMARY:Event #2
-DESCRIPTION:
-DTSTAMP:20181202T045844Z
-DTSTART:20181202T045844Z
-DTEND:20181202T081844Z
-BEGIN:VALARM
-TRIGGER:-PT27H50M0S
-ACTION:DISPLAY
-DESCRIPTION:Event #2
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT27H55M0S
-ACTION:DISPLAY
-DESCRIPTION:Event #2
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT27H58M20S
-ACTION:DISPLAY
-DESCRIPTION:Event #2
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
-UID:20181202T050024Z2aaef4a81d770c1e775e26bc5abebc87f1d3d7bffaa83
-SUMMARY:Event #3 with empty uid
-DESCRIPTION:
-DTSTAMP:20181202T050024Z
-DTSTART:20181202T050024Z
-DTEND:20181202T050320Z
-BEGIN:VALARM
-TRIGGER:-PT27H51M40S
-ACTION:DISPLAY
-DESCRIPTION:Event #3 with empty uid
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT27H56M40S
-ACTION:DISPLAY
-DESCRIPTION:Event #3 with empty uid
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT28H0M0S
-ACTION:DISPLAY
-DESCRIPTION:Event #3 with empty uid
-END:VALARM
-BEGIN:VALARM
-TRIGGER:PT27H46M40S
-ACTION:DISPLAY
-DESCRIPTION:Event #3 with empty uid
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
-UID:20181202T050024Zae7548ce9556df85038abe90dc674d4741a61ce74d1cf
-SUMMARY:Event #4 without any
-DESCRIPTION:
-DTSTAMP:20181202T050024Z
-DTSTART:20181202T050024Z
-DTEND:20181202T050320Z
-END:VEVENT
-END:VCALENDAR`,
-		},
-		{
-			name: "Test caldavparsing with multiline description",
-			args: args{
-				config: &Config{
-					Name:   "test",
-					ProdID: "RandomProdID which is not random",
-				},
-				events: []*Event{
-					{
-						Summary: "Event #1",
-						Description: `Lorem Ipsum
-Dolor sit amet`,
-						UID:       "randommduid",
-						Timestamp: time.Unix(1543626724, 0).In(config.GetTimeZone()),
-						Start:     time.Unix(1543626724, 0).In(config.GetTimeZone()),
-						End:       time.Unix(1543627824, 0).In(config.GetTimeZone()),
-					},
-				},
-			},
-			wantCaldavevents: `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:test
-PRODID:-//RandomProdID which is not random//EN
-BEGIN:VEVENT
-UID:randommduid
-SUMMARY:Event #1
-DESCRIPTION:Lorem Ipsum\nDolor sit amet
-DTSTAMP:20181201T011204Z
-DTSTART:20181201T011204Z
-DTEND:20181201T013024Z
-END:VEVENT
-END:VCALENDAR`,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			gotCaldavevents := ParseEvents(tt.args.config, tt.args.events)
-			assert.Equal(t, gotCaldavevents, tt.wantCaldavevents)
-		})
-	}
-}
-
 func TestParseTodos(t *testing.T) {
 	type args struct {
 		config *Config
@@ -481,13 +212,127 @@ DUE:20181201T011204Z
 RRULE:FREQ=SECONDLY;INTERVAL=435
 LAST-MODIFIED:00010101T000000Z
 END:VTODO
+END:VCALENDAR`,
+		},
+		{
+			name: "with categories",
+			args: args{
+				config: &Config{
+					Name:   "test",
+					ProdID: "RandomProdID which is not random",
+					Color:  "ffffff",
+				},
+				todos: []*Todo{
+					{
+						Summary:    "Todo #1",
+						UID:        "randommduid",
+						Timestamp:  time.Unix(1543626724, 0).In(config.GetTimeZone()),
+						Color:      "affffe",
+						Categories: []string{"label1", "label2"},
+					},
+				},
+			},
+			wantCaldavtasks: `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:test
+PRODID:-//RandomProdID which is not random//EN
+X-APPLE-CALENDAR-COLOR:#ffffffFF
+X-OUTLOOK-COLOR:#ffffffFF
+X-FUNAMBOL-COLOR:#ffffffFF
+BEGIN:VTODO
+UID:randommduid
+DTSTAMP:20181201T011204Z
+SUMMARY:Todo #1
+X-APPLE-CALENDAR-COLOR:#affffeFF
+X-OUTLOOK-COLOR:#affffeFF
+X-FUNAMBOL-COLOR:#affffeFF
+CATEGORIES:label1,label2
+LAST-MODIFIED:00010101T000000Z
+END:VTODO
+END:VCALENDAR`,
+		},
+		{
+			name: "with alarm",
+			args: args{
+				config: &Config{
+					Name:   "test",
+					ProdID: "RandomProdID which is not random",
+				},
+				todos: []*Todo{
+					{
+						Summary:   "Todo #1",
+						UID:       "randommduid",
+						Timestamp: time.Unix(1543626724, 0).In(config.GetTimeZone()),
+						Alarms: []Alarm{
+							{
+								Time: time.Unix(1543626724, 0).In(config.GetTimeZone()),
+							},
+							{
+								Time:        time.Unix(1543626724, 0).In(config.GetTimeZone()),
+								Description: "alarm description",
+							},
+							{
+								Duration:   -2 * time.Hour,
+								RelativeTo: "due_date",
+							},
+							{
+								Duration:   1 * time.Hour,
+								RelativeTo: "start_date",
+							},
+							{
+								Duration:   time.Duration(0),
+								RelativeTo: "end_date",
+							},
+						},
+					},
+				},
+			},
+			wantCaldavtasks: `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:test
+PRODID:-//RandomProdID which is not random//EN
+BEGIN:VTODO
+UID:randommduid
+DTSTAMP:20181201T011204Z
+SUMMARY:Todo #1
+LAST-MODIFIED:00010101T000000Z
+BEGIN:VALARM
+TRIGGER;VALUE=DATE-TIME:20181201T011204Z
+ACTION:DISPLAY
+DESCRIPTION:Todo #1
+END:VALARM
+BEGIN:VALARM
+TRIGGER;VALUE=DATE-TIME:20181201T011204Z
+ACTION:DISPLAY
+DESCRIPTION:alarm description
+END:VALARM
+BEGIN:VALARM
+TRIGGER;RELATED=END:-PT2H0M0S
+ACTION:DISPLAY
+DESCRIPTION:Todo #1
+END:VALARM
+BEGIN:VALARM
+TRIGGER;RELATED=START:PT1H0M0S
+ACTION:DISPLAY
+DESCRIPTION:Todo #1
+END:VALARM
+BEGIN:VALARM
+TRIGGER;RELATED=END:PT0S
+ACTION:DISPLAY
+DESCRIPTION:Todo #1
+END:VALARM
+END:VTODO
 END:VCALENDAR`,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			gotCaldavtasks := ParseTodos(tt.args.config, tt.args.todos)
-			assert.Equal(t, gotCaldavtasks, tt.wantCaldavtasks)
+			assert.Equal(t, tt.wantCaldavtasks, gotCaldavtasks)
 		})
 	}
 }

pkg/caldav/parsing.go

@@ -17,23 +17,38 @@
 package caldav
 
 import (
+	"errors"
 	"strconv"
 	"strings"
 	"time"
 
+	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/models"
+	"code.vikunja.io/api/pkg/utils"
 
 	ics "github.com/arran4/golang-ical"
 )
 
-func GetCaldavTodosForTasks(list *models.ListWithTasksAndBuckets, listTasks []*models.TaskWithComments) string {
+func GetCaldavTodosForTasks(project *models.ProjectWithTasksAndBuckets, projectTasks []*models.TaskWithComments) string {
 
 	// Make caldav todos from Vikunja todos
 	var caldavtodos []*Todo
-	for _, t := range listTasks {
+	for _, t := range projectTasks {
 
 		duration := t.EndDate.Sub(t.StartDate)
+		var categories []string
+		for _, label := range t.Labels {
+			categories = append(categories, label.Title)
+		}
+		var alarms []Alarm
+		for _, reminder := range t.Reminders {
+			alarms = append(alarms, Alarm{
+				Time:       reminder.Reminder,
+				Duration:   time.Duration(reminder.RelativePeriod) * time.Second,
+				RelativeTo: reminder.RelativeTo,
+			})
+		}
 
 		caldavtodos = append(caldavtodos, &Todo{
 			Timestamp:   t.Updated,
@@ -42,6 +57,7 @@ func GetCaldavTodosForTasks(list *models.ListWithTasksAndBuckets, listTasks []*m
 			Description: t.Description,
 			Completed:   t.DoneAt,
 			// Organizer:     &t.CreatedBy, // Disabled until we figure out how this works
+			Categories:  categories,
 			Priority:    t.Priority,
 			Start:       t.StartDate,
 			End:         t.EndDate,
@@ -51,11 +67,12 @@ func GetCaldavTodosForTasks(list *models.ListWithTasksAndBuckets, listTasks []*m
 			Duration:    duration,
 			RepeatAfter: t.RepeatAfter,
 			RepeatMode:  t.RepeatMode,
+			Alarms:      alarms,
 		})
 	}
 
 	caldavConfig := &Config{
-		Name:   list.Title,
+		Name:   project.Title,
 		ProdID: "Vikunja Todo App",
 	}
 
@@ -67,17 +84,20 @@ func ParseTaskFromVTODO(content string) (vTask *models.Task, err error) {
 	if err != nil {
 		return nil, err
 	}
-
-	// We put the task details in a map to be able to handle them more easily
-	task := make(map[string]string)
-	for _, c := range parsed.Components[0].UnknownPropertiesIANAProperties() {
-		task[c.IANAToken] = c.Value
+	vTodo, ok := parsed.Components[0].(*ics.VTodo)
+	if !ok {
+		return nil, errors.New("VTODO element not found")
+	}
+	// We put the vTodo details in a map to be able to handle them more easily
+	task := make(map[string]ics.IANAProperty)
+	for _, c := range vTodo.UnknownPropertiesIANAProperties() {
+		task[c.IANAToken] = c
 	}
 
 	// Parse the priority
 	var priority int64
 	if _, ok := task["PRIORITY"]; ok {
-		priorityParsed, err := strconv.ParseInt(task["PRIORITY"], 10, 64)
+		priorityParsed, err := strconv.ParseInt(task["PRIORITY"].Value, 10, 64)
 		if err != nil {
 			return nil, err
 		}
@@ -86,23 +106,35 @@ func ParseTaskFromVTODO(content string) (vTask *models.Task, err error) {
 	}
 
 	// Parse the enddate
-	duration, _ := time.ParseDuration(task["DURATION"])
+	duration, _ := time.ParseDuration(task["DURATION"].Value)
 
-	description := strings.ReplaceAll(task["DESCRIPTION"], "\\,", ",")
+	description := strings.ReplaceAll(task["DESCRIPTION"].Value, "\\,", ",")
 	description = strings.ReplaceAll(description, "\\n", "\n")
 
+	var labels []*models.Label
+	if val, ok := task["CATEGORIES"]; ok {
+		categories := strings.Split(val.Value, ",")
+		labels = make([]*models.Label, 0, len(categories))
+		for _, category := range categories {
+			labels = append(labels, &models.Label{
+				Title: category,
+			})
+		}
+	}
+
 	vTask = &models.Task{
-		UID:         task["UID"],
-		Title:       task["SUMMARY"],
+		UID:         task["UID"].Value,
+		Title:       task["SUMMARY"].Value,
 		Description: description,
 		Priority:    priority,
+		Labels:      labels,
 		DueDate:     caldavTimeToTimestamp(task["DUE"]),
 		Updated:     caldavTimeToTimestamp(task["DTSTAMP"]),
 		StartDate:   caldavTimeToTimestamp(task["DTSTART"]),
 		DoneAt:      caldavTimeToTimestamp(task["COMPLETED"]),
 	}
 
-	if task["STATUS"] == "COMPLETED" {
+	if task["STATUS"].Value == "COMPLETED" {
 		vTask.Done = true
 	}
 
@@ -110,11 +142,66 @@ func ParseTaskFromVTODO(content string) (vTask *models.Task, err error) {
 		vTask.EndDate = vTask.StartDate.Add(duration)
 	}
 
+	for _, vAlarm := range vTodo.SubComponents() {
+		if vAlarm, ok := vAlarm.(*ics.VAlarm); ok {
+			vTask = parseVAlarm(vAlarm, vTask)
+		}
+	}
+
 	return
 }
 
+func parseVAlarm(vAlarm *ics.VAlarm, vTask *models.Task) *models.Task {
+	for _, property := range vAlarm.UnknownPropertiesIANAProperties() {
+		if property.IANAToken != "TRIGGER" {
+			continue
+		}
+
+		if contains(property.ICalParameters["VALUE"], "DATE-TIME") {
+			// Example: TRIGGER;VALUE=DATE-TIME:20181201T011210Z
+			vTask.Reminders = append(vTask.Reminders, &models.TaskReminder{
+				Reminder: caldavTimeToTimestamp(property),
+			})
+			continue
+		}
+
+		duration := utils.ParseISO8601Duration(property.Value)
+
+		if contains(property.ICalParameters["RELATED"], "END") {
+			// Example: TRIGGER;RELATED=END:-P2D
+			if vTask.EndDate.IsZero() {
+				vTask.Reminders = append(vTask.Reminders, &models.TaskReminder{
+					RelativePeriod: int64(duration.Seconds()),
+					RelativeTo:     models.ReminderRelationDueDate})
+			} else {
+				vTask.Reminders = append(vTask.Reminders, &models.TaskReminder{
+					RelativePeriod: int64(duration.Seconds()),
+					RelativeTo:     models.ReminderRelationEndDate})
+			}
+			continue
+		}
+
+		// Example: TRIGGER;RELATED=START:-P2D
+		// Example: TRIGGER:-PT60M
+		vTask.Reminders = append(vTask.Reminders, &models.TaskReminder{
+			RelativePeriod: int64(duration.Seconds()),
+			RelativeTo:     models.ReminderRelationStartDate})
+	}
+	return vTask
+}
+
+func contains(array []string, str string) bool {
+	for _, value := range array {
+		if value == str {
+			return true
+		}
+	}
+	return false
+}
+
 // https://tools.ietf.org/html/rfc5545#section-3.3.5
-func caldavTimeToTimestamp(tstring string) time.Time {
+func caldavTimeToTimestamp(ianaProperty ics.IANAProperty) time.Time {
+	tstring := ianaProperty.Value
 	if tstring == "" {
 		return time.Time{}
 	}
@@ -129,7 +216,24 @@ func caldavTimeToTimestamp(tstring string) time.Time {
 		format = `20060102`
 	}
 
-	t, err := time.Parse(format, tstring)
+	var t time.Time
+	var err error
+	tzParameter := ianaProperty.ICalParameters["TZID"]
+	if len(tzParameter) > 0 {
+		loc, err := time.LoadLocation(tzParameter[0])
+		if err != nil {
+			log.Warningf("Error while parsing caldav timezone %s: %s", tzParameter[0], err)
+		} else {
+			t, err = time.ParseInLocation(format, tstring, loc)
+			if err != nil {
+				log.Warningf("Error while parsing caldav time %s to TimeStamp: %s at location %s", tstring, loc, err)
+			} else {
+				t = t.In(config.GetTimeZone())
+				return t
+			}
+		}
+	}
+	t, err = time.Parse(format, tstring)
 	if err != nil {
 		log.Warningf("Error while parsing caldav time %s to TimeStamp: %s", tstring, err)
 		return time.Time{}

pkg/caldav/parsing_test.go

@@ -85,6 +85,210 @@ END:VCALENDAR`,
 				Updated:     time.Unix(1543626724, 0).In(config.GetTimeZone()),
 			},
 		},
+		{
+			name: "With categories",
+			args: args{content: `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:test
+PRODID:-//RandomProdID which is not random//EN
+BEGIN:VTODO
+UID:randomuid
+DTSTAMP:20181201T011204
+SUMMARY:Todo #1
+DESCRIPTION:Lorem Ipsum
+CATEGORIES:cat1,cat2
+LAST-MODIFIED:00010101T000000
+END:VTODO
+END:VCALENDAR`,
+			},
+			wantVTask: &models.Task{
+				Title:       "Todo #1",
+				UID:         "randomuid",
+				Description: "Lorem Ipsum",
+				Labels: []*models.Label{
+					{
+						Title: "cat1",
+					},
+					{
+						Title: "cat2",
+					},
+				},
+				Updated: time.Unix(1543626724, 0).In(config.GetTimeZone()),
+			},
+		},
+		{
+			name: "With alarm (time trigger)",
+			args: args{content: `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:test
+PRODID:-//RandomProdID which is not random//EN
+BEGIN:VTODO
+UID:randomuid
+DTSTAMP:20181201T011204
+SUMMARY:Todo #1
+DESCRIPTION:Lorem Ipsum
+BEGIN:VALARM
+TRIGGER;VALUE=DATE-TIME:20181201T011210Z
+ACTION:DISPLAY
+END:VALARM
+END:VTODO
+END:VCALENDAR`,
+			},
+			wantVTask: &models.Task{
+				Title:       "Todo #1",
+				UID:         "randomuid",
+				Description: "Lorem Ipsum",
+				Reminders: []*models.TaskReminder{
+					{
+						Reminder: time.Date(2018, 12, 1, 1, 12, 10, 0, config.GetTimeZone()),
+					},
+				},
+				Updated: time.Unix(1543626724, 0).In(config.GetTimeZone()),
+			},
+		},
+		{
+			name: "With alarm (relative trigger)",
+			args: args{content: `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:test
+PRODID:-//RandomProdID which is not random//EN
+BEGIN:VTODO
+UID:randomuid
+DTSTAMP:20181201T011204
+SUMMARY:Todo #1
+DESCRIPTION:Lorem Ipsum
+DTSTART:20230228T170000Z
+DUE:20230304T150000Z
+BEGIN:VALARM
+TRIGGER:PT0S
+ACTION:DISPLAY
+END:VALARM
+BEGIN:VALARM
+TRIGGER;VALUE=DURATION:-PT60M
+ACTION:DISPLAY
+END:VALARM
+BEGIN:VALARM
+TRIGGER:-PT61M
+ACTION:DISPLAY
+END:VALARM
+BEGIN:VALARM
+TRIGGER;RELATED=START:-P1D
+ACTION:DISPLAY
+END:VALARM
+BEGIN:VALARM
+TRIGGER;RELATED=END:-PT30M
+ACTION:DISPLAY
+END:VALARM
+END:VTODO
+END:VCALENDAR`,
+			},
+			wantVTask: &models.Task{
+				Title:       "Todo #1",
+				UID:         "randomuid",
+				Description: "Lorem Ipsum",
+				StartDate:   time.Date(2023, 2, 28, 17, 0, 0, 0, config.GetTimeZone()),
+				DueDate:     time.Date(2023, 3, 4, 15, 0, 0, 0, config.GetTimeZone()),
+				Reminders: []*models.TaskReminder{
+					{
+						RelativeTo:     models.ReminderRelationStartDate,
+						RelativePeriod: 0,
+					},
+					{
+						RelativeTo:     models.ReminderRelationStartDate,
+						RelativePeriod: -3600,
+					},
+					{
+						RelativeTo:     models.ReminderRelationStartDate,
+						RelativePeriod: -3660,
+					},
+					{
+						RelativeTo:     models.ReminderRelationStartDate,
+						RelativePeriod: -86400,
+					},
+					{
+						RelativeTo:     models.ReminderRelationDueDate,
+						RelativePeriod: -1800,
+					},
+				},
+				Updated: time.Unix(1543626724, 0).In(config.GetTimeZone()),
+			},
+		},
+		{
+			name: "example task from tasks.org app",
+			args: args{content: `BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:+//IDN tasks.org//android-130102//EN
+BEGIN:VTODO
+DTSTAMP:20230402T074158Z
+UID:4290517349243274514
+CREATED:20230402T060451Z
+LAST-MODIFIED:20230402T074154Z
+SUMMARY:Test with tasks.org
+PRIORITY:9
+CATEGORIES:Vikunja
+X-APPLE-SORT-ORDER:697384109
+DUE;TZID=Europe/Berlin:20230402T170001
+DTSTART;TZID=Europe/Berlin:20230401T090000
+BEGIN:VALARM
+TRIGGER;RELATED=END:PT0S
+ACTION:DISPLAY
+DESCRIPTION:Default Tasks.org description
+END:VALARM
+BEGIN:VALARM
+TRIGGER;VALUE=DATE-TIME:20230402T100000Z
+ACTION:DISPLAY
+DESCRIPTION:Default Tasks.org description
+END:VALARM
+END:VTODO
+BEGIN:VTIMEZONE
+TZID:Europe/Berlin
+LAST-MODIFIED:20220816T024022Z
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR`,
+			},
+			wantVTask: &models.Task{
+				Updated:  time.Date(2023, 4, 2, 7, 41, 58, 0, config.GetTimeZone()),
+				UID:      "4290517349243274514",
+				Title:    "Test with tasks.org",
+				Priority: 1,
+				Labels: []*models.Label{
+					{
+						Title: "Vikunja",
+					},
+				},
+				DueDate:   time.Date(2023, 4, 2, 15, 0, 1, 0, config.GetTimeZone()),
+				StartDate: time.Date(2023, 4, 1, 7, 0, 0, 0, config.GetTimeZone()),
+				Reminders: []*models.TaskReminder{
+					{
+						RelativeTo:     models.ReminderRelationDueDate,
+						RelativePeriod: 0,
+					},
+					{
+						Reminder: time.Date(2023, 4, 2, 10, 0, 0, 0, config.GetTimeZone()),
+					},
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -94,7 +298,108 @@ END:VCALENDAR`,
 				return
 			}
 			if diff, equal := messagediff.PrettyDiff(got, tt.wantVTask); !equal {
-				t.Errorf("ParseTaskFromVTODO() gotVTask = %v, want %v, diff = %s", got, tt.wantVTask, diff)
+				t.Errorf("ParseTaskFromVTODO()\n gotVTask = %v\n want %v\n diff = %s", got, tt.wantVTask, diff)
+			}
+		})
+	}
+}
+
+func TestGetCaldavTodosForTasks(t *testing.T) {
+	type args struct {
+		list  *models.ProjectWithTasksAndBuckets
+		tasks []*models.TaskWithComments
+	}
+	tests := []struct {
+		name       string
+		args       args
+		wantCaldav string
+	}{
+		{
+			name: "Format single Task as CalDAV",
+			args: args{
+				list: &models.ProjectWithTasksAndBuckets{
+					Project: models.Project{
+						Title: "List title",
+					},
+				},
+				tasks: []*models.TaskWithComments{
+					{
+						Task: models.Task{
+							Title:       "Task 1",
+							UID:         "randomuid",
+							Description: "Description",
+							Priority:    3,
+							Created:     time.Unix(1543626721, 0).In(config.GetTimeZone()),
+							DueDate:     time.Unix(1543626722, 0).In(config.GetTimeZone()),
+							StartDate:   time.Unix(1543626723, 0).In(config.GetTimeZone()),
+							EndDate:     time.Unix(1543626724, 0).In(config.GetTimeZone()),
+							Updated:     time.Unix(1543626725, 0).In(config.GetTimeZone()),
+							DoneAt:      time.Unix(1543626726, 0).In(config.GetTimeZone()),
+							RepeatAfter: 86400,
+							Labels: []*models.Label{
+								{
+									ID:    1,
+									Title: "label1",
+								},
+								{
+									ID:    2,
+									Title: "label2",
+								},
+							},
+							Reminders: []*models.TaskReminder{
+								{
+									Reminder: time.Unix(1543626730, 0).In(config.GetTimeZone()),
+								},
+								{
+									Reminder:       time.Unix(1543626731, 0).In(config.GetTimeZone()),
+									RelativePeriod: -3600,
+									RelativeTo:     models.ReminderRelationDueDate,
+								},
+							},
+						},
+					},
+				},
+			},
+			wantCaldav: `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:List title
+PRODID:-//Vikunja Todo App//EN
+BEGIN:VTODO
+UID:randomuid
+DTSTAMP:20181201T011205Z
+SUMMARY:Task 1
+DTSTART:20181201T011203Z
+DTEND:20181201T011204Z
+DESCRIPTION:Description
+COMPLETED:20181201T011206Z
+STATUS:COMPLETED
+DUE:20181201T011202Z
+CREATED:20181201T011201Z
+PRIORITY:3
+RRULE:FREQ=SECONDLY;INTERVAL=86400
+CATEGORIES:label1,label2
+LAST-MODIFIED:20181201T011205Z
+BEGIN:VALARM
+TRIGGER;VALUE=DATE-TIME:20181201T011210Z
+ACTION:DISPLAY
+DESCRIPTION:Task 1
+END:VALARM
+BEGIN:VALARM
+TRIGGER;RELATED=END:-PT1H0M0S
+ACTION:DISPLAY
+DESCRIPTION:Task 1
+END:VALARM
+END:VTODO
+END:VCALENDAR`,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := GetCaldavTodosForTasks(tt.args.list, tt.args.tasks)
+			if diff, equal := messagediff.PrettyDiff(got, tt.wantCaldav); !equal {
+				t.Errorf("GetCaldavTodosForTasks() gotVTask = %v, want %v, diff = %s", got, tt.wantCaldav, diff)
 			}
 		})
 	}

pkg/cmd/user.go

@@ -73,7 +73,7 @@ func init() {
 	// User deletion flags
 	userDeleteCmd.Flags().BoolVarP(&userFlagDeleteNow, "now", "n", false, "If provided, deletes the user immediately instead of sending them an email first.")
 
-	userCmd.AddCommand(userListCmd, userCreateCmd, userUpdateCmd, userResetPasswordCmd, userChangeEnabledCmd, userDeleteCmd)
+	userCmd.AddCommand(userProjectCmd, userCreateCmd, userUpdateCmd, userResetPasswordCmd, userChangeEnabledCmd, userDeleteCmd)
 	rootCmd.AddCommand(userCmd)
 }
 
@@ -117,9 +117,9 @@ var userCmd = &cobra.Command{
 	Short: "Manage users locally through the cli.",
 }
 
-var userListCmd = &cobra.Command{
-	Use:   "list",
-	Short: "Shows a list of all users.",
+var userProjectCmd = &cobra.Command{
+	Use:   "project",
+	Short: "Shows a project of all users.",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		initialize.FullInit()
 	},
@@ -127,7 +127,7 @@ var userListCmd = &cobra.Command{
 		s := db.NewSession()
 		defer s.Close()
 
-		users, err := user.ListAllUsers(s)
+		users, err := user.ProjectAllUsers(s)
 		if err != nil {
 			_ = s.Rollback()
 			log.Fatalf("Error getting users: %s", err)

pkg/cmd/web.go

@@ -23,15 +23,14 @@ import (
 	"os/signal"
 	"time"
 
-	"code.vikunja.io/api/pkg/cron"
-
 	"code.vikunja.io/api/pkg/config"
+	"code.vikunja.io/api/pkg/cron"
 	"code.vikunja.io/api/pkg/initialize"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/routes"
-	"code.vikunja.io/api/pkg/swagger"
 	"code.vikunja.io/api/pkg/utils"
 	"code.vikunja.io/api/pkg/version"
+
 	"github.com/labstack/echo/v4"
 	"github.com/spf13/cobra"
 )
@@ -76,9 +75,6 @@ var webCmd = &cobra.Command{
 		// Version notification
 		log.Infof("Vikunja version %s", version.Version)
 
-		// Additional swagger information
-		swagger.SwaggerInfo.Version = version.Version
-
 		// Start the webserver
 		e := routes.NewEcho()
 		routes.RegisterRoutes(e)

pkg/config/config.go

@@ -118,6 +118,8 @@ const (
 	LogPath          Key = `log.path`
 	LogEvents        Key = `log.events`
 	LogEventsLevel   Key = `log.eventslevel`
+	LogMail          Key = `log.mail`
+	LogMailLevel     Key = `log.maillevel`
 
 	RateLimitEnabled Key = `ratelimit.enabled`
 	RateLimitKind    Key = `ratelimit.kind`
@@ -164,7 +166,7 @@ const (
 	DefaultSettingsDiscoverableByName          Key = `defaultsettings.discoverable_by_name`
 	DefaultSettingsDiscoverableByEmail         Key = `defaultsettings.discoverable_by_email`
 	DefaultSettingsOverdueTaskRemindersEnabled Key = `defaultsettings.overdue_tasks_reminders_enabled`
-	DefaultSettingsDefaultListID               Key = `defaultsettings.default_list_id`
+	DefaultSettingsDefaultProjectID            Key = `defaultsettings.default_project_id`
 	DefaultSettingsWeekStart                   Key = `defaultsettings.week_start`
 	DefaultSettingsLanguage                    Key = `defaultsettings.language`
 	DefaultSettingsTimezone                    Key = `defaultsettings.timezone`
@@ -349,8 +351,10 @@ func InitDefaultConfig() {
 	LogHTTP.setDefault("stdout")
 	LogEcho.setDefault("off")
 	LogPath.setDefault(ServiceRootpath.GetString() + "/logs")
-	LogEvents.setDefault("stdout")
+	LogEvents.setDefault("off")
 	LogEventsLevel.setDefault("INFO")
+	LogMail.setDefault("off")
+	LogMailLevel.setDefault("INFO")
 	// Rate Limit
 	RateLimitEnabled.setDefault(false)
 	RateLimitKind.setDefault("user")
@@ -370,7 +374,7 @@ func InitDefaultConfig() {
 	MigrationMicrosoftTodoEnable.setDefault(false)
 	// Avatar
 	AvatarGravaterExpiration.setDefault(3600)
-	// List Backgrounds
+	// Project Backgrounds
 	BackgroundsEnabled.setDefault(true)
 	BackgroundsUploadEnabled.setDefault(true)
 	BackgroundsUnsplashEnabled.setDefault(false)

pkg/db/db.go

@@ -112,11 +112,16 @@ func RegisterTableStructsForCache(val interface{}) {
 func initMysqlEngine() (engine *xorm.Engine, err error) {
 	// We're using utf8mb here instead of just utf8 because we want to use non-BMP characters.
 	// See https://stackoverflow.com/a/30074553/10924593 for more info.
+	host := fmt.Sprintf("tcp(%s)", config.DatabaseHost.GetString())
+	if config.DatabaseHost.GetString()[0] == '/' { // looks like a unix socket
+		host = fmt.Sprintf("unix(%s)", config.DatabaseHost.GetString())
+	}
+
 	connStr := fmt.Sprintf(
-		"%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=true&tls=%s",
+		"%s:%s@%s/%s?charset=utf8mb4&parseTime=true&tls=%s",
 		config.DatabaseUser.GetString(),
 		config.DatabasePassword.GetString(),
-		config.DatabaseHost.GetString(),
+		host,
 		config.DatabaseDatabase.GetString(),
 		config.DatabaseTLS.GetString())
 	engine, err = xorm.NewEngine("mysql", connStr)

pkg/db/fixtures/buckets.yml

@@ -1,6 +1,6 @@
 - id: 1
   title: testbucket1
-  list_id: 1
+  project_id: 1
   created_by_id: 1
   limit: 9999999 # This bucket has a limit we will never exceed in the tests to make sure the logic allows for buckets with limits
   position: 1
@@ -8,7 +8,7 @@
   updated: 2020-04-18 21:13:52
 - id: 2
   title: testbucket2
-  list_id: 1
+  project_id: 1
   created_by_id: 1
   limit: 3
   position: 2
@@ -16,15 +16,15 @@
   updated: 2020-04-18 21:13:52
 - id: 3
   title: testbucket3
-  list_id: 1
+  project_id: 1
   created_by_id: 1
   is_done_bucket: 1
   position: 3
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 4
-  title: testbucket4 - other list
-  list_id: 2
+  title: testbucket4 - other project
+  project_id: 2
   created_by_id: 1
   is_done_bucket: 1
   created: 2020-04-18 21:13:52
@@ -32,189 +32,195 @@
 # The following are not or only partly owned by user 1
 - id: 5
   title: testbucket5
-  list_id: 20
+  project_id: 20
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 6
   title: testbucket6
-  list_id: 6
+  project_id: 6
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 7
   title: testbucket7
-  list_id: 7
+  project_id: 7
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 8
   title: testbucket8
-  list_id: 8
+  project_id: 8
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 9
   title: testbucket9
-  list_id: 9
+  project_id: 9
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 10
   title: testbucket10
-  list_id: 10
+  project_id: 10
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 11
   title: testbucket11
-  list_id: 11
+  project_id: 11
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 12
   title: testbucket13
-  list_id: 12
+  project_id: 12
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 13
   title: testbucket13
-  list_id: 13
+  project_id: 13
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 14
   title: testbucket14
-  list_id: 14
+  project_id: 14
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 15
   title: testbucket15
-  list_id: 15
+  project_id: 15
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 16
   title: testbucket16
-  list_id: 16
+  project_id: 16
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 17
   title: testbucket17
-  list_id: 17
+  project_id: 17
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 18
   title: testbucket18
-  list_id: 5
+  project_id: 5
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 19
   title: testbucket19
-  list_id: 21
+  project_id: 21
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 20
   title: testbucket20
-  list_id: 22
+  project_id: 22
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 21
   title: testbucket21
-  list_id: 3
+  project_id: 3
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 # Duplicate buckets to make deletion of one of them possible
 - id: 22
   title: testbucket22
-  list_id: 6
+  project_id: 6
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 23
   title: testbucket23
-  list_id: 7
+  project_id: 7
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 24
   title: testbucket24
-  list_id: 8
+  project_id: 8
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 25
   title: testbucket25
-  list_id: 9
+  project_id: 9
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 26
   title: testbucket26
-  list_id: 10
+  project_id: 10
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 27
   title: testbucket27
-  list_id: 11
+  project_id: 11
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 28
   title: testbucket28
-  list_id: 12
+  project_id: 12
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 29
   title: testbucket29
-  list_id: 13
+  project_id: 13
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 30
   title: testbucket30
-  list_id: 14
+  project_id: 14
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 31
   title: testbucket31
-  list_id: 15
+  project_id: 15
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 32
   title: testbucket32
-  list_id: 16
+  project_id: 16
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 33
   title: testbucket33
-  list_id: 17
+  project_id: 17
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
-# This bucket is the last one in its list
+# This bucket is the last one in its project
 - id: 34
   title: testbucket34
-  list_id: 18
+  project_id: 18
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 35
   title: testbucket35
-  list_id: 23
+  project_id: 23
   created_by_id: -2
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
+- id: 36
+  title: testbucket36
+  project_id: 26
+  created_by_id: 15
+  created: 2020-04-18 21:13:52
+  updated: 2020-04-18 21:13:52

pkg/db/fixtures/label_tasks.yml

@@ -14,3 +14,7 @@
   task_id: 36
   label_id: 4
   created: 2018-12-01 15:13:12
+- id: 5
+  task_id: 39
+  label_id: 4
+  created: 2018-12-01 15:13:12

pkg/db/fixtures/link_shares.yml

@@ -1,6 +1,6 @@
 - id: 1
   hash: test
-  list_id: 1
+  project_id: 1
   right: 0
   sharing_type: 1
   shared_by_id: 1
@@ -8,7 +8,7 @@
   updated: 2018-12-02 15:13:12
 - id: 2
   hash: test2
-  list_id: 2
+  project_id: 2
   right: 1
   sharing_type: 1
   shared_by_id: 1
@@ -16,7 +16,7 @@
   updated: 2018-12-02 15:13:12
 - id: 3
   hash: test3
-  list_id: 3
+  project_id: 3
   right: 2
   sharing_type: 1
   shared_by_id: 1
@@ -24,7 +24,7 @@
   updated: 2018-12-02 15:13:12
 - id: 4
   hash: testWithPassword
-  list_id: 1
+  project_id: 1
   right: 0
   password: '$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.' # 1234
   sharing_type: 2

pkg/db/fixtures/namespaces.yml

@@ -88,3 +88,9 @@
   owner_id: 12
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
+- id: 18
+  title: testnamespace18
+  description: Lorem Ipsum
+  owner_id: 15
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12

pkg/db/fixtures/projects.yml

@@ -168,8 +168,8 @@
   position: 17
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
-# This list is owned by user 7, and several other users have access to it via different methods.
-# It is used to test the listUsers method.
+# This project is owned by user 7, and several other users have access to it via different methods.
+# It is used to test the projectUsers method.
 -
   id: 18
   title: Test18
@@ -190,7 +190,7 @@
   position: 19
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
-# User 1 does not have access to this list
+# User 1 does not have access to this project
 -
   id: 20
   title: Test20
@@ -242,3 +242,24 @@
   position: 7
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
+-
+  id: 25
+  title: Test25 with background
+  description: Lorem Ipsum
+  identifier: test6
+  owner_id: 6
+  namespace_id: 6
+  background_file_id: 1
+  position: 8
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+-
+  id: 26
+  title: List 26 for Caldav tests
+  description: Lorem Ipsum
+  identifier: test26
+  owner_id: 15
+  namespace_id: 18
+  position: 1
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12

pkg/db/fixtures/subscriptions.yml

@@ -9,13 +9,13 @@
   user_id: 6
   created: 2021-02-01 15:13:12
 - id: 3
-  entity_type: 2 # List
+  entity_type: 2 # project
   entity_id: 12 # belongs to namespace 7
   user_id: 6
   created: 2021-02-01 15:13:12
 - id: 4
   entity_type: 3 # Task
-  entity_id: 22 # belongs to list 13 which belongs to namespace 8
+  entity_id: 22 # belongs to project 13 which belongs to namespace 8
   user_id: 6
   created: 2021-02-01 15:13:12
 - id: 5
@@ -24,7 +24,7 @@
   user_id: 6
   created: 2021-02-01 15:13:12
 - id: 6
-  entity_type: 2 # List
+  entity_type: 2 # project
   entity_id: 13
   user_id: 6
   created: 2021-02-01 15:13:12

pkg/db/fixtures/task_reminders.yml

@@ -6,7 +6,13 @@
   task_id: 27
   reminder: 2018-12-01 01:13:44
   created: 2018-12-01 01:12:04
+  relative_to: 'start_date'
+  relative_period: -3600
 - id: 3
   task_id: 2
   reminder: 2018-12-01 01:13:44
   created: 2018-12-01 01:12:04
+- id: 4
+  task_id: 39
+  reminder: 2023-03-04 15:00:00
+  created: 2018-12-01 01:12:04

pkg/db/fixtures/tasks.yml

@@ -3,7 +3,7 @@
   description: 'Lorem Ipsum'
   done: false
   created_by_id: 1
-  list_id: 1
+  project_id: 1
   index: 1
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
@@ -13,7 +13,7 @@
   title: 'task #2 done'
   done: true
   created_by_id: 1
-  list_id: 1
+  project_id: 1
   index: 2
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
@@ -23,7 +23,7 @@
   title: 'task #3 high prio'
   done: false
   created_by_id: 1
-  list_id: 1
+  project_id: 1
   index: 3
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
@@ -33,7 +33,7 @@
   title: 'task #4 low prio'
   done: false
   created_by_id: 1
-  list_id: 1
+  project_id: 1
   index: 4
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
@@ -43,7 +43,7 @@
   title: 'task #5 higher due date'
   done: false
   created_by_id: 1
-  list_id: 1
+  project_id: 1
   index: 5
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
@@ -53,7 +53,7 @@
   title: 'task #6 lower due date'
   done: false
   created_by_id: 1
-  list_id: 1
+  project_id: 1
   index: 6
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
@@ -63,7 +63,7 @@
   title: 'task #7 with start date'
   done: false
   created_by_id: 1
-  list_id: 1
+  project_id: 1
   index: 7
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
@@ -73,7 +73,7 @@
   title: 'task #8 with end date'
   done: false
   created_by_id: 1
-  list_id: 1
+  project_id: 1
   index: 8
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
@@ -83,7 +83,7 @@
   title: 'task #9 with start and end date'
   done: false
   created_by_id: 1
-  list_id: 1
+  project_id: 1
   index: 9
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
@@ -94,7 +94,7 @@
   title: 'task #10 basic'
   done: false
   created_by_id: 1
-  list_id: 1
+  project_id: 1
   index: 10
   bucket_id: 1
   created: 2018-12-01 01:12:04
@@ -103,7 +103,7 @@
   title: 'task #11 basic'
   done: false
   created_by_id: 1
-  list_id: 1
+  project_id: 1
   index: 11
   bucket_id: 1
   created: 2018-12-01 01:12:04
@@ -112,25 +112,25 @@
   title: 'task #12 basic'
   done: false
   created_by_id: 1
-  list_id: 1
+  project_id: 1
   index: 12
   bucket_id: 1
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 13
-  title: 'task #13 basic other list'
+  title: 'task #13 basic other project'
   done: false
   created_by_id: 1
-  list_id: 2
+  project_id: 2
   index: 1
   bucket_id: 4
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 14
-  title: 'task #14 basic other list'
+  title: 'task #14 basic other project'
   done: false
   created_by_id: 5
-  list_id: 5
+  project_id: 5
   index: 1
   bucket_id: 18
   created: 2018-12-01 01:12:04
@@ -139,7 +139,7 @@
   title: 'task #15'
   done: false
   created_by_id: 6
-  list_id: 6
+  project_id: 6
   index: 1
   bucket_id: 6
   created: 2018-12-01 01:12:04
@@ -148,7 +148,7 @@
   title: 'task #16'
   done: false
   created_by_id: 6
-  list_id: 7
+  project_id: 7
   index: 1
   bucket_id: 7
   created: 2018-12-01 01:12:04
@@ -157,7 +157,7 @@
   title: 'task #17'
   done: false
   created_by_id: 6
-  list_id: 8
+  project_id: 8
   index: 1
   bucket_id: 8
   created: 2018-12-01 01:12:04
@@ -166,7 +166,7 @@
   title: 'task #18'
   done: false
   created_by_id: 6
-  list_id: 9
+  project_id: 9
   index: 1
   bucket_id: 9
   created: 2018-12-01 01:12:04
@@ -175,7 +175,7 @@
   title: 'task #19'
   done: false
   created_by_id: 6
-  list_id: 10
+  project_id: 10
   index: 1
   bucket_id: 10
   created: 2018-12-01 01:12:04
@@ -184,7 +184,7 @@
   title: 'task #20'
   done: false
   created_by_id: 6
-  list_id: 11
+  project_id: 11
   index: 1
   bucket_id: 11
   created: 2018-12-01 01:12:04
@@ -193,7 +193,7 @@
   title: 'task #21'
   done: false
   created_by_id: 6
-  list_id: 12
+  project_id: 12
   index: 1
   bucket_id: 12
   created: 2018-12-01 01:12:04
@@ -202,7 +202,7 @@
   title: 'task #22'
   done: false
   created_by_id: 6
-  list_id: 13
+  project_id: 13
   index: 1
   bucket_id: 13
   created: 2018-12-01 01:12:04
@@ -211,7 +211,7 @@
   title: 'task #23'
   done: false
   created_by_id: 6
-  list_id: 14
+  project_id: 14
   index: 1
   bucket_id: 14
   created: 2018-12-01 01:12:04
@@ -220,7 +220,7 @@
   title: 'task #24'
   done: false
   created_by_id: 6
-  list_id: 15
+  project_id: 15
   index: 1
   bucket_id: 15
   created: 2018-12-01 01:12:04
@@ -229,7 +229,7 @@
   title: 'task #25'
   done: false
   created_by_id: 6
-  list_id: 16
+  project_id: 16
   index: 1
   bucket_id: 16
   created: 2018-12-01 01:12:04
@@ -238,26 +238,27 @@
   title: 'task #26'
   done: false
   created_by_id: 6
-  list_id: 17
+  project_id: 17
   index: 1
   bucket_id: 17
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 27
-  title: 'task #27 with reminders'
+  title: 'task #27 with reminders and start_date'
   done: false
   created_by_id: 1
-  list_id: 1
+  project_id: 1
   index: 12
   bucket_id: 1
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
+  start_date: 2018-11-30 22:25:24
 - id: 28
   title: 'task #28 with repeat after'
   done: false
   created_by_id: 1
   repeat_after: 3600
-  list_id: 1
+  project_id: 1
   index: 13
   bucket_id: 1
   created: 2018-12-01 01:12:04
@@ -266,7 +267,7 @@
   title: 'task #29 with parent task (1)'
   done: false
   created_by_id: 1
-  list_id: 1
+  project_id: 1
   index: 14
   bucket_id: 1
   created: 2018-12-01 01:12:04
@@ -275,7 +276,7 @@
   title: 'task #30 with assignees'
   done: false
   created_by_id: 1
-  list_id: 1
+  project_id: 1
   index: 15
   bucket_id: 1
   created: 2018-12-01 01:12:04
@@ -284,7 +285,7 @@
   title: 'task #31 with color'
   done: false
   created_by_id: 1
-  list_id: 1
+  project_id: 1
   index: 16
   hex_color: f0f0f0
   bucket_id: 1
@@ -294,7 +295,7 @@
   title: 'task #32'
   done: false
   created_by_id: 1
-  list_id: 3
+  project_id: 3
   index: 1
   bucket_id: 21
   created: 2018-12-01 01:12:04
@@ -303,7 +304,7 @@
   title: 'task #33 with percent done'
   done: false
   created_by_id: 1
-  list_id: 1
+  project_id: 1
   index: 17
   percent_done: 0.5
   bucket_id: 1
@@ -314,7 +315,7 @@
   title: 'task #34'
   done: false
   created_by_id: 13
-  list_id: 20
+  project_id: 20
   index: 20
   bucket_id: 5
   created: 2018-12-01 01:12:04
@@ -323,7 +324,7 @@
   title: 'task #35'
   done: false
   created_by_id: 1
-  list_id: 21
+  project_id: 21
   index: 1
   bucket_id: 19
   created: 2018-12-01 01:12:04
@@ -332,7 +333,7 @@
   title: 'task #36'
   done: false
   created_by_id: 1
-  list_id: 22
+  project_id: 22
   index: 1
   bucket_id: 20
   created: 2018-12-01 01:12:04
@@ -342,7 +343,7 @@
   title: 'task #37'
   done: false
   created_by_id: -2
-  list_id: 2
+  project_id: 2
   index: 2
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
@@ -350,8 +351,22 @@
   title: 'task #37 done with due date'
   done: true
   created_by_id: 1
-  list_id: 22
+  project_id: 22
   index: 2
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
   due_date: 2018-10-30 22:25:24
+- id: 39
+  uid: 'uid-caldav-test'
+  title: 'Title Caldav Test'
+  description: 'Description Caldav Test'
+  priority: 3
+  done: false
+  created_by_id: 15
+  project_id: 26
+  index: 39
+  due_date: 2023-03-01 15:00:00
+  created: 2018-12-01 01:12:04
+  updated: 2018-12-01 01:12:04
+  bucket_id: 1
+  position: 39

pkg/db/fixtures/team_projects.yml

@@ -1,54 +1,54 @@
 - id: 1
   team_id: 1
-  list_id: 3
+  project_id: 3
   right: 0
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
-# This team has read only access on list 6
+# This team has read only access on project 6
 - id: 2
   team_id: 2
-  list_id: 6
+  project_id: 6
   right: 0
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
-# This team has write access on list 7
+# This team has write access on project 7
 - id: 3
   team_id: 3
-  list_id: 7
+  project_id: 7
   right: 1
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
-# This team has admin access on list 8
+# This team has admin access on project 8
 - id: 4
   team_id: 4
-  list_id: 8
+  project_id: 8
   right: 2
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
-# Readonly acces on list 19
+# Readonly acces on project 19
 - id: 5
   team_id: 8
-  list_id: 19
+  project_id: 19
   right: 2
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
-# Write acces on list 19
+# Write acces on project 19
 - id: 6
   team_id: 9
-  list_id: 19
+  project_id: 19
   right: 1
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
-# Admin acces on list 19
+# Admin acces on project 19
 - id: 7
   team_id: 10
-  list_id: 19
+  project_id: 19
   right: 2
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 - id: 8
   team_id: 1
-  list_id: 21
+  project_id: 21
   right: 0
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12

pkg/db/fixtures/teams.yml

@@ -3,13 +3,13 @@
   description: Lorem Ipsum
   created_by_id: 1
 - id: 2
-  name: testteam2_read_only_on_list6
+  name: testteam2_read_only_on_project6
   created_by_id: 1
 - id: 3
-  name: testteam3_write_on_list7
+  name: testteam3_write_on_project7
   created_by_id: 1
 - id: 4
-  name: testteam4_admin_on_list8
+  name: testteam4_admin_on_project8
   created_by_id: 1
 - id: 5
   name: testteam2_read_only_on_namespace7

pkg/db/fixtures/users.yml

@@ -40,7 +40,7 @@
   issuer: local
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
-# This use is used to create a whole bunch of lists which are then shared directly with a user
+# This use is used to create a whole bunch of projects which are then shared directly with a user
 - id: 6
   username: 'user6'
   password: '$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.' # 1234
@@ -109,3 +109,10 @@
   subject: '12345'
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
+- id: 15
+  username: 'user15'
+  password: '$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.' # 1234
+  email: 'user15@example.com'
+  issuer: local
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12

pkg/db/fixtures/users_projects.yml

@@ -1,48 +1,54 @@
 - id: 1
   user_id: 1
-  list_id: 3
+  project_id: 3
   right: 0
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 - id: 2
   user_id: 2
-  list_id: 3
+  project_id: 3
   right: 0
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 - id: 3
   user_id: 1
-  list_id: 9
+  project_id: 9
   right: 0
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 - id: 4
   user_id: 1
-  list_id: 10
+  project_id: 10
   right: 1
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 - id: 5
   user_id: 1
-  list_id: 11
+  project_id: 11
   right: 2
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 - id: 6
   user_id: 4
-  list_id: 19
+  project_id: 19
   right: 0
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 - id: 7
   user_id: 5
-  list_id: 19
+  project_id: 19
   right: 1
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 - id: 8
   user_id: 6
-  list_id: 19
+  project_id: 19
   right: 2
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
+- id: 9
+  user_id: 15
+  project_id: 26
+  right: 0
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12

pkg/db/helpers.go

@@ -22,7 +22,7 @@ import (
 )
 
 // ILIKE returns an ILIKE query on postgres and a LIKE query on all other platforms.
-// Postgres' is case sensitive by default.
+// Postgres' is case-sensitive by default.
 // To work around this, we're using ILIKE as opposed to normal LIKE statements.
 // ILIKE is preferred over LOWER(text) LIKE for performance reasons.
 // See https://stackoverflow.com/q/7005302/10924593

pkg/files/files.go

@@ -140,7 +140,7 @@ func (f *File) Delete() (err error) {
 		var perr *os.PathError
 		if errors.As(err, &perr) {
 			// Don't fail when removing the file failed
-			log.Errorf("Error deleting file %d: %w", err)
+			log.Errorf("Error deleting file %d: %w", f.ID, err)
 			return s.Commit()
 		}
 

pkg/initialize/init.go

@@ -27,6 +27,7 @@ import (
 	"code.vikunja.io/api/pkg/mail"
 	"code.vikunja.io/api/pkg/migration"
 	"code.vikunja.io/api/pkg/models"
+	"code.vikunja.io/api/pkg/modules/auth/openid"
 	"code.vikunja.io/api/pkg/modules/keyvalue"
 	migrator "code.vikunja.io/api/pkg/modules/migration"
 	"code.vikunja.io/api/pkg/notifications"
@@ -98,6 +99,7 @@ func FullInit() {
 	user.RegisterDeletionNotificationCron()
 	models.RegisterUserDeletionCron()
 	models.RegisterOldExportCleanupCron()
+	openid.CleanupSavedOpenIDProviders()
 
 	// Start processing events
 	go func() {

pkg/integrations/archived_test.go

@@ -28,37 +28,37 @@ import (
 // This tests the following behaviour:
 // 1. A namespace should not be editable if it is archived.
 //   1. With the exception being to un-archive it.
-// 2. A list which belongs to an archived namespace cannot be edited.
-// 3. An archived list should not be editable.
+// 2. A project which belongs to an archived namespace cannot be edited.
+// 3. An archived project should not be editable.
 //   1. Except for un-archiving it.
-// 4. It is not possible to un-archive a list individually if its namespace is archived.
-// 5. Creating new lists on an archived namespace should not work.
-// 6. Creating new tasks on an archived list should not work.
-// 7. Creating new tasks on a list who's namespace is archived should not work.
-// 8. Editing tasks on an archived list should not work.
-// 9. Editing tasks on a list who's namespace is archived should not work.
-// 10. Archived namespaces should not appear in the list with all namespaces.
-// 11. Archived lists should not appear in the list with all lists.
-// 12. Lists who's namespace is archived should not appear in the list with all lists.
+// 4. It is not possible to un-archive a project individually if its namespace is archived.
+// 5. Creating new projects on an archived namespace should not work.
+// 6. Creating new tasks on an archived project should not work.
+// 7. Creating new tasks on a project who's namespace is archived should not work.
+// 8. Editing tasks on an archived project should not work.
+// 9. Editing tasks on a project who's namespace is archived should not work.
+// 10. Archived namespaces should not appear in the project with all namespaces.
+// 11. Archived projects should not appear in the project with all projects.
+// 12. Projects who's namespace is archived should not appear in the project with all projects.
 //
 // All of this is tested through integration tests because it's not yet clear if this will be implemented directly
 // or with some kind of middleware.
 //
-// Maybe the inheritance of lists from namespaces could be solved with some kind of is_archived_inherited flag -
-// that way I'd only need to implement the checking on a list level and update the flag for all lists once the
-// namespace is archived. The archived flag would then be used to not accedentially unarchive lists which were
+// Maybe the inheritance of projects from namespaces could be solved with some kind of is_archived_inherited flag -
+// that way I'd only need to implement the checking on a project level and update the flag for all projects once the
+// namespace is archived. The archived flag would then be used to not accedentially unarchive projects which were
 // already individually archived when the namespace was archived.
 // Should still test it all though.
 //
 // Namespace 16 is archived
-// List 21 belongs to namespace 16
-// List 22 is archived individually
+// Project 21 belongs to namespace 16
+// Project 22 is archived individually
 
 func TestArchived(t *testing.T) {
-	testListHandler := webHandlerTest{
+	testProjectHandler := webHandlerTest{
 		user: &testuser1,
 		strFunc: func() handler.CObject {
-			return &models.List{}
+			return &models.Project{}
 		},
 		t: t,
 	}
@@ -116,54 +116,54 @@ func TestArchived(t *testing.T) {
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"is_archived":false`)
 		})
-		t.Run("no new lists", func(t *testing.T) {
-			_, err := testListHandler.testCreateWithUser(nil, map[string]string{"namespace": "16"}, `{"title":"Lorem"}`)
+		t.Run("no new projects", func(t *testing.T) {
+			_, err := testProjectHandler.testCreateWithUser(nil, map[string]string{"namespace": "16"}, `{"title":"Lorem"}`)
 			assert.Error(t, err)
 			assertHandlerErrorCode(t, err, models.ErrCodeNamespaceIsArchived)
 		})
-		t.Run("should not appear in the list", func(t *testing.T) {
+		t.Run("should not appear in the project", func(t *testing.T) {
 			rec, err := testNamespaceHandler.testReadAllWithUser(nil, nil)
 			assert.NoError(t, err)
 			assert.NotContains(t, rec.Body.String(), `"title":"Archived testnamespace16"`)
 		})
-		t.Run("should appear in the list if explicitly requested", func(t *testing.T) {
+		t.Run("should appear in the project if explicitly requested", func(t *testing.T) {
 			rec, err := testNamespaceHandler.testReadAllWithUser(url.Values{"is_archived": []string{"true"}}, nil)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"Archived testnamespace16"`)
 		})
 	})
 
-	t.Run("list", func(t *testing.T) {
+	t.Run("project", func(t *testing.T) {
 
 		taskTests := func(taskID string, errCode int, t *testing.T) {
 			t.Run("task", func(t *testing.T) {
 				t.Run("edit task", func(t *testing.T) {
-					_, err := testTaskHandler.testUpdateWithUser(nil, map[string]string{"listtask": taskID}, `{"title":"TestIpsum"}`)
+					_, err := testTaskHandler.testUpdateWithUser(nil, map[string]string{"projecttask": taskID}, `{"title":"TestIpsum"}`)
 					assert.Error(t, err)
 					assertHandlerErrorCode(t, err, errCode)
 				})
 				t.Run("delete", func(t *testing.T) {
-					_, err := testTaskHandler.testDeleteWithUser(nil, map[string]string{"listtask": taskID})
+					_, err := testTaskHandler.testDeleteWithUser(nil, map[string]string{"projecttask": taskID})
 					assert.Error(t, err)
 					assertHandlerErrorCode(t, err, errCode)
 				})
 				t.Run("add new labels", func(t *testing.T) {
-					_, err := testLabelHandler.testCreateWithUser(nil, map[string]string{"listtask": taskID}, `{"label_id":1}`)
+					_, err := testLabelHandler.testCreateWithUser(nil, map[string]string{"projecttask": taskID}, `{"label_id":1}`)
 					assert.Error(t, err)
 					assertHandlerErrorCode(t, err, errCode)
 				})
 				t.Run("remove lables", func(t *testing.T) {
-					_, err := testLabelHandler.testDeleteWithUser(nil, map[string]string{"listtask": taskID, "label": "4"})
+					_, err := testLabelHandler.testDeleteWithUser(nil, map[string]string{"projecttask": taskID, "label": "4"})
 					assert.Error(t, err)
 					assertHandlerErrorCode(t, err, errCode)
 				})
 				t.Run("add assignees", func(t *testing.T) {
-					_, err := testAssigneeHandler.testCreateWithUser(nil, map[string]string{"listtask": taskID}, `{"user_id":3}`)
+					_, err := testAssigneeHandler.testCreateWithUser(nil, map[string]string{"projecttask": taskID}, `{"user_id":3}`)
 					assert.Error(t, err)
 					assertHandlerErrorCode(t, err, errCode)
 				})
 				t.Run("remove assignees", func(t *testing.T) {
-					_, err := testAssigneeHandler.testDeleteWithUser(nil, map[string]string{"listtask": taskID, "user": "2"})
+					_, err := testAssigneeHandler.testDeleteWithUser(nil, map[string]string{"projecttask": taskID, "user": "2"})
 					assert.Error(t, err)
 					assertHandlerErrorCode(t, err, errCode)
 				})
@@ -194,45 +194,45 @@ func TestArchived(t *testing.T) {
 			})
 		}
 
-		// The list belongs to an archived namespace
+		// The project belongs to an archived namespace
 		t.Run("archived namespace", func(t *testing.T) {
 			t.Run("not editable", func(t *testing.T) {
-				_, err := testListHandler.testUpdateWithUser(nil, map[string]string{"list": "21"}, `{"title":"TestIpsum","is_archived":true}`)
+				_, err := testProjectHandler.testUpdateWithUser(nil, map[string]string{"project": "21"}, `{"title":"TestIpsum","is_archived":true}`)
 				assert.Error(t, err)
 				assertHandlerErrorCode(t, err, models.ErrCodeNamespaceIsArchived)
 			})
 			t.Run("no new tasks", func(t *testing.T) {
-				_, err := testTaskHandler.testCreateWithUser(nil, map[string]string{"list": "21"}, `{"title":"Lorem"}`)
+				_, err := testTaskHandler.testCreateWithUser(nil, map[string]string{"project": "21"}, `{"title":"Lorem"}`)
 				assert.Error(t, err)
 				assertHandlerErrorCode(t, err, models.ErrCodeNamespaceIsArchived)
 			})
 			t.Run("not unarchivable", func(t *testing.T) {
-				_, err := testListHandler.testUpdateWithUser(nil, map[string]string{"list": "21"}, `{"title":"LoremIpsum","is_archived":false}`)
+				_, err := testProjectHandler.testUpdateWithUser(nil, map[string]string{"project": "21"}, `{"title":"LoremIpsum","is_archived":false}`)
 				assert.Error(t, err)
 				assertHandlerErrorCode(t, err, models.ErrCodeNamespaceIsArchived)
 			})
 
 			taskTests("35", models.ErrCodeNamespaceIsArchived, t)
 		})
-		// The list itself is archived
+		// The project itself is archived
 		t.Run("archived individually", func(t *testing.T) {
 			t.Run("not editable", func(t *testing.T) {
-				_, err := testListHandler.testUpdateWithUser(nil, map[string]string{"list": "22"}, `{"title":"TestIpsum","is_archived":true}`)
+				_, err := testProjectHandler.testUpdateWithUser(nil, map[string]string{"project": "22"}, `{"title":"TestIpsum","is_archived":true}`)
 				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeListIsArchived)
+				assertHandlerErrorCode(t, err, models.ErrCodeProjectIsArchived)
 			})
 			t.Run("no new tasks", func(t *testing.T) {
-				_, err := testTaskHandler.testCreateWithUser(nil, map[string]string{"list": "22"}, `{"title":"Lorem"}`)
+				_, err := testTaskHandler.testCreateWithUser(nil, map[string]string{"project": "22"}, `{"title":"Lorem"}`)
 				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeListIsArchived)
+				assertHandlerErrorCode(t, err, models.ErrCodeProjectIsArchived)
 			})
 			t.Run("unarchivable", func(t *testing.T) {
-				rec, err := testListHandler.testUpdateWithUser(nil, map[string]string{"list": "22"}, `{"title":"LoremIpsum","is_archived":false,"namespace_id":1}`)
+				rec, err := testProjectHandler.testUpdateWithUser(nil, map[string]string{"project": "22"}, `{"title":"LoremIpsum","is_archived":false,"namespace_id":1}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"is_archived":false`)
 			})
 
-			taskTests("36", models.ErrCodeListIsArchived, t)
+			taskTests("36", models.ErrCodeProjectIsArchived, t)
 		})
 	})
 }

pkg/integrations/caldav_test.go

@@ -0,0 +1,77 @@
+// 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 integrations
+
+import (
+	"net/http"
+	"testing"
+
+	"code.vikunja.io/api/pkg/routes/caldav"
+	"github.com/stretchr/testify/assert"
+)
+
+const vtodo = `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:List 26 for Caldav tests
+PRODID:-//Vikunja Todo App//EN
+BEGIN:VTODO
+UID:uid
+DTSTAMP:20230301T073337Z
+SUMMARY:Caldav Task 1
+CATEGORIES:tag1,tag2,tag3
+CREATED:20230301T073337Z
+LAST-MODIFIED:20230301T073337Z
+BEGIN:VALARM
+TRIGGER;VALUE=DATE-TIME:20230304T150000Z
+ACTION:DISPLAY
+END:VALARM
+END:VTODO
+END:VCALENDAR`
+
+func TestCaldav(t *testing.T) {
+	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")
+		assert.Contains(t, rec.Body.String(), "X-WR-CALNAME:List 26 for Caldav tests")
+		assert.Contains(t, rec.Body.String(), "BEGIN:VTODO")
+		assert.Contains(t, rec.Body.String(), "END:VTODO")
+		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{"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{"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")
+		assert.Contains(t, rec.Body.String(), "DESCRIPTION:Description Caldav Test")
+		assert.Contains(t, rec.Body.String(), "DUE:20230301T150000Z")
+		assert.Contains(t, rec.Body.String(), "PRIORITY:3")
+		assert.Contains(t, rec.Body.String(), "CATEGORIES:Label #4")
+		assert.Contains(t, rec.Body.String(), "BEGIN:VALARM")
+		assert.Contains(t, rec.Body.String(), "TRIGGER;VALUE=DATE-TIME:20230304T150000Z")
+		assert.Contains(t, rec.Body.String(), "ACTION:DISPLAY")
+		assert.Contains(t, rec.Body.String(), "END:VALARM")
+	})
+}

pkg/integrations/integrations.go

@@ -33,6 +33,7 @@ import (
 	"code.vikunja.io/api/pkg/modules/auth"
 	"code.vikunja.io/api/pkg/modules/keyvalue"
 	"code.vikunja.io/api/pkg/routes"
+	"code.vikunja.io/api/pkg/routes/caldav"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
 	"code.vikunja.io/web/handler"
@@ -49,30 +50,11 @@ var (
 		Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
 		Email:    "user1@example.com",
 	}
-	testuser2 = user.User{
-		ID:       2,
-		Username: "user2",
+	testuser15 = user.User{
+		ID:       15,
+		Username: "user15",
 		Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
-		Email:    "user2@example.com",
-	}
-	testuser3 = user.User{
-		ID:       3,
-		Username: "user3",
-		Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
-		Email:    "user3@example.com",
-	}
-	testuser4 = user.User{
-		ID:       4,
-		Username: "user4",
-		Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
-		Email:    "user4@example.com",
-	}
-	testuser5 = user.User{
-		ID:       4,
-		Username: "user5",
-		Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
-		Email:    "user5@example.com",
-		Status:   user.StatusDisabled,
+		Email:    "user15@example.com",
 	}
 )
 
@@ -170,6 +152,19 @@ func newTestRequestWithLinkShare(t *testing.T, method string, handler echo.Handl
 	return
 }
 
+func newCaldavTestRequestWithUser(t *testing.T, method string, handler echo.HandlerFunc, user *user.User, payload string, queryParams url.Values, urlParams map[string]string) (rec *httptest.ResponseRecorder, err error) {
+	rec, c := testRequestSetup(t, method, payload, queryParams, urlParams)
+	c.Request().Header.Set(echo.HeaderContentType, echo.MIMETextPlain)
+
+	result, _ := caldav.BasicAuth(user.Username, "1234", c)
+	if !result {
+		t.Error("BasicAuth for caldav failed")
+		t.FailNow()
+	}
+	err = handler(c)
+	return
+}
+
 func assertHandlerErrorCode(t *testing.T, err error, expectedErrorCode int) {
 	if err == nil {
 		t.Error("Error is nil")

pkg/integrations/kanban_test.go

@@ -39,7 +39,7 @@ func TestBucket(t *testing.T) {
 		linkShare: &models.LinkSharing{
 			ID:          2,
 			Hash:        "test2",
-			ListID:      2,
+			ProjectID:   2,
 			Right:       models.RightWrite,
 			SharingType: models.SharingTypeWithoutPassword,
 			SharedByID:  1,
@@ -51,17 +51,17 @@ func TestBucket(t *testing.T) {
 	}
 	t.Run("ReadAll", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			rec, err := testHandler.testReadAllWithUser(nil, map[string]string{"list": "1"})
+			rec, err := testHandler.testReadAllWithUser(nil, map[string]string{"project": "1"})
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `testbucket1`)
 			assert.Contains(t, rec.Body.String(), `testbucket2`)
 			assert.Contains(t, rec.Body.String(), `testbucket3`)
-			assert.NotContains(t, rec.Body.String(), `testbucket4`) // Different List
+			assert.NotContains(t, rec.Body.String(), `testbucket4`) // Different Project
 		})
 	})
 	t.Run("Update", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			// Check the list was loaded successfully afterwards, see testReadOneWithUser
+			// Check the project was loaded successfully afterwards, see testReadOneWithUser
 			rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "1"}, `{"title":"TestLoremIpsum"}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
@@ -150,7 +150,7 @@ func TestBucket(t *testing.T) {
 	})
 	t.Run("Delete", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "1", "bucket": "1"})
+			rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "1", "bucket": "1"})
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 		})
@@ -162,70 +162,70 @@ func TestBucket(t *testing.T) {
 		t.Run("Rights check", func(t *testing.T) {
 			t.Run("Forbidden", func(t *testing.T) {
 				// Owned by user13
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "20", "bucket": "5"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "20", "bucket": "5"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "6", "bucket": "6"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "6", "bucket": "6"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team write", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "7", "bucket": "7"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "7", "bucket": "7"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
 			t.Run("Shared Via Team admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "8", "bucket": "8"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "8", "bucket": "8"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
 
 			t.Run("Shared Via User readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "9", "bucket": "9"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "9", "bucket": "9"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via User write", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "10", "bucket": "10"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "10", "bucket": "10"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
 			t.Run("Shared Via User admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "11", "bucket": "11"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "11", "bucket": "11"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
 
 			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "12", "bucket": "12"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "12", "bucket": "12"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "13", "bucket": "13"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "13", "bucket": "13"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
 			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "14", "bucket": "14"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "14", "bucket": "14"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
 
 			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "15", "bucket": "15"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "15", "bucket": "15"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "16", "bucket": "16"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "16", "bucket": "16"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
 			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "17", "bucket": "17"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "17", "bucket": "17"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
@@ -233,92 +233,92 @@ func TestBucket(t *testing.T) {
 	})
 	t.Run("Create", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "1"}, `{"title":"Lorem Ipsum"}`)
+			rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "1"}, `{"title":"Lorem Ipsum"}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 		})
 		t.Run("Nonexisting", func(t *testing.T) {
-			_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9999"}, `{"title":"Lorem Ipsum"}`)
+			_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "9999"}, `{"title":"Lorem Ipsum"}`)
 			assert.Error(t, err)
-			assertHandlerErrorCode(t, err, models.ErrCodeListDoesNotExist)
+			assertHandlerErrorCode(t, err, models.ErrCodeProjectDoesNotExist)
 		})
 		t.Run("Rights check", func(t *testing.T) {
 			t.Run("Forbidden", func(t *testing.T) {
 				// Owned by user13
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "20"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "20"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "6"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "6"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "7"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "7"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via Team admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "8"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "8"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 
 			t.Run("Shared Via User readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "9"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via User write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "10"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "10"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via User admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "11"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "11"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 
 			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "12"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "12"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "13"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "13"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "14"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "14"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 
 			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "15"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "15"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "16"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "16"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "17"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "17"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 		})
 		t.Run("Link Share", func(t *testing.T) {
-			rec, err := testHandlerLinkShareWrite.testCreateWithLinkShare(nil, map[string]string{"list": "2"}, `{"title":"Lorem Ipsum"}`)
+			rec, err := testHandlerLinkShareWrite.testCreateWithLinkShare(nil, map[string]string{"project": "2"}, `{"title":"Lorem Ipsum"}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			db.AssertExists(t, "buckets", map[string]interface{}{
-				"list_id":       2,
+				"project_id":    2,
 				"created_by_id": -2,
 				"title":         "Lorem Ipsum",
 			}, false)

pkg/integrations/link_sharing_auth_test.go

@@ -31,14 +31,14 @@ func TestLinkSharingAuth(t *testing.T) {
 		assert.NoError(t, err)
 		assert.Equal(t, http.StatusOK, rec.Code)
 		assert.Contains(t, rec.Body.String(), `"token":"`)
-		assert.Contains(t, rec.Body.String(), `"list_id":1`)
+		assert.Contains(t, rec.Body.String(), `"project_id":1`)
 	})
 	t.Run("Without Password, Password Provided", func(t *testing.T) {
 		rec, err := newTestRequest(t, http.MethodPost, apiv1.AuthenticateLinkShare, `{"password":"somethingsomething"}`, nil, map[string]string{"share": "test"})
 		assert.NoError(t, err)
 		assert.Equal(t, http.StatusOK, rec.Code)
 		assert.Contains(t, rec.Body.String(), `"token":"`)
-		assert.Contains(t, rec.Body.String(), `"list_id":1`)
+		assert.Contains(t, rec.Body.String(), `"project_id":1`)
 	})
 	t.Run("With Password, No Password Provided", func(t *testing.T) {
 		_, err := newTestRequest(t, http.MethodPost, apiv1.AuthenticateLinkShare, ``, nil, map[string]string{"share": "testWithPassword"})
@@ -50,7 +50,7 @@ func TestLinkSharingAuth(t *testing.T) {
 		assert.NoError(t, err)
 		assert.Equal(t, http.StatusOK, rec.Code)
 		assert.Contains(t, rec.Body.String(), `"token":"`)
-		assert.Contains(t, rec.Body.String(), `"list_id":1`)
+		assert.Contains(t, rec.Body.String(), `"project_id":1`)
 	})
 	t.Run("With Wrong Password", func(t *testing.T) {
 		_, err := newTestRequest(t, http.MethodPost, apiv1.AuthenticateLinkShare, `{"password":"someWrongPassword"}`, nil, map[string]string{"share": "testWithPassword"})

pkg/integrations/link_sharing_test.go

@@ -31,7 +31,7 @@ func TestLinkSharing(t *testing.T) {
 	linkshareRead := &models.LinkSharing{
 		ID:          1,
 		Hash:        "test1",
-		ListID:      1,
+		ProjectID:   1,
 		Right:       models.RightRead,
 		SharingType: models.SharingTypeWithoutPassword,
 		SharedByID:  1,
@@ -40,7 +40,7 @@ func TestLinkSharing(t *testing.T) {
 	linkShareWrite := &models.LinkSharing{
 		ID:          2,
 		Hash:        "test2",
-		ListID:      2,
+		ProjectID:   2,
 		Right:       models.RightWrite,
 		SharingType: models.SharingTypeWithoutPassword,
 		SharedByID:  1,
@@ -49,7 +49,7 @@ func TestLinkSharing(t *testing.T) {
 	linkShareAdmin := &models.LinkSharing{
 		ID:          3,
 		Hash:        "test3",
-		ListID:      3,
+		ProjectID:   3,
 		Right:       models.RightAdmin,
 		SharingType: models.SharingTypeWithoutPassword,
 		SharedByID:  1,
@@ -65,102 +65,102 @@ func TestLinkSharing(t *testing.T) {
 		}
 		t.Run("Forbidden", func(t *testing.T) {
 			t.Run("read only", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "20"}, `{"right":0}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "20"}, `{"right":0}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("write", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "20"}, `{"right":1}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "20"}, `{"right":1}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("admin", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "20"}, `{"right":2}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "20"}, `{"right":2}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 		})
 		t.Run("Read only access", func(t *testing.T) {
 			t.Run("read only", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9"}, `{"right":0}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "9"}, `{"right":0}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("write", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9"}, `{"right":1}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "9"}, `{"right":1}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("admin", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9"}, `{"right":2}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "9"}, `{"right":2}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 		})
 		t.Run("Write access", func(t *testing.T) {
 			t.Run("read only", func(t *testing.T) {
-				req, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "10"}, `{"right":0}`)
+				req, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "10"}, `{"right":0}`)
 				assert.NoError(t, err)
 				assert.Contains(t, req.Body.String(), `"hash":`)
 			})
 			t.Run("write", func(t *testing.T) {
-				req, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "10"}, `{"right":1}`)
+				req, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "10"}, `{"right":1}`)
 				assert.NoError(t, err)
 				assert.Contains(t, req.Body.String(), `"hash":`)
 			})
 			t.Run("admin", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "10"}, `{"right":2}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "10"}, `{"right":2}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 		})
 		t.Run("Admin access", func(t *testing.T) {
 			t.Run("read only", func(t *testing.T) {
-				req, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "11"}, `{"right":0}`)
+				req, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "11"}, `{"right":0}`)
 				assert.NoError(t, err)
 				assert.Contains(t, req.Body.String(), `"hash":`)
 			})
 			t.Run("write", func(t *testing.T) {
-				req, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "11"}, `{"right":1}`)
+				req, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "11"}, `{"right":1}`)
 				assert.NoError(t, err)
 				assert.Contains(t, req.Body.String(), `"hash":`)
 			})
 			t.Run("admin", func(t *testing.T) {
-				req, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "11"}, `{"right":2}`)
+				req, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "11"}, `{"right":2}`)
 				assert.NoError(t, err)
 				assert.Contains(t, req.Body.String(), `"hash":`)
 			})
 		})
 	})
 
-	t.Run("Lists", func(t *testing.T) {
-		testHandlerListReadOnly := webHandlerTest{
+	t.Run("Projects", func(t *testing.T) {
+		testHandlerProjectReadOnly := webHandlerTest{
 			linkShare: linkshareRead,
 			strFunc: func() handler.CObject {
-				return &models.List{}
+				return &models.Project{}
 			},
 			t: t,
 		}
-		testHandlerListWrite := webHandlerTest{
+		testHandlerProjectWrite := webHandlerTest{
 			linkShare: linkShareWrite,
 			strFunc: func() handler.CObject {
-				return &models.List{}
+				return &models.Project{}
 			},
 			t: t,
 		}
-		testHandlerListAdmin := webHandlerTest{
+		testHandlerProjectAdmin := webHandlerTest{
 			linkShare: linkShareAdmin,
 			strFunc: func() handler.CObject {
-				return &models.List{}
+				return &models.Project{}
 			},
 			t: t,
 		}
 
 		t.Run("ReadAll", func(t *testing.T) {
 			t.Run("Normal", func(t *testing.T) {
-				rec, err := testHandlerListReadOnly.testReadAllWithLinkShare(nil, nil)
+				rec, err := testHandlerProjectReadOnly.testReadAllWithLinkShare(nil, nil)
 				assert.NoError(t, err)
-				// Should only return the shared list, nothing else
+				// Should only return the shared project, nothing else
 				assert.Contains(t, rec.Body.String(), `Test1`)
 				assert.NotContains(t, rec.Body.String(), `Test2`)
 				assert.NotContains(t, rec.Body.String(), `Test3`)
@@ -168,9 +168,9 @@ func TestLinkSharing(t *testing.T) {
 				assert.NotContains(t, rec.Body.String(), `Test5`)
 			})
 			t.Run("Search", func(t *testing.T) {
-				rec, err := testHandlerListReadOnly.testReadAllWithLinkShare(url.Values{"s": []string{"est1"}}, nil)
+				rec, err := testHandlerProjectReadOnly.testReadAllWithLinkShare(url.Values{"s": []string{"est1"}}, nil)
 				assert.NoError(t, err)
-				// Should only return the shared list, nothing else
+				// Should only return the shared project, nothing else
 				assert.Contains(t, rec.Body.String(), `Test1`)
 				assert.NotContains(t, rec.Body.String(), `Test2`)
 				assert.NotContains(t, rec.Body.String(), `Test3`)
@@ -180,35 +180,35 @@ func TestLinkSharing(t *testing.T) {
 		})
 		t.Run("ReadOne", func(t *testing.T) {
 			t.Run("Normal", func(t *testing.T) {
-				rec, err := testHandlerListReadOnly.testReadOneWithLinkShare(nil, map[string]string{"list": "1"})
+				rec, err := testHandlerProjectReadOnly.testReadOneWithLinkShare(nil, map[string]string{"project": "1"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test1"`)
 				assert.NotContains(t, rec.Body.String(), `"title":"Test2"`)
 			})
 			t.Run("Nonexisting", func(t *testing.T) {
-				_, err := testHandlerListReadOnly.testReadOneWithLinkShare(nil, map[string]string{"list": "9999999"})
+				_, err := testHandlerProjectReadOnly.testReadOneWithLinkShare(nil, map[string]string{"project": "9999999"})
 				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeListDoesNotExist)
+				assertHandlerErrorCode(t, err, models.ErrCodeProjectDoesNotExist)
 			})
 			t.Run("Rights check", func(t *testing.T) {
 				t.Run("Forbidden", func(t *testing.T) {
-					// List 2, not shared with this token
-					_, err := testHandlerListReadOnly.testReadOneWithLinkShare(nil, map[string]string{"list": "2"})
+					// Project 2, not shared with this token
+					_, err := testHandlerProjectReadOnly.testReadOneWithLinkShare(nil, map[string]string{"project": "2"})
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `You don't have the right to see this`)
 				})
 				t.Run("Shared readonly", func(t *testing.T) {
-					rec, err := testHandlerListReadOnly.testReadOneWithLinkShare(nil, map[string]string{"list": "1"})
+					rec, err := testHandlerProjectReadOnly.testReadOneWithLinkShare(nil, map[string]string{"project": "1"})
 					assert.NoError(t, err)
 					assert.Contains(t, rec.Body.String(), `"title":"Test1"`)
 				})
 				t.Run("Shared write", func(t *testing.T) {
-					rec, err := testHandlerListWrite.testReadOneWithLinkShare(nil, map[string]string{"list": "2"})
+					rec, err := testHandlerProjectWrite.testReadOneWithLinkShare(nil, map[string]string{"project": "2"})
 					assert.NoError(t, err)
 					assert.Contains(t, rec.Body.String(), `"title":"Test2"`)
 				})
 				t.Run("Shared admin", func(t *testing.T) {
-					rec, err := testHandlerListAdmin.testReadOneWithLinkShare(nil, map[string]string{"list": "3"})
+					rec, err := testHandlerProjectAdmin.testReadOneWithLinkShare(nil, map[string]string{"project": "3"})
 					assert.NoError(t, err)
 					assert.Contains(t, rec.Body.String(), `"title":"Test3"`)
 				})
@@ -216,28 +216,28 @@ func TestLinkSharing(t *testing.T) {
 		})
 		t.Run("Update", func(t *testing.T) {
 			t.Run("Nonexisting", func(t *testing.T) {
-				_, err := testHandlerListReadOnly.testUpdateWithLinkShare(nil, map[string]string{"list": "9999999"}, `{"title":"TestLoremIpsum"}`)
+				_, err := testHandlerProjectReadOnly.testUpdateWithLinkShare(nil, map[string]string{"project": "9999999"}, `{"title":"TestLoremIpsum"}`)
 				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeListDoesNotExist)
+				assertHandlerErrorCode(t, err, models.ErrCodeProjectDoesNotExist)
 			})
 			t.Run("Rights check", func(t *testing.T) {
 				t.Run("Forbidden", func(t *testing.T) {
-					_, err := testHandlerListReadOnly.testUpdateWithLinkShare(nil, map[string]string{"list": "2"}, `{"title":"TestLoremIpsum"}`)
+					_, err := testHandlerProjectReadOnly.testUpdateWithLinkShare(nil, map[string]string{"project": "2"}, `{"title":"TestLoremIpsum"}`)
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 				})
 				t.Run("Shared readonly", func(t *testing.T) {
-					_, err := testHandlerListReadOnly.testUpdateWithLinkShare(nil, map[string]string{"list": "1"}, `{"title":"TestLoremIpsum"}`)
+					_, err := testHandlerProjectReadOnly.testUpdateWithLinkShare(nil, map[string]string{"project": "1"}, `{"title":"TestLoremIpsum"}`)
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 				})
 				t.Run("Shared write", func(t *testing.T) {
-					rec, err := testHandlerListWrite.testUpdateWithLinkShare(nil, map[string]string{"list": "2"}, `{"title":"TestLoremIpsum","namespace_id":1}`)
+					rec, err := testHandlerProjectWrite.testUpdateWithLinkShare(nil, map[string]string{"project": "2"}, `{"title":"TestLoremIpsum","namespace_id":1}`)
 					assert.NoError(t, err)
 					assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 				})
 				t.Run("Shared admin", func(t *testing.T) {
-					rec, err := testHandlerListAdmin.testUpdateWithLinkShare(nil, map[string]string{"list": "3"}, `{"title":"TestLoremIpsum","namespace_id":2}`)
+					rec, err := testHandlerProjectAdmin.testUpdateWithLinkShare(nil, map[string]string{"project": "3"}, `{"title":"TestLoremIpsum","namespace_id":2}`)
 					assert.NoError(t, err)
 					assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 				})
@@ -245,54 +245,54 @@ func TestLinkSharing(t *testing.T) {
 		})
 		t.Run("Delete", func(t *testing.T) {
 			t.Run("Nonexisting", func(t *testing.T) {
-				_, err := testHandlerListReadOnly.testDeleteWithLinkShare(nil, map[string]string{"list": "9999999"})
+				_, err := testHandlerProjectReadOnly.testDeleteWithLinkShare(nil, map[string]string{"project": "9999999"})
 				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeListDoesNotExist)
+				assertHandlerErrorCode(t, err, models.ErrCodeProjectDoesNotExist)
 			})
 			t.Run("Rights check", func(t *testing.T) {
 				t.Run("Forbidden", func(t *testing.T) {
-					_, err := testHandlerListReadOnly.testDeleteWithLinkShare(nil, map[string]string{"list": "1"})
+					_, err := testHandlerProjectReadOnly.testDeleteWithLinkShare(nil, map[string]string{"project": "1"})
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 				})
 				t.Run("Shared readonly", func(t *testing.T) {
-					_, err := testHandlerListReadOnly.testDeleteWithLinkShare(nil, map[string]string{"list": "1"})
+					_, err := testHandlerProjectReadOnly.testDeleteWithLinkShare(nil, map[string]string{"project": "1"})
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 				})
 				t.Run("Shared write", func(t *testing.T) {
-					_, err := testHandlerListWrite.testDeleteWithLinkShare(nil, map[string]string{"list": "2"})
+					_, err := testHandlerProjectWrite.testDeleteWithLinkShare(nil, map[string]string{"project": "2"})
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 				})
 				t.Run("Shared admin", func(t *testing.T) {
-					rec, err := testHandlerListAdmin.testDeleteWithLinkShare(nil, map[string]string{"list": "3"})
+					rec, err := testHandlerProjectAdmin.testDeleteWithLinkShare(nil, map[string]string{"project": "3"})
 					assert.NoError(t, err)
 					assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 				})
 			})
 		})
 
-		// Creating a list should always be forbidden, since users need access to a namespace to create a list
+		// Creating a project should always be forbidden, since users need access to a namespace to create a project
 		t.Run("Create", func(t *testing.T) {
 			t.Run("Nonexisting", func(t *testing.T) {
-				_, err := testHandlerListReadOnly.testCreateWithLinkShare(nil, map[string]string{"namespace": "999999"}, `{"title":"Lorem"}`)
+				_, err := testHandlerProjectReadOnly.testCreateWithLinkShare(nil, map[string]string{"namespace": "999999"}, `{"title":"Lorem"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Rights check", func(t *testing.T) {
 				t.Run("Shared readonly", func(t *testing.T) {
-					_, err := testHandlerListReadOnly.testCreateWithLinkShare(nil, map[string]string{"namespace": "1"}, `{"title":"Lorem","description":"Lorem Ipsum"}`)
+					_, err := testHandlerProjectReadOnly.testCreateWithLinkShare(nil, map[string]string{"namespace": "1"}, `{"title":"Lorem","description":"Lorem Ipsum"}`)
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 				})
 				t.Run("Shared write", func(t *testing.T) {
-					_, err := testHandlerListWrite.testCreateWithLinkShare(nil, map[string]string{"namespace": "2"}, `{"title":"Lorem","description":"Lorem Ipsum"}`)
+					_, err := testHandlerProjectWrite.testCreateWithLinkShare(nil, map[string]string{"namespace": "2"}, `{"title":"Lorem","description":"Lorem Ipsum"}`)
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 				})
 				t.Run("Shared admin", func(t *testing.T) {
-					_, err := testHandlerListAdmin.testCreateWithLinkShare(nil, map[string]string{"namespace": "3"}, `{"title":"Lorem","description":"Lorem Ipsum"}`)
+					_, err := testHandlerProjectAdmin.testCreateWithLinkShare(nil, map[string]string{"namespace": "3"}, `{"title":"Lorem","description":"Lorem Ipsum"}`)
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 				})
@@ -301,74 +301,74 @@ func TestLinkSharing(t *testing.T) {
 
 		t.Run("Right Management", func(t *testing.T) {
 			t.Run("Users", func(t *testing.T) {
-				testHandlerListUserReadOnly := webHandlerTest{
+				testHandlerProjectUserReadOnly := webHandlerTest{
 					linkShare: linkshareRead,
 					strFunc: func() handler.CObject {
-						return &models.ListUser{}
+						return &models.ProjectUser{}
 					},
 					t: t,
 				}
-				testHandlerListUserWrite := webHandlerTest{
+				testHandlerProjectUserWrite := webHandlerTest{
 					linkShare: linkShareWrite,
 					strFunc: func() handler.CObject {
-						return &models.ListUser{}
+						return &models.ProjectUser{}
 					},
 					t: t,
 				}
-				testHandlerListUserAdmin := webHandlerTest{
+				testHandlerProjectUserAdmin := webHandlerTest{
 					linkShare: linkShareAdmin,
 					strFunc: func() handler.CObject {
-						return &models.ListUser{}
+						return &models.ProjectUser{}
 					},
 					t: t,
 				}
 				t.Run("ReadAll", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						rec, err := testHandlerListUserReadOnly.testReadAllWithLinkShare(nil, map[string]string{"list": "1"})
+						rec, err := testHandlerProjectUserReadOnly.testReadAllWithLinkShare(nil, map[string]string{"project": "1"})
 						assert.NoError(t, err)
 						assert.Contains(t, rec.Body.String(), `[]`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						rec, err := testHandlerListUserWrite.testReadAllWithLinkShare(nil, map[string]string{"list": "2"})
+						rec, err := testHandlerProjectUserWrite.testReadAllWithLinkShare(nil, map[string]string{"project": "2"})
 						assert.NoError(t, err)
 						assert.Contains(t, rec.Body.String(), `[]`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						rec, err := testHandlerListUserAdmin.testReadAllWithLinkShare(nil, map[string]string{"list": "3"})
+						rec, err := testHandlerProjectUserAdmin.testReadAllWithLinkShare(nil, map[string]string{"project": "3"})
 						assert.NoError(t, err)
 						assert.Contains(t, rec.Body.String(), `"username":"user1"`)
 					})
 				})
 				t.Run("Create", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerListUserReadOnly.testCreateWithLinkShare(nil, map[string]string{"list": "1"}, `{"user_id":"user1"}`)
+						_, err := testHandlerProjectUserReadOnly.testCreateWithLinkShare(nil, map[string]string{"project": "1"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerListUserWrite.testCreateWithLinkShare(nil, map[string]string{"list": "2"}, `{"user_id":"user1"}`)
+						_, err := testHandlerProjectUserWrite.testCreateWithLinkShare(nil, map[string]string{"project": "2"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerListUserAdmin.testCreateWithLinkShare(nil, map[string]string{"list": "3"}, `{"user_id":"user1"}`)
+						_, err := testHandlerProjectUserAdmin.testCreateWithLinkShare(nil, map[string]string{"project": "3"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 				})
 				t.Run("Update", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerListUserReadOnly.testUpdateWithLinkShare(nil, map[string]string{"list": "1"}, `{"user_id":"user1"}`)
+						_, err := testHandlerProjectUserReadOnly.testUpdateWithLinkShare(nil, map[string]string{"project": "1"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerListUserWrite.testUpdateWithLinkShare(nil, map[string]string{"list": "2"}, `{"user_id":"user1"}`)
+						_, err := testHandlerProjectUserWrite.testUpdateWithLinkShare(nil, map[string]string{"project": "2"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerListUserAdmin.testUpdateWithLinkShare(nil, map[string]string{"list": "3"}, `{"user_id":"user1"}`)
+						_, err := testHandlerProjectUserAdmin.testUpdateWithLinkShare(nil, map[string]string{"project": "3"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
@@ -376,91 +376,91 @@ func TestLinkSharing(t *testing.T) {
 				})
 				t.Run("Delete", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerListUserReadOnly.testDeleteWithLinkShare(nil, map[string]string{"list": "1"})
+						_, err := testHandlerProjectUserReadOnly.testDeleteWithLinkShare(nil, map[string]string{"project": "1"})
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerListUserWrite.testDeleteWithLinkShare(nil, map[string]string{"list": "2"})
+						_, err := testHandlerProjectUserWrite.testDeleteWithLinkShare(nil, map[string]string{"project": "2"})
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerListUserAdmin.testDeleteWithLinkShare(nil, map[string]string{"list": "3"})
+						_, err := testHandlerProjectUserAdmin.testDeleteWithLinkShare(nil, map[string]string{"project": "3"})
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 				})
 			})
 			t.Run("Teams", func(t *testing.T) {
-				testHandlerListTeamReadOnly := webHandlerTest{
+				testHandlerProjectTeamReadOnly := webHandlerTest{
 					linkShare: linkshareRead,
 					strFunc: func() handler.CObject {
-						return &models.TeamList{}
+						return &models.TeamProject{}
 					},
 					t: t,
 				}
-				testHandlerListTeamWrite := webHandlerTest{
+				testHandlerProjectTeamWrite := webHandlerTest{
 					linkShare: linkShareWrite,
 					strFunc: func() handler.CObject {
-						return &models.TeamList{}
+						return &models.TeamProject{}
 					},
 					t: t,
 				}
-				testHandlerListTeamAdmin := webHandlerTest{
+				testHandlerProjectTeamAdmin := webHandlerTest{
 					linkShare: linkShareAdmin,
 					strFunc: func() handler.CObject {
-						return &models.TeamList{}
+						return &models.TeamProject{}
 					},
 					t: t,
 				}
 				t.Run("ReadAll", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						rec, err := testHandlerListTeamReadOnly.testReadAllWithLinkShare(nil, map[string]string{"list": "1"})
+						rec, err := testHandlerProjectTeamReadOnly.testReadAllWithLinkShare(nil, map[string]string{"project": "1"})
 						assert.NoError(t, err)
 						assert.Contains(t, rec.Body.String(), `[]`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						rec, err := testHandlerListTeamWrite.testReadAllWithLinkShare(nil, map[string]string{"list": "2"})
+						rec, err := testHandlerProjectTeamWrite.testReadAllWithLinkShare(nil, map[string]string{"project": "2"})
 						assert.NoError(t, err)
 						assert.Contains(t, rec.Body.String(), `[]`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						rec, err := testHandlerListTeamAdmin.testReadAllWithLinkShare(nil, map[string]string{"list": "3"})
+						rec, err := testHandlerProjectTeamAdmin.testReadAllWithLinkShare(nil, map[string]string{"project": "3"})
 						assert.NoError(t, err)
 						assert.Contains(t, rec.Body.String(), `"name":"testteam1"`)
 					})
 				})
 				t.Run("Create", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerListTeamReadOnly.testCreateWithLinkShare(nil, map[string]string{"list": "1"}, `{"team_id":1}`)
+						_, err := testHandlerProjectTeamReadOnly.testCreateWithLinkShare(nil, map[string]string{"project": "1"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerListTeamWrite.testCreateWithLinkShare(nil, map[string]string{"list": "2"}, `{"team_id":1}`)
+						_, err := testHandlerProjectTeamWrite.testCreateWithLinkShare(nil, map[string]string{"project": "2"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerListTeamAdmin.testCreateWithLinkShare(nil, map[string]string{"list": "3"}, `{"team_id":1}`)
+						_, err := testHandlerProjectTeamAdmin.testCreateWithLinkShare(nil, map[string]string{"project": "3"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 				})
 				t.Run("Update", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerListTeamReadOnly.testUpdateWithLinkShare(nil, map[string]string{"list": "1"}, `{"team_id":1}`)
+						_, err := testHandlerProjectTeamReadOnly.testUpdateWithLinkShare(nil, map[string]string{"project": "1"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerListTeamWrite.testUpdateWithLinkShare(nil, map[string]string{"list": "2"}, `{"team_id":1}`)
+						_, err := testHandlerProjectTeamWrite.testUpdateWithLinkShare(nil, map[string]string{"project": "2"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerListTeamAdmin.testUpdateWithLinkShare(nil, map[string]string{"list": "3"}, `{"team_id":1}`)
+						_, err := testHandlerProjectTeamAdmin.testUpdateWithLinkShare(nil, map[string]string{"project": "3"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
@@ -468,17 +468,17 @@ func TestLinkSharing(t *testing.T) {
 				})
 				t.Run("Delete", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerListTeamReadOnly.testDeleteWithLinkShare(nil, map[string]string{"list": "1"})
+						_, err := testHandlerProjectTeamReadOnly.testDeleteWithLinkShare(nil, map[string]string{"project": "1"})
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerListTeamWrite.testDeleteWithLinkShare(nil, map[string]string{"list": "2"})
+						_, err := testHandlerProjectTeamWrite.testDeleteWithLinkShare(nil, map[string]string{"project": "2"})
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerListTeamAdmin.testDeleteWithLinkShare(nil, map[string]string{"list": "3"})
+						_, err := testHandlerProjectTeamAdmin.testDeleteWithLinkShare(nil, map[string]string{"project": "3"})
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
@@ -586,34 +586,34 @@ func TestLinkSharing(t *testing.T) {
 		})
 		t.Run("Create", func(t *testing.T) {
 			t.Run("Shared readonly", func(t *testing.T) {
-				_, err := testHandlerTaskReadOnly.testCreateWithLinkShare(nil, map[string]string{"list": "1"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandlerTaskReadOnly.testCreateWithLinkShare(nil, map[string]string{"project": "1"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared write", func(t *testing.T) {
-				rec, err := testHandlerTaskWrite.testCreateWithLinkShare(nil, map[string]string{"list": "2"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandlerTaskWrite.testCreateWithLinkShare(nil, map[string]string{"project": "2"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared admin", func(t *testing.T) {
-				rec, err := testHandlerTaskAdmin.testCreateWithLinkShare(nil, map[string]string{"list": "3"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandlerTaskAdmin.testCreateWithLinkShare(nil, map[string]string{"project": "3"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 		})
 		t.Run("Update", func(t *testing.T) {
 			t.Run("Shared readonly", func(t *testing.T) {
-				_, err := testHandlerTaskReadOnly.testUpdateWithLinkShare(nil, map[string]string{"listtask": "1"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandlerTaskReadOnly.testUpdateWithLinkShare(nil, map[string]string{"projecttask": "1"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared write", func(t *testing.T) {
-				rec, err := testHandlerTaskWrite.testUpdateWithLinkShare(nil, map[string]string{"listtask": "13"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandlerTaskWrite.testUpdateWithLinkShare(nil, map[string]string{"projecttask": "13"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared admin", func(t *testing.T) {
-				rec, err := testHandlerTaskAdmin.testUpdateWithLinkShare(nil, map[string]string{"listtask": "32"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandlerTaskAdmin.testUpdateWithLinkShare(nil, map[string]string{"projecttask": "32"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
@@ -621,17 +621,17 @@ func TestLinkSharing(t *testing.T) {
 		})
 		t.Run("Delete", func(t *testing.T) {
 			t.Run("Shared readonly", func(t *testing.T) {
-				_, err := testHandlerTaskReadOnly.testDeleteWithLinkShare(nil, map[string]string{"listtask": "1"})
+				_, err := testHandlerTaskReadOnly.testDeleteWithLinkShare(nil, map[string]string{"projecttask": "1"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared write", func(t *testing.T) {
-				rec, err := testHandlerTaskWrite.testDeleteWithLinkShare(nil, map[string]string{"listtask": "13"})
+				rec, err := testHandlerTaskWrite.testDeleteWithLinkShare(nil, map[string]string{"projecttask": "13"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})
 			t.Run("Shared admin", func(t *testing.T) {
-				rec, err := testHandlerTaskAdmin.testDeleteWithLinkShare(nil, map[string]string{"listtask": "32"})
+				rec, err := testHandlerTaskAdmin.testDeleteWithLinkShare(nil, map[string]string{"projecttask": "32"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})
@@ -738,34 +738,34 @@ func TestLinkSharing(t *testing.T) {
 		}
 		t.Run("ReadAll", func(t *testing.T) {
 			t.Run("Shared readonly", func(t *testing.T) {
-				rec, err := testHandlerLinkShareReadOnly.testReadAllWithLinkShare(nil, map[string]string{"list": "1"})
+				rec, err := testHandlerLinkShareReadOnly.testReadAllWithLinkShare(nil, map[string]string{"project": "1"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"hash":"test"`)
 			})
 			t.Run("Shared write", func(t *testing.T) {
-				rec, err := testHandlerLinkShareWrite.testReadAllWithLinkShare(nil, map[string]string{"list": "2"})
+				rec, err := testHandlerLinkShareWrite.testReadAllWithLinkShare(nil, map[string]string{"project": "2"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"hash":"test2"`)
 			})
 			t.Run("Shared admin", func(t *testing.T) {
-				rec, err := testHandlerLinkShareAdmin.testReadAllWithLinkShare(nil, map[string]string{"list": "3"})
+				rec, err := testHandlerLinkShareAdmin.testReadAllWithLinkShare(nil, map[string]string{"project": "3"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"hash":"test3"`)
 			})
 		})
 		t.Run("Create", func(t *testing.T) {
 			t.Run("Shared readonly", func(t *testing.T) {
-				_, err := testHandlerLinkShareReadOnly.testCreateWithLinkShare(nil, map[string]string{"list": "1"}, `{}`)
+				_, err := testHandlerLinkShareReadOnly.testCreateWithLinkShare(nil, map[string]string{"project": "1"}, `{}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared write", func(t *testing.T) {
-				_, err := testHandlerLinkShareWrite.testCreateWithLinkShare(nil, map[string]string{"list": "2"}, `{}`)
+				_, err := testHandlerLinkShareWrite.testCreateWithLinkShare(nil, map[string]string{"project": "2"}, `{}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared admin", func(t *testing.T) {
-				_, err := testHandlerLinkShareAdmin.testCreateWithLinkShare(nil, map[string]string{"list": "3"}, `{}`)
+				_, err := testHandlerLinkShareAdmin.testCreateWithLinkShare(nil, map[string]string{"project": "3"}, `{}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})

pkg/integrations/project_test.go

@@ -26,11 +26,11 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestList(t *testing.T) {
+func TestProject(t *testing.T) {
 	testHandler := webHandlerTest{
 		user: &testuser1,
 		strFunc: func() handler.CObject {
-			return &models.List{}
+			return &models.Project{}
 		},
 		t: t,
 	}
@@ -40,7 +40,7 @@ func TestList(t *testing.T) {
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `Test1`)
 			assert.NotContains(t, rec.Body.String(), `Test2"`)
-			assert.Contains(t, rec.Body.String(), `Test3`) // Shared directly via users_list
+			assert.Contains(t, rec.Body.String(), `Test3`) // Shared directly via users_project
 			assert.Contains(t, rec.Body.String(), `Test4`) // Shared via namespace
 			assert.NotContains(t, rec.Body.String(), `Test5`)
 			assert.NotContains(t, rec.Body.String(), `Test21`) // Archived through namespace
@@ -55,12 +55,12 @@ func TestList(t *testing.T) {
 			assert.NotContains(t, rec.Body.String(), `Test4`)
 			assert.NotContains(t, rec.Body.String(), `Test5`)
 		})
-		t.Run("Normal with archived lists", func(t *testing.T) {
+		t.Run("Normal with archived projects", func(t *testing.T) {
 			rec, err := testHandler.testReadAllWithUser(url.Values{"is_archived": []string{"true"}}, nil)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `Test1`)
 			assert.NotContains(t, rec.Body.String(), `Test2"`)
-			assert.Contains(t, rec.Body.String(), `Test3`) // Shared directly via users_list
+			assert.Contains(t, rec.Body.String(), `Test3`) // Shared directly via users_project
 			assert.Contains(t, rec.Body.String(), `Test4`) // Shared via namespace
 			assert.NotContains(t, rec.Body.String(), `Test5`)
 			assert.Contains(t, rec.Body.String(), `Test21`) // Archived through namespace
@@ -69,7 +69,7 @@ func TestList(t *testing.T) {
 	})
 	t.Run("ReadOne", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "1"})
+			rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "1"})
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"Test1"`)
 			assert.NotContains(t, rec.Body.String(), `"title":"Test2"`)
@@ -79,89 +79,89 @@ func TestList(t *testing.T) {
 			assert.Equal(t, "2", rec.Result().Header.Get("x-max-right")) // User 1 is owner so they should have admin rights.
 		})
 		t.Run("Nonexisting", func(t *testing.T) {
-			_, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "9999"})
+			_, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "9999"})
 			assert.Error(t, err)
-			assertHandlerErrorCode(t, err, models.ErrCodeListDoesNotExist)
+			assertHandlerErrorCode(t, err, models.ErrCodeProjectDoesNotExist)
 		})
 		t.Run("Rights check", func(t *testing.T) {
 			t.Run("Forbidden", func(t *testing.T) {
 				// Owned by user13
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "20"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "20"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `You don't have the right to see this`)
 				assert.Empty(t, rec.Result().Header.Get("x-max-rights"))
 			})
 			t.Run("Shared Via Team readonly", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "6"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "6"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test6"`)
 				assert.Equal(t, "0", rec.Result().Header.Get("x-max-right"))
 			})
 			t.Run("Shared Via Team write", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "7"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "7"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test7"`)
 				assert.Equal(t, "1", rec.Result().Header.Get("x-max-right"))
 			})
 			t.Run("Shared Via Team admin", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "8"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "8"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test8"`)
 				assert.Equal(t, "2", rec.Result().Header.Get("x-max-right"))
 			})
 
 			t.Run("Shared Via User readonly", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "9"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "9"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test9"`)
 				assert.Equal(t, "0", rec.Result().Header.Get("x-max-right"))
 			})
 			t.Run("Shared Via User write", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "10"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "10"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test10"`)
 				assert.Equal(t, "1", rec.Result().Header.Get("x-max-right"))
 			})
 			t.Run("Shared Via User admin", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "11"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "11"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test11"`)
 				assert.Equal(t, "2", rec.Result().Header.Get("x-max-right"))
 			})
 
 			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "12"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "12"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test12"`)
 				assert.Equal(t, "0", rec.Result().Header.Get("x-max-right"))
 			})
 			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "13"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "13"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test13"`)
 				assert.Equal(t, "1", rec.Result().Header.Get("x-max-right"))
 			})
 			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "14"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "14"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test14"`)
 				assert.Equal(t, "2", rec.Result().Header.Get("x-max-right"))
 			})
 
 			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "15"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "15"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test15"`)
 				assert.Equal(t, "0", rec.Result().Header.Get("x-max-right"))
 			})
 			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "16"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "16"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test16"`)
 				assert.Equal(t, "1", rec.Result().Header.Get("x-max-right"))
 			})
 			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "17"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "17"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test17"`)
 				assert.Equal(t, "2", rec.Result().Header.Get("x-max-right"))
@@ -170,101 +170,101 @@ func TestList(t *testing.T) {
 	})
 	t.Run("Update", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			// Check the list was loaded successfully afterwards, see testReadOneWithUser
-			rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "1"}, `{"title":"TestLoremIpsum","namespace_id":1}`)
+			// Check the project was loaded successfully afterwards, see testReadOneWithUser
+			rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "1"}, `{"title":"TestLoremIpsum","namespace_id":1}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			// The description should not be updated but returned correctly
 			assert.Contains(t, rec.Body.String(), `description":"Lorem Ipsum`)
 		})
 		t.Run("Nonexisting", func(t *testing.T) {
-			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "9999"}, `{"title":"TestLoremIpsum"}`)
+			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "9999"}, `{"title":"TestLoremIpsum"}`)
 			assert.Error(t, err)
-			assertHandlerErrorCode(t, err, models.ErrCodeListDoesNotExist)
+			assertHandlerErrorCode(t, err, models.ErrCodeProjectDoesNotExist)
 		})
 		t.Run("Normal with updating the description", func(t *testing.T) {
-			rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "1"}, `{"title":"TestLoremIpsum","description":"Lorem Ipsum dolor sit amet","namespace_id":1}`)
+			rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "1"}, `{"title":"TestLoremIpsum","description":"Lorem Ipsum dolor sit amet","namespace_id":1}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			assert.Contains(t, rec.Body.String(), `"description":"Lorem Ipsum dolor sit amet`)
 		})
 		t.Run("Empty title", func(t *testing.T) {
-			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "1"}, `{"title":""}`)
+			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "1"}, `{"title":""}`)
 			assert.Error(t, err)
 			assert.Contains(t, err.(*echo.HTTPError).Message.(models.ValidationHTTPError).InvalidFields, "title: non zero value required")
 		})
 		t.Run("Title too long", func(t *testing.T) {
-			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "1"}, `{"title":"Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea taki"}`)
+			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "1"}, `{"title":"Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea taki"}`)
 			assert.Error(t, err)
 			assert.Contains(t, err.(*echo.HTTPError).Message.(models.ValidationHTTPError).InvalidFields[0], "does not validate as runelength(1|250)")
 		})
 		t.Run("Rights check", func(t *testing.T) {
 			t.Run("Forbidden", func(t *testing.T) {
 				// Owned by user13
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "20"}, `{"title":"TestLoremIpsum"}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "20"}, `{"title":"TestLoremIpsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team readonly", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "6"}, `{"title":"TestLoremIpsum"}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "6"}, `{"title":"TestLoremIpsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team write", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "7"}, `{"title":"TestLoremIpsum","namespace_id":6}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "7"}, `{"title":"TestLoremIpsum","namespace_id":6}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})
 			t.Run("Shared Via Team admin", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "8"}, `{"title":"TestLoremIpsum","namespace_id":6}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "8"}, `{"title":"TestLoremIpsum","namespace_id":6}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})
 
 			t.Run("Shared Via User readonly", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "9"}, `{"title":"TestLoremIpsum"}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "9"}, `{"title":"TestLoremIpsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via User write", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "10"}, `{"title":"TestLoremIpsum","namespace_id":6}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "10"}, `{"title":"TestLoremIpsum","namespace_id":6}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})
 			t.Run("Shared Via User admin", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "11"}, `{"title":"TestLoremIpsum","namespace_id":6}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "11"}, `{"title":"TestLoremIpsum","namespace_id":6}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})
 
 			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "12"}, `{"title":"TestLoremIpsum"}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "12"}, `{"title":"TestLoremIpsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "13"}, `{"title":"TestLoremIpsum","namespace_id":8}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "13"}, `{"title":"TestLoremIpsum","namespace_id":8}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})
 			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "14"}, `{"title":"TestLoremIpsum","namespace_id":9}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "14"}, `{"title":"TestLoremIpsum","namespace_id":9}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})
 
 			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "15"}, `{"title":"TestLoremIpsum"}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "15"}, `{"title":"TestLoremIpsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "16"}, `{"title":"TestLoremIpsum","namespace_id":11}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "16"}, `{"title":"TestLoremIpsum","namespace_id":11}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})
 			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "17"}, `{"title":"TestLoremIpsum","namespace_id":12}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "17"}, `{"title":"TestLoremIpsum","namespace_id":12}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})
@@ -272,82 +272,82 @@ func TestList(t *testing.T) {
 	})
 	t.Run("Delete", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "1"})
+			rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "1"})
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 		})
 		t.Run("Nonexisting", func(t *testing.T) {
-			_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "999"})
+			_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "999"})
 			assert.Error(t, err)
-			assertHandlerErrorCode(t, err, models.ErrCodeListDoesNotExist)
+			assertHandlerErrorCode(t, err, models.ErrCodeProjectDoesNotExist)
 		})
 		t.Run("Rights check", func(t *testing.T) {
 			t.Run("Forbidden", func(t *testing.T) {
 				// Owned by user13
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "20"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "20"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "6"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "6"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team write", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "7"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "7"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "8"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "8"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
 
 			t.Run("Shared Via User readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "9"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "9"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via User write", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "10"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "10"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via User admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "11"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "11"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
 
 			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "12"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "12"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "13"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "13"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "14"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "14"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
 
 			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "15"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "15"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "16"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "16"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "17"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "17"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
@@ -355,7 +355,7 @@ func TestList(t *testing.T) {
 	})
 	t.Run("Create", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			// Check the list was loaded successfully after update, see testReadOneWithUser
+			// Check the project was loaded successfully after update, see testReadOneWithUser
 			rec, err := testHandler.testCreateWithUser(nil, map[string]string{"namespace": "1"}, `{"title":"Lorem"}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"Lorem"`)

pkg/integrations/task_collection_test.go

@@ -33,23 +33,23 @@ func TestTaskCollection(t *testing.T) {
 		},
 		t: t,
 	}
-	t.Run("ReadAll on list", func(t *testing.T) {
+	t.Run("ReadAll on project", func(t *testing.T) {
 
-		urlParams := map[string]string{"list": "1"}
+		urlParams := map[string]string{"project": "1"}
 
 		t.Run("Normal", func(t *testing.T) {
 			rec, err := testHandler.testReadAllWithUser(nil, urlParams)
 			assert.NoError(t, err)
 			// Not using assert.Equal to avoid having the tests break every time we add new fixtures
 			assert.Contains(t, rec.Body.String(), `task #1`)
-			assert.Contains(t, rec.Body.String(), `task #2`)
-			assert.Contains(t, rec.Body.String(), `task #3`)
-			assert.Contains(t, rec.Body.String(), `task #4`)
-			assert.Contains(t, rec.Body.String(), `task #5`)
-			assert.Contains(t, rec.Body.String(), `task #6`)
-			assert.Contains(t, rec.Body.String(), `task #7`)
-			assert.Contains(t, rec.Body.String(), `task #8`)
-			assert.Contains(t, rec.Body.String(), `task #9`)
+			assert.Contains(t, rec.Body.String(), `task #2 `)
+			assert.Contains(t, rec.Body.String(), `task #3 `)
+			assert.Contains(t, rec.Body.String(), `task #4 `)
+			assert.Contains(t, rec.Body.String(), `task #5 `)
+			assert.Contains(t, rec.Body.String(), `task #6 `)
+			assert.Contains(t, rec.Body.String(), `task #7 `)
+			assert.Contains(t, rec.Body.String(), `task #8 `)
+			assert.Contains(t, rec.Body.String(), `task #9 `)
 			assert.Contains(t, rec.Body.String(), `task #10`)
 			assert.Contains(t, rec.Body.String(), `task #11`)
 			assert.Contains(t, rec.Body.String(), `task #12`)
@@ -75,14 +75,14 @@ func TestTaskCollection(t *testing.T) {
 			rec, err := testHandler.testReadAllWithUser(url.Values{"s": []string{"task #6"}}, urlParams)
 			assert.NoError(t, err)
 			assert.NotContains(t, rec.Body.String(), `task #1`)
-			assert.NotContains(t, rec.Body.String(), `task #2`)
-			assert.NotContains(t, rec.Body.String(), `task #3`)
-			assert.NotContains(t, rec.Body.String(), `task #4`)
-			assert.NotContains(t, rec.Body.String(), `task #5`)
-			assert.Contains(t, rec.Body.String(), `task #6`)
-			assert.NotContains(t, rec.Body.String(), `task #7`)
-			assert.NotContains(t, rec.Body.String(), `task #8`)
-			assert.NotContains(t, rec.Body.String(), `task #9`)
+			assert.NotContains(t, rec.Body.String(), `task #2 `)
+			assert.NotContains(t, rec.Body.String(), `task #3 `)
+			assert.NotContains(t, rec.Body.String(), `task #4 `)
+			assert.NotContains(t, rec.Body.String(), `task #5 `)
+			assert.Contains(t, rec.Body.String(), `task #6 `)
+			assert.NotContains(t, rec.Body.String(), `task #7 `)
+			assert.NotContains(t, rec.Body.String(), `task #8 `)
+			assert.NotContains(t, rec.Body.String(), `task #9 `)
 			assert.NotContains(t, rec.Body.String(), `task #10`)
 			assert.NotContains(t, rec.Body.String(), `task #11`)
 			assert.NotContains(t, rec.Body.String(), `task #12`)
@@ -93,14 +93,14 @@ func TestTaskCollection(t *testing.T) {
 			rec, err := testHandler.testReadAllWithUser(url.Values{"s": []string{"tASk #6"}}, urlParams)
 			assert.NoError(t, err)
 			assert.NotContains(t, rec.Body.String(), `task #1`)
-			assert.NotContains(t, rec.Body.String(), `task #2`)
-			assert.NotContains(t, rec.Body.String(), `task #3`)
-			assert.NotContains(t, rec.Body.String(), `task #4`)
-			assert.NotContains(t, rec.Body.String(), `task #5`)
-			assert.Contains(t, rec.Body.String(), `task #6`)
-			assert.NotContains(t, rec.Body.String(), `task #7`)
-			assert.NotContains(t, rec.Body.String(), `task #8`)
-			assert.NotContains(t, rec.Body.String(), `task #9`)
+			assert.NotContains(t, rec.Body.String(), `task #2 `)
+			assert.NotContains(t, rec.Body.String(), `task #3 `)
+			assert.NotContains(t, rec.Body.String(), `task #4 `)
+			assert.NotContains(t, rec.Body.String(), `task #5 `)
+			assert.Contains(t, rec.Body.String(), `task #6 `)
+			assert.NotContains(t, rec.Body.String(), `task #7 `)
+			assert.NotContains(t, rec.Body.String(), `task #8 `)
+			assert.NotContains(t, rec.Body.String(), `task #9 `)
 			assert.NotContains(t, rec.Body.String(), `task #10`)
 			assert.NotContains(t, rec.Body.String(), `task #11`)
 			assert.NotContains(t, rec.Body.String(), `task #12`)
@@ -113,49 +113,49 @@ func TestTaskCollection(t *testing.T) {
 			t.Run("by priority", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)
+				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)
 			})
 			t.Run("by priority desc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}, "order_by": []string{"desc"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":3,"title":"task #3 high prio","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":4,"title":"task #4 low prio","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":1`)
+				assert.Contains(t, rec.Body.String(), `[{"id":3,"title":"task #3 high prio","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":4,"title":"task #4 low prio","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":1`)
 			})
 			t.Run("by priority asc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}, "order_by": []string{"asc"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)
+				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)
 			})
 			// should equal duedate asc
 			t.Run("by due_date", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
+				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
 			})
 			t.Run("by duedate desc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}, "order_by": []string{"desc"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":6,"title":"task #6 lower due date`)
+				assert.Contains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":6,"title":"task #6 lower due date`)
 			})
 			// Due date without unix suffix
 			t.Run("by duedate asc without  suffix", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}, "order_by": []string{"asc"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
+				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
 			})
 			t.Run("by due_date without suffix", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
+				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
 			})
 			t.Run("by duedate desc without  suffix", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}, "order_by": []string{"desc"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":6,"title":"task #6 lower due date`)
+				assert.Contains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":6,"title":"task #6 lower due date`)
 			})
 			t.Run("by duedate asc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}, "order_by": []string{"asc"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
+				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
 			})
 			t.Run("invalid sort parameter", func(t *testing.T) {
 				_, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"loremipsum"}}, urlParams)
@@ -171,10 +171,10 @@ func TestTaskCollection(t *testing.T) {
 				// Invalid parameter should not sort at all
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort": []string{"loremipsum"}}, urlParams)
 				assert.NoError(t, err)
-				assert.NotContains(t, rec.Body.String(), `[{"id":3,"title":"task #3 high prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":4,"title":"task #4 low prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":1`)
-				assert.NotContains(t, rec.Body.String(), `{"id":4,"title":"task #4 low prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":1,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":3,"title":"task #3 high prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}}]`)
-				assert.NotContains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":6,"title":"task #6 lower due date"`)
-				assert.NotContains(t, rec.Body.String(), `{"id":6,"title":"task #6 lower due date","description":"","done":false,"due_date":1543616724,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":5,"title":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}}]`)
+				assert.NotContains(t, rec.Body.String(), `[{"id":3,"title":"task #3 high prio","description":"","done":false,"due_date":0,"reminder_dates":null,"reminders":null,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":4,"title":"task #4 low prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":1`)
+				assert.NotContains(t, rec.Body.String(), `{"id":4,"title":"task #4 low prio","description":"","done":false,"due_date":0,"reminder_dates":null,"reminders":null,"repeat_after":0,"repeat_mode":0,"priority":1,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":3,"title":"task #3 high prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}}]`)
+				assert.NotContains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminder_dates":null,"reminders":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":6,"title":"task #6 lower due date"`)
+				assert.NotContains(t, rec.Body.String(), `{"id":6,"title":"task #6 lower due date","description":"","done":false,"due_date":1543616724,"reminder_dates":null,"reminders":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":5,"title":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}}]`)
 			})
 		})
 		t.Run("Filter", func(t *testing.T) {
@@ -190,14 +190,14 @@ func TestTaskCollection(t *testing.T) {
 					)
 					assert.NoError(t, err)
 					assert.NotContains(t, rec.Body.String(), `task #1`)
-					assert.NotContains(t, rec.Body.String(), `task #2`)
-					assert.NotContains(t, rec.Body.String(), `task #3`)
-					assert.NotContains(t, rec.Body.String(), `task #4`)
-					assert.Contains(t, rec.Body.String(), `task #5`)
-					assert.Contains(t, rec.Body.String(), `task #6`)
-					assert.Contains(t, rec.Body.String(), `task #7`)
-					assert.Contains(t, rec.Body.String(), `task #8`)
-					assert.Contains(t, rec.Body.String(), `task #9`)
+					assert.NotContains(t, rec.Body.String(), `task #2 `)
+					assert.NotContains(t, rec.Body.String(), `task #3 `)
+					assert.NotContains(t, rec.Body.String(), `task #4 `)
+					assert.Contains(t, rec.Body.String(), `task #5 `)
+					assert.Contains(t, rec.Body.String(), `task #6 `)
+					assert.Contains(t, rec.Body.String(), `task #7 `)
+					assert.Contains(t, rec.Body.String(), `task #8 `)
+					assert.Contains(t, rec.Body.String(), `task #9 `)
 					assert.NotContains(t, rec.Body.String(), `task #10`)
 					assert.NotContains(t, rec.Body.String(), `task #11`)
 					assert.NotContains(t, rec.Body.String(), `task #12`)
@@ -215,14 +215,14 @@ func TestTaskCollection(t *testing.T) {
 					)
 					assert.NoError(t, err)
 					assert.NotContains(t, rec.Body.String(), `task #1`)
-					assert.NotContains(t, rec.Body.String(), `task #2`)
-					assert.NotContains(t, rec.Body.String(), `task #3`)
-					assert.NotContains(t, rec.Body.String(), `task #4`)
-					assert.NotContains(t, rec.Body.String(), `task #5`)
-					assert.NotContains(t, rec.Body.String(), `task #6`)
-					assert.Contains(t, rec.Body.String(), `task #7`)
-					assert.NotContains(t, rec.Body.String(), `task #8`)
-					assert.Contains(t, rec.Body.String(), `task #9`)
+					assert.NotContains(t, rec.Body.String(), `task #2 `)
+					assert.NotContains(t, rec.Body.String(), `task #3 `)
+					assert.NotContains(t, rec.Body.String(), `task #4 `)
+					assert.NotContains(t, rec.Body.String(), `task #5 `)
+					assert.NotContains(t, rec.Body.String(), `task #6 `)
+					assert.Contains(t, rec.Body.String(), `task #7 `)
+					assert.NotContains(t, rec.Body.String(), `task #8 `)
+					assert.Contains(t, rec.Body.String(), `task #9 `)
 					assert.NotContains(t, rec.Body.String(), `task #10`)
 					assert.NotContains(t, rec.Body.String(), `task #11`)
 					assert.NotContains(t, rec.Body.String(), `task #12`)
@@ -255,14 +255,14 @@ func TestTaskCollection(t *testing.T) {
 					)
 					assert.NoError(t, err)
 					assert.NotContains(t, rec.Body.String(), `task #1`)
-					assert.NotContains(t, rec.Body.String(), `task #2`)
-					assert.NotContains(t, rec.Body.String(), `task #3`)
-					assert.NotContains(t, rec.Body.String(), `task #4`)
-					assert.Contains(t, rec.Body.String(), `task #5`)
-					assert.Contains(t, rec.Body.String(), `task #6`)
-					assert.Contains(t, rec.Body.String(), `task #7`)
-					assert.NotContains(t, rec.Body.String(), `task #8`)
-					assert.Contains(t, rec.Body.String(), `task #9`)
+					assert.NotContains(t, rec.Body.String(), `task #2 `)
+					assert.NotContains(t, rec.Body.String(), `task #3 `)
+					assert.NotContains(t, rec.Body.String(), `task #4 `)
+					assert.Contains(t, rec.Body.String(), `task #5 `)
+					assert.Contains(t, rec.Body.String(), `task #6 `)
+					assert.Contains(t, rec.Body.String(), `task #7 `)
+					assert.NotContains(t, rec.Body.String(), `task #8 `)
+					assert.Contains(t, rec.Body.String(), `task #9 `)
 					assert.NotContains(t, rec.Body.String(), `task #10`)
 					assert.NotContains(t, rec.Body.String(), `task #11`)
 					assert.NotContains(t, rec.Body.String(), `task #12`)
@@ -287,18 +287,18 @@ func TestTaskCollection(t *testing.T) {
 			t.Run("date range", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(
 					nil,
-					map[string]string{"list": "-2"}, // Actually a saved filter - contains the same filter arguments as the start and end date filter from above
+					map[string]string{"project": "-2"}, // Actually a saved filter - contains the same filter arguments as the start and end date filter from above
 				)
 				assert.NoError(t, err)
 				assert.NotContains(t, rec.Body.String(), `task #1`)
-				assert.NotContains(t, rec.Body.String(), `task #2`)
-				assert.NotContains(t, rec.Body.String(), `task #3`)
-				assert.NotContains(t, rec.Body.String(), `task #4`)
-				assert.Contains(t, rec.Body.String(), `task #5`)
-				assert.Contains(t, rec.Body.String(), `task #6`)
-				assert.Contains(t, rec.Body.String(), `task #7`)
-				assert.Contains(t, rec.Body.String(), `task #8`)
-				assert.Contains(t, rec.Body.String(), `task #9`)
+				assert.NotContains(t, rec.Body.String(), `task #2 `)
+				assert.NotContains(t, rec.Body.String(), `task #3 `)
+				assert.NotContains(t, rec.Body.String(), `task #4 `)
+				assert.Contains(t, rec.Body.String(), `task #5 `)
+				assert.Contains(t, rec.Body.String(), `task #6 `)
+				assert.Contains(t, rec.Body.String(), `task #7 `)
+				assert.Contains(t, rec.Body.String(), `task #8 `)
+				assert.Contains(t, rec.Body.String(), `task #9 `)
 				assert.NotContains(t, rec.Body.String(), `task #10`)
 				assert.NotContains(t, rec.Body.String(), `task #11`)
 				assert.NotContains(t, rec.Body.String(), `task #12`)
@@ -314,14 +314,14 @@ func TestTaskCollection(t *testing.T) {
 			assert.NoError(t, err)
 			// Not using assert.Equal to avoid having the tests break every time we add new fixtures
 			assert.Contains(t, rec.Body.String(), `task #1`)
-			assert.Contains(t, rec.Body.String(), `task #2`)
-			assert.Contains(t, rec.Body.String(), `task #3`)
-			assert.Contains(t, rec.Body.String(), `task #4`)
-			assert.Contains(t, rec.Body.String(), `task #5`)
-			assert.Contains(t, rec.Body.String(), `task #6`)
-			assert.Contains(t, rec.Body.String(), `task #7`)
-			assert.Contains(t, rec.Body.String(), `task #8`)
-			assert.Contains(t, rec.Body.String(), `task #9`)
+			assert.Contains(t, rec.Body.String(), `task #2 `)
+			assert.Contains(t, rec.Body.String(), `task #3 `)
+			assert.Contains(t, rec.Body.String(), `task #4 `)
+			assert.Contains(t, rec.Body.String(), `task #5 `)
+			assert.Contains(t, rec.Body.String(), `task #6 `)
+			assert.Contains(t, rec.Body.String(), `task #7 `)
+			assert.Contains(t, rec.Body.String(), `task #8 `)
+			assert.Contains(t, rec.Body.String(), `task #9 `)
 			assert.Contains(t, rec.Body.String(), `task #10`)
 			assert.Contains(t, rec.Body.String(), `task #11`)
 			assert.Contains(t, rec.Body.String(), `task #12`)
@@ -341,20 +341,20 @@ func TestTaskCollection(t *testing.T) {
 			assert.Contains(t, rec.Body.String(), `task #24`) // Shared via namespace user readonly
 			assert.Contains(t, rec.Body.String(), `task #25`) // Shared via namespace user write
 			assert.Contains(t, rec.Body.String(), `task #26`) // Shared via namespace user admin
-			// TODO: Add some cases where the user has access to the list, somhow shared
+			// TODO: Add some cases where the user has access to the project, somhow shared
 		})
 		t.Run("Search", func(t *testing.T) {
 			rec, err := testHandler.testReadAllWithUser(url.Values{"s": []string{"task #6"}}, nil)
 			assert.NoError(t, err)
 			assert.NotContains(t, rec.Body.String(), `task #1`)
-			assert.NotContains(t, rec.Body.String(), `task #2`)
-			assert.NotContains(t, rec.Body.String(), `task #3`)
-			assert.NotContains(t, rec.Body.String(), `task #4`)
-			assert.NotContains(t, rec.Body.String(), `task #5`)
-			assert.Contains(t, rec.Body.String(), `task #6`)
-			assert.NotContains(t, rec.Body.String(), `task #7`)
-			assert.NotContains(t, rec.Body.String(), `task #8`)
-			assert.NotContains(t, rec.Body.String(), `task #9`)
+			assert.NotContains(t, rec.Body.String(), `task #2 `)
+			assert.NotContains(t, rec.Body.String(), `task #3 `)
+			assert.NotContains(t, rec.Body.String(), `task #4 `)
+			assert.NotContains(t, rec.Body.String(), `task #5 `)
+			assert.Contains(t, rec.Body.String(), `task #6 `)
+			assert.NotContains(t, rec.Body.String(), `task #7 `)
+			assert.NotContains(t, rec.Body.String(), `task #8 `)
+			assert.NotContains(t, rec.Body.String(), `task #9 `)
 			assert.NotContains(t, rec.Body.String(), `task #10`)
 			assert.NotContains(t, rec.Body.String(), `task #11`)
 			assert.NotContains(t, rec.Body.String(), `task #12`)
@@ -366,42 +366,42 @@ func TestTaskCollection(t *testing.T) {
 			t.Run("by priority", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)
+				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)
 			})
 			t.Run("by priority desc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}, "order_by": []string{"desc"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":3,"title":"task #3 high prio","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":4,"title":"task #4 low prio","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":1`)
+				assert.Contains(t, rec.Body.String(), `[{"id":3,"title":"task #3 high prio","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":4,"title":"task #4 low prio","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":1`)
 			})
 			t.Run("by priority asc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}, "order_by": []string{"asc"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)
+				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)
 			})
 			// should equal duedate asc
 			t.Run("by due_date", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
+				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
 			})
 			t.Run("by duedate desc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}, "order_by": []string{"desc"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":6,"title":"task #6 lower due date`)
+				assert.Contains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":6,"title":"task #6 lower due date`)
 			})
 			t.Run("by duedate asc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}, "order_by": []string{"asc"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
+				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
 			})
 			t.Run("invalid parameter", func(t *testing.T) {
 				// Invalid parameter should not sort at all
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort": []string{"loremipsum"}}, nil)
 				assert.NoError(t, err)
-				assert.NotContains(t, rec.Body.String(), `[{"id":3,"title":"task #3 high prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":4,"title":"task #4 low prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":1`)
-				assert.NotContains(t, rec.Body.String(), `{"id":4,"title":"task #4 low prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":1,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":3,"title":"task #3 high prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}}]`)
-				assert.NotContains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":6,"title":"task #6 lower due date"`)
-				assert.NotContains(t, rec.Body.String(), `{"id":6,"title":"task #6 lower due date","description":"","done":false,"due_date":1543616724,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":5,"title":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}}]`)
+				assert.NotContains(t, rec.Body.String(), `[{"id":3,"title":"task #3 high prio","description":"","done":false,"due_date":0,"reminder_dates":null,"reminders":null,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":4,"title":"task #4 low prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":1`)
+				assert.NotContains(t, rec.Body.String(), `{"id":4,"title":"task #4 low prio","description":"","done":false,"due_date":0,"reminder_dates":null,"reminders":null,"repeat_after":0,"repeat_mode":0,"priority":1,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":3,"title":"task #3 high prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}}]`)
+				assert.NotContains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminder_dates":null,"reminders":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":6,"title":"task #6 lower due date"`)
+				assert.NotContains(t, rec.Body.String(), `{"id":6,"title":"task #6 lower due date","description":"","done":false,"due_date":1543616724,"reminder_dates":null,"reminders":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":5,"title":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}}]`)
 			})
 		})
 		t.Run("Filter", func(t *testing.T) {
@@ -417,14 +417,14 @@ func TestTaskCollection(t *testing.T) {
 					)
 					assert.NoError(t, err)
 					assert.NotContains(t, rec.Body.String(), `task #1`)
-					assert.NotContains(t, rec.Body.String(), `task #2`)
-					assert.NotContains(t, rec.Body.String(), `task #3`)
-					assert.NotContains(t, rec.Body.String(), `task #4`)
-					assert.Contains(t, rec.Body.String(), `task #5`)
-					assert.Contains(t, rec.Body.String(), `task #6`)
-					assert.Contains(t, rec.Body.String(), `task #7`)
-					assert.Contains(t, rec.Body.String(), `task #8`)
-					assert.Contains(t, rec.Body.String(), `task #9`)
+					assert.NotContains(t, rec.Body.String(), `task #2 `)
+					assert.NotContains(t, rec.Body.String(), `task #3 `)
+					assert.NotContains(t, rec.Body.String(), `task #4 `)
+					assert.Contains(t, rec.Body.String(), `task #5 `)
+					assert.Contains(t, rec.Body.String(), `task #6 `)
+					assert.Contains(t, rec.Body.String(), `task #7 `)
+					assert.Contains(t, rec.Body.String(), `task #8 `)
+					assert.Contains(t, rec.Body.String(), `task #9 `)
 					assert.NotContains(t, rec.Body.String(), `task #10`)
 					assert.NotContains(t, rec.Body.String(), `task #11`)
 					assert.NotContains(t, rec.Body.String(), `task #12`)
@@ -442,14 +442,14 @@ func TestTaskCollection(t *testing.T) {
 					)
 					assert.NoError(t, err)
 					assert.NotContains(t, rec.Body.String(), `task #1`)
-					assert.NotContains(t, rec.Body.String(), `task #2`)
-					assert.NotContains(t, rec.Body.String(), `task #3`)
-					assert.NotContains(t, rec.Body.String(), `task #4`)
-					assert.NotContains(t, rec.Body.String(), `task #5`)
-					assert.NotContains(t, rec.Body.String(), `task #6`)
-					assert.Contains(t, rec.Body.String(), `task #7`)
-					assert.NotContains(t, rec.Body.String(), `task #8`)
-					assert.Contains(t, rec.Body.String(), `task #9`)
+					assert.NotContains(t, rec.Body.String(), `task #2 `)
+					assert.NotContains(t, rec.Body.String(), `task #3 `)
+					assert.NotContains(t, rec.Body.String(), `task #4 `)
+					assert.NotContains(t, rec.Body.String(), `task #5 `)
+					assert.NotContains(t, rec.Body.String(), `task #6 `)
+					assert.Contains(t, rec.Body.String(), `task #7 `)
+					assert.NotContains(t, rec.Body.String(), `task #8 `)
+					assert.Contains(t, rec.Body.String(), `task #9 `)
 					assert.NotContains(t, rec.Body.String(), `task #10`)
 					assert.NotContains(t, rec.Body.String(), `task #11`)
 					assert.NotContains(t, rec.Body.String(), `task #12`)

pkg/integrations/task_comment_test.go

@@ -39,7 +39,7 @@ func TestTaskComments(t *testing.T) {
 		linkShare: &models.LinkSharing{
 			ID:          2,
 			Hash:        "test2",
-			ListID:      2,
+			ProjectID:   2,
 			Right:       models.RightWrite,
 			SharingType: models.SharingTypeWithoutPassword,
 			SharedByID:  1,

pkg/integrations/task_test.go

@@ -39,7 +39,7 @@ func TestTask(t *testing.T) {
 		linkShare: &models.LinkSharing{
 			ID:          2,
 			Hash:        "test2",
-			ListID:      2,
+			ProjectID:   2,
 			Right:       models.RightWrite,
 			SharingType: models.SharingTypeWithoutPassword,
 			SharedByID:  1,
@@ -54,157 +54,180 @@ func TestTask(t *testing.T) {
 	t.Run("Update", func(t *testing.T) {
 		t.Run("Update task items", func(t *testing.T) {
 			t.Run("Title", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 				assert.NotContains(t, rec.Body.String(), `"title":"task #1"`)
 			})
 			t.Run("Description", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"description":"Dolor sit amet"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"description":"Dolor sit amet"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"description":"Dolor sit amet"`)
 				assert.NotContains(t, rec.Body.String(), `"description":"Lorem Ipsum"`)
 			})
 			t.Run("Description to empty", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"description":""}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"description":""}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"description":""`)
 				assert.NotContains(t, rec.Body.String(), `"description":"Lorem Ipsum"`)
 			})
 			t.Run("Done", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"done":true}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"done":true}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"done":true`)
 				assert.NotContains(t, rec.Body.String(), `"done":false`)
 			})
 			t.Run("Undone", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "2"}, `{"done":false}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "2"}, `{"done":false}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"done":false`)
 				assert.NotContains(t, rec.Body.String(), `"done":true`)
 			})
 			t.Run("Due date", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"due_date": "2020-02-10T10:00:00Z"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"due_date": "2020-02-10T10:00:00Z"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"due_date":"2020-02-10T10:00:00Z"`)
 				assert.NotContains(t, rec.Body.String(), `"due_date":0`)
 			})
 			t.Run("Due date unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "5"}, `{"due_date": null}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "5"}, `{"due_date": null}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"due_date":"0001-01-01T00:00:00Z"`)
 				assert.NotContains(t, rec.Body.String(), `"due_date":"2020-02-10T10:00:00Z"`)
 			})
-			t.Run("Reminders", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"reminder_dates": ["2020-02-10T10:00:00Z","2020-02-11T10:00:00Z"]}`)
+			// Deprecated: Remove if ReminderDates is removed
+			t.Run("ReminderDates", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"reminder_dates": ["2020-02-10T10:00:00Z","2020-02-11T10:00:00Z"]}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"reminder_dates":["2020-02-10T10:00:00Z","2020-02-11T10:00:00Z"]`)
 				assert.NotContains(t, rec.Body.String(), `"reminder_dates": null`)
 			})
-			t.Run("Reminders unset to empty array", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "27"}, `{"reminder_dates": []}`)
+			// Deprecated: Remove if ReminderDates is removed
+			t.Run("ReminderDates unset to empty array", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "27"}, `{"reminder_dates": []}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"reminder_dates":null`)
 				assert.NotContains(t, rec.Body.String(), `"reminder_dates":[1543626724,1543626824]`)
 			})
+			// Deprecated: Remove if ReminderDates is removed
+			t.Run("ReminderDates unset to null", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "27"}, `{"reminder_dates": null}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"reminder_dates":null`)
+				assert.NotContains(t, rec.Body.String(), `"reminder_dates":[1543626724,1543626824]`)
+			})
+			t.Run("Reminders", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"reminders": [{"reminder": "2020-02-10T10:00:00Z"},{"reminder": "2020-02-11T10:00:00Z"}]}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"reminders":[`)
+				assert.Contains(t, rec.Body.String(), `{"reminder":"2020-02-10T10:00:00Z"`)
+				assert.Contains(t, rec.Body.String(), `{"reminder":"2020-02-11T10:00:00Z"`)
+				assert.NotContains(t, rec.Body.String(), `"reminders":null`)
+			})
+			t.Run("Reminders unset to empty array", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "27"}, `{"reminders": []}`)
+				assert.NoError(t, err)
+				assert.Contains(t, rec.Body.String(), `"reminders":null`)
+				assert.NotContains(t, rec.Body.String(), `{"Reminder":"2020-02-10T10:00:00Z"`)
+			})
 			t.Run("Reminders unset to null", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "27"}, `{"reminder_dates": null}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "27"}, `{"reminders": null}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"reminder_dates":null`)
-				assert.NotContains(t, rec.Body.String(), `"reminder_dates":[1543626724,1543626824]`)
+				assert.NotContains(t, rec.Body.String(), `{"Reminder":"2020-02-10T10:00:00Z"`)
 			})
 			t.Run("Repeat after", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"repeat_after":3600}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"repeat_after":3600}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"repeat_after":3600`)
 				assert.NotContains(t, rec.Body.String(), `"repeat_after":0`)
 			})
 			t.Run("Repeat after unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "28"}, `{"repeat_after":0}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "28"}, `{"repeat_after":0}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"repeat_after":0`)
 				assert.NotContains(t, rec.Body.String(), `"repeat_after":3600`)
 			})
 			t.Run("Repeat after update done", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "28"}, `{"done":true}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "28"}, `{"done":true}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"done":false`)
 				assert.NotContains(t, rec.Body.String(), `"done":true`)
 			})
 			t.Run("Assignees", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"assignees":[{"id":1}]}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"assignees":[{"id":1}]}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"assignees":[{"id":1`)
 				assert.NotContains(t, rec.Body.String(), `"assignees":[]`)
 			})
 			t.Run("Removing Assignees empty array", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "30"}, `{"assignees":[]}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "30"}, `{"assignees":[]}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"assignees":null`)
 				assert.NotContains(t, rec.Body.String(), `"assignees":[{"id":1`)
 			})
 			t.Run("Removing Assignees null", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "30"}, `{"assignees":null}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "30"}, `{"assignees":null}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"assignees":null`)
 				assert.NotContains(t, rec.Body.String(), `"assignees":[{"id":1`)
 			})
 			t.Run("Priority", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"priority":100}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"priority":100}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"priority":100`)
 				assert.NotContains(t, rec.Body.String(), `"priority":0`)
 			})
 			t.Run("Priority to 0", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "3"}, `{"priority":0}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "3"}, `{"priority":0}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"priority":0`)
 				assert.NotContains(t, rec.Body.String(), `"priority":100`)
 			})
 			t.Run("Start date", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"start_date":"2020-02-10T10:00:00Z"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"start_date":"2020-02-10T10:00:00Z"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"start_date":"2020-02-10T10:00:00Z"`)
 				assert.NotContains(t, rec.Body.String(), `"start_date":0`)
 			})
 			t.Run("Start date unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "7"}, `{"start_date":"0001-01-01T00:00:00Z"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "7"}, `{"start_date":"0001-01-01T00:00:00Z"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"start_date":"0001-01-01T00:00:00Z"`)
 				assert.NotContains(t, rec.Body.String(), `"start_date":"2020-02-10T10:00:00Z"`)
 			})
 			t.Run("End date", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"end_date":"2020-02-10T12:00:00Z"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"end_date":"2020-02-10T12:00:00Z"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"end_date":"2020-02-10T12:00:00Z"`)
 				assert.NotContains(t, rec.Body.String(), `"end_date":""`)
 			})
 			t.Run("End date unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "8"}, `{"end_date":"0001-01-01T00:00:00Z"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "8"}, `{"end_date":"0001-01-01T00:00:00Z"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"end_date":"0001-01-01T00:00:00Z"`)
 				assert.NotContains(t, rec.Body.String(), `"end_date":"2020-02-10T10:00:00Z"`)
 			})
 			t.Run("Color", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"hex_color":"f0f0f0"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"hex_color":"f0f0f0"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"hex_color":"f0f0f0"`)
 				assert.NotContains(t, rec.Body.String(), `"hex_color":""`)
 			})
 			t.Run("Color unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "31"}, `{"hex_color":""}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "31"}, `{"hex_color":""}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"hex_color":""`)
 				assert.NotContains(t, rec.Body.String(), `"hex_color":"f0f0f0"`)
 			})
 			t.Run("Percent Done", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"percent_done":0.1}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"percent_done":0.1}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"percent_done":0.1`)
 				assert.NotContains(t, rec.Body.String(), `"percent_done":0,`)
 			})
 			t.Run("Percent Done unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "33"}, `{"percent_done":0}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "33"}, `{"percent_done":0}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"percent_done":0,`)
 				assert.NotContains(t, rec.Body.String(), `"percent_done":0.1`)
@@ -212,112 +235,112 @@ func TestTask(t *testing.T) {
 		})
 
 		t.Run("Nonexisting", func(t *testing.T) {
-			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "99999"}, `{"title":"Lorem Ipsum"}`)
+			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "99999"}, `{"title":"Lorem Ipsum"}`)
 			assert.Error(t, err)
 			assertHandlerErrorCode(t, err, models.ErrCodeTaskDoesNotExist)
 		})
 		t.Run("Rights check", func(t *testing.T) {
 			t.Run("Forbidden", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "14"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "14"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team readonly", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "15"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "15"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team write", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "16"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "16"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via Team admin", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "17"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "17"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 
 			t.Run("Shared Via User readonly", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "18"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "18"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via User write", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "19"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "19"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via User admin", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "20"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "20"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 
 			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "21"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "21"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "22"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "22"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "23"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "23"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 
 			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "24"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "24"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "25"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "25"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "26"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "26"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 		})
-		t.Run("Move to other list", func(t *testing.T) {
+		t.Run("Move to other project", func(t *testing.T) {
 			t.Run("normal", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"list_id":7}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"project_id":7}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"list_id":7`)
-				assert.NotContains(t, rec.Body.String(), `"list_id":1`)
+				assert.Contains(t, rec.Body.String(), `"project_id":7`)
+				assert.NotContains(t, rec.Body.String(), `"project_id":1`)
 			})
 			t.Run("Forbidden", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"list_id":20}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"project_id":20}`)
 				assert.Error(t, err)
 				assertHandlerErrorCode(t, err, models.ErrorCodeGenericForbidden)
 			})
 			t.Run("Read Only", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"list_id":6}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"project_id":6}`)
 				assert.Error(t, err)
 				assertHandlerErrorCode(t, err, models.ErrorCodeGenericForbidden)
 			})
 		})
 		t.Run("Bucket", func(t *testing.T) {
 			t.Run("Normal", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"bucket_id":3}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"bucket_id":3}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"bucket_id":3`)
 				assert.NotContains(t, rec.Body.String(), `"bucket_id":1`)
 			})
-			t.Run("Different List", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"bucket_id":4}`)
+			t.Run("Different Project", func(t *testing.T) {
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"bucket_id":4}`)
 				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotBelongToList)
+				assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotBelongToProject)
 			})
 			t.Run("Nonexisting Bucket", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"bucket_id":9999}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"bucket_id":9999}`)
 				assert.Error(t, err)
 				assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotExist)
 			})
@@ -325,81 +348,81 @@ func TestTask(t *testing.T) {
 	})
 	t.Run("Delete", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "1"})
+			rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "1"})
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 		})
 		t.Run("Nonexisting", func(t *testing.T) {
-			_, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "99999"})
+			_, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "99999"})
 			assert.Error(t, err)
 			assertHandlerErrorCode(t, err, models.ErrCodeTaskDoesNotExist)
 		})
 		t.Run("Rights check", func(t *testing.T) {
 			t.Run("Forbidden", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "14"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "14"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "15"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "15"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team write", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "16"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "16"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})
 			t.Run("Shared Via Team admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "17"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "17"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})
 
 			t.Run("Shared Via User readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "18"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "18"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via User write", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "19"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "19"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})
 			t.Run("Shared Via User admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "20"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "20"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})
 
 			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "21"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "21"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "22"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "22"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})
 			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "23"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "23"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})
 
 			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "24"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "24"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "25"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "25"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})
 			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "26"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "26"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})
@@ -407,110 +430,110 @@ func TestTask(t *testing.T) {
 	})
 	t.Run("Create", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "1"}, `{"title":"Lorem Ipsum"}`)
+			rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "1"}, `{"title":"Lorem Ipsum"}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 		})
 		t.Run("Nonexisting", func(t *testing.T) {
-			_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9999"}, `{"title":"Lorem Ipsum"}`)
+			_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "9999"}, `{"title":"Lorem Ipsum"}`)
 			assert.Error(t, err)
-			assertHandlerErrorCode(t, err, models.ErrCodeListDoesNotExist)
+			assertHandlerErrorCode(t, err, models.ErrCodeProjectDoesNotExist)
 		})
 		t.Run("Rights check", func(t *testing.T) {
 			t.Run("Forbidden", func(t *testing.T) {
 				// Owned by user13
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "20"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "20"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "6"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "6"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "7"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "7"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via Team admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "8"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "8"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 
 			t.Run("Shared Via User readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "9"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via User write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "10"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "10"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via User admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "11"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "11"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 
 			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "12"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "12"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "13"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "13"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "14"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "14"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 
 			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "15"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "15"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "16"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "16"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "17"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "17"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 		})
 		t.Run("Bucket", func(t *testing.T) {
 			t.Run("Normal", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "1"}, `{"title":"Lorem Ipsum","bucket_id":3}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "1"}, `{"title":"Lorem Ipsum","bucket_id":3}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"bucket_id":3`)
 				assert.NotContains(t, rec.Body.String(), `"bucket_id":1`)
 			})
-			t.Run("Different List", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "1"}, `{"title":"Lorem Ipsum","bucket_id":4}`)
+			t.Run("Different Project", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "1"}, `{"title":"Lorem Ipsum","bucket_id":4}`)
 				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotBelongToList)
+				assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotBelongToProject)
 			})
 			t.Run("Nonexisting Bucket", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "1"}, `{"title":"Lorem Ipsum","bucket_id":9999}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "1"}, `{"title":"Lorem Ipsum","bucket_id":9999}`)
 				assert.Error(t, err)
 				assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotExist)
 			})
 		})
 		t.Run("Link Share", func(t *testing.T) {
-			rec, err := testHandlerLinkShareWrite.testCreateWithLinkShare(nil, map[string]string{"list": "2"}, `{"title":"Lorem Ipsum"}`)
+			rec, err := testHandlerLinkShareWrite.testCreateWithLinkShare(nil, map[string]string{"project": "2"}, `{"title":"Lorem Ipsum"}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			db.AssertExists(t, "tasks", map[string]interface{}{
-				"list_id":       2,
+				"project_id":    2,
 				"title":         "Lorem Ipsum",
 				"created_by_id": -2,
 			}, false)

pkg/integrations/user_project_test.go

@@ -24,7 +24,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestUserList(t *testing.T) {
+func TestUserProject(t *testing.T) {
 	t.Run("Normal test", func(t *testing.T) {
 		rec, err := newTestRequestWithUser(t, http.MethodPost, apiv1.UserList, &testuser1, "", nil, nil)
 		assert.NoError(t, err)

pkg/log/mail_logger.go

@@ -0,0 +1,87 @@
+// 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 log
+
+import (
+	"strings"
+	"time"
+
+	"code.vikunja.io/api/pkg/config"
+	"github.com/op/go-logging"
+	"xorm.io/xorm/log"
+)
+
+type MailLogger struct {
+	logger *logging.Logger
+	level  log.LogLevel
+}
+
+const mailFormat = `%{color}%{time:` + time.RFC3339Nano + `}: %{level}` + "\t" + `▶ [MAIL] %{id:03x}%{color:reset} %{message}`
+const mailLogModule = `vikunja_mail`
+
+func NewMailLogger() *MailLogger {
+	lvl := strings.ToUpper(config.LogMailLevel.GetString())
+	level, err := logging.LogLevel(lvl)
+	if err != nil {
+		Criticalf("Error setting database log level: %s", err.Error())
+	}
+
+	mailLogger := &MailLogger{
+		logger: logging.MustGetLogger(mailLogModule),
+	}
+
+	logBackend := logging.NewLogBackend(GetLogWriter("mail"), "", 0)
+	backend := logging.NewBackendFormatter(logBackend, logging.MustStringFormatter(mailFormat+"\n"))
+
+	backendLeveled := logging.AddModuleLevel(backend)
+	backendLeveled.SetLevel(level, mailLogModule)
+
+	mailLogger.logger.SetBackend(backendLeveled)
+
+	switch level {
+	case logging.CRITICAL:
+	case logging.ERROR:
+		mailLogger.level = log.LOG_ERR
+	case logging.WARNING:
+		mailLogger.level = log.LOG_WARNING
+	case logging.NOTICE:
+	case logging.INFO:
+		mailLogger.level = log.LOG_INFO
+	case logging.DEBUG:
+		mailLogger.level = log.LOG_DEBUG
+	default:
+		mailLogger.level = log.LOG_OFF
+	}
+
+	return mailLogger
+}
+
+func (m *MailLogger) Errorf(format string, v ...interface{}) {
+	m.logger.Errorf(format, v...)
+}
+
+func (m *MailLogger) Warnf(format string, v ...interface{}) {
+	m.logger.Warningf(format, v...)
+}
+
+func (m *MailLogger) Infof(format string, v ...interface{}) {
+	m.logger.Infof(format, v...)
+}
+
+func (m *MailLogger) Debugf(format string, v ...interface{}) {
+	m.logger.Debugf(format, v...)
+}

pkg/log/noop.go

@@ -23,6 +23,6 @@ import (
 // NoopBackend doesn't log anything. Used in cases where we want to disable logging completely.
 type NoopBackend struct{}
 
-func (n *NoopBackend) Log(level logging.Level, i int, record *logging.Record) error {
+func (n *NoopBackend) Log(_ logging.Level, _ int, _ *logging.Record) error {
 	return nil
 }

pkg/log/watermill_logger.go

@@ -91,6 +91,6 @@ func (w *WatermillLogger) Trace(msg string, fields watermill.LogFields) {
 	w.logger.Debugf("%s, %s", msg, concatFields(fields))
 }
 
-func (w *WatermillLogger) With(fields watermill.LogFields) watermill.LoggerAdapter {
+func (w *WatermillLogger) With(_ watermill.LogFields) watermill.LoggerAdapter {
 	return w
 }

pkg/mail/mail.go

@@ -56,6 +56,8 @@ func getClient() (*mail.Client, error) {
 			ServerName:         config.MailerHost.GetString(),
 		}),
 		mail.WithTimeout((config.MailerQueueTimeout.GetDuration() + 3) * time.Second), // 3s more for us to close before mail server timeout
+		mail.WithLogger(log.NewMailLogger()),
+		mail.WithDebugLog(),
 	}
 
 	if config.MailerForceSSL.GetBool() {

pkg/metrics/metrics.go

@@ -28,8 +28,8 @@ import (
 )
 
 const (
-	// ListCountKey is the name of the key in which we save the list count
-	ListCountKey = `listcount`
+	// ProjectCountKey is the name of the key in which we save the project count
+	ProjectCountKey = `projectcount`
 
 	// UserCountKey is the name of the key we use to store total users in redis
 	UserCountKey = `usercount`
@@ -65,16 +65,16 @@ func InitMetrics() {
 
 	GetRegistry()
 
-	// Register total list count metric
+	// Register total project count metric
 	err := registry.Register(promauto.NewGaugeFunc(prometheus.GaugeOpts{
-		Name: "vikunja_list_count",
-		Help: "The number of lists on this instance",
+		Name: "vikunja_project_count",
+		Help: "The number of projects on this instance",
 	}, func() float64 {
-		count, _ := GetCount(ListCountKey)
+		count, _ := GetCount(ProjectCountKey)
 		return float64(count)
 	}))
 	if err != nil {
-		log.Criticalf("Could not register metrics for %s: %s", ListCountKey, err)
+		log.Criticalf("Could not register metrics for %s: %s", ProjectCountKey, err)
 	}
 
 	// Register total user count metric
@@ -147,7 +147,7 @@ func GetCount(key string) (count int64, err error) {
 	return
 }
 
-// SetCount sets the list count to a given value
+// SetCount sets the project count to a given value
 func SetCount(count int64, key string) error {
 	return keyvalue.Put(key, count)
 }

pkg/migration/20221113170740.go

@@ -0,0 +1,432 @@
+// 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 migration
+
+import (
+	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
+	"xorm.io/xorm/schemas"
+)
+
+const sqliteRename20221113170740 = `
+-- buckets
+create table buckets_dg_tmp
+(
+    id             INTEGER  not null
+        primary key autoincrement,
+    title          TEXT     not null,
+    project_id     INTEGER  not null,
+    "limit"        INTEGER default 0,
+    is_done_bucket INTEGER,
+    position       REAL,
+    created        DATETIME not null,
+    updated        DATETIME not null,
+    created_by_id  INTEGER  not null
+);
+
+insert into buckets_dg_tmp(id, title, project_id, "limit", is_done_bucket, position, created, updated, created_by_id)
+select id,
+       title,
+       list_id,
+       "limit",
+       is_done_bucket,
+       position,
+       created,
+       updated,
+       created_by_id
+from buckets;
+
+drop table buckets;
+
+alter table buckets_dg_tmp
+    rename to buckets;
+
+create unique index UQE_buckets_id
+    on buckets (id);
+
+-- link shares
+create table link_shares_dg_tmp
+(
+    id           INTEGER           not null
+        primary key autoincrement,
+    hash         TEXT              not null,
+    name         TEXT,
+    project_id   INTEGER           not null,
+    "right"      INTEGER default 0 not null,
+    sharing_type INTEGER default 0 not null,
+    password     TEXT,
+    shared_by_id INTEGER           not null,
+    created      DATETIME          not null,
+    updated      DATETIME          not null
+);
+
+insert into link_shares_dg_tmp(id, hash, name, project_id, "right", sharing_type, password, shared_by_id, created,
+                               updated)
+select id,
+       hash,
+       name,
+       list_id,
+       "right",
+       sharing_type,
+       password,
+       shared_by_id,
+       created,
+       updated
+from link_shares;
+
+drop table link_shares;
+
+alter table link_shares_dg_tmp
+    rename to link_shares;
+
+create index IDX_link_shares_right
+    on link_shares ("right");
+
+create index IDX_link_shares_shared_by_id
+    on link_shares (shared_by_id);
+
+create index IDX_link_shares_sharing_type
+    on link_shares (sharing_type);
+
+create unique index UQE_link_shares_hash
+    on link_shares (hash);
+
+create unique index UQE_link_shares_id
+    on link_shares (id);
+
+-- tasks
+create table tasks_dg_tmp
+(
+    id                        INTEGER           not null
+        primary key autoincrement,
+    title                     TEXT              not null,
+    description               TEXT,
+    done                      INTEGER,
+    done_at                   DATETIME,
+    due_date                  DATETIME,
+    project_id                INTEGER           not null,
+    repeat_after              INTEGER,
+    repeat_mode               INTEGER default 0 not null,
+    priority                  INTEGER,
+    start_date                DATETIME,
+    end_date                  DATETIME,
+    hex_color                 TEXT,
+    percent_done              REAL,
+    "index"                   INTEGER default 0 not null,
+    uid                       TEXT,
+    cover_image_attachment_id INTEGER default 0,
+    created                   DATETIME          not null,
+    updated                   DATETIME          not null,
+    bucket_id                 INTEGER,
+    position                  REAL,
+    kanban_position           REAL,
+    created_by_id             INTEGER           not null
+);
+
+insert into tasks_dg_tmp(id, title, description, done, done_at, due_date, project_id, repeat_after, repeat_mode,
+                         priority, start_date, end_date, hex_color, percent_done, "index", uid,
+                         cover_image_attachment_id, created, updated, bucket_id, position, kanban_position,
+                         created_by_id)
+select id,
+       title,
+       description,
+       done,
+       done_at,
+       due_date,
+       list_id,
+       repeat_after,
+       repeat_mode,
+       priority,
+       start_date,
+       end_date,
+       hex_color,
+       percent_done,
+       "index",
+       uid,
+       cover_image_attachment_id,
+       created,
+       updated,
+       bucket_id,
+       position,
+       kanban_position,
+       created_by_id
+from tasks;
+
+drop table tasks;
+
+alter table tasks_dg_tmp
+    rename to tasks;
+
+create index IDX_tasks_done
+    on tasks (done);
+
+create index IDX_tasks_done_at
+    on tasks (done_at);
+
+create index IDX_tasks_due_date
+    on tasks (due_date);
+
+create index IDX_tasks_end_date
+    on tasks (end_date);
+
+create index IDX_tasks_list_id
+    on tasks (project_id);
+
+create index IDX_tasks_repeat_after
+    on tasks (repeat_after);
+
+create index IDX_tasks_start_date
+    on tasks (start_date);
+
+create unique index UQE_tasks_id
+    on tasks (id);
+
+--- team_lists
+create table team_lists_dg_tmp
+(
+    id         INTEGER           not null
+        primary key autoincrement,
+    team_id    INTEGER           not null,
+    project_id INTEGER           not null,
+    "right"    INTEGER default 0 not null,
+    created    DATETIME          not null,
+    updated    DATETIME          not null
+);
+
+insert into team_lists_dg_tmp(id, team_id, project_id, "right", created, updated)
+select id, team_id, list_id, "right", created, updated
+from team_lists;
+
+drop table team_lists;
+
+alter table team_lists_dg_tmp
+    rename to team_lists;
+
+create index IDX_team_lists_list_id
+    on team_lists (project_id);
+
+create index IDX_team_lists_right
+    on team_lists ("right");
+
+create index IDX_team_lists_team_id
+    on team_lists (team_id);
+
+create unique index UQE_team_lists_id
+    on team_lists (id);
+
+--- users
+create table users_dg_tmp
+(
+    id                              INTEGER                 not null
+        primary key autoincrement,
+    name                            TEXT,
+    username                        TEXT                    not null,
+    password                        TEXT,
+    email                           TEXT,
+    status                          INTEGER default 0,
+    avatar_provider                 TEXT,
+    avatar_file_id                  INTEGER,
+    issuer                          TEXT,
+    subject                         TEXT,
+    email_reminders_enabled         INTEGER default 1,
+    discoverable_by_name            INTEGER default 0,
+    discoverable_by_email           INTEGER default 0,
+    overdue_tasks_reminders_enabled INTEGER default 1,
+    overdue_tasks_reminders_time    TEXT    default '09:00' not null,
+    default_project_id              INTEGER,
+    week_start                      INTEGER,
+    language                        TEXT,
+    timezone                        TEXT,
+    deletion_scheduled_at           DATETIME,
+    deletion_last_reminder_sent     DATETIME,
+    export_file_id                  INTEGER,
+    created                         DATETIME                not null,
+    updated                         DATETIME                not null
+);
+
+insert into users_dg_tmp(id, name, username, password, email, status, avatar_provider, avatar_file_id, issuer, subject,
+                         email_reminders_enabled, discoverable_by_name, discoverable_by_email,
+                         overdue_tasks_reminders_enabled, overdue_tasks_reminders_time, default_project_id, week_start,
+                         language, timezone, deletion_scheduled_at, deletion_last_reminder_sent, export_file_id,
+                         created, updated)
+select id,
+       name,
+       username,
+       password,
+       email,
+       status,
+       avatar_provider,
+       avatar_file_id,
+       issuer,
+       subject,
+       email_reminders_enabled,
+       discoverable_by_name,
+       discoverable_by_email,
+       overdue_tasks_reminders_enabled,
+       overdue_tasks_reminders_time,
+       default_list_id,
+       week_start,
+       language,
+       timezone,
+       deletion_scheduled_at,
+       deletion_last_reminder_sent,
+       export_file_id,
+       created,
+       updated
+from users;
+
+drop table users;
+
+alter table users_dg_tmp
+    rename to users;
+
+create index IDX_users_default_list_id
+    on users (default_project_id);
+
+create index IDX_users_discoverable_by_email
+    on users (discoverable_by_email);
+
+create index IDX_users_discoverable_by_name
+    on users (discoverable_by_name);
+
+create index IDX_users_overdue_tasks_reminders_enabled
+    on users (overdue_tasks_reminders_enabled);
+
+create unique index UQE_users_id
+    on users (id);
+
+create unique index UQE_users_username
+    on users (username);
+
+--- users_list
+create table users_lists_dg_tmp
+(
+    id         INTEGER           not null
+        primary key autoincrement,
+    user_id    INTEGER           not null,
+    project_id INTEGER           not null,
+    "right"    INTEGER default 0 not null,
+    created    DATETIME          not null,
+    updated    DATETIME          not null
+);
+
+insert into users_lists_dg_tmp(id, user_id, project_id, "right", created, updated)
+select id, user_id, list_id, "right", created, updated
+from users_lists;
+
+drop table users_lists;
+
+alter table users_lists_dg_tmp
+    rename to users_lists;
+
+create index IDX_users_lists_list_id
+    on users_lists (project_id);
+
+create index IDX_users_lists_right
+    on users_lists ("right");
+
+create index IDX_users_lists_user_id
+    on users_lists (user_id);
+
+create unique index UQE_users_lists_id
+    on users_lists (id);
+`
+
+type colToRename struct {
+	table   string
+	oldName string
+	newName string
+}
+
+func init() {
+	migrations = append(migrations, &xormigrate.Migration{
+		ID:          "20221113170740",
+		Description: "Rename lists to projects",
+		Migrate: func(tx *xorm.Engine) error {
+			// SQLite does not support renaming columns. Instead, we'll need to run manual sql.
+			if tx.Dialect().URI().DBType == schemas.SQLITE {
+				_, err := tx.Exec(sqliteRename20221113170740)
+				if err != nil {
+					return err
+				}
+			} else {
+
+				colsToRename := []*colToRename{
+					{
+						table:   "buckets",
+						oldName: "list_id",
+						newName: "project_id",
+					},
+					{
+						table:   "link_shares",
+						oldName: "list_id",
+						newName: "project_id",
+					},
+					{
+						table:   "tasks",
+						oldName: "list_id",
+						newName: "project_id",
+					},
+					{
+						table:   "team_lists",
+						oldName: "list_id",
+						newName: "project_id",
+					},
+					{
+						table:   "users",
+						oldName: "default_list_id",
+						newName: "default_project_id",
+					},
+					{
+						table:   "users_lists",
+						oldName: "list_id",
+						newName: "project_id",
+					},
+				}
+
+				for _, col := range colsToRename {
+					if tx.Dialect().URI().DBType == schemas.POSTGRES || tx.Dialect().URI().DBType == schemas.MYSQL {
+						_, err := tx.Exec("ALTER TABLE `" + col.table + "` RENAME COLUMN `" + col.oldName + "` TO `" + col.newName + "`")
+						if err != nil {
+							return err
+						}
+					}
+				}
+			}
+
+			err := renameTable(tx, "lists", "projects")
+			if err != nil {
+				return err
+			}
+
+			err = renameTable(tx, "team_lists", "team_projects")
+			if err != nil {
+				return err
+			}
+
+			err = renameTable(tx, "users_lists", "users_projects")
+			if err != nil {
+				return err
+			}
+
+			return nil
+		},
+		Rollback: func(tx *xorm.Engine) error {
+			return nil
+		},
+	})
+}

pkg/migration/20230307171848.go

@@ -0,0 +1,44 @@
+// 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 migration
+
+import (
+	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
+)
+
+type taskReminders20230307171848 struct {
+	RelativePeriod int64  `xorm:"bigint null" json:"relative_period"`
+	RelativeTo     string `xorm:"varchar(50) null" json:"relative_to,omitempty"`
+}
+
+func (taskReminders20230307171848) TableName() string {
+	return "task_reminders"
+}
+
+func init() {
+	migrations = append(migrations, &xormigrate.Migration{
+		ID:          "20230307171848",
+		Description: "Add relative period to task reminders",
+		Migrate: func(tx *xorm.Engine) error {
+			return tx.Sync2(taskReminders20230307171848{})
+		},
+		Rollback: func(tx *xorm.Engine) error {
+			return nil
+		},
+	})
+}

pkg/migration/migration.go

@@ -109,10 +109,7 @@ func Rollback(migrationID string) {
 // MigrateTo executes all migrations up to a certain point
 func MigrateTo(migrationID string, x *xorm.Engine) error {
 	m := initMigration(x)
-	if err := m.MigrateTo(migrationID); err != nil {
-		return err
-	}
-	return nil
+	return m.MigrateTo(migrationID)
 }
 
 // Deletes a column from a table. All arguments are strings, to let them be standalone and not depending on any struct.

pkg/models/bulk_task.go

@@ -24,13 +24,13 @@ import (
 
 // BulkTask is the definition of a bulk update task
 type BulkTask struct {
-	// A list of task ids to update
+	// A project of task ids to update
 	IDs   []int64 `json:"task_ids"`
 	Tasks []*Task `json:"-"`
 	Task
 }
 
-func (bt *BulkTask) checkIfTasksAreOnTheSameList(s *xorm.Session) (err error) {
+func (bt *BulkTask) checkIfTasksAreOnTheSameProject(s *xorm.Session) (err error) {
 	// Get the tasks
 	err = bt.GetTasksByIDs(s)
 	if err != nil {
@@ -41,11 +41,11 @@ func (bt *BulkTask) checkIfTasksAreOnTheSameList(s *xorm.Session) (err error) {
 		return ErrBulkTasksNeedAtLeastOne{}
 	}
 
-	// Check if all tasks are in the same list
-	var firstListID = bt.Tasks[0].ListID
+	// Check if all tasks are in the same project
+	var firstProjectID = bt.Tasks[0].ProjectID
 	for _, t := range bt.Tasks {
-		if t.ListID != firstListID {
-			return ErrBulkTasksMustBeInSameList{firstListID, t.ListID}
+		if t.ProjectID != firstProjectID {
+			return ErrBulkTasksMustBeInSameProject{firstProjectID, t.ProjectID}
 		}
 	}
 
@@ -55,13 +55,13 @@ func (bt *BulkTask) checkIfTasksAreOnTheSameList(s *xorm.Session) (err error) {
 // CanUpdate checks if a user is allowed to update a task
 func (bt *BulkTask) CanUpdate(s *xorm.Session, a web.Auth) (bool, error) {
 
-	err := bt.checkIfTasksAreOnTheSameList(s)
+	err := bt.checkIfTasksAreOnTheSameProject(s)
 	if err != nil {
 		return false, err
 	}
 
-	// A user can update an task if he has write acces to its list
-	l := &List{ID: bt.Tasks[0].ListID}
+	// A user can update an task if he has write acces to its project
+	l := &Project{ID: bt.Tasks[0].ProjectID}
 	return l.CanWrite(s, a)
 }
 
@@ -72,10 +72,10 @@ func (bt *BulkTask) CanUpdate(s *xorm.Session, a web.Auth) (bool, error) {
 // @Accept json
 // @Produce json
 // @Security JWTKeyAuth
-// @Param task body models.BulkTask true "The task object. Looks like a normal task, the only difference is it uses an array of list_ids to update."
+// @Param task body models.BulkTask true "The task object. Looks like a normal task, the only difference is it uses an array of project_ids to update."
 // @Success 200 {object} models.Task "The updated task object."
 // @Failure 400 {object} web.HTTPError "Invalid task object provided."
-// @Failure 403 {object} web.HTTPError "The user does not have access to the task (aka its list)"
+// @Failure 403 {object} web.HTTPError "The user does not have access to the task (aka its project)"
 // @Failure 500 {object} models.Message "Internal error"
 // @Router /tasks/bulk [post]
 func (bt *BulkTask) Update(s *xorm.Session, a web.Auth) (err error) {

pkg/models/bulk_task_test.go

@@ -47,7 +47,7 @@ func TestBulkTask_Update(t *testing.T) {
 			},
 		},
 		{
-			name: "Test with one task on different list",
+			name: "Test with one task on different project",
 			fields: fields{
 				IDs: []int64{10, 11, 12, 13},
 				Task: Task{

pkg/models/error.go

@@ -110,222 +110,222 @@ func (err ValidationHTTPError) Error() string {
 }
 
 // ===========
-// List errors
+// Project errors
 // ===========
 
-// ErrListDoesNotExist represents a "ErrListDoesNotExist" kind of error. Used if the list does not exist.
-type ErrListDoesNotExist struct {
+// ErrProjectDoesNotExist represents a "ErrProjectDoesNotExist" kind of error. Used if the project does not exist.
+type ErrProjectDoesNotExist struct {
 	ID int64
 }
 
-// IsErrListDoesNotExist checks if an error is a ErrListDoesNotExist.
-func IsErrListDoesNotExist(err error) bool {
-	_, ok := err.(ErrListDoesNotExist)
+// IsErrProjectDoesNotExist checks if an error is a ErrProjectDoesNotExist.
+func IsErrProjectDoesNotExist(err error) bool {
+	_, ok := err.(ErrProjectDoesNotExist)
 	return ok
 }
 
-func (err ErrListDoesNotExist) Error() string {
-	return fmt.Sprintf("List does not exist [ID: %d]", err.ID)
+func (err ErrProjectDoesNotExist) Error() string {
+	return fmt.Sprintf("Project does not exist [ID: %d]", err.ID)
 }
 
-// ErrCodeListDoesNotExist holds the unique world-error code of this error
-const ErrCodeListDoesNotExist = 3001
+// ErrCodeProjectDoesNotExist holds the unique world-error code of this error
+const ErrCodeProjectDoesNotExist = 3001
 
 // HTTPError holds the http error description
-func (err ErrListDoesNotExist) HTTPError() web.HTTPError {
-	return web.HTTPError{HTTPCode: http.StatusNotFound, Code: ErrCodeListDoesNotExist, Message: "This list does not exist."}
+func (err ErrProjectDoesNotExist) HTTPError() web.HTTPError {
+	return web.HTTPError{HTTPCode: http.StatusNotFound, Code: ErrCodeProjectDoesNotExist, Message: "This project does not exist."}
 }
 
-// ErrNeedToHaveListReadAccess represents an error, where the user dont has read access to that List
-type ErrNeedToHaveListReadAccess struct {
-	ListID int64
-	UserID int64
+// ErrNeedToHaveProjectReadAccess represents an error, where the user dont has read access to that Project
+type ErrNeedToHaveProjectReadAccess struct {
+	ProjectID int64
+	UserID    int64
 }
 
-// IsErrNeedToHaveListReadAccess checks if an error is a ErrListDoesNotExist.
-func IsErrNeedToHaveListReadAccess(err error) bool {
-	_, ok := err.(ErrNeedToHaveListReadAccess)
+// IsErrNeedToHaveProjectReadAccess checks if an error is a ErrProjectDoesNotExist.
+func IsErrNeedToHaveProjectReadAccess(err error) bool {
+	_, ok := err.(ErrNeedToHaveProjectReadAccess)
 	return ok
 }
 
-func (err ErrNeedToHaveListReadAccess) Error() string {
-	return fmt.Sprintf("User needs to have read access to that list [ListID: %d, UserID: %d]", err.ListID, err.UserID)
+func (err ErrNeedToHaveProjectReadAccess) Error() string {
+	return fmt.Sprintf("User needs to have read access to that project [ProjectID: %d, UserID: %d]", err.ProjectID, err.UserID)
 }
 
-// ErrCodeNeedToHaveListReadAccess holds the unique world-error code of this error
-const ErrCodeNeedToHaveListReadAccess = 3004
+// ErrCodeNeedToHaveProjectReadAccess holds the unique world-error code of this error
+const ErrCodeNeedToHaveProjectReadAccess = 3004
 
 // HTTPError holds the http error description
-func (err ErrNeedToHaveListReadAccess) HTTPError() web.HTTPError {
-	return web.HTTPError{HTTPCode: http.StatusForbidden, Code: ErrCodeNeedToHaveListReadAccess, Message: "You need to have read access to this list."}
+func (err ErrNeedToHaveProjectReadAccess) HTTPError() web.HTTPError {
+	return web.HTTPError{HTTPCode: http.StatusForbidden, Code: ErrCodeNeedToHaveProjectReadAccess, Message: "You need to have read access to this project."}
 }
 
-// ErrListTitleCannotBeEmpty represents a "ErrListTitleCannotBeEmpty" kind of error. Used if the list does not exist.
-type ErrListTitleCannotBeEmpty struct{}
+// ErrProjectTitleCannotBeEmpty represents a "ErrProjectTitleCannotBeEmpty" kind of error. Used if the project does not exist.
+type ErrProjectTitleCannotBeEmpty struct{}
 
-// IsErrListTitleCannotBeEmpty checks if an error is a ErrListTitleCannotBeEmpty.
-func IsErrListTitleCannotBeEmpty(err error) bool {
-	_, ok := err.(ErrListTitleCannotBeEmpty)
+// IsErrProjectTitleCannotBeEmpty checks if an error is a ErrProjectTitleCannotBeEmpty.
+func IsErrProjectTitleCannotBeEmpty(err error) bool {
+	_, ok := err.(ErrProjectTitleCannotBeEmpty)
 	return ok
 }
 
-func (err ErrListTitleCannotBeEmpty) Error() string {
-	return "List title cannot be empty."
+func (err ErrProjectTitleCannotBeEmpty) Error() string {
+	return "Project title cannot be empty."
 }
 
-// ErrCodeListTitleCannotBeEmpty holds the unique world-error code of this error
-const ErrCodeListTitleCannotBeEmpty = 3005
+// ErrCodeProjectTitleCannotBeEmpty holds the unique world-error code of this error
+const ErrCodeProjectTitleCannotBeEmpty = 3005
 
 // HTTPError holds the http error description
-func (err ErrListTitleCannotBeEmpty) HTTPError() web.HTTPError {
-	return web.HTTPError{HTTPCode: http.StatusBadRequest, Code: ErrCodeListTitleCannotBeEmpty, Message: "You must provide at least a list title."}
+func (err ErrProjectTitleCannotBeEmpty) HTTPError() web.HTTPError {
+	return web.HTTPError{HTTPCode: http.StatusBadRequest, Code: ErrCodeProjectTitleCannotBeEmpty, Message: "You must provide at least a project title."}
 }
 
-// ErrListShareDoesNotExist represents a "ErrListShareDoesNotExist" kind of error. Used if the list share does not exist.
-type ErrListShareDoesNotExist struct {
+// ErrProjectShareDoesNotExist represents a "ErrProjectShareDoesNotExist" kind of error. Used if the project share does not exist.
+type ErrProjectShareDoesNotExist struct {
 	ID   int64
 	Hash string
 }
 
-// IsErrListShareDoesNotExist checks if an error is a ErrListShareDoesNotExist.
-func IsErrListShareDoesNotExist(err error) bool {
-	_, ok := err.(ErrListShareDoesNotExist)
+// IsErrProjectShareDoesNotExist checks if an error is a ErrProjectShareDoesNotExist.
+func IsErrProjectShareDoesNotExist(err error) bool {
+	_, ok := err.(ErrProjectShareDoesNotExist)
 	return ok
 }
 
-func (err ErrListShareDoesNotExist) Error() string {
-	return "List share does not exist."
+func (err ErrProjectShareDoesNotExist) Error() string {
+	return "Project share does not exist."
 }
 
-// ErrCodeListShareDoesNotExist holds the unique world-error code of this error
-const ErrCodeListShareDoesNotExist = 3006
+// ErrCodeProjectShareDoesNotExist holds the unique world-error code of this error
+const ErrCodeProjectShareDoesNotExist = 3006
 
 // HTTPError holds the http error description
-func (err ErrListShareDoesNotExist) HTTPError() web.HTTPError {
-	return web.HTTPError{HTTPCode: http.StatusNotFound, Code: ErrCodeListShareDoesNotExist, Message: "The list share does not exist."}
+func (err ErrProjectShareDoesNotExist) HTTPError() web.HTTPError {
+	return web.HTTPError{HTTPCode: http.StatusNotFound, Code: ErrCodeProjectShareDoesNotExist, Message: "The project share does not exist."}
 }
 
-// ErrListIdentifierIsNotUnique represents a "ErrListIdentifierIsNotUnique" kind of error. Used if the provided list identifier is not unique.
-type ErrListIdentifierIsNotUnique struct {
+// ErrProjectIdentifierIsNotUnique represents a "ErrProjectIdentifierIsNotUnique" kind of error. Used if the provided project identifier is not unique.
+type ErrProjectIdentifierIsNotUnique struct {
 	Identifier string
 }
 
-// IsErrListIdentifierIsNotUnique checks if an error is a ErrListIdentifierIsNotUnique.
-func IsErrListIdentifierIsNotUnique(err error) bool {
-	_, ok := err.(ErrListIdentifierIsNotUnique)
+// IsErrProjectIdentifierIsNotUnique checks if an error is a ErrProjectIdentifierIsNotUnique.
+func IsErrProjectIdentifierIsNotUnique(err error) bool {
+	_, ok := err.(ErrProjectIdentifierIsNotUnique)
 	return ok
 }
 
-func (err ErrListIdentifierIsNotUnique) Error() string {
-	return "List identifier is not unique."
+func (err ErrProjectIdentifierIsNotUnique) Error() string {
+	return "Project identifier is not unique."
 }
 
-// ErrCodeListIdentifierIsNotUnique holds the unique world-error code of this error
-const ErrCodeListIdentifierIsNotUnique = 3007
+// ErrCodeProjectIdentifierIsNotUnique holds the unique world-error code of this error
+const ErrCodeProjectIdentifierIsNotUnique = 3007
 
 // HTTPError holds the http error description
-func (err ErrListIdentifierIsNotUnique) HTTPError() web.HTTPError {
+func (err ErrProjectIdentifierIsNotUnique) HTTPError() web.HTTPError {
 	return web.HTTPError{
 		HTTPCode: http.StatusBadRequest,
-		Code:     ErrCodeListIdentifierIsNotUnique,
-		Message:  "A list with this identifier already exists.",
+		Code:     ErrCodeProjectIdentifierIsNotUnique,
+		Message:  "A project with this identifier already exists.",
 	}
 }
 
-// ErrListIsArchived represents an error, where a list is archived
-type ErrListIsArchived struct {
-	ListID int64
+// ErrProjectIsArchived represents an error, where a project is archived
+type ErrProjectIsArchived struct {
+	ProjectID int64
 }
 
-// IsErrListIsArchived checks if an error is a list is archived error.
-func IsErrListIsArchived(err error) bool {
-	_, ok := err.(ErrListIsArchived)
+// IsErrProjectIsArchived checks if an error is a project is archived error.
+func IsErrProjectIsArchived(err error) bool {
+	_, ok := err.(ErrProjectIsArchived)
 	return ok
 }
 
-func (err ErrListIsArchived) Error() string {
-	return fmt.Sprintf("List is archived [ListID: %d]", err.ListID)
+func (err ErrProjectIsArchived) Error() string {
+	return fmt.Sprintf("Project is archived [ProjectID: %d]", err.ProjectID)
 }
 
-// ErrCodeListIsArchived holds the unique world-error code of this error
-const ErrCodeListIsArchived = 3008
+// ErrCodeProjectIsArchived holds the unique world-error code of this error
+const ErrCodeProjectIsArchived = 3008
 
 // HTTPError holds the http error description
-func (err ErrListIsArchived) HTTPError() web.HTTPError {
-	return web.HTTPError{HTTPCode: http.StatusPreconditionFailed, Code: ErrCodeListIsArchived, Message: "This list is archived. Editing or creating new tasks is not possible."}
+func (err ErrProjectIsArchived) HTTPError() web.HTTPError {
+	return web.HTTPError{HTTPCode: http.StatusPreconditionFailed, Code: ErrCodeProjectIsArchived, Message: "This project is archived. Editing or creating new tasks is not possible."}
 }
 
-// ErrListCannotBelongToAPseudoNamespace represents an error where a list cannot belong to a pseudo namespace
-type ErrListCannotBelongToAPseudoNamespace struct {
-	ListID      int64
+// ErrProjectCannotBelongToAPseudoNamespace represents an error where a project cannot belong to a pseudo namespace
+type ErrProjectCannotBelongToAPseudoNamespace struct {
+	ProjectID   int64
 	NamespaceID int64
 }
 
-// IsErrListCannotBelongToAPseudoNamespace checks if an error is a list is archived error.
-func IsErrListCannotBelongToAPseudoNamespace(err error) bool {
-	_, ok := err.(*ErrListCannotBelongToAPseudoNamespace)
+// IsErrProjectCannotBelongToAPseudoNamespace checks if an error is a project is archived error.
+func IsErrProjectCannotBelongToAPseudoNamespace(err error) bool {
+	_, ok := err.(*ErrProjectCannotBelongToAPseudoNamespace)
 	return ok
 }
 
-func (err *ErrListCannotBelongToAPseudoNamespace) Error() string {
-	return fmt.Sprintf("List cannot belong to a pseudo namespace [ListID: %d, NamespaceID: %d]", err.ListID, err.NamespaceID)
+func (err *ErrProjectCannotBelongToAPseudoNamespace) Error() string {
+	return fmt.Sprintf("Project cannot belong to a pseudo namespace [ProjectID: %d, NamespaceID: %d]", err.ProjectID, err.NamespaceID)
 }
 
-// ErrCodeListCannotBelongToAPseudoNamespace holds the unique world-error code of this error
-const ErrCodeListCannotBelongToAPseudoNamespace = 3009
+// ErrCodeProjectCannotBelongToAPseudoNamespace holds the unique world-error code of this error
+const ErrCodeProjectCannotBelongToAPseudoNamespace = 3009
 
 // HTTPError holds the http error description
-func (err *ErrListCannotBelongToAPseudoNamespace) HTTPError() web.HTTPError {
+func (err *ErrProjectCannotBelongToAPseudoNamespace) HTTPError() web.HTTPError {
 	return web.HTTPError{
 		HTTPCode: http.StatusPreconditionFailed,
-		Code:     ErrCodeListCannotBelongToAPseudoNamespace,
-		Message:  "This list cannot belong a dynamically generated namespace.",
+		Code:     ErrCodeProjectCannotBelongToAPseudoNamespace,
+		Message:  "This project cannot belong a dynamically generated namespace.",
 	}
 }
 
-// ErrListMustBelongToANamespace represents an error where a list must belong to a namespace
-type ErrListMustBelongToANamespace struct {
-	ListID      int64
+// ErrProjectMustBelongToANamespace represents an error where a project must belong to a namespace
+type ErrProjectMustBelongToANamespace struct {
+	ProjectID   int64
 	NamespaceID int64
 }
 
-// IsErrListMustBelongToANamespace checks if an error is a list must belong to a namespace error.
-func IsErrListMustBelongToANamespace(err error) bool {
-	_, ok := err.(*ErrListMustBelongToANamespace)
+// IsErrProjectMustBelongToANamespace checks if an error is a project must belong to a namespace error.
+func IsErrProjectMustBelongToANamespace(err error) bool {
+	_, ok := err.(*ErrProjectMustBelongToANamespace)
 	return ok
 }
 
-func (err *ErrListMustBelongToANamespace) Error() string {
-	return fmt.Sprintf("List must belong to a namespace [ListID: %d, NamespaceID: %d]", err.ListID, err.NamespaceID)
+func (err *ErrProjectMustBelongToANamespace) Error() string {
+	return fmt.Sprintf("Project must belong to a namespace [ProjectID: %d, NamespaceID: %d]", err.ProjectID, err.NamespaceID)
 }
 
-// ErrCodeListMustBelongToANamespace holds the unique world-error code of this error
-const ErrCodeListMustBelongToANamespace = 3010
+// ErrCodeProjectMustBelongToANamespace holds the unique world-error code of this error
+const ErrCodeProjectMustBelongToANamespace = 3010
 
 // HTTPError holds the http error description
-func (err *ErrListMustBelongToANamespace) HTTPError() web.HTTPError {
+func (err *ErrProjectMustBelongToANamespace) HTTPError() web.HTTPError {
 	return web.HTTPError{
 		HTTPCode: http.StatusPreconditionFailed,
-		Code:     ErrCodeListMustBelongToANamespace,
-		Message:  "This list must belong to a namespace.",
+		Code:     ErrCodeProjectMustBelongToANamespace,
+		Message:  "This project must belong to a namespace.",
 	}
 }
 
 // ================
-// List task errors
+// Project task errors
 // ================
 
-// ErrTaskCannotBeEmpty represents a "ErrListDoesNotExist" kind of error. Used if the list does not exist.
+// ErrTaskCannotBeEmpty represents a "ErrProjectDoesNotExist" kind of error. Used if the project does not exist.
 type ErrTaskCannotBeEmpty struct{}
 
-// IsErrTaskCannotBeEmpty checks if an error is a ErrListDoesNotExist.
+// IsErrTaskCannotBeEmpty checks if an error is a ErrProjectDoesNotExist.
 func IsErrTaskCannotBeEmpty(err error) bool {
 	_, ok := err.(ErrTaskCannotBeEmpty)
 	return ok
 }
 
 func (err ErrTaskCannotBeEmpty) Error() string {
-	return "List task title cannot be empty."
+	return "Project task title cannot be empty."
 }
 
 // ErrCodeTaskCannotBeEmpty holds the unique world-error code of this error
@@ -333,22 +333,22 @@ const ErrCodeTaskCannotBeEmpty = 4001
 
 // HTTPError holds the http error description
 func (err ErrTaskCannotBeEmpty) HTTPError() web.HTTPError {
-	return web.HTTPError{HTTPCode: http.StatusBadRequest, Code: ErrCodeTaskCannotBeEmpty, Message: "You must provide at least a list task title."}
+	return web.HTTPError{HTTPCode: http.StatusBadRequest, Code: ErrCodeTaskCannotBeEmpty, Message: "You must provide at least a project task title."}
 }
 
-// ErrTaskDoesNotExist represents a "ErrListDoesNotExist" kind of error. Used if the list does not exist.
+// ErrTaskDoesNotExist represents a "ErrProjectDoesNotExist" kind of error. Used if the project does not exist.
 type ErrTaskDoesNotExist struct {
 	ID int64
 }
 
-// IsErrTaskDoesNotExist checks if an error is a ErrListDoesNotExist.
+// IsErrTaskDoesNotExist checks if an error is a ErrProjectDoesNotExist.
 func IsErrTaskDoesNotExist(err error) bool {
 	_, ok := err.(ErrTaskDoesNotExist)
 	return ok
 }
 
 func (err ErrTaskDoesNotExist) Error() string {
-	return fmt.Sprintf("List task does not exist. [ID: %d]", err.ID)
+	return fmt.Sprintf("Project task does not exist. [ID: %d]", err.ID)
 }
 
 // ErrCodeTaskDoesNotExist holds the unique world-error code of this error
@@ -359,28 +359,28 @@ func (err ErrTaskDoesNotExist) HTTPError() web.HTTPError {
 	return web.HTTPError{HTTPCode: http.StatusNotFound, Code: ErrCodeTaskDoesNotExist, Message: "This task does not exist"}
 }
 
-// ErrBulkTasksMustBeInSameList represents a "ErrBulkTasksMustBeInSameList" kind of error.
-type ErrBulkTasksMustBeInSameList struct {
+// ErrBulkTasksMustBeInSameProject represents a "ErrBulkTasksMustBeInSameProject" kind of error.
+type ErrBulkTasksMustBeInSameProject struct {
 	ShouldBeID int64
 	IsID       int64
 }
 
-// IsErrBulkTasksMustBeInSameList checks if an error is a ErrBulkTasksMustBeInSameList.
-func IsErrBulkTasksMustBeInSameList(err error) bool {
-	_, ok := err.(ErrBulkTasksMustBeInSameList)
+// IsErrBulkTasksMustBeInSameProject checks if an error is a ErrBulkTasksMustBeInSameProject.
+func IsErrBulkTasksMustBeInSameProject(err error) bool {
+	_, ok := err.(ErrBulkTasksMustBeInSameProject)
 	return ok
 }
 
-func (err ErrBulkTasksMustBeInSameList) Error() string {
-	return fmt.Sprintf("All bulk editing tasks must be in the same list. [Should be: %d, is: %d]", err.ShouldBeID, err.IsID)
+func (err ErrBulkTasksMustBeInSameProject) Error() string {
+	return fmt.Sprintf("All bulk editing tasks must be in the same project. [Should be: %d, is: %d]", err.ShouldBeID, err.IsID)
 }
 
-// ErrCodeBulkTasksMustBeInSameList holds the unique world-error code of this error
-const ErrCodeBulkTasksMustBeInSameList = 4003
+// ErrCodeBulkTasksMustBeInSameProject holds the unique world-error code of this error
+const ErrCodeBulkTasksMustBeInSameProject = 4003
 
 // HTTPError holds the http error description
-func (err ErrBulkTasksMustBeInSameList) HTTPError() web.HTTPError {
-	return web.HTTPError{HTTPCode: http.StatusBadRequest, Code: ErrCodeBulkTasksMustBeInSameList, Message: "All tasks must be in the same list."}
+func (err ErrBulkTasksMustBeInSameProject) HTTPError() web.HTTPError {
+	return web.HTTPError{HTTPCode: http.StatusBadRequest, Code: ErrCodeBulkTasksMustBeInSameProject, Message: "All tasks must be in the same project."}
 }
 
 // ErrBulkTasksNeedAtLeastOne represents a "ErrBulkTasksNeedAtLeastOne" kind of error.
@@ -875,6 +875,33 @@ func (err ErrUserAlreadyAssigned) HTTPError() web.HTTPError {
 	}
 }
 
+// ErrReminderRelativeToMissing represents an error where a task has a relative reminder without reference date
+type ErrReminderRelativeToMissing struct {
+	TaskID int64
+}
+
+// IsErrReminderRelativeToMissing checks if an error is ErrReminderRelativeToMissing.
+func IsErrReminderRelativeToMissing(err error) bool {
+	_, ok := err.(ErrReminderRelativeToMissing)
+	return ok
+}
+
+func (err ErrReminderRelativeToMissing) Error() string {
+	return fmt.Sprintf("Task [TaskID: %v] has a relative reminder without relative_to", err.TaskID)
+}
+
+// ErrCodeRelationDoesNotExist holds the unique world-error code of this error
+const ErrCodeReminderRelativeToMissing = 4022
+
+// HTTPError holds the http error description
+func (err ErrReminderRelativeToMissing) HTTPError() web.HTTPError {
+	return web.HTTPError{
+		HTTPCode: http.StatusBadRequest,
+		Code:     ErrCodeReminderRelativeToMissing,
+		Message:  "Please provide what the reminder date is relative to",
+	}
+}
+
 // =================
 // Namespace errors
 // =================
@@ -1042,7 +1069,7 @@ const ErrCodeNamespaceIsArchived = 5012
 
 // HTTPError holds the http error description
 func (err ErrNamespaceIsArchived) HTTPError() web.HTTPError {
-	return web.HTTPError{HTTPCode: http.StatusPreconditionFailed, Code: ErrCodeNamespaceIsArchived, Message: "This namespaces is archived. Editing or creating new lists is not possible."}
+	return web.HTTPError{HTTPCode: http.StatusPreconditionFailed, Code: ErrCodeNamespaceIsArchived, Message: "This namespaces is archived. Editing or creating new projects is not possible."}
 }
 
 // ============
@@ -1095,7 +1122,7 @@ func (err ErrTeamDoesNotExist) HTTPError() web.HTTPError {
 	return web.HTTPError{HTTPCode: http.StatusNotFound, Code: ErrCodeTeamDoesNotExist, Message: "This team does not exist."}
 }
 
-// ErrTeamAlreadyHasAccess represents an error where a team already has access to a list/namespace
+// ErrTeamAlreadyHasAccess represents an error where a team already has access to a project/namespace
 type ErrTeamAlreadyHasAccess struct {
 	TeamID int64
 	ID     int64
@@ -1167,38 +1194,38 @@ func (err ErrCannotDeleteLastTeamMember) HTTPError() web.HTTPError {
 	return web.HTTPError{HTTPCode: http.StatusBadRequest, Code: ErrCodeCannotDeleteLastTeamMember, Message: "You cannot delete the last member of a team."}
 }
 
-// ErrTeamDoesNotHaveAccessToList represents an error, where the Team is not the owner of that List (used i.e. when deleting a List)
-type ErrTeamDoesNotHaveAccessToList struct {
-	ListID int64
-	TeamID int64
+// ErrTeamDoesNotHaveAccessToProject represents an error, where the Team is not the owner of that Project (used i.e. when deleting a Project)
+type ErrTeamDoesNotHaveAccessToProject struct {
+	ProjectID int64
+	TeamID    int64
 }
 
-// IsErrTeamDoesNotHaveAccessToList checks if an error is a ErrListDoesNotExist.
-func IsErrTeamDoesNotHaveAccessToList(err error) bool {
-	_, ok := err.(ErrTeamDoesNotHaveAccessToList)
+// IsErrTeamDoesNotHaveAccessToProject checks if an error is a ErrProjectDoesNotExist.
+func IsErrTeamDoesNotHaveAccessToProject(err error) bool {
+	_, ok := err.(ErrTeamDoesNotHaveAccessToProject)
 	return ok
 }
 
-func (err ErrTeamDoesNotHaveAccessToList) Error() string {
-	return fmt.Sprintf("Team does not have access to the list [ListID: %d, TeamID: %d]", err.ListID, err.TeamID)
+func (err ErrTeamDoesNotHaveAccessToProject) Error() string {
+	return fmt.Sprintf("Team does not have access to the project [ProjectID: %d, TeamID: %d]", err.ProjectID, err.TeamID)
 }
 
-// ErrCodeTeamDoesNotHaveAccessToList holds the unique world-error code of this error
-const ErrCodeTeamDoesNotHaveAccessToList = 6007
+// ErrCodeTeamDoesNotHaveAccessToProject holds the unique world-error code of this error
+const ErrCodeTeamDoesNotHaveAccessToProject = 6007
 
 // HTTPError holds the http error description
-func (err ErrTeamDoesNotHaveAccessToList) HTTPError() web.HTTPError {
-	return web.HTTPError{HTTPCode: http.StatusForbidden, Code: ErrCodeTeamDoesNotHaveAccessToList, Message: "This team does not have access to the list."}
+func (err ErrTeamDoesNotHaveAccessToProject) HTTPError() web.HTTPError {
+	return web.HTTPError{HTTPCode: http.StatusForbidden, Code: ErrCodeTeamDoesNotHaveAccessToProject, Message: "This team does not have access to the project."}
 }
 
 // ====================
-// User <-> List errors
+// User <-> Project errors
 // ====================
 
-// ErrUserAlreadyHasAccess represents an error where a user already has access to a list/namespace
+// ErrUserAlreadyHasAccess represents an error where a user already has access to a project/namespace
 type ErrUserAlreadyHasAccess struct {
-	UserID int64
-	ListID int64
+	UserID    int64
+	ProjectID int64
 }
 
 // IsErrUserAlreadyHasAccess checks if an error is ErrUserAlreadyHasAccess.
@@ -1208,7 +1235,7 @@ func IsErrUserAlreadyHasAccess(err error) bool {
 }
 
 func (err ErrUserAlreadyHasAccess) Error() string {
-	return fmt.Sprintf("User already has access to that list. [User ID: %d, List ID: %d]", err.UserID, err.ListID)
+	return fmt.Sprintf("User already has access to that project. [User ID: %d, Project ID: %d]", err.UserID, err.ProjectID)
 }
 
 // ErrCodeUserAlreadyHasAccess holds the unique world-error code of this error
@@ -1216,31 +1243,31 @@ const ErrCodeUserAlreadyHasAccess = 7002
 
 // HTTPError holds the http error description
 func (err ErrUserAlreadyHasAccess) HTTPError() web.HTTPError {
-	return web.HTTPError{HTTPCode: http.StatusConflict, Code: ErrCodeUserAlreadyHasAccess, Message: "This user already has access to this list."}
+	return web.HTTPError{HTTPCode: http.StatusConflict, Code: ErrCodeUserAlreadyHasAccess, Message: "This user already has access to this project."}
 }
 
-// ErrUserDoesNotHaveAccessToList represents an error, where the user is not the owner of that List (used i.e. when deleting a List)
-type ErrUserDoesNotHaveAccessToList struct {
-	ListID int64
-	UserID int64
+// ErrUserDoesNotHaveAccessToProject represents an error, where the user is not the owner of that Project (used i.e. when deleting a Project)
+type ErrUserDoesNotHaveAccessToProject struct {
+	ProjectID int64
+	UserID    int64
 }
 
-// IsErrUserDoesNotHaveAccessToList checks if an error is a ErrListDoesNotExist.
-func IsErrUserDoesNotHaveAccessToList(err error) bool {
-	_, ok := err.(ErrUserDoesNotHaveAccessToList)
+// IsErrUserDoesNotHaveAccessToProject checks if an error is a ErrProjectDoesNotExist.
+func IsErrUserDoesNotHaveAccessToProject(err error) bool {
+	_, ok := err.(ErrUserDoesNotHaveAccessToProject)
 	return ok
 }
 
-func (err ErrUserDoesNotHaveAccessToList) Error() string {
-	return fmt.Sprintf("User does not have access to the list [ListID: %d, UserID: %d]", err.ListID, err.UserID)
+func (err ErrUserDoesNotHaveAccessToProject) Error() string {
+	return fmt.Sprintf("User does not have access to the project [ProjectID: %d, UserID: %d]", err.ProjectID, err.UserID)
 }
 
-// ErrCodeUserDoesNotHaveAccessToList holds the unique world-error code of this error
-const ErrCodeUserDoesNotHaveAccessToList = 7003
+// ErrCodeUserDoesNotHaveAccessToProject holds the unique world-error code of this error
+const ErrCodeUserDoesNotHaveAccessToProject = 7003
 
 // HTTPError holds the http error description
-func (err ErrUserDoesNotHaveAccessToList) HTTPError() web.HTTPError {
-	return web.HTTPError{HTTPCode: http.StatusForbidden, Code: ErrCodeUserDoesNotHaveAccessToList, Message: "This user does not have access to the list."}
+func (err ErrUserDoesNotHaveAccessToProject) HTTPError() web.HTTPError {
+	return web.HTTPError{HTTPCode: http.StatusForbidden, Code: ErrCodeUserDoesNotHaveAccessToProject, Message: "This user does not have access to the project."}
 }
 
 // =============
@@ -1392,38 +1419,38 @@ func (err ErrBucketDoesNotExist) HTTPError() web.HTTPError {
 	}
 }
 
-// ErrBucketDoesNotBelongToList represents an error where a kanban bucket does not belong to a list
-type ErrBucketDoesNotBelongToList struct {
-	BucketID int64
-	ListID   int64
+// ErrBucketDoesNotBelongToProject represents an error where a kanban bucket does not belong to a project
+type ErrBucketDoesNotBelongToProject struct {
+	BucketID  int64
+	ProjectID int64
 }
 
-// IsErrBucketDoesNotBelongToList checks if an error is ErrBucketDoesNotBelongToList.
-func IsErrBucketDoesNotBelongToList(err error) bool {
-	_, ok := err.(ErrBucketDoesNotBelongToList)
+// IsErrBucketDoesNotBelongToProject checks if an error is ErrBucketDoesNotBelongToProject.
+func IsErrBucketDoesNotBelongToProject(err error) bool {
+	_, ok := err.(ErrBucketDoesNotBelongToProject)
 	return ok
 }
 
-func (err ErrBucketDoesNotBelongToList) Error() string {
-	return fmt.Sprintf("Bucket does not not belong to list [BucketID: %d, ListID: %d]", err.BucketID, err.ListID)
+func (err ErrBucketDoesNotBelongToProject) Error() string {
+	return fmt.Sprintf("Bucket does not not belong to project [BucketID: %d, ProjectID: %d]", err.BucketID, err.ProjectID)
 }
 
-// ErrCodeBucketDoesNotBelongToList holds the unique world-error code of this error
-const ErrCodeBucketDoesNotBelongToList = 10002
+// ErrCodeBucketDoesNotBelongToProject holds the unique world-error code of this error
+const ErrCodeBucketDoesNotBelongToProject = 10002
 
 // HTTPError holds the http error description
-func (err ErrBucketDoesNotBelongToList) HTTPError() web.HTTPError {
+func (err ErrBucketDoesNotBelongToProject) HTTPError() web.HTTPError {
 	return web.HTTPError{
 		HTTPCode: http.StatusBadRequest,
-		Code:     ErrCodeBucketDoesNotBelongToList,
-		Message:  "This bucket does not belong to that list.",
+		Code:     ErrCodeBucketDoesNotBelongToProject,
+		Message:  "This bucket does not belong to that project.",
 	}
 }
 
-// ErrCannotRemoveLastBucket represents an error where a kanban bucket is the last on a list and thus cannot be removed.
+// ErrCannotRemoveLastBucket represents an error where a kanban bucket is the last on a project and thus cannot be removed.
 type ErrCannotRemoveLastBucket struct {
-	BucketID int64
-	ListID   int64
+	BucketID  int64
+	ProjectID int64
 }
 
 // IsErrCannotRemoveLastBucket checks if an error is ErrCannotRemoveLastBucket.
@@ -1433,7 +1460,7 @@ func IsErrCannotRemoveLastBucket(err error) bool {
 }
 
 func (err ErrCannotRemoveLastBucket) Error() string {
-	return fmt.Sprintf("Cannot remove last bucket of list [BucketID: %d, ListID: %d]", err.BucketID, err.ListID)
+	return fmt.Sprintf("Cannot remove last bucket of project [BucketID: %d, ProjectID: %d]", err.BucketID, err.ProjectID)
 }
 
 // ErrCodeCannotRemoveLastBucket holds the unique world-error code of this error
@@ -1444,7 +1471,7 @@ func (err ErrCannotRemoveLastBucket) HTTPError() web.HTTPError {
 	return web.HTTPError{
 		HTTPCode: http.StatusPreconditionFailed,
 		Code:     ErrCodeCannotRemoveLastBucket,
-		Message:  "You cannot remove the last bucket on this list.",
+		Message:  "You cannot remove the last bucket on this project.",
 	}
 }
 
@@ -1477,32 +1504,32 @@ func (err ErrBucketLimitExceeded) HTTPError() web.HTTPError {
 	}
 }
 
-// ErrOnlyOneDoneBucketPerList represents an error where a bucket is set to the done bucket but one already exists for its list.
-type ErrOnlyOneDoneBucketPerList struct {
+// ErrOnlyOneDoneBucketPerProject represents an error where a bucket is set to the done bucket but one already exists for its project.
+type ErrOnlyOneDoneBucketPerProject struct {
 	BucketID     int64
-	ListID       int64
+	ProjectID    int64
 	DoneBucketID int64
 }
 
-// IsErrOnlyOneDoneBucketPerList checks if an error is ErrBucketLimitExceeded.
-func IsErrOnlyOneDoneBucketPerList(err error) bool {
-	_, ok := err.(*ErrOnlyOneDoneBucketPerList)
+// IsErrOnlyOneDoneBucketPerProject checks if an error is ErrBucketLimitExceeded.
+func IsErrOnlyOneDoneBucketPerProject(err error) bool {
+	_, ok := err.(*ErrOnlyOneDoneBucketPerProject)
 	return ok
 }
 
-func (err *ErrOnlyOneDoneBucketPerList) Error() string {
-	return fmt.Sprintf("There can be only one done bucket per list [BucketID: %d, ListID: %d]", err.BucketID, err.ListID)
+func (err *ErrOnlyOneDoneBucketPerProject) Error() string {
+	return fmt.Sprintf("There can be only one done bucket per project [BucketID: %d, ProjectID: %d]", err.BucketID, err.ProjectID)
 }
 
-// ErrCodeOnlyOneDoneBucketPerList holds the unique world-error code of this error
-const ErrCodeOnlyOneDoneBucketPerList = 10005
+// ErrCodeOnlyOneDoneBucketPerProject holds the unique world-error code of this error
+const ErrCodeOnlyOneDoneBucketPerProject = 10005
 
 // HTTPError holds the http error description
-func (err *ErrOnlyOneDoneBucketPerList) HTTPError() web.HTTPError {
+func (err *ErrOnlyOneDoneBucketPerProject) HTTPError() web.HTTPError {
 	return web.HTTPError{
 		HTTPCode: http.StatusPreconditionFailed,
-		Code:     ErrCodeOnlyOneDoneBucketPerList,
-		Message:  "There can be only one done bucket per list.",
+		Code:     ErrCodeOnlyOneDoneBucketPerProject,
+		Message:  "There can be only one done bucket per project.",
 	}
 }
 
@@ -1682,3 +1709,29 @@ func (err ErrLinkSharePasswordInvalid) HTTPError() web.HTTPError {
 		Message:  "The provided link share password is invalid.",
 	}
 }
+
+// ErrLinkShareTokenInvalid represents an error where a link share token is invalid
+type ErrLinkShareTokenInvalid struct {
+}
+
+// IsErrLinkShareTokenInvalid checks if an error is ErrLinkShareTokenInvalid.
+func IsErrLinkShareTokenInvalid(err error) bool {
+	_, ok := err.(*ErrLinkShareTokenInvalid)
+	return ok
+}
+
+func (err *ErrLinkShareTokenInvalid) Error() string {
+	return "Provided Link Share Token is invalid"
+}
+
+// ErrCodeLinkShareTokenInvalid holds the unique world-error code of this error
+const ErrCodeLinkShareTokenInvalid = 13003
+
+// HTTPError holds the http error description
+func (err ErrLinkShareTokenInvalid) HTTPError() web.HTTPError {
+	return web.HTTPError{
+		HTTPCode: http.StatusBadRequest,
+		Code:     ErrCodeLinkShareTokenInvalid,
+		Message:  "The provided link share token is invalid.",
+	}
+}

pkg/models/events.go

@@ -80,6 +80,18 @@ func (t *TaskAssigneeCreatedEvent) Name() string {
 	return "task.assignee.created"
 }
 
+// TaskAssigneeDeletedEvent represents a TaskAssigneeDeletedEvent event
+type TaskAssigneeDeletedEvent struct {
+	Task     *Task
+	Assignee *user.User
+	Doer     *user.User
+}
+
+// Name defines the name for TaskAssigneeDeletedEvent
+func (t *TaskAssigneeDeletedEvent) Name() string {
+	return "task.assignee.deleted"
+}
+
 // TaskCommentCreatedEvent represents an event where a task comment has been created
 type TaskCommentCreatedEvent struct {
 	Task    *Task
@@ -104,6 +116,66 @@ func (t *TaskCommentUpdatedEvent) Name() string {
 	return "task.comment.edited"
 }
 
+// TaskCommentDeletedEvent represents a TaskCommentDeletedEvent event
+type TaskCommentDeletedEvent struct {
+	Task    *Task
+	Comment *TaskComment
+	Doer    *user.User
+}
+
+// Name defines the name for TaskCommentDeletedEvent
+func (t *TaskCommentDeletedEvent) Name() string {
+	return "task.comment.deleted"
+}
+
+// TaskAttachmentCreatedEvent represents a TaskAttachmentCreatedEvent event
+type TaskAttachmentCreatedEvent struct {
+	Task       *Task
+	Attachment *TaskAttachment
+	Doer       *user.User
+}
+
+// Name defines the name for TaskAttachmentCreatedEvent
+func (t *TaskAttachmentCreatedEvent) Name() string {
+	return "task.attachment.created"
+}
+
+// TaskAttachmentDeletedEvent represents a TaskAttachmentDeletedEvent event
+type TaskAttachmentDeletedEvent struct {
+	Task       *Task
+	Attachment *TaskAttachment
+	Doer       *user.User
+}
+
+// Name defines the name for TaskAttachmentDeletedEvent
+func (t *TaskAttachmentDeletedEvent) Name() string {
+	return "task.attachment.deleted"
+}
+
+// TaskRelationCreatedEvent represents a TaskRelationCreatedEvent event
+type TaskRelationCreatedEvent struct {
+	Task     *Task
+	Relation *TaskRelation
+	Doer     *user.User
+}
+
+// Name defines the name for TaskRelationCreatedEvent
+func (t *TaskRelationCreatedEvent) Name() string {
+	return "task.relation.created"
+}
+
+// TaskRelationDeletedEvent represents a TaskRelationDeletedEvent event
+type TaskRelationDeletedEvent struct {
+	Task     *Task
+	Relation *TaskRelation
+	Doer     *user.User
+}
+
+// Name defines the name for TaskRelationDeletedEvent
+func (t *TaskRelationDeletedEvent) Name() string {
+	return "task.relation.deleted"
+}
+
 //////////////////////
 // Namespace Events //
 //////////////////////
@@ -142,68 +214,68 @@ func (t *NamespaceDeletedEvent) Name() string {
 }
 
 /////////////////
-// List Events //
+// Project Events //
 /////////////////
 
-// ListCreatedEvent represents an event where a list has been created
-type ListCreatedEvent struct {
-	List *List
-	Doer *user.User
+// ProjectCreatedEvent represents an event where a project has been created
+type ProjectCreatedEvent struct {
+	Project *Project
+	Doer    *user.User
 }
 
-// Name defines the name for ListCreatedEvent
-func (l *ListCreatedEvent) Name() string {
-	return "list.created"
+// Name defines the name for ProjectCreatedEvent
+func (l *ProjectCreatedEvent) Name() string {
+	return "project.created"
 }
 
-// ListUpdatedEvent represents an event where a list has been updated
-type ListUpdatedEvent struct {
-	List *List
-	Doer web.Auth
+// ProjectUpdatedEvent represents an event where a project has been updated
+type ProjectUpdatedEvent struct {
+	Project *Project
+	Doer    web.Auth
 }
 
-// Name defines the name for ListUpdatedEvent
-func (l *ListUpdatedEvent) Name() string {
-	return "list.updated"
+// Name defines the name for ProjectUpdatedEvent
+func (l *ProjectUpdatedEvent) Name() string {
+	return "project.updated"
 }
 
-// ListDeletedEvent represents an event where a list has been deleted
-type ListDeletedEvent struct {
-	List *List
-	Doer web.Auth
+// ProjectDeletedEvent represents an event where a project has been deleted
+type ProjectDeletedEvent struct {
+	Project *Project
+	Doer    web.Auth
 }
 
-// Name defines the name for ListDeletedEvent
-func (t *ListDeletedEvent) Name() string {
-	return "list.deleted"
+// Name defines the name for ProjectDeletedEvent
+func (t *ProjectDeletedEvent) Name() string {
+	return "project.deleted"
 }
 
 ////////////////////
 // Sharing Events //
 ////////////////////
 
-// ListSharedWithUserEvent represents an event where a list has been shared with a user
-type ListSharedWithUserEvent struct {
-	List *List
-	User *user.User
-	Doer web.Auth
+// ProjectSharedWithUserEvent represents an event where a project has been shared with a user
+type ProjectSharedWithUserEvent struct {
+	Project *Project
+	User    *user.User
+	Doer    web.Auth
 }
 
-// Name defines the name for ListSharedWithUserEvent
-func (l *ListSharedWithUserEvent) Name() string {
-	return "list.shared.user"
+// Name defines the name for ProjectSharedWithUserEvent
+func (l *ProjectSharedWithUserEvent) Name() string {
+	return "project.shared.user"
 }
 
-// ListSharedWithTeamEvent represents an event where a list has been shared with a team
-type ListSharedWithTeamEvent struct {
-	List *List
-	Team *Team
-	Doer web.Auth
+// ProjectSharedWithTeamEvent represents an event where a project has been shared with a team
+type ProjectSharedWithTeamEvent struct {
+	Project *Project
+	Team    *Team
+	Doer    web.Auth
 }
 
-// Name defines the name for ListSharedWithTeamEvent
-func (l *ListSharedWithTeamEvent) Name() string {
-	return "list.shared.team"
+// Name defines the name for ProjectSharedWithTeamEvent
+func (l *ProjectSharedWithTeamEvent) Name() string {
+	return "project.shared.team"
 }
 
 // NamespaceSharedWithUserEvent represents an event where a namespace has been shared with a user

pkg/models/export.go

@@ -57,7 +57,7 @@ func ExportUserData(s *xorm.Session, u *user.User) (err error) {
 	defer dumpWriter.Close()
 
 	// Get the data
-	err = exportListsAndTasks(s, u, dumpWriter)
+	err = exportProjectsAndTasks(s, u, dumpWriter)
 	if err != nil {
 		return err
 	}
@@ -72,7 +72,7 @@ func ExportUserData(s *xorm.Session, u *user.User) (err error) {
 		return err
 	}
 	// Background files
-	err = exportListBackgrounds(s, u, dumpWriter)
+	err = exportProjectBackgrounds(s, u, dumpWriter)
 	if err != nil {
 		return err
 	}
@@ -121,7 +121,7 @@ func ExportUserData(s *xorm.Session, u *user.User) (err error) {
 	})
 }
 
-func exportListsAndTasks(s *xorm.Session, u *user.User, wr *zip.Writer) (err error) {
+func exportProjectsAndTasks(s *xorm.Session, u *user.User, wr *zip.Writer) (err error) {
 
 	namspaces, _, _, err := (&Namespace{IsArchived: true}).ReadAll(s, u, "", -1, 0)
 	if err != nil {
@@ -129,29 +129,29 @@ func exportListsAndTasks(s *xorm.Session, u *user.User, wr *zip.Writer) (err err
 	}
 
 	namespaceIDs := []int64{}
-	namespaces := []*NamespaceWithListsAndTasks{}
-	listMap := make(map[int64]*ListWithTasksAndBuckets)
-	listIDs := []int64{}
-	for _, n := range namspaces.([]*NamespaceWithLists) {
+	namespaces := []*NamespaceWithProjectsAndTasks{}
+	projectMap := make(map[int64]*ProjectWithTasksAndBuckets)
+	projectIDs := []int64{}
+	for _, n := range namspaces.([]*NamespaceWithProjects) {
 		if n.ID < 1 {
 			// Don't include filters
 			continue
 		}
 
-		nn := &NamespaceWithListsAndTasks{
+		nn := &NamespaceWithProjectsAndTasks{
 			Namespace: n.Namespace,
-			Lists:     []*ListWithTasksAndBuckets{},
+			Projects:  []*ProjectWithTasksAndBuckets{},
 		}
 
-		for _, l := range n.Lists {
-			ll := &ListWithTasksAndBuckets{
-				List:             *l,
+		for _, l := range n.Projects {
+			ll := &ProjectWithTasksAndBuckets{
+				Project:          *l,
 				BackgroundFileID: l.BackgroundFileID,
 				Tasks:            []*TaskWithComments{},
 			}
-			nn.Lists = append(nn.Lists, ll)
-			listMap[l.ID] = ll
-			listIDs = append(listIDs, l.ID)
+			nn.Projects = append(nn.Projects, ll)
+			projectMap[l.ID] = ll
+			projectIDs = append(projectIDs, l.ID)
 		}
 
 		namespaceIDs = append(namespaceIDs, n.ID)
@@ -162,13 +162,13 @@ func exportListsAndTasks(s *xorm.Session, u *user.User, wr *zip.Writer) (err err
 		return nil
 	}
 
-	// Get all lists
-	lists, err := getListsForNamespaces(s, namespaceIDs, true)
+	// Get all projects
+	projects, err := getProjectsForNamespaces(s, namespaceIDs, true)
 	if err != nil {
 		return err
 	}
 
-	tasks, _, _, err := getTasksForLists(s, lists, u, &taskOptions{
+	tasks, _, _, err := getTasksForProjects(s, projects, u, &taskOptions{
 		page:    0,
 		perPage: -1,
 	})
@@ -181,17 +181,17 @@ func exportListsAndTasks(s *xorm.Session, u *user.User, wr *zip.Writer) (err err
 		taskMap[t.ID] = &TaskWithComments{
 			Task: *t,
 		}
-		if _, exists := listMap[t.ListID]; !exists {
-			log.Debugf("[User Data Export] List %d does not exist for task %d, omitting", t.ListID, t.ID)
+		if _, exists := projectMap[t.ProjectID]; !exists {
+			log.Debugf("[User Data Export] Project %d does not exist for task %d, omitting", t.ProjectID, t.ID)
 			continue
 		}
-		listMap[t.ListID].Tasks = append(listMap[t.ListID].Tasks, taskMap[t.ID])
+		projectMap[t.ProjectID].Tasks = append(projectMap[t.ProjectID].Tasks, taskMap[t.ID])
 	}
 
 	comments := []*TaskComment{}
 	err = s.
 		Join("LEFT", "tasks", "tasks.id = task_comments.task_id").
-		In("tasks.list_id", listIDs).
+		In("tasks.project_id", projectIDs).
 		Find(&comments)
 	if err != nil {
 		return
@@ -206,17 +206,17 @@ func exportListsAndTasks(s *xorm.Session, u *user.User, wr *zip.Writer) (err err
 	}
 
 	buckets := []*Bucket{}
-	err = s.In("list_id", listIDs).Find(&buckets)
+	err = s.In("project_id", projectIDs).Find(&buckets)
 	if err != nil {
 		return
 	}
 
 	for _, b := range buckets {
-		if _, exists := listMap[b.ListID]; !exists {
-			log.Debugf("[User Data Export] List %d does not exist for bucket %d, omitting", b.ListID, b.ID)
+		if _, exists := projectMap[b.ProjectID]; !exists {
+			log.Debugf("[User Data Export] Project %d does not exist for bucket %d, omitting", b.ProjectID, b.ID)
 			continue
 		}
-		listMap[b.ListID].Buckets = append(listMap[b.ListID].Buckets, b)
+		projectMap[b.ProjectID].Buckets = append(projectMap[b.ProjectID].Buckets, b)
 	}
 
 	data, err := json.Marshal(namespaces)
@@ -228,9 +228,9 @@ func exportListsAndTasks(s *xorm.Session, u *user.User, wr *zip.Writer) (err err
 }
 
 func exportTaskAttachments(s *xorm.Session, u *user.User, wr *zip.Writer) (err error) {
-	lists, _, _, err := getRawListsForUser(
+	projects, _, _, err := getRawProjectsForUser(
 		s,
-		&listOptions{
+		&projectOptions{
 			user: u,
 			page: -1,
 		},
@@ -239,7 +239,7 @@ func exportTaskAttachments(s *xorm.Session, u *user.User, wr *zip.Writer) (err e
 		return err
 	}
 
-	tasks, _, _, err := getRawTasksForLists(s, lists, u, &taskOptions{page: -1})
+	tasks, _, _, err := getRawTasksForProjects(s, projects, u, &taskOptions{page: -1})
 	if err != nil {
 		return err
 	}
@@ -279,10 +279,10 @@ func exportSavedFilters(s *xorm.Session, u *user.User, wr *zip.Writer) (err erro
 	return utils.WriteBytesToZip("filters.json", data, wr)
 }
 
-func exportListBackgrounds(s *xorm.Session, u *user.User, wr *zip.Writer) (err error) {
-	lists, _, _, err := getRawListsForUser(
+func exportProjectBackgrounds(s *xorm.Session, u *user.User, wr *zip.Writer) (err error) {
+	projects, _, _, err := getRawProjectsForUser(
 		s,
-		&listOptions{
+		&projectOptions{
 			user: u,
 			page: -1,
 		},
@@ -292,7 +292,7 @@ func exportListBackgrounds(s *xorm.Session, u *user.User, wr *zip.Writer) (err e
 	}
 
 	fs := make(map[int64]io.ReadCloser)
-	for _, l := range lists {
+	for _, l := range projects {
 		if l.BackgroundFileID == 0 {
 			continue
 		}

pkg/models/favorites.go

@@ -29,7 +29,7 @@ type FavoriteKind int
 const (
 	FavoriteKindUnknown FavoriteKind = iota
 	FavoriteKindTask
-	FavoriteKindList
+	FavoriteKindProject
 )
 
 // Favorite represents an entity which is a favorite to someone