Merge pull request 'Release 0.10.1' (#189 ) from dev into main

Reviewed-on: #189 Reviewed-by: Philipp Dormann <philipp@philippdormann.de>
🧾New changelog file version [CI SKIP] [skip ci]
2021-04-03 16:24:25 +00:00 · 2021-04-03 16:17:51 +00:00 · 2021-04-03 18:16:56 +02:00 · 2021-04-03 16:15:38 +00:00 · 2021-04-03 18:14:47 +02:00 · 2021-04-03 16:14:17 +00:00
154 changed files with 4341 additions and 6572 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,5 +1,27 @@
 ---
 kind: secret
 name: docker_username
 get:
  path: odit-registry-builder
  name: username
 ---
 kind: secret
 name: docker_password
 get:
  path: odit-registry-builder
  name: password
 ---
 kind: secret
 name: git_ssh
 get:
  path: odit-git-bot
  name: sshkey
 ---
 kind: pipeline
 type: kubernetes
 name: tests:node_latest
 clone:
  disable: true
@@ -9,7 +31,6 @@ steps:
    commands:
      - git clone $DRONE_REMOTE_URL .
      - git checkout $DRONE_SOURCE_BRANCH
      - mv .env.ci .env
  - name: run tests
    image: node:latest
    commands:
@@ -21,7 +42,7 @@ trigger:
 ---
 kind: pipeline
-type: docker
+type: kubernetes
 name: build:dev
 clone:
  disable: true
@@ -37,13 +58,14 @@ steps:
    depends_on: [clone]
    settings:
      username:
-        from_secret: DOCKER_REGISTRY_USER
+        from_secret: docker_username
      password:
-        from_secret: DOCKER_REGISTRY_PASSWORD
+        from_secret: docker_password
      repo: registry.odit.services/lfk/backend
      tags:
        - dev
      registry: registry.odit.services
      mtu: 1000
  - name: run changelog export
    depends_on: ["clone"]
    image: node:latest
@@ -59,7 +81,7 @@ steps:
      author_email: bot@odit.services
      remote: git@git.odit.services:lfk/backend.git
      ssh_key:
-        from_secret: GITLAB_SSHKEY
+        from_secret: git_ssh
  - name: run full license export
    depends_on: ["clone"]
    image: node:14.15.1-alpine3.12
@@ -77,7 +99,7 @@ steps:
      remote: git@git.odit.services:lfk/backend.git
      skip_verify: true
      ssh_key:
-        from_secret: GITLAB_SSHKEY
+        from_secret: git_ssh
 trigger:
@@ -88,7 +110,7 @@ trigger:
 ---
 kind: pipeline
-type: docker
+type: kubernetes
 name: build:latest
 clone:
  disable: true
@@ -106,13 +128,14 @@ steps:
    image: plugins/docker
    settings:
      username:
-        from_secret: DOCKER_REGISTRY_USER
+        from_secret: docker_username
      password:
-        from_secret: DOCKER_REGISTRY_PASSWORD
+        from_secret: docker_password
      repo: registry.odit.services/lfk/backend
      tags:
        - latest
      registry: registry.odit.services
      mtu: 1000
  - name: push merge to repo
    depends_on: ["clone"]
    image: appleboy/drone-git-push
@@ -121,7 +144,7 @@ steps:
      commit: false
      remote: git@git.odit.services:lfk/backend.git
      ssh_key:
-        from_secret: GITLAB_SSHKEY
+        from_secret: git_ssh
 trigger:
  branch:
@@ -131,7 +154,7 @@ trigger:
 ---
 kind: pipeline
-type: docker
+type: kubernetes
 name: build:tags
 steps:
@@ -140,13 +163,14 @@ steps:
    depends_on: [clone]
    settings:
      username:
-        from_secret: DOCKER_REGISTRY_USER
+        from_secret: docker_username
      password:
-        from_secret: DOCKER_REGISTRY_PASSWORD
+        from_secret: docker_password
      repo: registry.odit.services/lfk/backend
      tags:
        - '${DRONE_TAG}'
      registry: registry.odit.services
      mtu: 1000
  - name: trigger node lib build
    image: idcooldi/drone-webhook
    settings:
--- a/.env.example
+++ b/.env.example
@@ -1,9 +1,10 @@
 APP_PORT=4010
-DB_TYPE=bla
+DB_TYPE=sqlite
 DB_HOST=bla
 DB_PORT=bla
 DB_USER=bla
 DB_PASSWORD=bla
-DB_NAME=bla
+DB_NAME=./test.sqlite
 NODE_ENV=production
-POSTALCODE_COUNTRYCODE=DE
+POSTALCODE_COUNTRYCODE=DE
 SEED_TEST_DATA=false
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,524 @@
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 #### [v0.10.1](https://git.odit.services/lfk/backend/compare/v0.10.0...v0.10.1)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`69afd4d`](https://git.odit.services/lfk/backend/commit/69afd4d5877401eb46df430f43a7feb273abda1e)
 - 🚀Bumped version to v0.10.1 [`24d152f`](https://git.odit.services/lfk/backend/commit/24d152fdc8fe17fffa2f2a718d7145ba8a91d79c)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`4279e43`](https://git.odit.services/lfk/backend/commit/4279e4374304887e8db40eab77763b20bbce91a1)
 - Removed duplicate openapi statement [`4834a66`](https://git.odit.services/lfk/backend/commit/4834a6698b0958602421c1478a95fec7edda910b)
 - Merge pull request 'Selfservice donations reformatting feature/187-selfservice_donation' (#188) from feature/187-selfservice_donation into dev [`d837654`](https://git.odit.services/lfk/backend/commit/d837654617f7de5d055ffb06c65e2cd52f65c604)
 - New class: ResponseSelfServiceDonor [`d70c5b1`](https://git.odit.services/lfk/backend/commit/d70c5b1bbc9f02782f8755b6929e2d3458e10221)
 - Switched selfservice donation.donor from string to object [`0767943`](https://git.odit.services/lfk/backend/commit/0767943721b6964d542f580c541e744f86444ac6)
 - Adjusted runner property names [`ca87774`](https://git.odit.services/lfk/backend/commit/ca87774767807a2c4bc869b0de95cc73832a8405)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`71e3d0e`](https://git.odit.services/lfk/backend/commit/71e3d0efe2cbde47aea0f26cb5a8b5cd3312707d)
 - Added new responsetype for new class [`f693f2c`](https://git.odit.services/lfk/backend/commit/f693f2cde9a04147155aea4de5d52e1d19d722ca)
 #### [v0.10.0](https://git.odit.services/lfk/backend/compare/v0.9.2...v0.10.0)
 > 1 April 2021
 - Merge pull request 'Release 0.10.0' (#186) from dev into main [`b517dff`](https://git.odit.services/lfk/backend/commit/b517dff8a82c960836d9f0be90fd89f3ba2fae7d)
 - 🚀Bumped version to v0.10.0 [`dc3071f`](https://git.odit.services/lfk/backend/commit/dc3071f7d2be298f0bb02d86ec67ed1125cd3b49)
 - Added locale to mail related runner endpoints [`7af883f`](https://git.odit.services/lfk/backend/commit/7af883f27198206af542bcaff4686221d3788e87)
 - Added locale to mail related runner endpoints [`f543307`](https://git.odit.services/lfk/backend/commit/f5433076b01c743ed9af085fccadb8f1edc26419)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`5fb355f`](https://git.odit.services/lfk/backend/commit/5fb355f450f19e96d3671b1a46e94d564495942b)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`114c246`](https://git.odit.services/lfk/backend/commit/114c246aceba566cc0dd6daab51a77b951b031cc)
 - Merge pull request 'Mail locales feature/184-mail_locales' (#185) from feature/184-mail_locales into dev [`33c13de`](https://git.odit.services/lfk/backend/commit/33c13de32c68a3d9e87e4fd9ad12a815ed8c9fde)
 - Added locale to mail related user endpoints [`1be073a`](https://git.odit.services/lfk/backend/commit/1be073a4fa39f0332a46f567ee6af10a9137844c)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`6aafe4a`](https://git.odit.services/lfk/backend/commit/6aafe4a6ae7d253ab39220e551c52ae067cc481a)
 #### [v0.9.2](https://git.odit.services/lfk/backend/compare/v0.9.1...v0.9.2)
 > 29 March 2021
 - Merge pull request 'Release 0.9.2' (#183) from dev into main [`bdeeb03`](https://git.odit.services/lfk/backend/commit/bdeeb036459c2a2131e843d8a5a6b338e0ba46ea)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`675c876`](https://git.odit.services/lfk/backend/commit/675c8762e8e4cf28d2f334d5ab2e1cb6b594e33c)
 - Fixed bug in return creation [`6c9b91d`](https://git.odit.services/lfk/backend/commit/6c9b91d75a0d08fc4ab0e72c7a09bd0133566368)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`8c00aef`](https://git.odit.services/lfk/backend/commit/8c00aefd6ce3723d9f83d1c94e6491d5d597391f)
 - 🚀Bumped version to v0.9.2 [`89e3924`](https://git.odit.services/lfk/backend/commit/89e392473c52a3f328545699a0f4df89be33ba89)
 #### [v0.9.1](https://git.odit.services/lfk/backend/compare/v0.9.0...v0.9.1)
 > 29 March 2021
 - Merge pull request 'Release v0.9.1' (#182) from dev into main [`3afd785`](https://git.odit.services/lfk/backend/commit/3afd785a54fac91c12af789af19b45e6124e0e39)
 - 🚀Bumped version to v0.9.1 [`a139554`](https://git.odit.services/lfk/backend/commit/a139554e059e9a10acb1733ce1a82b610cc99269)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`8099999`](https://git.odit.services/lfk/backend/commit/8099999e2cdfc8046f9ff4a90681281b671e402d)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`0290b0e`](https://git.odit.services/lfk/backend/commit/0290b0e5f531364d37d8157e639614cf5a6b4189)
 - Merge pull request 'Return cards generated in bulk feature/180-blank_generation_return' (#181) from feature/180-blank_generation_return into dev [`0f7fa99`](https://git.odit.services/lfk/backend/commit/0f7fa990d473ce2dce032c47c39f79c1d0e8df90)
 - Added query param to return created runenrcards [`5a36c8d`](https://git.odit.services/lfk/backend/commit/5a36c8dcae3d79b3b05ffb30a7ebb0d31dc8183a)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`58f4d21`](https://git.odit.services/lfk/backend/commit/58f4d2151f459bc72692cc70e02a59b77abfb9f0)
 - Added test for returnCards=true array length [`1cb2dc9`](https://git.odit.services/lfk/backend/commit/1cb2dc9d53b530435f5798f9cdf7ee866eb7416e)
 - Added test for single card generation with returnCards=true [`6005b06`](https://git.odit.services/lfk/backend/commit/6005b0661f1d5c461bb102e243cc209a8adc21fa)
 - Fixed copy-paste oversight [`2f568c9`](https://git.odit.services/lfk/backend/commit/2f568c9cb8ae39ce40ec8df6d9acbaf0d5ae1a26)
 #### [v0.9.0](https://git.odit.services/lfk/backend/compare/v0.8.0...v0.9.0)
 > 26 March 2021
 - Merge pull request 'Release 0.9.0' (#179) from dev into main [`95135dd`](https://git.odit.services/lfk/backend/commit/95135ddc893dcf64be67b47b0ef2b0d9041253bd)
 - Reenabled user tests [`4c66650`](https://git.odit.services/lfk/backend/commit/4c6665062fe6717242e43b58e66c1f1d030c018d)
 - Moved to tmp files to better check for other problems [`7a64f23`](https://git.odit.services/lfk/backend/commit/7a64f2393783f97a9729356bc1dfd831927dd312)
 - Added user creation invalid tests [`888cab5`](https://git.odit.services/lfk/backend/commit/888cab5898caf9e552c421346934bf90f717a653)
 - Updated auth test to comply with the new pw requirements [`63f6526`](https://git.odit.services/lfk/backend/commit/63f6526e4f59621edbf1fad59fc569b4bd6acbf2)
 - Added user deletion tests [`e6a8ebc`](https://git.odit.services/lfk/backend/commit/e6a8ebcb5b4f430254da4afe159141b21d8da0ed)
 - Added user creation valid tests [`383a809`](https://git.odit.services/lfk/backend/commit/383a8095b8286d51fb2fb24ae2fd0156230e56ab)
 - 📖New license file version [CI SKIP] [skip ci] [`bd7b81e`](https://git.odit.services/lfk/backend/commit/bd7b81efe795c02512c87f3b5dd5eec796580144)
 - Added password errors [`24c38cc`](https://git.odit.services/lfk/backend/commit/24c38cce26da41ccf375e1ccf04afa1868aad8df)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`274a146`](https://git.odit.services/lfk/backend/commit/274a146b9bccfe5e1a879ca137ebb4f51eaa5d57)
 - Fixed test params [`070560e`](https://git.odit.services/lfk/backend/commit/070560e8632e833dd26505c02ccb2474462b63ac)
 - No longer using createuser in seeding process [`96ba25e`](https://git.odit.services/lfk/backend/commit/96ba25ec6c6c397cd2aa322afa79024395f658fe)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`a7fe1e1`](https://git.odit.services/lfk/backend/commit/a7fe1e175918edd7a98983ece570b47075e85e9a)
 - 🚀Bumped version to v0.8.0 [`c23b4d9`](https://git.odit.services/lfk/backend/commit/c23b4d907f20ed7af37a6de6ea4c61433e30b29b)
 - 🚀Bumped version to v0.9.0 [`56a5f41`](https://git.odit.services/lfk/backend/commit/56a5f4168621263daeab5d2fda97b944cdc6ab31)
 - Merge pull request 'Password security feature/99-password_checks' (#177) from feature/99-password_checks into dev [`5a3fc5b`](https://git.odit.services/lfk/backend/commit/5a3fc5b2bd06b3e26177d017d3503f4f627be3f2)
 - Added pw errors to user controller [`b24e24f`](https://git.odit.services/lfk/backend/commit/b24e24ff7dd75d972cdab0fd1e2fe6c532ca2b2f)
 - Now checking password rules on user creation [`5daaa3a`](https://git.odit.services/lfk/backend/commit/5daaa3a73c4eca2817d67e226679d125928a3645)
 - Now checking password rules on user update [`48a87e8`](https://git.odit.services/lfk/backend/commit/48a87e8936e13c48f4baa3f4b10f781ad2f55a44)
 - Fixed pw not getting hashed currectly; [`cb3ea9b`](https://git.odit.services/lfk/backend/commit/cb3ea9b1ebb82c650abd83d4be8629cfe29a5b21)
 - Added pw errors to me controller [`9ce35d8`](https://git.odit.services/lfk/backend/commit/9ce35d8eb78a01f40af8c70e640eca3bcb142304)
 - Now forceing user deletion in tests [`8154e71`](https://git.odit.services/lfk/backend/commit/8154e715bbf18938bd5d1031656a88d39231fa81)
 - Added password checker dependency [`bd00f4f`](https://git.odit.services/lfk/backend/commit/bd00f4f8d585fb6878874810f7de0b8b9f3950d5)
 - Fixed empty object getting called [`5369000`](https://git.odit.services/lfk/backend/commit/536900091afd7366128f21058490d0d4f15c6c89)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`03d76e6`](https://git.odit.services/lfk/backend/commit/03d76e6d0bc5b4655f7f441232681c9462815526)
 - Formatting [`b8c28eb`](https://git.odit.services/lfk/backend/commit/b8c28ebb0808395218b5fb9031f477ae1d48e65e)
 #### [v0.8.0](https://git.odit.services/lfk/backend/compare/v0.7.1...v0.8.0)
 > 26 March 2021
 - Merge pull request 'Release 0.8.0' (#176) from dev into main [`3f8e8ce`](https://git.odit.services/lfk/backend/commit/3f8e8ce3a66a943801c0c8e17885e71feeee744f)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`c9bd6de`](https://git.odit.services/lfk/backend/commit/c9bd6de4762fec04e1e02cd3b667838d05ef39a7)
 - Merge pull request 'Selfservice deletion feature/174-selfservice_deletion' (#175) from feature/174-selfservice_deletion into dev [`e702118`](https://git.odit.services/lfk/backend/commit/e702118d4d80e362e41bb88c74343d50530d1338)
 - Added tests for the new endpoint [`20aeed8`](https://git.odit.services/lfk/backend/commit/20aeed87780247dc6401bba725801fc1874e50b5)
 - Removed param from test [`97159dd`](https://git.odit.services/lfk/backend/commit/97159dd9f81aed080c174a3eb8da9e66dfea9b10)
 - Added selfservice deletion endpoint [`dcb12b0`](https://git.odit.services/lfk/backend/commit/dcb12b0ac289f8df148ba10ae6389727c16f53fd)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`88844e1`](https://git.odit.services/lfk/backend/commit/88844e1a44d87a7dc253bf9aedf2fb3f6cdd1cfe)
 - Fixed response bug [`ccb7ae2`](https://git.odit.services/lfk/backend/commit/ccb7ae29a39387c0f2762861565dc22996a2493a)
 - Updated old hint [`dd12583`](https://git.odit.services/lfk/backend/commit/dd1258333ef67243f8a8df97c176ec5a054a5e3b)
 #### [v0.7.1](https://git.odit.services/lfk/backend/compare/v0.7.0...v0.7.1)
 > 26 March 2021
 - Merge pull request 'Release 0.7.1' (#173) from dev into main [`e76a9ce`](https://git.odit.services/lfk/backend/commit/e76a9cef956b00de7bbb11b6d863d4f33e3d5a34)
 - Revert "Set timeout even higher b/c sqlite just kills itself during these tests" [`f159252`](https://git.odit.services/lfk/backend/commit/f159252651942e442026dbcaae09b242e05d8204)
 - Set timeout even higher b/c sqlite just kills itself during these tests [`6ab6099`](https://git.odit.services/lfk/backend/commit/6ab60998d4f716aded93bb3b5d15594fc5e0434a)
 - Adjusted jest timeout to mitigate sqlite from invalidateing all tests⏱ [`30d220b`](https://git.odit.services/lfk/backend/commit/30d220bc36a28f224406e49ed27ff3f6b4f409e9)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`963253c`](https://git.odit.services/lfk/backend/commit/963253cbc84ed07af13ed0925952ec1b7dcc53ad)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`3ef3a94`](https://git.odit.services/lfk/backend/commit/3ef3a94b20c1abf6fd2f19472e5f448b4c72bd7f)
 - 🚀Bumped version to v0.7.1 [`135852e`](https://git.odit.services/lfk/backend/commit/135852eb9a91010a4ab972ba9efc7b71dfe4d68f)
 - Merge pull request 'RESPONSERUNNERCARD fix bugfix/171-responserunnercards' (#172) from bugfix/171-responserunnercards into dev [`539a650`](https://git.odit.services/lfk/backend/commit/539a6509b17cfd373eef8e443eaa7d41168ac7a9)
 - Now resolveing runnercards [`24aff3b`](https://git.odit.services/lfk/backend/commit/24aff3bac458a9886ca40163484bc72733dc766a)
 - Tests now keep the group [`f3d73d5`](https://git.odit.services/lfk/backend/commit/f3d73d53467a4d00011d280c24e1e12fbb8e443d)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`ce63043`](https://git.odit.services/lfk/backend/commit/ce63043887769e1f92a8c064d6647e0deb81b7fa)
 #### [v0.7.0](https://git.odit.services/lfk/backend/compare/v0.6.4...v0.7.0)
 > 23 March 2021
 - Merge pull request 'Release 0.7.0' (#170) from dev into main [`e40017a`](https://git.odit.services/lfk/backend/commit/e40017a6b88d83d5bfc57ff4603abeaca7a9a37b)
 - Added bulk card creation tests [`438ff0f`](https://git.odit.services/lfk/backend/commit/438ff0fc3f246f83b1fa04cb11828f4a61dfcd1e)
 - Added new "bulk" endpoint [`c1bbda5`](https://git.odit.services/lfk/backend/commit/c1bbda51f067cbd9ac1a9a5378ae3f5d7b9f4eca)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`7a49e7c`](https://git.odit.services/lfk/backend/commit/7a49e7c5c98eb23af1cd0d2084914641e9a1bf90)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`e843a46`](https://git.odit.services/lfk/backend/commit/e843a464e747c0d41280484cb54495cb2de2a9e8)
 - 🚀Bumped version to v0.7.0 [`d0ae50d`](https://git.odit.services/lfk/backend/commit/d0ae50d5579e969ad33d6b9cfd66dac7fa472223)
 - Merge pull request 'Bulk card creation feature/168-runnercards_bulk' (#169) from feature/168-runnercards_bulk into dev [`1dd6420`](https://git.odit.services/lfk/backend/commit/1dd64204cc63fb1a8a4a4aa503c21da42945eafd)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`4705a39`](https://git.odit.services/lfk/backend/commit/4705a39aabaad894d332a5062df03840c23c6bfa)
 #### [v0.6.4](https://git.odit.services/lfk/backend/compare/v0.6.3...v0.6.4)
 > 19 March 2021
 - Merge pull request 'Release 0.6.4' (#167) from dev into main [`4d721f6`](https://git.odit.services/lfk/backend/commit/4d721f62d9a5f6a1361ef2811a3a2ff63011b2ad)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`b0328ff`](https://git.odit.services/lfk/backend/commit/b0328ffdaffc8ef2e6e01e808c29748f58f42cac)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`cc6568c`](https://git.odit.services/lfk/backend/commit/cc6568c3810fed3ff2597df0db73a6ca9e072413)
 - 🚀Bumped version to v0.6.4 [`031cede`](https://git.odit.services/lfk/backend/commit/031cede5426742dc3c2b9dc6b049951d7c14871c)
 - Adjsuted endpoint [`3c69f8c`](https://git.odit.services/lfk/backend/commit/3c69f8c4a824e588977b06dbb45119cccb03c6bc)
 #### [v0.6.3](https://git.odit.services/lfk/backend/compare/v0.6.2...v0.6.3)
 > 18 March 2021
 - Merge pull request 'Release 0.6.3' (#165) from dev into main [`a3a1395`](https://git.odit.services/lfk/backend/commit/a3a1395a46d7970cff1b8cc2e84306a97791ed88)
 - The basic bugfix 🐞 [`fbdadbe`](https://git.odit.services/lfk/backend/commit/fbdadbef1f9eb835e1914e8d3770cca836b4c443)
 - The basic bugfix 🐞 [`c87c97c`](https://git.odit.services/lfk/backend/commit/c87c97c90f5e1229f92671b1f2ebe1fa0d2307cd)
 - Updated tests 🧪 [`f347b7a`](https://git.odit.services/lfk/backend/commit/f347b7ad4982ed3760117c08e11dca5c3f72d495)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`3f9a704`](https://git.odit.services/lfk/backend/commit/3f9a7049e31a6948125a07e847233b804f27ba31)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`b08acc6`](https://git.odit.services/lfk/backend/commit/b08acc666035ed766cc6ccfa9a410a54db4d7321)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`a6bca59`](https://git.odit.services/lfk/backend/commit/a6bca59ffe06a37f03af21500c442cebeaa74c7e)
 - 🚀Bumped version to v0.6.3 [`7a303c2`](https://git.odit.services/lfk/backend/commit/7a303c2b2c267d6dd566b1470649e65bc1c1b2ee)
 - Merge pull request 'TrackScan Update bug 🐞bugfix/163-trackscan_updates' (#164) from bugfix/163-trackscan_updates into dev [`6249419`](https://git.odit.services/lfk/backend/commit/6249419fae22e0203c046c1a3cd82c07f94f510c)
 #### [v0.6.2](https://git.odit.services/lfk/backend/compare/v0.6.1...v0.6.2)
 > 17 March 2021
 - Merge pull request 'Release 0.6.2' (#162) from dev into main [`732a1b8`](https://git.odit.services/lfk/backend/commit/732a1b88d916720ea82cd4b192fc696640ade2aa)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`fcb43f9`](https://git.odit.services/lfk/backend/commit/fcb43f92b0b7a8fa2ed3772357c3eab8e6564eef)
 - Fixed trackscan vaildation [`a8ea4fa`](https://git.odit.services/lfk/backend/commit/a8ea4fa659732ca2c922fc3c75d2238be2feb5c7)
 - Added comments✏ [`289f9e2`](https://git.odit.services/lfk/backend/commit/289f9e219692789f86c631f52c67b578216acb48)
 - Added comments✏ [`937a9fa`](https://git.odit.services/lfk/backend/commit/937a9fad4d8914b83fc6300f776c0720b756a9f4)
 - Removed duplicate openapi declarations 🗑 [`c8882ae`](https://git.odit.services/lfk/backend/commit/c8882ae6a18188a9c98a237dd594548ebac6f460)
 - Now defining security per endpoint 🔐 [`d709ee7`](https://git.odit.services/lfk/backend/commit/d709ee74795b785599cda50b4351bd566a0b8573)
 - Changed the method of getting a parameter from the headers🛠 [`1d38d30`](https://git.odit.services/lfk/backend/commit/1d38d308ad8ae00d67c2b807b584da4f00bd9a58)
 - Now auto-etting the station token🔥🔥🔥 [`aae042c`](https://git.odit.services/lfk/backend/commit/aae042c041e325626b89b146d005e900bd880453)
 - Marked station as optional (quality of life improvements incoming) [`1f32ed0`](https://git.odit.services/lfk/backend/commit/1f32ed0727cb1117e5d201b5530b2f2d7f0323d8)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`4c960fe`](https://git.odit.services/lfk/backend/commit/4c960feeb22f819d1c618ced73f5799a3c7e4f00)
 - Fixed missing renameing🛠 [`0ed7f78`](https://git.odit.services/lfk/backend/commit/0ed7f78b2c284909d47fa0533424c279adef0ba3)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`c1dd451`](https://git.odit.services/lfk/backend/commit/c1dd4518d128edd8b8e36981a513744471241a25)
 - 🚀Bumped version to v0.6.2 [`5ba8f1d`](https://git.odit.services/lfk/backend/commit/5ba8f1dd4451c1a1b38fdd36cf632c9e6efa829c)
 - Merge pull request 'Bugfixes for trackscans feature/160-responseTrackScan_total_distance' (#161) from feature/160-responseTrackScan_total_distance into dev [`3d3790c`](https://git.odit.services/lfk/backend/commit/3d3790c2eb6a92bb5b1d2c7e44c75aef4e1b015f)
 - Fixed wrong error type 👀👀 [`1fa3fa7`](https://git.odit.services/lfk/backend/commit/1fa3fa75ee447b9919585e02c7997e3f1de9c8a7)
 - Added missing discription [`673e896`](https://git.odit.services/lfk/backend/commit/673e896aa3dc853b301a2e560e785c464a449b6f)
 #### [v0.6.1](https://git.odit.services/lfk/backend/compare/v0.6.0...v0.6.1)
 > 17 March 2021
 #### [v0.6.0](https://git.odit.services/lfk/backend/compare/v0.5.0...v0.6.0)
 > 17 March 2021
 - Merge pull request 'Release v0.6.0' (#159) from dev into main [`bdc7bb6`](https://git.odit.services/lfk/backend/commit/bdc7bb67e7e21769d95a762c3b6dfbf82e7e38d0)
 - 📖New license file version [CI SKIP] [skip ci] [`5f5c8a0`](https://git.odit.services/lfk/backend/commit/5f5c8a061eb94361e4cd02e9a6469194a9092513)
 - As requested by @philpp [`2cb7ec7`](https://git.odit.services/lfk/backend/commit/2cb7ec7317d8a48364261506facb2c11c7cf895f)
 - Updated ci with new kubernetes secrets 🚀🚀🚀 [`5541ae6`](https://git.odit.services/lfk/backend/commit/5541ae6ebd7f36f4482ae752f358102a18b95de0)
 - Added selfservice forgott positive tests [`bf1ec97`](https://git.odit.services/lfk/backend/commit/bf1ec976e3732b6ac052a55a51ee2ee18a8b1d3d)
 - Added all "negative" tests [`d0a7e34`](https://git.odit.services/lfk/backend/commit/d0a7e34de8095fca282adefff01fa5f72e7cdba3)
 - Added mailer functions [`8376513`](https://git.odit.services/lfk/backend/commit/83765136ccacd82ba6a8f9fb43eed78191ee0aa5)
 - Added tests for the new endpoint [`757332e`](https://git.odit.services/lfk/backend/commit/757332ed2b3325d8730ef1b284ac6ba40356df93)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`e4ed20d`](https://git.odit.services/lfk/backend/commit/e4ed20da3e0a9e32a2e4664d50f316f9131564f0)
 - Added first selfservice forgotten test [`a95a9b4`](https://git.odit.services/lfk/backend/commit/a95a9b4ec4a3012a91f6f622cfb9f5bff3376344)
 - Created basic endpoint for user forgotten mails [`d709971`](https://git.odit.services/lfk/backend/commit/d7099717c2eee8aaf1b580345717cc5acc06dbd2)
 - Implemented the "real" errors [`e26b7d4`](https://git.odit.services/lfk/backend/commit/e26b7d4923777a3013368e29c122709de7e1d9da)
 - Runner controller now uses the Mailer functions [`a343747`](https://git.odit.services/lfk/backend/commit/a3437475caf6b435ae4bdf6d48aeb7da7d43b25f)
 - Added scanstation me endpoint [`c5178e0`](https://git.odit.services/lfk/backend/commit/c5178e01814cedaa4402773b10f24d186714c1d2)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`54988ba`](https://git.odit.services/lfk/backend/commit/54988ba0fe012ce87d44c9068f7546a9be73723c)
 - Added last reset requested timestamp to runners [`66d6023`](https://git.odit.services/lfk/backend/commit/66d6023335c7a9d1a145c4189b610940ef5a525a)
 - Scanauth return objects [`46b7ace`](https://git.odit.services/lfk/backend/commit/46b7aceb0b86b03688faf0ec6661e4c9fbc6115c)
 - Revert "Switched normal images to chached registry" [`ca6fa63`](https://git.odit.services/lfk/backend/commit/ca6fa633a156a265d8f643a5f23090b6ab32260d)
 - Switched normal images to chached registry [`cba4455`](https://git.odit.services/lfk/backend/commit/cba4455d53f9a39b6f9993c36b5abd281201dfa1)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`a7958ee`](https://git.odit.services/lfk/backend/commit/a7958eecd65116ab937f640cbebcae1962cb86c8)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`076aa87`](https://git.odit.services/lfk/backend/commit/076aa87dba1d6fc544e76c16f99c64d37fc82ea0)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`486e450`](https://git.odit.services/lfk/backend/commit/486e450a58d3671dc867ae1a99d052d9fe814c1a)
 - Updated request timeout [`ffcd45e`](https://git.odit.services/lfk/backend/commit/ffcd45e5724fccdec9b1dbc48f1320525dcd7288)
 - Added testing env check [`3f37212`](https://git.odit.services/lfk/backend/commit/3f372123fd2e1fae467e9cb20985de1eeb9f6a57)
 - 🚀Bumped version to v0.6.1 [`ce3ca9f`](https://git.odit.services/lfk/backend/commit/ce3ca9f1c86a6fe72e4dd77e3a0d60bf1e1bf542)
 - 🚀Bumped version to v0.6.0 [`623b5a1`](https://git.odit.services/lfk/backend/commit/623b5a1873afa73a984251543995b7da1cfdb5c9)
 - Merge pull request 'Scanstation "me" endpoint feature/157-scanstation_me' (#158) from feature/157-scanstation_me into dev [`13e8399`](https://git.odit.services/lfk/backend/commit/13e839902c063057e902fdb52b403be081d1667e)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`a1a94ec`](https://git.odit.services/lfk/backend/commit/a1a94ec9dafecd9b4c453cc8cfe32c2e90acccf5)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`d5930f7`](https://git.odit.services/lfk/backend/commit/d5930f7c46f4fc8ed56b6eeec9f784d435fd3b2b)
 - Changed ci pipeline type to kubernetes [`6c43872`](https://git.odit.services/lfk/backend/commit/6c43872198c3dba44b3af3a7cfc7b628d5b304a3)
 - Mailer now ignores mailing erros when env is set to test [`6bb3ae8`](https://git.odit.services/lfk/backend/commit/6bb3ae8ba992bd6c4d5809d75a264c710999cdcf)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`bf71e35`](https://git.odit.services/lfk/backend/commit/bf71e35ecd333d888d63213d69b04fc681a9d0bd)
 - Adjusted tests for the new testing env [`9292027`](https://git.odit.services/lfk/backend/commit/92920273bec409563d1e38ea27f4d30f893598e8)
 - Applied Docker MTU fix 🛠 [`f7af777`](https://git.odit.services/lfk/backend/commit/f7af77710421d7aae5efb048e0622cd067fc20eb)
 - Updated description [`94001a4`](https://git.odit.services/lfk/backend/commit/94001a48f1b314e91ea5ec982e5585124f9541b6)
 - Now adding station id to headers of request for scan auth [`8ba7ee1`](https://git.odit.services/lfk/backend/commit/8ba7ee1d481e44e686489e237980b21aaaf6071c)
 - Merge pull request 'selfservice forgotten mails feature/154-selfservice_forgotten' (#155) from feature/154-selfservice_forgotten into dev [`cb6e78f`](https://git.odit.services/lfk/backend/commit/cb6e78fc176ec9efe94311b64286020b3c5bf633)
 - Changed endpoint url to avoid conflicts [`e5dab34`](https://git.odit.services/lfk/backend/commit/e5dab3469c3cef6298fc8deb1192a38f7d18406b)
 - Added console logging when a testing env get's discovered [`c01233b`](https://git.odit.services/lfk/backend/commit/c01233b4d663aefece26dbb86f8b6bcd5c916325)
 - Added not found error logic [`e7f0cb4`](https://git.odit.services/lfk/backend/commit/e7f0cb45c9ac3aa06e2a57786aa1cc51c9d66598)
 - Updated to new responsetype [`08957d4`](https://git.odit.services/lfk/backend/commit/08957d4dc2951cfeec56a54680c2ae4ef1525ab2)
 - Added readme description for testing env [`cedc175`](https://git.odit.services/lfk/backend/commit/cedc1750c21ad256c3337f293f06e894e2c2ef9f)
 - Renamed test [`1d762f5`](https://git.odit.services/lfk/backend/commit/1d762f56628eff47f4e1a910c7152bd0158283bd)
 #### [v0.5.0](https://git.odit.services/lfk/backend/compare/v0.4.6...v0.5.0)
 > 4 March 2021
 - Merge pull request 'Alpha Release 0.5.0' (#153) from dev into main [`64da0ea`](https://git.odit.services/lfk/backend/commit/64da0eadb313f3bd3ae20a66bcaf4401528008d9)
 - Removed mail templates [`c2fdfee`](https://git.odit.services/lfk/backend/commit/c2fdfeed4f5fc454b02bc4b198965889c173bbaa)
 - Removed mail config [`0342757`](https://git.odit.services/lfk/backend/commit/0342757d929b12635c88e74f17495df656865b1a)
 - Added selfservice scan response class [`6074ac5`](https://git.odit.services/lfk/backend/commit/6074ac5b3a8e43fd98394c1fb70c6e1dea8fcd5e)
 - Removed old mailer code [`0fcc729`](https://git.odit.services/lfk/backend/commit/0fcc729b56430f0fdb56242857aa1d883d5a4866)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`5272829`](https://git.odit.services/lfk/backend/commit/52728290b477d3f90ee7c14e0d438c4c74415322)
 - Added the new mailer code [`1551a44`](https://git.odit.services/lfk/backend/commit/1551a444babc025cde6e894c66d2be2c84ab26da)
 - Removed (now useless) mail controller [`485c247`](https://git.odit.services/lfk/backend/commit/485c247cd3305c4c4422d5582b1d61cc7af84989)
 - Trackscans now have a laptime that get's calculated on creation [`aa83373`](https://git.odit.services/lfk/backend/commit/aa833736d32993b1656abeeb02a4f8b021ec6252)
 - Removed useless functions and updated comments [`ada6798`](https://git.odit.services/lfk/backend/commit/ada679823cda8bc31d45c0ff6905f3d270cfd729)
 - Added new selfservice scans endpoint [`771a205`](https://git.odit.services/lfk/backend/commit/771a205fe634fc5c07e794b3245c59483ff14bd8)
 - Updated mail errors [`f289afd`](https://git.odit.services/lfk/backend/commit/f289afd8bc47f6eae9f12f765322b2db974ba918)
 - Laptime is now a part of the response [`a2c97a1`](https://git.odit.services/lfk/backend/commit/a2c97a11a3dc82543076e3844f20d1218943bbf9)
 - Updated readme env section [`db58a28`](https://git.odit.services/lfk/backend/commit/db58a280b3792b768eb2b1c82a76d9a9836978b1)
 - Added locale to pw reset endpoint [`a5d2a6e`](https://git.odit.services/lfk/backend/commit/a5d2a6ecd31dc9c186d4201aef5c52e34cbef3b5)
 - Now using mailer as static funtion [`9a1678a`](https://git.odit.services/lfk/backend/commit/9a1678acf0929dab9f84bd2c6a961b52e36172ce)
 - Updated readme env section [`149f3a8`](https://git.odit.services/lfk/backend/commit/149f3a83b2e9d59bfbf36c7ea9e27bc7f514856d)
 - Now checking for mails being set [`bb9bad6`](https://git.odit.services/lfk/backend/commit/bb9bad6d90370e768d4baffaae23ec756cc8353b)
 - Updated auth reset test for new mailer [`ae7d617`](https://git.odit.services/lfk/backend/commit/ae7d6176902699f82ea127194908ee360233e7b4)
 - Added scans returns 200 test [`82c65b6`](https://git.odit.services/lfk/backend/commit/82c65b632cdf44165b083494702b836c74e46a41)
 - 🚀Bumped version to v0.4.7 [`f1d85cf`](https://git.odit.services/lfk/backend/commit/f1d85cfb855c2aae581ade69751b3969ce38f020)
 - Now generateing bs mailer config in test env [`bf6b701`](https://git.odit.services/lfk/backend/commit/bf6b70106eb735d9ad6f6ad89f09194680af5ae1)
 - Added new mailer settings to config [`ddea02d`](https://git.odit.services/lfk/backend/commit/ddea02db574cc348685558f3fa3ecc84adbd6b65)
 - 🚀Bumped version to v0.5.0 [`3f2a2d2`](https://git.odit.services/lfk/backend/commit/3f2a2d292979c7f8162d92465b60b220f2634e7a)
 - Merge pull request 'Features for the new selfservice feature/151-selfservice_scans_mails' (#152) from feature/151-selfservice_scans_mails into dev [`15356c1`](https://git.odit.services/lfk/backend/commit/15356c1030988d03e3739f3ffe770669789759f2)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`be397c8`](https://git.odit.services/lfk/backend/commit/be397c8899d5b4406c17e8f9951555c54f852901)
 - Promoted axios to dependency [`a9e06c9`](https://git.odit.services/lfk/backend/commit/a9e06c905537b6da24706389e304e825a33a28ad)
 - Removed nodemailer from backend [`5833f42`](https://git.odit.services/lfk/backend/commit/5833f4218f9a4c97b69021814df92470a1816917)
 - Added another resonse type [`030b225`](https://git.odit.services/lfk/backend/commit/030b2255d42aab21d8974fc3a7235285934d53b7)
 - Added new selfservice response type [`f7f6df4`](https://git.odit.services/lfk/backend/commit/f7f6df41ff74708482db3ea2db717ffb562131c0)
 #### [v0.4.6](https://git.odit.services/lfk/backend/compare/v0.4.5...v0.4.6)
 > 26 February 2021
 - Merge pull request 'Alpha Release 0.4.6' (#148) from dev into main [`dd3c927`](https://git.odit.services/lfk/backend/commit/dd3c9275d60cb5bb1a40fbe91f666f17a8e0c8d3)
 - Added tests for the new org selfservice endpoints [`28ef139`](https://git.odit.services/lfk/backend/commit/28ef139a70e0c063982b2eb9167b7abe41db1621)
 - Added selfservice org response model [`ba3b5ee`](https://git.odit.services/lfk/backend/commit/ba3b5eeefc45f9bd94aef24f9f509f6835f5ea7c)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`764b7ff`](https://git.odit.services/lfk/backend/commit/764b7ffe00086248e1f1cccb265ca920a568c0a0)
 - Merge pull request 'Fixed wrong body acceptance type' (#150) from bugfix/146-usergroup_update into dev [`d870b2f`](https://git.odit.services/lfk/backend/commit/d870b2fd01b11b1732fcbb6feecaf6a6155fa702)
 - Added selfservice team response model [`ba396e0`](https://git.odit.services/lfk/backend/commit/ba396e0eba15647b3004437a5a9949c7a69e828d)
 - 📖New license file version [CI SKIP] [skip ci] [`bce8811`](https://git.odit.services/lfk/backend/commit/bce8811925e7f77c64fc507d55335ac45b0e5572)
 - 📖New license file version [CI SKIP] [skip ci] [`b1fced7`](https://git.odit.services/lfk/backend/commit/b1fced77640b6c26438331474f368f2b0708b672)
 - Added selfservice org info endpoint [`656f63d`](https://git.odit.services/lfk/backend/commit/656f63dfd5fdbe13554fc98440e416be7e56d909)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`c0cafb4`](https://git.odit.services/lfk/backend/commit/c0cafb4d510116773fed12592cad1efc2ef09f38)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`09fe47b`](https://git.odit.services/lfk/backend/commit/09fe47b9aaac47b65d4e910ef89d558c47fd7364)
 - Fixed wrong body acceptance type [`aaec09d`](https://git.odit.services/lfk/backend/commit/aaec09d2ab08a76e9d367fdfefc01cea5588f1b9)
 - Pinned package version to avoid dependency conflicts 📌 [`39ebfbf`](https://git.odit.services/lfk/backend/commit/39ebfbf0b633ecc479a33fdf851cd6550616bfee)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`3736b29`](https://git.odit.services/lfk/backend/commit/3736b29e5435abb05de03e5d99d9adb438cd7d7e)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`305fa00`](https://git.odit.services/lfk/backend/commit/305fa0078d44b39b0391e84ba67b048285cf77b9)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`3afc207`](https://git.odit.services/lfk/backend/commit/3afc207903c9cf1e62e6f4a62601b4213f608192)
 - Quick bugfix [`5d6c8c9`](https://git.odit.services/lfk/backend/commit/5d6c8c957acd098a20e674ce5529f60cbc9f4151)
 - 🚀Bumped version to v0.4.6 [`b4acd15`](https://git.odit.services/lfk/backend/commit/b4acd157fc075154a60946c1ee8876ee5f5dfbee)
 - Merge pull request 'New org selfservice endpoint feature/146-more_selfservice_endpoints' (#147) from feature/146-more_selfservice_endpoints into dev [`45d61b4`](https://git.odit.services/lfk/backend/commit/45d61b487e8e6fdd8e00c184a08c9d6e34a1b6bf)
 - Added new response types [`3c11d88`](https://git.odit.services/lfk/backend/commit/3c11d88557a2612bf4320ff669323bc048634e94)
 #### [v0.4.5](https://git.odit.services/lfk/backend/compare/v0.4.4...v0.4.5)
 > 9 February 2021
 - Merge pull request 'Alpha release 0.4.5' (#145) from dev into main [`a46d142`](https://git.odit.services/lfk/backend/commit/a46d14278b9a084ca54f8f90e5e70b04739c2dd7)
 - 🚀Bumped version to v0.4.5 [`cc869f6`](https://git.odit.services/lfk/backend/commit/cc869f69add1f1a175ff94510d52888f81bccb69)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`680ae8e`](https://git.odit.services/lfk/backend/commit/680ae8ebbb39d103085fe1fe8781d71b3c3ed055)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`b9aac71`](https://git.odit.services/lfk/backend/commit/b9aac7167681ff0945e538dd177abd6f97771bf2)
 - Merge pull request 'usergroups/permissions endpoint feature/143-usergroup_permissions_endpoint' (#144) from feature/143-usergroup_permissions_endpoint into dev [`a30a342`](https://git.odit.services/lfk/backend/commit/a30a342e00ba944f8014044bba28141c0657a17f)
 - Implemented /groups/permissions endpoint [`0c9867d`](https://git.odit.services/lfk/backend/commit/0c9867d70616615c8f3c72bbec37a4441e4868ef)
 - Now all /usergroups endpoints return ResponseUserGroup [`bdcfce8`](https://git.odit.services/lfk/backend/commit/bdcfce88cbe069f9ba1925fcaac06367a109d2b7)
 - The ResponseUserGroup now returns their permisssions as a string array [`416f2a1`](https://git.odit.services/lfk/backend/commit/416f2a1366c570998011d022ebd7f5f44276b2c9)
 - The ResponseUserGroup now returns their permisssions as a string array [`5e353db`](https://git.odit.services/lfk/backend/commit/5e353db2061c30b4d10965c47f0dcbecb7f59fc5)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`8379c3e`](https://git.odit.services/lfk/backend/commit/8379c3e29c45f0d7c4c84bce1f3abc718158fa84)
 #### [v0.4.4](https://git.odit.services/lfk/backend/compare/v0.4.3...v0.4.4)
 > 9 February 2021
 - Merge pull request 'Alpha release 0.4.4' (#142) from dev into main [`c4edcca`](https://git.odit.services/lfk/backend/commit/c4edccace78765dd5caa0f0e79c52f07c8a3568e)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`ca3d093`](https://git.odit.services/lfk/backend/commit/ca3d093e54bfaaa77c97e96738a74eeb25aee440)
 - Now loading runner's group's parentgroup with every runner controller request [`701706c`](https://git.odit.services/lfk/backend/commit/701706c0289b357439608b4e2eaa66c617d16e9d)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`74de655`](https://git.odit.services/lfk/backend/commit/74de6559d7c5e8c6d257d41dc91396b53bf0c071)
 - The group/runners endpoints now also deliver the runner's group's parentGroup [`906a1dc`](https://git.odit.services/lfk/backend/commit/906a1dc9e79ea4eb298a561cf98e6ae42b3ae4ec)
 - 🚀Bumped version to v0.4.4 [`a6f73c7`](https://git.odit.services/lfk/backend/commit/a6f73c733c8cfc8d84beb7e0bbd5bcd1313df9d0)
 - Merge pull request 'Expanded runner response feature/140-runner_group_parent' (#141) from feature/140-runner_group_parent into dev [`28cfbaa`](https://git.odit.services/lfk/backend/commit/28cfbaa6624d0bc65e2a9b72ffed17060e828735)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`09bbc70`](https://git.odit.services/lfk/backend/commit/09bbc70f5fd1f026148be07fe889a6907bc3f75a)
 - Adjusted test for the new response depth [`90e1ad7`](https://git.odit.services/lfk/backend/commit/90e1ad7db72732d13002c87461c33560b74befa6)
 - Adjusted test for the new response depth [`5872c63`](https://git.odit.services/lfk/backend/commit/5872c6335be573d849cdc3746b261c6cf476c3de)
 #### [v0.4.3](https://git.odit.services/lfk/backend/compare/v0.4.2...v0.4.3)
 > 7 February 2021
 - Merge pull request 'Alpha Release 0.4.3' (#139) from dev into main [`dd9cb6d`](https://git.odit.services/lfk/backend/commit/dd9cb6d3ef60cb118391abc2ba17fd0f83db0b1c)
 - 🚀Bumped version to v0.4.3 [`656d564`](https://git.odit.services/lfk/backend/commit/656d564baa8c8bf1f63523b0301ad9ff23e08aa4)
 - Bugfix for @lfk/frontend/#43 [`8f0a396`](https://git.odit.services/lfk/backend/commit/8f0a396dd07937fb7ccfb345d1acbac86eb5d9bb)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`f3f5cb4`](https://git.odit.services/lfk/backend/commit/f3f5cb462e4ecf932ad55eb519815222b4e5dd17)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`23c732b`](https://git.odit.services/lfk/backend/commit/23c732b6905cc9f6479a53a7744b72d01e345ecb)
 - Merge pull request 'Bugfix for @lfk/frontend/#43' (#138) from bugfix/118-encode_jwt_in_mail into dev [`9959172`](https://git.odit.services/lfk/backend/commit/9959172f2ae11cbb7a2b8e97bad432956fc70a80)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`a18d4d3`](https://git.odit.services/lfk/backend/commit/a18d4d3cee58f8eb9dc428b051a2394bd3ece5c2)
 #### [v0.4.2](https://git.odit.services/lfk/backend/compare/v0.4.1...v0.4.2)
 > 2 February 2021
 - Merge pull request 'Alpha Release 0.4.2' (#137) from dev into main [`390b36d`](https://git.odit.services/lfk/backend/commit/390b36dfd46cf8829126581bd62dd3d4ce8558fa)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`3b718f3`](https://git.odit.services/lfk/backend/commit/3b718f3ce58f12007b6068e5db00a00dbe1c5398)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`f7a0ec7`](https://git.odit.services/lfk/backend/commit/f7a0ec7174521b1863a4bc58c7ff2b86cafdee66)
 - 🚀Bumped version to v0.4.2 [`321b20b`](https://git.odit.services/lfk/backend/commit/321b20b073b6debd605a92544779d0dfc0449f10)
 - Merge pull request 'Imprint&Privacy Links feature/135-imprint_and_privacy' (#136) from feature/135-imprint_and_privacy into dev [`110a847`](https://git.odit.services/lfk/backend/commit/110a84783e023407cbcf81506deb7cc204db9659)
 - 📖New license file version [CI SKIP] [skip ci] [`74791df`](https://git.odit.services/lfk/backend/commit/74791df68b40355e1d1a1f7f5ae4f64422571dc9)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`8425043`](https://git.odit.services/lfk/backend/commit/84250430996920ada15af23b68756daba8f99257)
 - Added new url env vars to config [`bcad691`](https://git.odit.services/lfk/backend/commit/bcad691045d00c9630bedb0936c123610b655946)
 - fixed license-exporter call [`74b982a`](https://git.odit.services/lfk/backend/commit/74b982afba3ec82a038c4748420920732fe32a51)
 - Added documentation about the new env vars to the readme [`333e806`](https://git.odit.services/lfk/backend/commit/333e806da42d7654e2b9fc13abae984726c689e7)
 - Added imprint and privacy to the api spec [`f4f6219`](https://git.odit.services/lfk/backend/commit/f4f621973aa98645dee3d43252bb18f125087c54)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`3aefa75`](https://git.odit.services/lfk/backend/commit/3aefa754128fc58a8200b280ee036c49cdaaac4a)
 #### [v0.4.1](https://git.odit.services/lfk/backend/compare/v0.4.0...v0.4.1)
 > 30 January 2021
 - Merge pull request 'Alpha Release 0.4.1' (#134) from dev into main [`71cab4e`](https://git.odit.services/lfk/backend/commit/71cab4e836dca2e2072b62676337f5f90796f105)
 - Deleted useless file [ci skip] [`94dd796`](https://git.odit.services/lfk/backend/commit/94dd7963b73d98089f086175ed79002f59195c26)
 - Implemented the interface in all responses [`9d5e486`](https://git.odit.services/lfk/backend/commit/9d5e486c6ddb4db87d36409fbd8bca1bf9659e9f)
 - Adjusted tests for the new responseType parameter (part 1) [`bcc15e4`](https://git.odit.services/lfk/backend/commit/bcc15e42863b641b97cd03440f141332e112c889)
 - Cleaned up realations regarding response classes [`ff7406e`](https://git.odit.services/lfk/backend/commit/ff7406e71a4a76670d381b415bfb66f602e1206b)
 - Added Responseobjecttype enum [`581ca5f`](https://git.odit.services/lfk/backend/commit/581ca5ff6c67ed1c701c06532671441293ee0706)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`0229534`](https://git.odit.services/lfk/backend/commit/02295346dad109745faa492dc968abbc98522804)
 - Dependency bump🔝 [skip ci] [`3d1baae`](https://git.odit.services/lfk/backend/commit/3d1baae0cce26b0c1f6948778b15f4b0097a77a9)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`7ba67b9`](https://git.odit.services/lfk/backend/commit/7ba67b9dcab7692c8c1e548ccbc3895eb084eedd)
 - Adjusted tests for the new responseType parameter (part 3) [`8dc2810`](https://git.odit.services/lfk/backend/commit/8dc2810c0c4097e26bf1b517bb9d0b102494f6c1)
 - Added a Response interface [`e44cc4c`](https://git.odit.services/lfk/backend/commit/e44cc4c4cbecdf7c8d90f0af73fffd8b01eba61e)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`4e10077`](https://git.odit.services/lfk/backend/commit/4e100779017c5ce542b59cf2156bd6ab5fdceed2)
 - Adjusted tests for the new responseType parameter (part 2) [`ff8af09`](https://git.odit.services/lfk/backend/commit/ff8af090e3ea1760fb6110284cff870a0b4cbf84)
 - 🚀Bumped version to v0.4.1 [`c32fa93`](https://git.odit.services/lfk/backend/commit/c32fa93673010ab18e009ab24fc139ed4f67310e)
 - Merge pull request 'Response object types feature/132-object_types' (#133) from feature/132-object_types into dev [`6e5f1bd`](https://git.odit.services/lfk/backend/commit/6e5f1bd5ff217a88ec2dfaf154e5e26dee588e12)
 - Fixed typos and missing types [`2a87819`](https://git.odit.services/lfk/backend/commit/2a878194865d406123805659c011c329c955f669)
 #### [v0.4.0](https://git.odit.services/lfk/backend/compare/v0.3.1...v0.4.0)
 > 30 January 2021
 - Merge pull request 'Alpha Release 0.4.0' (#131) from dev into main [`c4ea808`](https://git.odit.services/lfk/backend/commit/c4ea808e06bdc68add5636346f99a7d292852ab0)
 - Added pw reset template provided by @philipp [`c116338`](https://git.odit.services/lfk/backend/commit/c116338cd74cf726362f8fa0ae5eea7ec9fabac4)
 - Added test mail templates [`8270029`](https://git.odit.services/lfk/backend/commit/827002989ee6e3f0d776b5b55b8fb6d65f10c898)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`09b24aa`](https://git.odit.services/lfk/backend/commit/09b24aa6094a980debf4428a1c32583cdb7b606f)
 - Implemented automatic ci env generation [`536de2a`](https://git.odit.services/lfk/backend/commit/536de2a3199b1befed54b6fe520a2e3fcefe0d90)
 - Implemented a basic mailer with reset link sending [`6379753`](https://git.odit.services/lfk/backend/commit/637975305f1adf9bf505507790638cf1e229cfb1)
 - Table fix [`1f0c842`](https://git.odit.services/lfk/backend/commit/1f0c842d9e086456f1ae0f6908e474258a04beb4)
 - Implemented the test-mail endpoint via a new mailcontroller [`54ed313`](https://git.odit.services/lfk/backend/commit/54ed313342a72b029b9545bc5ea193e3f0c2166d)
 - Added documentation for the env vars [`13ccab5`](https://git.odit.services/lfk/backend/commit/13ccab5e289d0a629cefb7fe281a85a46058ae97)
 - Added comments [`9bd7636`](https://git.odit.services/lfk/backend/commit/9bd7636a23b5a9662ea2b965d2a2407727a188fb)
 - Added test mail sending test [`ae74b39`](https://git.odit.services/lfk/backend/commit/ae74b3963fddb847aed4a828031b93b26cf551db)
 - Password reset now enforces email [`979d36e`](https://git.odit.services/lfk/backend/commit/979d36ea9147dc575e9e989f6833388828285176)
 - Implementes mail sending on pw reset request [`e26744b`](https://git.odit.services/lfk/backend/commit/e26744b7925d32d65ef4cc3911651758cfc9274f)
 - Added a txt variant of the pw-reset mail [`d3647e3`](https://git.odit.services/lfk/backend/commit/d3647e339990d989dbca4d91aa8c3fe5789dd24a)
 - Changed order [`583a4bc`](https://git.odit.services/lfk/backend/commit/583a4bc0dd0de8026bb2eb6a9b0c31f59344e813)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`fea4857`](https://git.odit.services/lfk/backend/commit/fea485768570eb5de2bbd2783e339794a67db2de)
 - Translated the pw reset mail to english [`5cade25`](https://git.odit.services/lfk/backend/commit/5cade25eeb137eb5890b3fd450646acfbdff2e8b)
 - The auth tests now use mail to identify the user [`c43334b`](https://git.odit.services/lfk/backend/commit/c43334bf96901bfd5116301ff7cf4b2ae1dfcbd3)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`e07f258`](https://git.odit.services/lfk/backend/commit/e07f258a315898d1183c311e7fcd8f65a415504c)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`b972395`](https://git.odit.services/lfk/backend/commit/b972395ae8bb06184baa56296a3b8bfc16ae96a7)
 - 🚀Bumped version to v0.4.0 [`e5f4f6e`](https://git.odit.services/lfk/backend/commit/e5f4f6ee590e0885d6eef9151ce7eb76578b70ca)
 - Merge pull request 'Implemented testmail endpoint feature/124-testmail' (#130) from feature/124-testmail into dev [`f9e75d0`](https://git.odit.services/lfk/backend/commit/f9e75d06b8ee8ff79f60fb384cb2c35ccf19811d)
 - Merge pull request 'Email Basics feature/118-emails' (#128) from feature/118-emails into dev [`348e6cd`](https://git.odit.services/lfk/backend/commit/348e6cdec7411345953243edfb5322a17ad7614d)
 - Merge pull request 'Mail+Env documentation feature/123-mail_documentation' (#129) from feature/123-mail_documentation into dev [`61bbeb0`](https://git.odit.services/lfk/backend/commit/61bbeb0d8f3fd6bfafb65bd11eb4c076a27b4a53)
 - Added a test mail sending function [`b94179e`](https://git.odit.services/lfk/backend/commit/b94179e3caaf4be0654ca3372f57a490fb32e208)
 - Added the first mail error [`c418603`](https://git.odit.services/lfk/backend/commit/c4186034233a296b5971fbef16e7ef6809fbac51)
 - Now also sending txt mail body [`b92f633`](https://git.odit.services/lfk/backend/commit/b92f633d68604636cecc5e9fdd0d6990b9cb83fe)
 - Removed tests working directly with the old pw-reset response [`d02e9de`](https://git.odit.services/lfk/backend/commit/d02e9dec5637aedefdf2ed3cd2c6d73216b6464b)
 - Added the basics about mail templates to the readme [`b5018eb`](https://git.odit.services/lfk/backend/commit/b5018eb11492884db9f4ec969c767c3cce53f105)
 - Cleaned up the replacements [`389e423`](https://git.odit.services/lfk/backend/commit/389e423850d68a5fe440b62413a6c662353ac9c6)
 - Added mail env vars [`d7ea928`](https://git.odit.services/lfk/backend/commit/d7ea928714f94814695cbd2815c8730df58033f6)
 - Added a barebones class for handleing mail stuff [`cf012c0`](https://git.odit.services/lfk/backend/commit/cf012c0b7efffb81b03497a04b0fdad0423c72f7)
 - Added a Mail permisssion target [`ad4b903`](https://git.odit.services/lfk/backend/commit/ad4b903c258820f14df28d56b12e099075ca7d78)
 - Added env vars [`470703c`](https://git.odit.services/lfk/backend/commit/470703c4de954da94726879becd57986b59e1f69)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`2071c4d`](https://git.odit.services/lfk/backend/commit/2071c4db33bbb9fd41ef650b409cac789732225f)
 - Added a hint to ethereal.email [`53fcff7`](https://git.odit.services/lfk/backend/commit/53fcff77d00fc2b205ada0bcee7bdfe83d94a9f4)
 - Fixed missing app_url protocol [`46af786`](https://git.odit.services/lfk/backend/commit/46af7865165bbfb97ed3e6cdfef15dfb72add611)
 - Removed the duplicate env copy/create from ci tests [`08e6e59`](https://git.odit.services/lfk/backend/commit/08e6e5965544906f5033f2080166bddc37cc30c7)
 - Removed bs console.log [`71c4caa`](https://git.odit.services/lfk/backend/commit/71c4caae8ba67e253d893409b3c5c3a39b08060a)
 - Added nodemailer types [`78d2ac3`](https://git.odit.services/lfk/backend/commit/78d2ac3027f7109161ee36e9b3dda628a7039468)
 - Added nodemailer dependecy [`908ac4f`](https://git.odit.services/lfk/backend/commit/908ac4f1ce9d78749268353c668e67b57eae6f94)
 - Fixed wrong file location [`b4c117b`](https://git.odit.services/lfk/backend/commit/b4c117b7dc326d212598b6e720d0a422134e383d)
 - Renamed the template [`fb77f4d`](https://git.odit.services/lfk/backend/commit/fb77f4d798550fdb6fe6b2c8a81198db0328f71e)
 - Added a folder for the mail templates [`6b0155f`](https://git.odit.services/lfk/backend/commit/6b0155f01464f5ef73ab679b9e3219743e9db66b)
 - Added a folder for the mail templates [`33890b5`](https://git.odit.services/lfk/backend/commit/33890b544b77272ab1c4797e91375d24568eae58)
 #### [v0.3.1](https://git.odit.services/lfk/backend/compare/v0.3.0...v0.3.1)
 > 27 January 2021
 - Merge pull request 'Alpha Release 0.3.1' (#127) from dev into main [`20f960e`](https://git.odit.services/lfk/backend/commit/20f960ed6700fe58c0556895e6485d26c4a4f5e2)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`e6fe8fc`](https://git.odit.services/lfk/backend/commit/e6fe8fcd587751392970d3ee412559b4c1d60f21)
 - Merge pull request 'new advanced endpoints feature/125-team_runner' (#126) from feature/125-team_runner into dev [`870fd47`](https://git.odit.services/lfk/backend/commit/870fd47c83389345d7b24a15df6a4e61e930d140)
 - Added get runners by team test [`69417e9`](https://git.odit.services/lfk/backend/commit/69417e93c081422561db1e211b12f32e539010ce)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`71898d5`](https://git.odit.services/lfk/backend/commit/71898d576c2620d2f2e2b4336e62f1d04a443201)
 - Created the organizations/runners endpoint [`570c34b`](https://git.odit.services/lfk/backend/commit/570c34bed04e359f389a8f427486bf92891f1dcb)
 - Created the runnerTeam/runners endpoint [`7be2971`](https://git.odit.services/lfk/backend/commit/7be2971a9e02bf0e784f7fe5cdd82afbbbf7f854)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`aedfcfc`](https://git.odit.services/lfk/backend/commit/aedfcfcc8359afd7dba4fa5e515e8e77fbb3fc6e)
 - Added get runners by org test [`f71a22f`](https://git.odit.services/lfk/backend/commit/f71a22f4dd9bf14d39ced91908f6f6a5d8395e56)
 - 🚀Bumped version to v0.3.1 [`db08760`](https://git.odit.services/lfk/backend/commit/db0876015bf0599dabb21357f172735888c79aa8)
 #### [v0.3.0](https://git.odit.services/lfk/backend/compare/v0.2.1...v0.3.0)
 > 24 January 2021
 - Merge pull request 'Alpha Release 0.3.0' (#122) from dev into main [`c964591`](https://git.odit.services/lfk/backend/commit/c9645918398e62a80341d038b6b6b5c60ee4b1c7)
 - Renamed files and classed from *Organisation* to *Organization*📝 [`c6c643e`](https://git.odit.services/lfk/backend/commit/c6c643ecf125f5fdf58b105f97efad32e8545dd4)
 - Changed organisation* to organization* in descriptions, comments and endoints ✏ [`ef15d0d`](https://git.odit.services/lfk/backend/commit/ef15d0d57619d79e014e0c0331965ca2bc664254)
 - Added registration invalid citizen tests [`81d2197`](https://git.odit.services/lfk/backend/commit/81d2197a3e978ca43bc79720c32d75f8490f08df)
 - Implemented registration key generation [`ad44650`](https://git.odit.services/lfk/backend/commit/ad446500f90f945aadc3510377bcfd2123440da0)
 - Implemented a runner selfservice registration creation action [`10af1ba`](https://git.odit.services/lfk/backend/commit/10af1ba34148c992e94fa580e1c0210bfaea5112)
 - Created a citizenrunner selfservice create action [`6df195b`](https://git.odit.services/lfk/backend/commit/6df195b6ec5fde27f84cbe54992558715b843b87)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`5660aec`](https://git.odit.services/lfk/backend/commit/5660aecb50c0e6dd538850c6375d2f692fb7a1f2)
 - Implemented a registration key for organisations [`d490247`](https://git.odit.services/lfk/backend/commit/d490247d1e337a680b385d2115e82f79ba54a601)
 - Updates old tests to the new ss-ktokens [`a9843ed`](https://git.odit.services/lfk/backend/commit/a9843ed4598485e6e3d18e78b876b6e000ea6e38)
 - Added self-service get invalid tests [`e964a8e`](https://git.odit.services/lfk/backend/commit/e964a8ed44109899516c4d3b0dc35fe4990107a1)
 - Implemented runner selfservice token generation [`c39a59e`](https://git.odit.services/lfk/backend/commit/c39a59e54ef0b1cc891684283422805af38969e3)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`cc4bf44`](https://git.odit.services/lfk/backend/commit/cc4bf4451cf4eac0e0f1bab02119c2dd5e300f48)
 - Renamedpermisssions from *Organisation* to *Organization*📝 [`cd7e9b8`](https://git.odit.services/lfk/backend/commit/cd7e9b86b4b9d3e1ef0312f6fff436fcef4a5c94)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`3697783`](https://git.odit.services/lfk/backend/commit/3697783e190e36f1168132d75da1eca7be27b4f6)
 - Merge pull request 'OrganiZation rename feature/117-organization' (#121) from feature/117-organization into dev [`161feaf`](https://git.odit.services/lfk/backend/commit/161feaf364195c7b85041e06cdefef72d75b8951)
 - Added registration valid company tests [`20e102e`](https://git.odit.services/lfk/backend/commit/20e102ec5c52c6a01144d064c96b8b2bd1ccfd00)
 - Added registration invalid company tests [`29aeb04`](https://git.odit.services/lfk/backend/commit/29aeb046de769e37fd7257507e36337237697ea0)
 - Added registration valid citizentests [`72941da`](https://git.odit.services/lfk/backend/commit/72941da1cb1c31fd6bfcba2ee3704f34bdd73ef0)
 - Citizen runners now have to provide an email address for verification [`dee3639`](https://git.odit.services/lfk/backend/commit/dee36395a69da6c5e1bc4e94bd705b0418a6a3ff)
 - Implemented the basics for the runner selfservice registration endpoint [`5288c70`](https://git.odit.services/lfk/backend/commit/5288c701c1ac880f3c8b7ece01457aae4bac87d7)
 - Added selfservice get positive test [`0c87906`](https://git.odit.services/lfk/backend/commit/0c87906cc3fa5feaf1d7c186f68d978d4ed7fa8e)
 - Fixed tests testing for a old responseclass [`45c8bb8`](https://git.odit.services/lfk/backend/commit/45c8bb83be0814bed8856a617de435f4694db76c)
 - Fixed typo [`46f9503`](https://git.odit.services/lfk/backend/commit/46f9503543ee011d0780caeefa95748e4be45f58)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`c5d0646`](https://git.odit.services/lfk/backend/commit/c5d0646c425f83689bffd862edd568ca0c1b5ad8)
 - Added registration invalid company tests [`e5b6f65`](https://git.odit.services/lfk/backend/commit/e5b6f650b25af776a543f7f9c7ccf0000bf07a66)
 - Marked param as optional (default: false) [`f8d7544`](https://git.odit.services/lfk/backend/commit/f8d754451769e8361ec2367df7bc586f8fffe8eb)
 - Bugfix: turned old entity in response to responseclass [`10f98e9`](https://git.odit.services/lfk/backend/commit/10f98e9c992b1fb45334e65082d7c47af214b6ac)
 - Resolved missing relation [`3b2ed3f`](https://git.odit.services/lfk/backend/commit/3b2ed3f0f2557dccddf6ba656b201c196cc24bf0)
 - Fixed fluctuating test bahaviour [`1227408`](https://git.odit.services/lfk/backend/commit/1227408407ac66b9689446c1f318b453a9d45069)
 - 🚀Bumped version to v0.3.0 [`75e2a44`](https://git.odit.services/lfk/backend/commit/75e2a44c9c7f720d1a5a20611b305e5d56a9155b)
 - Merge pull request 'Self service registration feature/112-selfservice_registration' (#120) from feature/112-selfservice_registration into dev [`6a66dd8`](https://git.odit.services/lfk/backend/commit/6a66dd803becb59172e8645c6b55898fb4b4c0b5)
 - Implemented the citizen runner self-registration endpoint [`1b5465b`](https://git.odit.services/lfk/backend/commit/1b5465bea810f59cbf8bb1a3e82c062176f79c49)
 - Citizen registration now returns tokens [`9dd9304`](https://git.odit.services/lfk/backend/commit/9dd9304a71eae94978710cf9db82dc030ca7a37d)
 - Fixed wrong error getting thrown [`6469e3b`](https://git.odit.services/lfk/backend/commit/6469e3bc976c589b42fbac4a95bbee84f67244ee)
 - Updated response schema error to a more fitting one [`5a00394`](https://git.odit.services/lfk/backend/commit/5a003945ac7d1a8d446c1bcc8007523b675ab6f5)
 - Added check for empty token for runner self-service get [`6434b4d`](https://git.odit.services/lfk/backend/commit/6434b4dfce2da307d66ec5670d570d66ea8af8f8)
 - Specified uft-8 format for string [`34c852b`](https://git.odit.services/lfk/backend/commit/34c852b12aaa88e64efa1e0575361c09652e22e1)
 - MAde uuid column unique [`7b00b19`](https://git.odit.services/lfk/backend/commit/7b00b19fce3189069bcdbe0d2bcf91322506eb2b)
 - Updated Method of removeing the team of citizen runners [`946efef`](https://git.odit.services/lfk/backend/commit/946efef2523c5ceb627b5c465343422cd985832d)
 - Added openapi description [`73b1114`](https://git.odit.services/lfk/backend/commit/73b1114883ed2b87ef523130de4c5ca90a11c856)
 #### [v0.2.1](https://git.odit.services/lfk/backend/compare/v0.2.0...v0.2.1)
 > 21 January 2021
 - Merge pull request 'Alpha Release 0.2.1' (#119) from dev into main [`b441658`](https://git.odit.services/lfk/backend/commit/b44165857016c3ecdf0dffe8d324d572524d10ed)
 - Created a donation runner response class for the runner selfservice [`88a7089`](https://git.odit.services/lfk/backend/commit/88a7089289e35be4468cb952b311fcb15c54c5a1)
 - Readme reorganisation [skip ci] [`e2ec0a3`](https://git.odit.services/lfk/backend/commit/e2ec0a3b64a7388ae85d557dfb66354d70cd1b72)
 - Added a seeder for runner test data [`9df9d9a`](https://git.odit.services/lfk/backend/commit/9df9d9ae80277d5ccc753639badb48c4afb13088)
 - Created a donation respoinse class for the runner selfservice [`b89f7ac`](https://git.odit.services/lfk/backend/commit/b89f7ac1b4ddd6e53e6e2e8330c1fa2170b48591)
 - Added barebones controller for the runner info selfservice [`2274b47`](https://git.odit.services/lfk/backend/commit/2274b476d6caa1de91bb13b6944f8dc233cf446e)
 - Implemented a method for getting the runner object from a jwt [`8079769`](https://git.odit.services/lfk/backend/commit/80797698818f456c7746523d5a4f66267fdab10d)
 - Added key-value like db table for config flags [`b15967f`](https://git.odit.services/lfk/backend/commit/b15967ff3162e9fe3a634a6f4fc5669f2314cc21)
 - Added a /runners/id/scans endpoint [`a82fc0f`](https://git.odit.services/lfk/backend/commit/a82fc0fb9e9c3cbdc6be299b27164c0811e58775)
 - Now creating a test contact [`1837336`](https://git.odit.services/lfk/backend/commit/1837336865893ca39d3bc628ff3c57e018a8555d)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`02677de`](https://git.odit.services/lfk/backend/commit/02677de5c07b2ac5dcff5567655130ba1b1d48cf)
 - The data seeding now only get's triggered on the first time thx to using the key-value [`7bc6030`](https://git.odit.services/lfk/backend/commit/7bc603028dc60d26ffc5327868afbce512966d4d)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`3a93c9c`](https://git.odit.services/lfk/backend/commit/3a93c9c078af38ba837b55bf4590867dfd401955)
 - Added a "onlyValid" query param [`b5f3dec`](https://git.odit.services/lfk/backend/commit/b5f3dec93bfe4180abbe9ce74094cb1269d0e686)
 - Added a citizen org seeder [`2db6510`](https://git.odit.services/lfk/backend/commit/2db6510a8ad83300b286a3bd35ca4db103da72d1)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`d528134`](https://git.odit.services/lfk/backend/commit/d5281348b6f3bd6f2e6936ee4497860699b8c3c6)
 - 📖New license file version [CI SKIP] [skip ci] [`d8b6669`](https://git.odit.services/lfk/backend/commit/d8b6669d126e64d9e434b5f841ae17a02117822b)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`e95c457`](https://git.odit.services/lfk/backend/commit/e95c457e444e9d2e99c2af8b6ee369c36d4ca8ea)
 - Beautified import [`c5f7cb2`](https://git.odit.services/lfk/backend/commit/c5f7cb2c68dbee0ab1e0361754f4d4b876666c82)
 - 🚀Bumped version to v0.2.1 [`6de9d54`](https://git.odit.services/lfk/backend/commit/6de9d547b736c4538dac5254353d483576337290)
 - Merge pull request 'Runner scans endpoint feature/113-runner_scans' (#116) from feature/113-runner_scans into dev [`36d01a0`](https://git.odit.services/lfk/backend/commit/36d01a0a890eb74428679ec6c4fcb14708aaa9fe)
 - Added get tests for the /runner/scans endpoint [`26dff4f`](https://git.odit.services/lfk/backend/commit/26dff4f41829e8571231aff3c5d0e3a7c53559d8)
 - Implemented the get part of the runner selfservice (no jwts are availdable yet (tm) [`da1fe34`](https://git.odit.services/lfk/backend/commit/da1fe34249a741115c1aeedcade16c5c852e896b)
 - Fixed the bool converter for null values [`e12aedd`](https://git.odit.services/lfk/backend/commit/e12aedd1aad6de1f934e9593dda4607a303b2eb5)
 - Added a config option for test data seeding [`67ba489`](https://git.odit.services/lfk/backend/commit/67ba489fe2f2a2706d640a668cd0e675ded6a7df)
 - SEED_TEST_DATA is now false by default [`8870ebd`](https://git.odit.services/lfk/backend/commit/8870ebdb5e6d9045222440abc2c047929a74b520)
 - Added sqlite as to env.sample db of choice [skip ci] [`f4668b6`](https://git.odit.services/lfk/backend/commit/f4668b6e81d7aeac62e24291ffcb39b00ea44aac)
 - Merge pull request 'Runner selfservice info endpoint feature/111-runner_selfservic_info' (#115) from feature/111-runner_selfservic_info into dev [`1717df1`](https://git.odit.services/lfk/backend/commit/1717df113edeab2d2628041ee1eccc27380fd379)
 - Merge pull request 'Implemented more seeding feature/110-seeding' (#114) from feature/110-seeding into dev [`886c109`](https://git.odit.services/lfk/backend/commit/886c1092d60f8e39357e3b841ed01bb082ede2c4)
 - Updated the openapi description [`1915697`](https://git.odit.services/lfk/backend/commit/191569792c9a5cee93718555bba4e7679e4391af)
 - Fixed wrong amount calculation [`4ee8079`](https://git.odit.services/lfk/backend/commit/4ee807973e1995681ec549f7c482bc5514a6ec55)
 - Added bool conversion for testdata seeding env var [`c18012f`](https://git.odit.services/lfk/backend/commit/c18012f65a704e07acd56870c9ed9f6d06cf97a9)
 - Now also seeding runners to the test org [`eab0e63`](https://git.odit.services/lfk/backend/commit/eab0e634a26c1a80e7fa2ccb9dc368f0760b2fd8)
 #### [v0.2.0](https://git.odit.services/lfk/backend/compare/v0.1.1...v0.2.0)
- 🧾New changelog file version [CI SKIP] [skip ci] [`8960aa5`](https://git.odit.services/lfk/backend/commit/8960aa5545ddeb57d4ef42c21c0ca6001dfeaea9)
+> 20 January 2021
- 🚀Bumped version to v0.2.0 [`ddafd90`](https://git.odit.services/lfk/backend/commit/ddafd90d3e41fb9ee37172a8306c30d8483dfe2c)
+
- Merge pull request 'Implemented group contacts feature/104-contacts' (#108) from feature/104-contacts into dev [`a0c2b5a`](https://git.odit.services/lfk/backend/commit/a0c2b5ade8d198ec16d33b39e47205e8b03a669f)
+- Merge pull request 'Alpha Release 0.2.0' (#109) from dev into main [`dd3d93e`](https://git.odit.services/lfk/backend/commit/dd3d93edc7db7ca7f133cb2d8f60c3eaf30bcbf0)
 - Updated contact update tests [`c3d008e`](https://git.odit.services/lfk/backend/commit/c3d008ec0ff92f80addbdb93ffc1fa2b3278a8a6)
 - Added contact delete tests [`dd7e5da`](https://git.odit.services/lfk/backend/commit/dd7e5dae368a8decd79357f658dda2164fa6f1e7)
 - Added contact add valid tests [`e165f01`](https://git.odit.services/lfk/backend/commit/e165f019307e7745357493eacf3e2fa31538122b)
@@ -29,6 +542,7 @@ All notable changes to this project will be documented in this file. Dates are d
 - Implemented contact updateing [`28fb983`](https://git.odit.services/lfk/backend/commit/28fb9834e18bde012c5b51cc49a39585d20f7cc1)
 - Fixed key null constraint [`de82437`](https://git.odit.services/lfk/backend/commit/de824375d3a1da6ee4d78ea39b7da66fc05f2a02)
 - Implemented contact posting [`11af9c0`](https://git.odit.services/lfk/backend/commit/11af9c02d977dcd6919652256dbdb9fd5438cabd)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`8960aa5`](https://git.odit.services/lfk/backend/commit/8960aa5545ddeb57d4ef42c21c0ca6001dfeaea9)
 - Implemented contact group setting on creation [`3b06d1a`](https://git.odit.services/lfk/backend/commit/3b06d1a6ef3c95eb5bb7d485accddabba0a8e4f7)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`32e054e`](https://git.odit.services/lfk/backend/commit/32e054eb84c869210fd483583ae5a6d0e2249cf9)
 - Switched Address to embedded entity [`7fbe649`](https://git.odit.services/lfk/backend/commit/7fbe649dc90f4bb9f240c5a80fed447048e5e105)
@@ -39,11 +553,14 @@ All notable changes to this project will be documented in this file. Dates are d
 - Fixed donor address check [`4824547`](https://git.odit.services/lfk/backend/commit/4824547dde4d7f90e9e2377a26df34cabf082fdb)
 - Updated contact delete tests [`8ae53f1`](https://git.odit.services/lfk/backend/commit/8ae53f1c4930e2fd72eb230a5314336f3a45a611)
 - Added address to contact response [`09e429f`](https://git.odit.services/lfk/backend/commit/09e429fc676c7dd370bba0495b072f81867bd250)
 - Updated comments [`a4e8311`](https://git.odit.services/lfk/backend/commit/a4e8311cbd22588ecb4dc2fdbe05397b07d336f8)
 - Updated the responseclasses to use the new address implementation [`dafac06`](https://git.odit.services/lfk/backend/commit/dafac06bc84d1b237096a561b3adcd3ca5cb1dd8)
 - Added address validity check [`ae7c5ff`](https://git.odit.services/lfk/backend/commit/ae7c5ff0c387e9337d01a9dd819a4dddc208f6dd)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`da9a359`](https://git.odit.services/lfk/backend/commit/da9a3592510eacd2d67a127dc61e954343e0444b)
 - 🚀Bumped version to v0.2.0 [`ddafd90`](https://git.odit.services/lfk/backend/commit/ddafd90d3e41fb9ee37172a8306c30d8483dfe2c)
 - Merge pull request 'Implemented group contacts feature/104-contacts' (#108) from feature/104-contacts into dev [`a0c2b5a`](https://git.odit.services/lfk/backend/commit/a0c2b5ade8d198ec16d33b39e47205e8b03a669f)
 - Updated comments [`a4e8311`](https://git.odit.services/lfk/backend/commit/a4e8311cbd22588ecb4dc2fdbe05397b07d336f8)
 - Removed (now useless) relations [`673dea2`](https://git.odit.services/lfk/backend/commit/673dea2e5754e99ff77f7556d4fc03d4cca28a94)
 - Added missing id property [`6b4b16c`](https://git.odit.services/lfk/backend/commit/6b4b16c13b0c2f55745ded3431cad2f4986be296)
 - Added address validity check [`ae7c5ff`](https://git.odit.services/lfk/backend/commit/ae7c5ff0c387e9337d01a9dd819a4dddc208f6dd)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`f53894b`](https://git.odit.services/lfk/backend/commit/f53894b16ac1c06ecbeeb0b63a56ac438b2fbe1b)
 - Updated comments [`8bc01d3`](https://git.odit.services/lfk/backend/commit/8bc01d3f2406ce8e58c2ab2963c858495c510dcf)
 - Fixed contact cascading [`179c2a5`](https://git.odit.services/lfk/backend/commit/179c2a5157fca036acf8d0e6a51821d377860bc1)
--- a/README.md
+++ b/README.md
@@ -2,20 +2,18 @@
 Backend Server
 ## Quickstart 🐳
 > Use this to run the backend with a postgresql db in docker
 1. Clone the repo or copy the docker-compose 
 2. Run in toe folder that contains the docker-compose file: `docker-compose up -d`
 3. Visit http://127.0.0.1:4010/api/docs to check if the server is running
 4. You can now use the default admin user (`demo:demo`)
 ## Dev Setup 🛠
 > Local dev setup utilizing sqlite3 as the database.
-### Local w/ sqlite
+1. Rename the .env.example file to .env (you can adjust app port and other settings, if needed)
 1. Create a .env file in the project root containing:
   ```
    APP_PORT=4010
    DB_TYPE=sqlite
    DB_HOST=bla
    DB_PORT=bla
    DB_USER=bla
    DB_PASSWORD=bla
    DB_NAME=./test.sqlite
   ```
 2. Install Dependencies
   ```bash
   yarn
@@ -25,16 +23,52 @@ Backend Server
   yarn dev
   ```
-### Generate Docs
+### Run Tests
 ```bash
 # Run tests once (server has to run)
 yarn test
 # Run test in watch mode (reruns on change)
 yarn test:watch
 # Run test in ci mode (automaticly starts the dev server)
 yarn test:ci
 ```
 ### Use your own mail templates
 > You use your own mail templates by replacing the default ones we provided (either in-code or by mounting them into the /app/static/mail_templates folder).
 The mail templates always come in a .html and a .txt variant to provide compatability with legacy mail clients.
 Currently the following templates exist:
 * pw-reset.(html/txt)
 ### Generate Docs
 ```bash
 yarn docs
 ```
-### Docker w/ postgres 🐳
+## ENV Vars
 > You can provide them via .env file or docker env vars.
 > You can use the `test:ci:generate_env` package script to generate a example env (uses bs data as test server and ignores the errors).
 | Name | Type | Default | Description
 | - | - | - | -
 | APP_PORT | Number | 4010 | The port the backend server listens on. Is optional.
 | DB_TYPE | String | N/A | The type of the db u want to use. It has to be supported by typeorm. Possible: `sqlite`, `mysql`, `postgresql`
 | DB_HOST | String | N/A | The db's host's ip-address/fqdn or file path for sqlite
 | DB_PORT | String | N/A | The db's port
 | DB_USER | String | N/A | The user for accessing the db
 | DB_PASSWORD | String | N/A | The user's password for accessing the db
 | DB_NAME | String | N/A | The db's name
 | NODE_ENV | String | dev | The apps env - influences debug info. Also when the env is set to "test", mailing errors get ignored.
 | POSTALCODE_COUNTRYCODE | String/CountryCode | N/A | The countrycode used to validate address's postal codes
 | PHONE_COUNTRYCODE | String/CountryCode | null (international) | The countrycode used to validate phone numers
 | SEED_TEST_DATA | Boolean | False | If you want the app to seed some example data set this to true
 | MAILER_URL | String(Url) | N/A | The mailer's base url (no trailing slash)
 | MAILER_KEY | String | N/A | The mailer's api key.
 | IMPRINT_URL | String(Url) | /imprint | The link to a imprint page for the system (Defaults to the frontend's imprint)
 | PRIVACY_URL | String(Url) | /privacy | The link to a privacy page for the system (Defaults to the frontend's privacy page)
 ```bash
 docker-compose up --build
 ```
 ## Recommended Editor
@@ -42,22 +76,19 @@ docker-compose up --build
 ### Recommended Extensions
- will be automatically recommended via ./vscode/extensions.json
+* will be automatically recommended via ./vscode/extensions.json
-## Branches
+## Staging
- main: Protected "release" branch
+### Branches & Tags
- dev: Current dev branch for merging the different features - only push for merges or minor changes!
+* vX.Y.Z: Release tags created from the main branch
- feature/xyz: Feature branches - `feature/issueid-title`
+   * The version numbers follow the semver standard
- bugfix/xyz: Branches for bugfixes - `bugfix/issueid-title` (no id for readme changes needed)
+   * A new release tag automaticly triggers the release ci pipeline
-
+* main: Protected "release" branch
-
+   * The latest tag of the docker image get's build from this
-## File Structure
+   * New releases get created as tags from this   
-
+* dev: Current dev branch for merging the different feature branches and bugfixes
- src/models/entities\* - database models (typeorm entities)
+   * The dev tag of the docker image get's build from this
- src/models/actions\* - actions models
+   * Only push minor changes to this branch!
- src/models/responses\* - response models
+   * To merge a feature branch into this please create a pull request
- src/controllers/\* - routing-controllers
+* feature/xyz: Feature branches - nameing scheme: `feature/issueid-title`
- src/loaders/\* - loaders for the different init steps of the api server
+* bugfix/xyz: Branches for bugfixes - nameing scheme:`bugfix/issueid-title`
 - src/middlewares/\* - express middlewares (mainly auth r/n)
 - src/errors/* - our custom (http) errors
 - src/routes/\* - express routes for everything we don't do via routing-controllers (depreciated)
--- a/licenses.md
+++ b/licenses.md
@@ -1,3 +1,32 @@
 # @odit/class-validator-jsonschema
 **Author**: Aleksi Pekkala <aleksipekkala@gmail.com>
 **Repo**: git@github.com:epiphone/class-validator-jsonschema.git
 **License**: MIT
 **Description**: Convert class-validator-decorated classes into JSON schema
 ## License Text
 MIT License
 Copyright (c) 2017 Aleksi Pekkala
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 # argon2
 **Author**: Ranieri Althoff <ranisalt+argon2@gmail.com>
 **Repo**: [object Object]
@@ -28,6 +57,33 @@ SOFTWARE.
 # axios
 **Author**: Matt Zabriskie
 **Repo**: [object Object]
 **License**: MIT
 **Description**: Promise based HTTP client for the browser and node.js
 ## License Text
 Copyright (c) 2014-present Matt Zabriskie
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 # body-parser
 **Author**: undefined
 **Repo**: expressjs/body-parser
@@ -59,6 +115,35 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # check-password-strength
 **Author**: deanilvincent
 **Repo**: [object Object]
 **License**: MIT
 **Description**: A NPM Password strength checker based from Javascript RegExp. Check passphrase if it's "Weak", "Medium" or "Strong"
 ## License Text
 MIT License
 Copyright (c) 2020 Mark Deanil Vicente
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 # class-transformer
 **Author**: [object Object]
 **Repo**: [object Object]
@@ -88,22 +173,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE. 
 # class-validator
-**Author**: [object Object]
+**Author**: TypeStack contributors
 **Repo**: [object Object]
 **License**: MIT
-**Description**: Class-based validation with Typescript / ES6 / ES5 using decorators or validation schemas. Supports both node.js and browser
+**Description**: Decorator-based property validation for classes.
 ## License Text
-# class-validator-jsonschema
+The MIT License
 **Author**: Aleksi Pekkala <aleksipekkala@gmail.com>
 **Repo**: git@github.com:epiphone/class-validator-jsonschema.git
 **License**: MIT
 **Description**: Convert class-validator-decorated classes into JSON schema
 ## License Text
 MIT License
-Copyright (c) 2017 Aleksi Pekkala
+Copyright (c) 2015-2020 TypeStack
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -112,17 +190,16 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
+The above copyright notice and this permission notice shall be included in
-copies or substantial portions of the Software.
+all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-SOFTWARE.
+THE SOFTWARE. 
 # consola
 **Author**: undefined
@@ -332,6 +409,35 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 # libphonenumber-js
 **Author**: catamphetamine <purecatamphetamine@gmail.com>
 **Repo**: [object Object]
 **License**: MIT
 **Description**: A simpler (and smaller) rewrite of Google Android's libphonenumber library in javascript
 ## License Text
 (The MIT License)
 Copyright (c) 2016 @catamphetamine <purecatamphetamine@gmail.com>
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
 'Software'), to deal in the Software without restriction, including
 without limitation the rights to use, copy, modify, merge, publish,
 distribute, sublicense, and/or sell copies of the Software, and to
 permit persons to whom the Software is furnished to do so, subject to
 the following conditions:
 The above copyright notice and this permission notice shall be
 included in all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
 # mysql
 **Author**: Felix Geisendörfer <felix@debuggable.com> (http://debuggable.com/)
 **Repo**: mysqljs/mysql
@@ -594,7 +700,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **Author**: ODIT.Services
 **Repo**: [object Object]
 **License**: MIT
-**Description**: A simple license crawler
+**Description**: A simple license crawler for crediting open source work
 ## License Text
 MIT License Copyright (c) 2020 ODIT.Services (info@odit.services)
@@ -820,33 +926,6 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    SOFTWARE
 # axios
 **Author**: Matt Zabriskie
 **Repo**: [object Object]
 **License**: MIT
 **Description**: Promise based HTTP client for the browser and node.js
 ## License Text
 Copyright (c) 2014-present Matt Zabriskie
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 # cp-cli
 **Author**: undefined
 **Repo**: [object Object]
@@ -934,6 +1013,35 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 # release-it
 **Author**: [object Object]
 **Repo**: [object Object]
 **License**: MIT
 **Description**: Generic CLI tool to automate versioning and package publishing related tasks.
 ## License Text
 MIT License
 Copyright (c) 2018 Lars Kappert
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 # rimraf
 **Author**: Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)
 **Repo**: git://github.com/isaacs/rimraf.git
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@odit/lfk-backend",
-  "version": "0.2.0",
+  "version": "0.10.1",
  "main": "src/app.ts",
  "repository": "https://git.odit.services/lfk/backend",
  "author": {
@@ -24,7 +24,9 @@
  "dependencies": {
    "@odit/class-validator-jsonschema": "2.1.1",
    "argon2": "^0.27.1",
    "axios": "^0.21.1",
    "body-parser": "^1.19.0",
    "check-password-strength": "^2.0.2",
    "class-transformer": "0.3.1",
    "class-validator": "^0.13.1",
    "consola": "^2.15.0",
@@ -35,14 +37,14 @@
    "dotenv": "^8.2.0",
    "express": "^4.17.1",
    "jsonwebtoken": "^8.5.1",
-    "libphonenumber-js": "^1.9.7",
+    "libphonenumber-js": "^1.9.9",
    "mysql": "^2.18.1",
    "pg": "^8.5.1",
    "reflect-metadata": "^0.1.13",
-    "routing-controllers": "^0.9.0-alpha.6",
+    "routing-controllers": "0.9.0-alpha.6",
    "routing-controllers-openapi": "^2.2.0",
    "sqlite3": "5.0.0",
-    "typeorm": "^0.2.29",
+    "typeorm": "^0.2.30",
    "typeorm-routing-controllers-extensions": "^0.2.0",
    "typeorm-seeding": "^1.6.1",
    "uuid": "^8.3.2",
@@ -52,21 +54,20 @@
    "@odit/license-exporter": "^0.0.9",
    "@types/cors": "^2.8.9",
    "@types/csvtojson": "^1.1.5",
-    "@types/express": "^4.17.9",
+    "@types/express": "^4.17.11",
-    "@types/jest": "^26.0.16",
+    "@types/jest": "^26.0.20",
    "@types/jsonwebtoken": "^8.5.0",
-    "@types/node": "^14.14.20",
+    "@types/node": "^14.14.22",
    "@types/uuid": "^8.3.0",
    "axios": "^0.21.1",
    "cp-cli": "^2.0.0",
    "jest": "^26.6.3",
    "nodemon": "^2.0.7",
    "release-it": "^14.2.2",
    "rimraf": "^3.0.2",
    "start-server-and-test": "^1.11.7",
-    "ts-jest": "^26.4.4",
+    "ts-jest": "^26.5.0",
    "ts-node": "^9.1.1",
-    "typedoc": "^0.20.14",
+    "typedoc": "^0.20.19",
    "typescript": "^4.1.3"
  },
  "scripts": {
@@ -75,10 +76,12 @@
    "docs": "typedoc --out docs src",
    "test": "jest",
    "test:watch": "jest --watchAll",
-    "test:ci": "start-server-and-test dev http://localhost:4010/api/docs/openapi.json test",
+    "test:ci:generate_env": "ts-node scripts/create_testenv.ts",
    "test:ci:run": "start-server-and-test dev http://localhost:4010/api/docs/openapi.json test",
    "test:ci": "npm run test:ci:generate_env && npm run test:ci:run",
    "seed": "ts-node ./node_modules/typeorm/cli.js schema:sync && ts-node ./node_modules/typeorm-seeding/dist/cli.js seed",
    "openapi:export": "ts-node scripts/openapi_export.ts",
-    "licenses:export": "license-exporter --md",
+    "licenses:export": "license-exporter --markdown",
    "release": "release-it --only-version"
  },
  "release-it": {
--- a/scripts/create_testenv.ts
+++ b/scripts/create_testenv.ts
@@ -0,0 +1,24 @@
 import consola from "consola";
 import fs from "fs";
 const env = `
 APP_PORT=4010
 DB_TYPE=sqlite
 DB_HOST=bla
 DB_PORT=bla
 DB_USER=bla
 DB_PASSWORD=bla
 DB_NAME=./test.sqlite
 NODE_ENV=test
 POSTALCODE_COUNTRYCODE=DE
 SEED_TEST_DATA=true
 MAILER_URL=https://dev.lauf-fuer-kaya.de/mailer
 MAILER_KEY=asdasd`;
 try {
    fs.writeFileSync("./.env", env, { encoding: "utf-8" });
    consola.success("Exported ci env to .env");
 } catch (error) {
    consola.error("Couldn't export the ci env");
 }
--- a/src/apispec.ts
+++ b/src/apispec.ts
@@ -42,7 +42,7 @@ export function generateSpec(storage: MetadataArgsStorage, schemas) {
                }
            },
            info: {
-                description: "The the backend API for the LfK! runner system.",
+                description: `The the backend API for the LfK! runner system. <br>[Imprint](${config.imprint_url}) & [Privacy](${config.privacy_url})`,
                title: "LfK! Backend API",
                version: config.version
            },
--- a/src/app.ts
+++ b/src/app.ts
@@ -20,6 +20,9 @@ const app = createExpressServer({
 async function main() {
  await loaders(app);
  if (config.testing) {
    consola.info("🛠[config]: Discovered testing env. Mailing errors will get ignored!")
  }
  app.listen(config.internal_port, () => {
    consola.success(
      `⚡️[server]: Server is running at http://localhost:${config.internal_port}`
--- a/src/config.ts
+++ b/src/config.ts
@@ -6,10 +6,17 @@ configDotenv();
 export const config = {
    internal_port: parseInt(process.env.APP_PORT) || 4010,
    development: process.env.NODE_ENV === "production",
    testing: process.env.NODE_ENV === "test",
    jwt_secret: process.env.JWT_SECRET || "secretjwtsecret",
    phone_validation_countrycode: getPhoneCodeLocale(),
    postalcode_validation_countrycode: getPostalCodeLocale(),
-    version: process.env.VERSION || require('../package.json').version
+    version: process.env.VERSION || require('../package.json').version,
    seedTestData: getDataSeeding(),
    app_url: process.env.APP_URL || "http://localhost:8080",
    privacy_url: process.env.PRIVACY_URL || "/privacy",
    imprint_url: process.env.IMPRINT_URL || "/imprint",
    mailer_url: process.env.MAILER_URL || "",
    mailer_key: process.env.MAILER_KEY || ""
 }
 let errors = 0
 if (typeof config.internal_port !== "number") {
@@ -18,6 +25,9 @@ if (typeof config.internal_port !== "number") {
 if (typeof config.development !== "boolean") {
    errors++
 }
 if (config.mailer_url == "" || config.mailer_key == "") {
    errors++;
 }
 function getPhoneCodeLocale(): CountryCode {
    return (process.env.PHONE_COUNTRYCODE as CountryCode);
 }
@@ -30,4 +40,11 @@ function getPostalCodeLocale(): any {
        return null;
    }
 }
 function getDataSeeding(): Boolean {
    try {
        return JSON.parse(process.env.SEED_TEST_DATA);
    } catch (error) {
        return false;
    }
 }
 export let e = errors
--- a/src/controllers/AuthController.ts
+++ b/src/controllers/AuthController.ts
@@ -1,103 +1,106 @@
-import { Body, CookieParam, JsonController, Param, Post, Req, Res } from 'routing-controllers';
+import { Body, CookieParam, JsonController, Param, Post, QueryParam, Req, Res } from 'routing-controllers';
-import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
+import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
-import { IllegalJWTError, InvalidCredentialsError, JwtNotProvidedError, PasswordNeededError, RefreshTokenCountInvalidError, UsernameOrEmailNeededError } from '../errors/AuthError';
+import { IllegalJWTError, InvalidCredentialsError, JwtNotProvidedError, PasswordNeededError, RefreshTokenCountInvalidError, UsernameOrEmailNeededError } from '../errors/AuthError';
-import { UserNotFoundError } from '../errors/UserErrors';
+import { MailSendingError } from '../errors/MailErrors';
-import { CreateAuth } from '../models/actions/create/CreateAuth';
+import { UserNotFoundError } from '../errors/UserErrors';
-import { CreateResetToken } from '../models/actions/create/CreateResetToken';
+import { Mailer } from '../mailer';
-import { HandleLogout } from '../models/actions/HandleLogout';
+import { CreateAuth } from '../models/actions/create/CreateAuth';
-import { RefreshAuth } from '../models/actions/RefreshAuth';
+import { CreateResetToken } from '../models/actions/create/CreateResetToken';
-import { ResetPassword } from '../models/actions/ResetPassword';
+import { HandleLogout } from '../models/actions/HandleLogout';
-import { ResponseAuth } from '../models/responses/ResponseAuth';
+import { RefreshAuth } from '../models/actions/RefreshAuth';
-import { Logout } from '../models/responses/ResponseLogout';
+import { ResetPassword } from '../models/actions/ResetPassword';
-
+import { ResponseAuth } from '../models/responses/ResponseAuth';
-@JsonController('/auth')
+import { ResponseEmpty } from '../models/responses/ResponseEmpty';
-export class AuthController {
+import { Logout } from '../models/responses/ResponseLogout';
-	constructor() {
+
-	}
+@JsonController('/auth')
-
+export class AuthController {
-	@Post("/login")
+
-	@ResponseSchema(ResponseAuth)
+	@Post("/login")
-	@ResponseSchema(InvalidCredentialsError)
+	@ResponseSchema(ResponseAuth)
-	@ResponseSchema(UserNotFoundError)
+	@ResponseSchema(InvalidCredentialsError)
-	@ResponseSchema(UsernameOrEmailNeededError)
+	@ResponseSchema(UserNotFoundError)
-	@ResponseSchema(PasswordNeededError)
+	@ResponseSchema(UsernameOrEmailNeededError)
-	@ResponseSchema(InvalidCredentialsError)
+	@ResponseSchema(PasswordNeededError)
-	@OpenAPI({ description: 'Login with your username/email and password. <br> You will receive: \n * access token (use it as a bearer token) \n * refresh token (will also be sent as a cookie)' })
+	@ResponseSchema(InvalidCredentialsError)
-	async login(@Body({ validate: true }) createAuth: CreateAuth, @Res() response: any) {
+	@OpenAPI({ description: 'Login with your username/email and password. <br> You will receive: \n * access token (use it as a bearer token) \n * refresh token (will also be sent as a cookie)' })
-		let auth;
+	async login(@Body({ validate: true }) createAuth: CreateAuth, @Res() response: any) {
-		try {
+		let auth;
-			auth = await createAuth.toAuth();
+		try {
-			response.cookie('lfk_backend__refresh_token', auth.refresh_token, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
+			auth = await createAuth.toAuth();
-			response.cookie('lfk_backend__refresh_token_expires_at', auth.refresh_token_expires_at, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
+			response.cookie('lfk_backend__refresh_token', auth.refresh_token, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
-			return response.send(auth)
+			response.cookie('lfk_backend__refresh_token_expires_at', auth.refresh_token_expires_at, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
-		} catch (error) {
+			return response.send(auth)
-			throw error;
+		} catch (error) {
-		}
+			throw error;
-	}
+		}
-
+	}
-	@Post("/logout")
+
-	@ResponseSchema(Logout)
+	@Post("/logout")
-	@ResponseSchema(InvalidCredentialsError)
+	@ResponseSchema(Logout)
-	@ResponseSchema(UserNotFoundError)
+	@ResponseSchema(InvalidCredentialsError)
-	@ResponseSchema(UsernameOrEmailNeededError)
+	@ResponseSchema(UserNotFoundError)
-	@ResponseSchema(PasswordNeededError)
+	@ResponseSchema(UsernameOrEmailNeededError)
-	@ResponseSchema(InvalidCredentialsError)
+	@ResponseSchema(PasswordNeededError)
-	@OpenAPI({ description: 'Logout using your refresh token. <br> This instantly invalidates all your access and refresh tokens.', security: [{ "RefreshTokenCookie": [] }] })
+	@ResponseSchema(InvalidCredentialsError)
-	async logout(@Body({ validate: true }) handleLogout: HandleLogout, @CookieParam("lfk_backend__refresh_token") refresh_token: string, @Res() response: any) {
+	@OpenAPI({ description: 'Logout using your refresh token. <br> This instantly invalidates all your access and refresh tokens.', security: [{ "RefreshTokenCookie": [] }] })
-		if (refresh_token && refresh_token.length != 0 && handleLogout.token == undefined) {
+	async logout(@Body({ validate: true }) handleLogout: HandleLogout, @CookieParam("lfk_backend__refresh_token") refresh_token: string, @Res() response: any) {
-			handleLogout.token = refresh_token;
+		if (refresh_token && refresh_token.length != 0 && handleLogout.token == undefined) {
-		}
+			handleLogout.token = refresh_token;
-
+		}
-		let logout;
+
-		try {
+		let logout;
-			logout = await handleLogout.logout()
+		try {
-			await response.cookie('lfk_backend__refresh_token', "expired", { expires: new Date(Date.now()), httpOnly: true });
+			logout = await handleLogout.logout()
-			response.cookie('lfk_backend__refresh_token_expires_at', "expired", { expires: new Date(Date.now()), httpOnly: true });
+			await response.cookie('lfk_backend__refresh_token', "expired", { expires: new Date(Date.now()), httpOnly: true });
-		} catch (error) {
+			response.cookie('lfk_backend__refresh_token_expires_at', "expired", { expires: new Date(Date.now()), httpOnly: true });
-			throw error;
+		} catch (error) {
-		}
+			throw error;
-		return response.send(logout)
+		}
-	}
+		return response.send(logout)
-
+	}
-	@Post("/refresh")
+
-	@ResponseSchema(ResponseAuth)
+	@Post("/refresh")
-	@ResponseSchema(JwtNotProvidedError)
+	@ResponseSchema(ResponseAuth)
-	@ResponseSchema(IllegalJWTError)
+	@ResponseSchema(JwtNotProvidedError)
-	@ResponseSchema(UserNotFoundError)
+	@ResponseSchema(IllegalJWTError)
-	@ResponseSchema(RefreshTokenCountInvalidError)
+	@ResponseSchema(UserNotFoundError)
-	@OpenAPI({ description: 'Refresh your access and refresh tokens using a valid refresh token. <br> You will receive: \n * access token (use it as a bearer token) \n * refresh token (will also be sent as a cookie)', security: [{ "RefreshTokenCookie": [] }] })
+	@ResponseSchema(RefreshTokenCountInvalidError)
-	async refresh(@Body({ validate: true }) refreshAuth: RefreshAuth, @CookieParam("lfk_backend__refresh_token") refresh_token: string, @Res() response: any, @Req() req: any) {
+	@OpenAPI({ description: 'Refresh your access and refresh tokens using a valid refresh token. <br> You will receive: \n * access token (use it as a bearer token) \n * refresh token (will also be sent as a cookie)', security: [{ "RefreshTokenCookie": [] }] })
-		if (refresh_token && refresh_token.length != 0 && refreshAuth.token == undefined) {
+	async refresh(@Body({ validate: true }) refreshAuth: RefreshAuth, @CookieParam("lfk_backend__refresh_token") refresh_token: string, @Res() response: any, @Req() req: any) {
-			refreshAuth.token = refresh_token;
+		if (refresh_token && refresh_token.length != 0 && refreshAuth.token == undefined) {
-		}
+			refreshAuth.token = refresh_token;
-		let auth;
+		}
-		try {
+		let auth;
-			auth = await refreshAuth.toAuth();
+		try {
-			response.cookie('lfk_backend__refresh_token', auth.refresh_token, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
+			auth = await refreshAuth.toAuth();
-			response.cookie('lfk_backend__refresh_token_expires_at', auth.refresh_token_expires_at, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
+			response.cookie('lfk_backend__refresh_token', auth.refresh_token, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
-		} catch (error) {
+			response.cookie('lfk_backend__refresh_token_expires_at', auth.refresh_token_expires_at, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
-			throw error;
+		} catch (error) {
-		}
+			throw error;
-		return response.send(auth)
+		}
-	}
+		return response.send(auth)
-
+	}
-	@Post("/reset")
+
-	@ResponseSchema(ResponseAuth)
+	@Post("/reset")
-	@ResponseSchema(UserNotFoundError)
+	@ResponseSchema(ResponseEmpty, { statusCode: 200 })
-	@ResponseSchema(UsernameOrEmailNeededError)
+	@ResponseSchema(UserNotFoundError, { statusCode: 404 })
-	@OpenAPI({ description: "Request a password reset token. <br> This will provide you with a reset token that you can use by posting to /api/auth/reset/{token}." })
+	@ResponseSchema(UsernameOrEmailNeededError, { statusCode: 406 })
-	async getResetToken(@Body({ validate: true }) passwordReset: CreateResetToken) {
+	@ResponseSchema(MailSendingError, { statusCode: 500 })
-		//This really shouldn't just get returned, but sent via mail or sth like that. But for dev only this is fine.
+	@OpenAPI({ description: "Request a password reset token. <br> This will provide you with a reset token that you can use by posting to /api/auth/reset/{token}." })
-		return { "resetToken": await passwordReset.toResetToken() };
+	async getResetToken(@Body({ validate: true }) passwordReset: CreateResetToken, @QueryParam("locale") locale: string = "en") {
-	}
+		const reset_token: string = await passwordReset.toResetToken();
-
+		await Mailer.sendResetMail(passwordReset.email, reset_token, locale);
-	@Post("/reset/:token")
+		return new ResponseEmpty();
-	@ResponseSchema(ResponseAuth)
+	}
-	@ResponseSchema(UserNotFoundError)
+
-	@ResponseSchema(UsernameOrEmailNeededError)
+	@Post("/reset/:token")
-	@OpenAPI({ description: "Reset a user's utilising a valid password reset token. <br> This will set the user's password to the one you provided in the body. <br> To get a reset token post to /api/auth/reset with your username." })
+	@ResponseSchema(ResponseAuth)
-	async resetPassword(@Param("token") token: string, @Body({ validate: true }) passwordReset: ResetPassword) {
+	@ResponseSchema(UserNotFoundError)
-		passwordReset.resetToken = token;
+	@ResponseSchema(UsernameOrEmailNeededError)
-		return await passwordReset.resetPassword();
+	@OpenAPI({ description: "Reset a user's utilising a valid password reset token. <br> This will set the user's password to the one you provided in the body. <br> To get a reset token post to /api/auth/reset with your username." })
-	}
+	async resetPassword(@Param("token") token: string, @Body({ validate: true }) passwordReset: ResetPassword) {
-}
+		passwordReset.resetToken = token;
 		return await passwordReset.resetPassword();
 	}
 }
--- a/src/controllers/DonationController.ts
+++ b/src/controllers/DonationController.ts
@@ -78,7 +78,7 @@ export class DonationController {
 	async postDistance(@Body({ validate: true }) createDonation: CreateDistanceDonation) {
 		let donation = await createDonation.toEntity();
 		donation = await this.distanceDonationRepository.save(donation);
-		return (await this.donationRepository.findOne({ id: donation.id }, { relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'] })).toResponse();
+		return (await this.distanceDonationRepository.findOne({ id: donation.id }, { relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'] })).toResponse();
 	}
 	@Put('/fixed/:id')
@@ -124,7 +124,7 @@ export class DonationController {
 		}
 		await this.distanceDonationRepository.save(await donation.update(oldDonation));
-		return (await this.donationRepository.findOne({ id: donation.id }, { relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'] })).toResponse();
+		return (await this.distanceDonationRepository.findOne({ id: donation.id }, { relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'] })).toResponse();
 	}
 	@Delete('/:id')
--- a/src/controllers/GroupContactController.ts
+++ b/src/controllers/GroupContactController.ts
@@ -28,7 +28,7 @@ export class GroupContactController {
 	@OpenAPI({ description: 'Lists all contacts. <br> This includes the contact\'s associated groups.' })
 	async getAll() {
 		let responseContacts: ResponseGroupContact[] = new Array<ResponseGroupContact>();
-		const contacts = await this.contactRepository.find({ relations: ['groups'] });
+		const contacts = await this.contactRepository.find({ relations: ['groups', 'groups.parentGroup'] });
 		contacts.forEach(contact => {
 			responseContacts.push(contact.toResponse());
 		});
@@ -42,7 +42,7 @@ export class GroupContactController {
 	@OnUndefined(GroupContactNotFoundError)
 	@OpenAPI({ description: 'Lists all information about the contact whose id got provided. <br> This includes the contact\'s associated groups.' })
 	async getOne(@Param('id') id: number) {
-		let contact = await this.contactRepository.findOne({ id: id }, { relations: ['groups'] })
+		let contact = await this.contactRepository.findOne({ id: id }, { relations: ['groups', 'groups.parentGroup'] })
 		if (!contact) { throw new GroupContactNotFoundError(); }
 		return contact.toResponse();
 	}
@@ -61,7 +61,7 @@ export class GroupContactController {
 		}
 		contact = await this.contactRepository.save(contact)
-		return (await this.contactRepository.findOne({ id: contact.id }, { relations: ['groups'] })).toResponse();
+		return (await this.contactRepository.findOne({ id: contact.id }, { relations: ['groups', 'groups.parentGroup'] })).toResponse();
 	}
 	@Put('/:id')
@@ -83,7 +83,7 @@ export class GroupContactController {
 		}
 		await this.contactRepository.save(await contact.update(oldContact));
-		return (await this.contactRepository.findOne({ id: contact.id }, { relations: ['groups'] })).toResponse();
+		return (await this.contactRepository.findOne({ id: contact.id }, { relations: ['groups', 'groups.parentGroup'] })).toResponse();
 	}
 	@Delete('/:id')
@@ -95,7 +95,7 @@ export class GroupContactController {
 	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
 		let contact = await this.contactRepository.findOne({ id: id });
 		if (!contact) { return null; }
-		const responseContact = await this.contactRepository.findOne(contact, { relations: ['groups'] });
+		const responseContact = await this.contactRepository.findOne(contact, { relations: ['groups', 'groups.parentGroup'] });
 		for (let group of responseContact.groups) {
 			group.contact = null;
 			await getConnection().getRepository(RunnerGroup).save(group);
--- a/src/controllers/ImportController.ts
+++ b/src/controllers/ImportController.ts
@@ -36,7 +36,7 @@ export class ImportController {
        return responseRunners;
    }
-    @Post('/organisations/:id/import')
+    @Post('/organizations/:id/import')
    @ContentType("application/json")
    @ResponseSchema(ResponseRunner, { isArray: true, statusCode: 200 })
    @ResponseSchema(RunnerGroupNotFoundError, { statusCode: 404 })
@@ -78,7 +78,7 @@ export class ImportController {
        return await this.postJSON(importRunners, groupID);
    }
-    @Post('/organisations/:id/import/csv')
+    @Post('/organizations/:id/import/csv')
    @ContentType("application/json")
    @UseBefore(RawBodyMiddleware)
    @ResponseSchema(ResponseRunner, { isArray: true, statusCode: 200 })
--- a/src/controllers/MeController.ts
+++ b/src/controllers/MeController.ts
@@ -1,7 +1,7 @@
 import { Body, CurrentUser, Delete, Get, JsonController, OnUndefined, Put, QueryParam } from 'routing-controllers';
 import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
 import { getConnectionManager, Repository } from 'typeorm';
-import { UserDeletionNotConfirmedError, UserIdsNotMatchingError, UsernameContainsIllegalCharacterError, UserNotFoundError } from '../errors/UserErrors';
+import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, UserDeletionNotConfirmedError, UserIdsNotMatchingError, UsernameContainsIllegalCharacterError, UserNotFoundError } from '../errors/UserErrors';
 import { UpdateUser } from '../models/actions/update/UpdateUser';
 import { User } from '../models/entities/User';
 import { ResponseUser } from '../models/responses/ResponseUser';
@@ -32,7 +32,7 @@ export class MeController {
 		return new ResponseUser(user);
 	}
-	@Get('/')
+	@Get('/permissions')
 	@ResponseSchema(ResponseUserPermissions)
 	@ResponseSchema(UserNotFoundError, { statusCode: 404 })
 	@OnUndefined(UserNotFoundError)
@@ -48,6 +48,10 @@ export class MeController {
 	@ResponseSchema(UserNotFoundError, { statusCode: 404 })
 	@ResponseSchema(UserIdsNotMatchingError, { statusCode: 406 })
 	@ResponseSchema(UsernameContainsIllegalCharacterError, { statusCode: 406 })
 	@ResponseSchema(PasswordMustContainUppercaseLetterError, { statusCode: 406 })
 	@ResponseSchema(PasswordMustContainLowercaseLetterError, { statusCode: 406 })
 	@ResponseSchema(PasswordMustContainNumberError, { statusCode: 406 })
 	@ResponseSchema(PasswordTooShortError, { statusCode: 406 })
 	@OpenAPI({ description: "Update the yourself. <br> You can't edit your own permissions or group memberships here - Please use the /api/users/:id enpoint instead. <br> Please remember that ids can't be changed." })
 	async put(@CurrentUser() currentUser: User, @Body({ validate: true }) updateUser: UpdateUser) {
 		let oldUser = await this.userRepository.findOne({ id: currentUser.id }, { relations: ['groups'] });
--- a/src/controllers/RunnerCardController.ts
+++ b/src/controllers/RunnerCardController.ts
@@ -1,106 +1,131 @@
-import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
+import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
-import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
+import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
-import { getConnectionManager, Repository } from 'typeorm';
+import { getConnectionManager, Repository } from 'typeorm';
-import { RunnerCardHasScansError, RunnerCardIdsNotMatchingError, RunnerCardNotFoundError } from '../errors/RunnerCardErrors';
+import { RunnerCardHasScansError, RunnerCardIdsNotMatchingError, RunnerCardNotFoundError } from '../errors/RunnerCardErrors';
-import { RunnerNotFoundError } from '../errors/RunnerErrors';
+import { RunnerNotFoundError } from '../errors/RunnerErrors';
-import { CreateRunnerCard } from '../models/actions/create/CreateRunnerCard';
+import { CreateRunnerCard } from '../models/actions/create/CreateRunnerCard';
-import { UpdateRunnerCard } from '../models/actions/update/UpdateRunnerCard';
+import { UpdateRunnerCard } from '../models/actions/update/UpdateRunnerCard';
-import { RunnerCard } from '../models/entities/RunnerCard';
+import { RunnerCard } from '../models/entities/RunnerCard';
-import { ResponseEmpty } from '../models/responses/ResponseEmpty';
+import { ResponseEmpty } from '../models/responses/ResponseEmpty';
-import { ResponseRunnerCard } from '../models/responses/ResponseRunnerCard';
+import { ResponseRunnerCard } from '../models/responses/ResponseRunnerCard';
-import { ScanController } from './ScanController';
+import { ScanController } from './ScanController';
-
+
-@JsonController('/cards')
+@JsonController('/cards')
-@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
+@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
-export class RunnerCardController {
+export class RunnerCardController {
-	private cardRepository: Repository<RunnerCard>;
+	private cardRepository: Repository<RunnerCard>;
-
+
-	/**
+	/**
-	 * Gets the repository of this controller's model/entity.
+	 * Gets the repository of this controller's model/entity.
-	 */
+	 */
-	constructor() {
+	constructor() {
-		this.cardRepository = getConnectionManager().get().getRepository(RunnerCard);
+		this.cardRepository = getConnectionManager().get().getRepository(RunnerCard);
-	}
+	}
-
+
-	@Get()
+	@Get()
-	@Authorized("CARD:GET")
+	@Authorized("CARD:GET")
-	@ResponseSchema(ResponseRunnerCard, { isArray: true })
+	@ResponseSchema(ResponseRunnerCard, { isArray: true })
-	@OpenAPI({ description: 'Lists all card.' })
+	@OpenAPI({ description: 'Lists all card.' })
-	async getAll() {
+	async getAll() {
-		let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>();
+		let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>();
-		const cards = await this.cardRepository.find({ relations: ['runner'] });
+		const cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'] });
-		cards.forEach(card => {
+		cards.forEach(card => {
-			responseCards.push(new ResponseRunnerCard(card));
+			responseCards.push(new ResponseRunnerCard(card));
-		});
+		});
-		return responseCards;
+		return responseCards;
-	}
+	}
-
+
-	@Get('/:id')
+	@Get('/:id')
-	@Authorized("CARD:GET")
+	@Authorized("CARD:GET")
-	@ResponseSchema(ResponseRunnerCard)
+	@ResponseSchema(ResponseRunnerCard)
-	@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 })
+	@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 })
-	@OnUndefined(RunnerCardNotFoundError)
+	@OnUndefined(RunnerCardNotFoundError)
-	@OpenAPI({ description: "Lists all information about the card whose id got provided." })
+	@OpenAPI({ description: "Lists all information about the card whose id got provided." })
-	async getOne(@Param('id') id: number) {
+	async getOne(@Param('id') id: number) {
-		let card = await this.cardRepository.findOne({ id: id }, { relations: ['runner'] });
+		let card = await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] });
-		if (!card) { throw new RunnerCardNotFoundError(); }
+		if (!card) { throw new RunnerCardNotFoundError(); }
-		return card.toResponse();
+		return card.toResponse();
-	}
+	}
-
+
-	@Post()
+	@Post('/bulk')
-	@Authorized("CARD:CREATE")
+	@Authorized("CARD:CREATE")
-	@ResponseSchema(ResponseRunnerCard)
+	@ResponseSchema(ResponseEmpty, { statusCode: 200 })
-	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
+	@OpenAPI({ description: "Create blank cards in bulk. <br> Just provide the count as a query param and wait for the 200 response. <br> You can provide the 'returnCards' query param if you want to receive the RESPONSERUNNERCARD objects in the response." })
-	@OpenAPI({ description: "Create a new card. <br> You can provide a associated runner by id but you don't have to." })
+	async postBlancoBulk(@QueryParam("count") count: number, @QueryParam("returnCards") returnCards: boolean = false) {
-	async post(@Body({ validate: true }) createCard: CreateRunnerCard) {
+		let createPromises = new Array<any>();
-		let card = await createCard.toEntity();
+		for (let index = 0; index < count; index++) {
-		card = await this.cardRepository.save(card);
+			createPromises.push(this.cardRepository.save({ runner: null, enabled: true }))
-		return (await this.cardRepository.findOne({ id: card.id }, { relations: ['runner'] })).toResponse();
+		}
-	}
+
-
+		const cards = await Promise.all(createPromises);
-	@Put('/:id')
+
-	@Authorized("CARD:UPDATE")
+		if (returnCards) {
-	@ResponseSchema(ResponseRunnerCard)
+			let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>();
-	@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 })
+			for await (let card of cards) {
-	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
+				let dbCard = await this.cardRepository.findOne({ id: card.id });
-	@ResponseSchema(RunnerCardIdsNotMatchingError, { statusCode: 406 })
+				responseCards.push(new ResponseRunnerCard(dbCard));
-	@OpenAPI({ description: "Update the card whose id you provided. <br> Scans created via this card will still be associated with the old runner. <br> Please remember that ids can't be changed." })
+			}
-	async put(@Param('id') id: number, @Body({ validate: true }) card: UpdateRunnerCard) {
+			return responseCards;
-		let oldCard = await this.cardRepository.findOne({ id: id });
+		}
-
+		let response = new ResponseEmpty();
-		if (!oldCard) {
+		response.response = `Created ${count} new blanco cards.`
-			throw new RunnerCardNotFoundError();
+		return response;
-		}
+	}
-
+
-		if (oldCard.id != card.id) {
+	@Post()
-			throw new RunnerCardIdsNotMatchingError();
+	@Authorized("CARD:CREATE")
-		}
+	@ResponseSchema(ResponseRunnerCard)
-
+	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
-		await this.cardRepository.save(await card.update(oldCard));
+	@OpenAPI({ description: "Create a new card. <br> You can provide a associated runner by id but you don't have to." })
-		return (await this.cardRepository.findOne({ id: id }, { relations: ['runner'] })).toResponse();
+	async post(@Body({ validate: true }) createCard: CreateRunnerCard) {
-	}
+		let card = await createCard.toEntity();
-
+		card = await this.cardRepository.save(card);
-	@Delete('/:id')
+		return (await this.cardRepository.findOne({ id: card.id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse();
-	@Authorized("CARD:DELETE")
+	}
-	@ResponseSchema(ResponseRunnerCard)
+
-	@ResponseSchema(ResponseEmpty, { statusCode: 204 })
+	@Put('/:id')
-	@ResponseSchema(RunnerCardHasScansError, { statusCode: 406 })
+	@Authorized("CARD:UPDATE")
-	@OnUndefined(204)
+	@ResponseSchema(ResponseRunnerCard)
-	@OpenAPI({ description: "Delete the card whose id you provided. <br> If no card with this id exists it will just return 204(no content). <br> If the card still has scans associated you have to provide the force=true query param (warning: this deletes all scans associated with by this card - please disable it instead or just remove the runner association)." })
+	@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 })
-	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
+	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
-		let card = await this.cardRepository.findOne({ id: id });
+	@ResponseSchema(RunnerCardIdsNotMatchingError, { statusCode: 406 })
-		if (!card) { return null; }
+	@OpenAPI({ description: "Update the card whose id you provided. <br> Scans created via this card will still be associated with the old runner. <br> Please remember that ids can't be changed." })
-
+	async put(@Param('id') id: number, @Body({ validate: true }) card: UpdateRunnerCard) {
-		const cardScans = (await this.cardRepository.findOne({ id: id }, { relations: ["scans"] })).scans;
+		let oldCard = await this.cardRepository.findOne({ id: id });
-		if (cardScans.length != 0 && !force) {
+
-			throw new RunnerCardHasScansError();
+		if (!oldCard) {
-		}
+			throw new RunnerCardNotFoundError();
-		const scanController = new ScanController;
+		}
-		for (let scan of cardScans) {
+
-			await scanController.remove(scan.id, force);
+		if (oldCard.id != card.id) {
-		}
+			throw new RunnerCardIdsNotMatchingError();
-
+		}
-		await this.cardRepository.delete(card);
+
-		return card.toResponse();
+		await this.cardRepository.save(await card.update(oldCard));
-	}
+		return (await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse();
 	}
 	@Delete('/:id')
 	@Authorized("CARD:DELETE")
 	@ResponseSchema(ResponseRunnerCard)
 	@ResponseSchema(ResponseEmpty, { statusCode: 204 })
 	@ResponseSchema(RunnerCardHasScansError, { statusCode: 406 })
 	@OnUndefined(204)
 	@OpenAPI({ description: "Delete the card whose id you provided. <br> If no card with this id exists it will just return 204(no content). <br> If the card still has scans associated you have to provide the force=true query param (warning: this deletes all scans associated with by this card - please disable it instead or just remove the runner association)." })
 	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
 		let card = await this.cardRepository.findOne({ id: id });
 		if (!card) { return null; }
 		const cardScans = (await this.cardRepository.findOne({ id: id }, { relations: ["scans"] })).scans;
 		if (cardScans.length != 0 && !force) {
 			throw new RunnerCardHasScansError();
 		}
 		const scanController = new ScanController;
 		for (let scan of cardScans) {
 			await scanController.remove(scan.id, force);
 		}
 		await this.cardRepository.delete(card);
 		return card.toResponse();
 	}
 }
--- a/src/controllers/RunnerController.ts
+++ b/src/controllers/RunnerController.ts
@@ -8,6 +8,8 @@ import { UpdateRunner } from '../models/actions/update/UpdateRunner';
 import { Runner } from '../models/entities/Runner';
 import { ResponseEmpty } from '../models/responses/ResponseEmpty';
 import { ResponseRunner } from '../models/responses/ResponseRunner';
 import { ResponseScan } from '../models/responses/ResponseScan';
 import { ResponseTrackScan } from '../models/responses/ResponseTrackScan';
 import { DonationController } from './DonationController';
 import { RunnerCardController } from './RunnerCardController';
 import { ScanController } from './ScanController';
@@ -30,7 +32,7 @@ export class RunnerController {
 	@OpenAPI({ description: 'Lists all runners from all teams/orgs. <br> This includes the runner\'s group and distance ran.' })
 	async getAll() {
 		let responseRunners: ResponseRunner[] = new Array<ResponseRunner>();
-		const runners = await this.runnerRepository.find({ relations: ['scans', 'group', 'scans.track', 'cards'] });
+		const runners = await this.runnerRepository.find({ relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] });
 		runners.forEach(runner => {
 			responseRunners.push(new ResponseRunner(runner));
 		});
@@ -44,11 +46,36 @@ export class RunnerController {
 	@OnUndefined(RunnerNotFoundError)
 	@OpenAPI({ description: 'Lists all information about the runner whose id got provided.' })
 	async getOne(@Param('id') id: number) {
-		let runner = await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group', 'scans.track', 'cards'] })
+		let runner = await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] })
 		if (!runner) { throw new RunnerNotFoundError(); }
 		return new ResponseRunner(runner);
 	}
 	@Get('/:id/scans')
 	@Authorized(["RUNNER:GET", "SCAN:GET"])
 	@ResponseSchema(ResponseScan, { isArray: true })
 	@ResponseSchema(ResponseTrackScan, { isArray: true })
 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
 	@OpenAPI({ description: 'Lists all scans of the runner whose id got provided. <br> If you only want the valid scans just add the ?onlyValid=true query param.' })
 	async getScans(@Param('id') id: number, onlyValid?: boolean) {
 		let responseScans: ResponseScan[] = new Array<ResponseScan>();
 		let runner = await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'scans.track', 'scans.station', 'scans.runner'] })
 		if (!runner) { throw new RunnerNotFoundError(); }
 		if (!onlyValid) {
 			for (let scan of runner.scans) {
 				responseScans.push(scan.toResponse());
 			}
 		}
 		else {
 			for (let scan of runner.validScans) {
 				responseScans.push(scan.toResponse());
 			}
 		}
 		return responseScans;
 	}
 	@Post()
 	@Authorized("RUNNER:CREATE")
 	@ResponseSchema(ResponseRunner)
@@ -64,7 +91,7 @@ export class RunnerController {
 		}
 		runner = await this.runnerRepository.save(runner)
-		return new ResponseRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'scans.track', 'cards'] }));
+		return new ResponseRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] }));
 	}
 	@Put('/:id')
@@ -85,7 +112,7 @@ export class RunnerController {
 		}
 		await this.runnerRepository.save(await runner.update(oldRunner));
-		return new ResponseRunner(await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group', 'scans.track', 'cards'] }));
+		return new ResponseRunner(await this.runnerRepository.findOne({ id: id }, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] }));
 	}
 	@Delete('/:id')
@@ -98,7 +125,7 @@ export class RunnerController {
 	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
 		let runner = await this.runnerRepository.findOne({ id: id });
 		if (!runner) { return null; }
-		const responseRunner = await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'scans.track', 'cards'] });
+		const responseRunner = await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] });
 		if (!runner) {
 			throw new RunnerNotFoundError();
--- a/src/controllers/RunnerOrganisationController.ts
+++ b/src/controllers/RunnerOrganisationController.ts
@@ -1,127 +0,0 @@
 import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
 import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
 import { getConnectionManager, Repository } from 'typeorm';
 import { RunnerOrganisationHasRunnersError, RunnerOrganisationHasTeamsError, RunnerOrganisationIdsNotMatchingError, RunnerOrganisationNotFoundError } from '../errors/RunnerOrganisationErrors';
 import { CreateRunnerOrganisation } from '../models/actions/create/CreateRunnerOrganisation';
 import { UpdateRunnerOrganisation } from '../models/actions/update/UpdateRunnerOrganisation';
 import { RunnerOrganisation } from '../models/entities/RunnerOrganisation';
 import { ResponseEmpty } from '../models/responses/ResponseEmpty';
 import { ResponseRunnerOrganisation } from '../models/responses/ResponseRunnerOrganisation';
 import { RunnerController } from './RunnerController';
 import { RunnerTeamController } from './RunnerTeamController';
@JsonController('/organisations')
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
 export class RunnerOrganisationController {
 	private runnerOrganisationRepository: Repository<RunnerOrganisation>;
 	/**
 	 * Gets the repository of this controller's model/entity.
 	 */
 	constructor() {
 		this.runnerOrganisationRepository = getConnectionManager().get().getRepository(RunnerOrganisation);
 	}
 	@Get()
 	@Authorized("ORGANISATION:GET")
 	@ResponseSchema(ResponseRunnerOrganisation, { isArray: true })
 	@OpenAPI({ description: 'Lists all organisations. <br> This includes their address, contact and teams (if existing/associated).' })
 	async getAll() {
 		let responseTeams: ResponseRunnerOrganisation[] = new Array<ResponseRunnerOrganisation>();
 		const runners = await this.runnerOrganisationRepository.find({ relations: ['contact', 'teams'] });
 		runners.forEach(runner => {
 			responseTeams.push(new ResponseRunnerOrganisation(runner));
 		});
 		return responseTeams;
 	}
 	@Get('/:id')
 	@Authorized("ORGANISATION:GET")
 	@ResponseSchema(ResponseRunnerOrganisation)
 	@ResponseSchema(RunnerOrganisationNotFoundError, { statusCode: 404 })
 	@OnUndefined(RunnerOrganisationNotFoundError)
 	@OpenAPI({ description: 'Lists all information about the organisation whose id got provided.' })
 	async getOne(@Param('id') id: number) {
 		let runnerOrg = await this.runnerOrganisationRepository.findOne({ id: id }, { relations: ['contact', 'teams'] });
 		if (!runnerOrg) { throw new RunnerOrganisationNotFoundError(); }
 		return new ResponseRunnerOrganisation(runnerOrg);
 	}
 	@Post()
 	@Authorized("ORGANISATION:CREATE")
 	@ResponseSchema(ResponseRunnerOrganisation)
 	@OpenAPI({ description: 'Create a new organsisation.' })
 	async post(@Body({ validate: true }) createRunnerOrganisation: CreateRunnerOrganisation) {
 		let runnerOrganisation;
 		try {
 			runnerOrganisation = await createRunnerOrganisation.toEntity();
 		} catch (error) {
 			throw error;
 		}
 		runnerOrganisation = await this.runnerOrganisationRepository.save(runnerOrganisation);
 		return new ResponseRunnerOrganisation(await this.runnerOrganisationRepository.findOne(runnerOrganisation, { relations: ['contact', 'teams'] }));
 	}
 	@Put('/:id')
 	@Authorized("ORGANISATION:UPDATE")
 	@ResponseSchema(ResponseRunnerOrganisation)
 	@ResponseSchema(RunnerOrganisationNotFoundError, { statusCode: 404 })
 	@ResponseSchema(RunnerOrganisationIdsNotMatchingError, { statusCode: 406 })
 	@OpenAPI({ description: "Update the organisation whose id you provided. <br> Please remember that ids can't be changed." })
 	async put(@Param('id') id: number, @Body({ validate: true }) updateOrganisation: UpdateRunnerOrganisation) {
 		let oldRunnerOrganisation = await this.runnerOrganisationRepository.findOne({ id: id });
 		if (!oldRunnerOrganisation) {
 			throw new RunnerOrganisationNotFoundError();
 		}
 		if (oldRunnerOrganisation.id != updateOrganisation.id) {
 			throw new RunnerOrganisationIdsNotMatchingError();
 		}
 		await this.runnerOrganisationRepository.save(await updateOrganisation.update(oldRunnerOrganisation));
 		return new ResponseRunnerOrganisation(await this.runnerOrganisationRepository.findOne(id, { relations: ['contact', 'teams'] }));
 	}
 	@Delete('/:id')
 	@Authorized("ORGANISATION:DELETE")
 	@ResponseSchema(ResponseRunnerOrganisation)
 	@ResponseSchema(ResponseEmpty, { statusCode: 204 })
 	@ResponseSchema(RunnerOrganisationHasTeamsError, { statusCode: 406 })
 	@ResponseSchema(RunnerOrganisationHasRunnersError, { statusCode: 406 })
 	@OnUndefined(204)
 	@OpenAPI({ description: 'Delete the organsisation whose id you provided. <br> If the organisation still has runners and/or teams associated this will fail. <br> To delete the organisation with all associated runners and teams set the force QueryParam to true (cascading deletion might take a while). <br> This won\'t delete the associated contact. <br> If no organisation with this id exists it will just return 204(no content).' })
 	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
 		let organisation = await this.runnerOrganisationRepository.findOne({ id: id });
 		if (!organisation) { return null; }
 		let runnerOrganisation = await this.runnerOrganisationRepository.findOne(organisation, { relations: ['contact', 'runners', 'teams'] });
 		if (!force) {
 			if (runnerOrganisation.teams.length != 0) {
 				throw new RunnerOrganisationHasTeamsError();
 			}
 		}
 		const teamController = new RunnerTeamController()
 		for (let team of runnerOrganisation.teams) {
 			await teamController.remove(team.id, true);
 		}
 		if (!force) {
 			if (runnerOrganisation.runners.length != 0) {
 				throw new RunnerOrganisationHasRunnersError();
 			}
 		}
 		const runnerController = new RunnerController()
 		for (let runner of runnerOrganisation.runners) {
 			await runnerController.remove(runner.id, true);
 		}
 		const responseOrganisation = new ResponseRunnerOrganisation(runnerOrganisation);
 		await this.runnerOrganisationRepository.delete(organisation);
 		return responseOrganisation;
 	}
 }
--- a/src/controllers/RunnerOrganizationController.ts
+++ b/src/controllers/RunnerOrganizationController.ts
@@ -0,0 +1,145 @@
 import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
 import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
 import { getConnectionManager, Repository } from 'typeorm';
 import { RunnerOrganizationHasRunnersError, RunnerOrganizationHasTeamsError, RunnerOrganizationIdsNotMatchingError, RunnerOrganizationNotFoundError } from '../errors/RunnerOrganizationErrors';
 import { CreateRunnerOrganization } from '../models/actions/create/CreateRunnerOrganization';
 import { UpdateRunnerOrganization } from '../models/actions/update/UpdateRunnerOrganization';
 import { Runner } from '../models/entities/Runner';
 import { RunnerOrganization } from '../models/entities/RunnerOrganization';
 import { ResponseEmpty } from '../models/responses/ResponseEmpty';
 import { ResponseRunner } from '../models/responses/ResponseRunner';
 import { ResponseRunnerOrganization } from '../models/responses/ResponseRunnerOrganization';
 import { RunnerController } from './RunnerController';
 import { RunnerTeamController } from './RunnerTeamController';
@JsonController('/organizations')
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
 export class RunnerOrganizationController {
 	private runnerOrganizationRepository: Repository<RunnerOrganization>;
 	/**
 	 * Gets the repository of this controller's model/entity.
 	 */
 	constructor() {
 		this.runnerOrganizationRepository = getConnectionManager().get().getRepository(RunnerOrganization);
 	}
 	@Get()
 	@Authorized("ORGANIZATION:GET")
 	@ResponseSchema(ResponseRunnerOrganization, { isArray: true })
 	@OpenAPI({ description: 'Lists all organizations. <br> This includes their address, contact and teams (if existing/associated).' })
 	async getAll() {
 		let responseTeams: ResponseRunnerOrganization[] = new Array<ResponseRunnerOrganization>();
 		const runners = await this.runnerOrganizationRepository.find({ relations: ['contact', 'teams'] });
 		runners.forEach(runner => {
 			responseTeams.push(new ResponseRunnerOrganization(runner));
 		});
 		return responseTeams;
 	}
 	@Get('/:id')
 	@Authorized("ORGANIZATION:GET")
 	@ResponseSchema(ResponseRunnerOrganization)
 	@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
 	@OnUndefined(RunnerOrganizationNotFoundError)
 	@OpenAPI({ description: 'Lists all information about the organization whose id got provided.' })
 	async getOne(@Param('id') id: number) {
 		let runnerOrg = await this.runnerOrganizationRepository.findOne({ id: id }, { relations: ['contact', 'teams'] });
 		if (!runnerOrg) { throw new RunnerOrganizationNotFoundError(); }
 		return new ResponseRunnerOrganization(runnerOrg);
 	}
 	@Get('/:id/runners')
 	@Authorized(["RUNNER:GET", "SCAN:GET"])
 	@ResponseSchema(ResponseRunner, { isArray: true })
 	@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
 	@OpenAPI({ description: 'Lists all runners from this org and it\'s teams (if you don\'t provide the ?onlyDirect=true param). <br> This includes the runner\'s group and distance ran.' })
 	async getRunners(@Param('id') id: number, @QueryParam('onlyDirect') onlyDirect: boolean) {
 		let responseRunners: ResponseRunner[] = new Array<ResponseRunner>();
 		let runners: Runner[];
 		if (!onlyDirect) { runners = (await this.runnerOrganizationRepository.findOne({ id: id }, { relations: ['runners', 'runners.group', 'runners.group.parentGroup', 'runners.scans', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.group', 'teams.runners.group.parentGroup', 'teams.runners.scans', 'teams.runners.scans.track'] })).allRunners; }
 		else { runners = (await this.runnerOrganizationRepository.findOne({ id: id }, { relations: ['runners', 'runners.group', 'runners.group.parentGroup', 'runners.scans', 'runners.scans.track'] })).runners; }
 		runners.forEach(runner => {
 			responseRunners.push(new ResponseRunner(runner));
 		});
 		return responseRunners;
 	}
 	@Post()
 	@Authorized("ORGANIZATION:CREATE")
 	@ResponseSchema(ResponseRunnerOrganization)
 	@OpenAPI({ description: 'Create a new organsisation.' })
 	async post(@Body({ validate: true }) createRunnerOrganization: CreateRunnerOrganization) {
 		let runnerOrganization;
 		try {
 			runnerOrganization = await createRunnerOrganization.toEntity();
 		} catch (error) {
 			throw error;
 		}
 		runnerOrganization = await this.runnerOrganizationRepository.save(runnerOrganization);
 		return new ResponseRunnerOrganization(await this.runnerOrganizationRepository.findOne(runnerOrganization, { relations: ['contact', 'teams'] }));
 	}
 	@Put('/:id')
 	@Authorized("ORGANIZATION:UPDATE")
 	@ResponseSchema(ResponseRunnerOrganization)
 	@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
 	@ResponseSchema(RunnerOrganizationIdsNotMatchingError, { statusCode: 406 })
 	@OpenAPI({ description: "Update the organization whose id you provided. <br> Please remember that ids can't be changed." })
 	async put(@Param('id') id: number, @Body({ validate: true }) updateOrganization: UpdateRunnerOrganization) {
 		let oldRunnerOrganization = await this.runnerOrganizationRepository.findOne({ id: id });
 		if (!oldRunnerOrganization) {
 			throw new RunnerOrganizationNotFoundError();
 		}
 		if (oldRunnerOrganization.id != updateOrganization.id) {
 			throw new RunnerOrganizationIdsNotMatchingError();
 		}
 		await this.runnerOrganizationRepository.save(await updateOrganization.update(oldRunnerOrganization));
 		return new ResponseRunnerOrganization(await this.runnerOrganizationRepository.findOne(id, { relations: ['contact', 'teams'] }));
 	}
 	@Delete('/:id')
 	@Authorized("ORGANIZATION:DELETE")
 	@ResponseSchema(ResponseRunnerOrganization)
 	@ResponseSchema(ResponseEmpty, { statusCode: 204 })
 	@ResponseSchema(RunnerOrganizationHasTeamsError, { statusCode: 406 })
 	@ResponseSchema(RunnerOrganizationHasRunnersError, { statusCode: 406 })
 	@OnUndefined(204)
 	@OpenAPI({ description: 'Delete the organsisation whose id you provided. <br> If the organization still has runners and/or teams associated this will fail. <br> To delete the organization with all associated runners and teams set the force QueryParam to true (cascading deletion might take a while). <br> This won\'t delete the associated contact. <br> If no organization with this id exists it will just return 204(no content).' })
 	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
 		let organization = await this.runnerOrganizationRepository.findOne({ id: id });
 		if (!organization) { return null; }
 		let runnerOrganization = await this.runnerOrganizationRepository.findOne(organization, { relations: ['contact', 'runners', 'teams'] });
 		if (!force) {
 			if (runnerOrganization.teams.length != 0) {
 				throw new RunnerOrganizationHasTeamsError();
 			}
 		}
 		const teamController = new RunnerTeamController()
 		for (let team of runnerOrganization.teams) {
 			await teamController.remove(team.id, true);
 		}
 		if (!force) {
 			if (runnerOrganization.runners.length != 0) {
 				throw new RunnerOrganizationHasRunnersError();
 			}
 		}
 		const runnerController = new RunnerController()
 		for (let runner of runnerOrganization.runners) {
 			await runnerController.remove(runner.id, true);
 		}
 		const responseOrganization = new ResponseRunnerOrganization(runnerOrganization);
 		await this.runnerOrganizationRepository.delete(organization);
 		return responseOrganization;
 	}
 }
--- a/src/controllers/RunnerSelfServiceController.ts
+++ b/src/controllers/RunnerSelfServiceController.ts
@@ -0,0 +1,228 @@
 import { Request } from "express";
 import * as jwt from "jsonwebtoken";
 import { Body, Delete, Get, JsonController, OnUndefined, Param, Post, QueryParam, Req, UseBefore } from 'routing-controllers';
 import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
 import { getConnectionManager, Repository } from 'typeorm';
 import { config } from '../config';
 import { InvalidCredentialsError, JwtNotProvidedError } from '../errors/AuthError';
 import { MailSendingError } from '../errors/MailErrors';
 import { RunnerEmailNeededError, RunnerHasDistanceDonationsError, RunnerNotFoundError, RunnerSelfserviceTimeoutError } from '../errors/RunnerErrors';
 import { RunnerOrganizationNotFoundError } from '../errors/RunnerOrganizationErrors';
 import { ScanStationNotFoundError } from '../errors/ScanStationErrors';
 import { JwtCreator } from '../jwtcreator';
 import { Mailer } from '../mailer';
 import ScanAuth from '../middlewares/ScanAuth';
 import { CreateSelfServiceCitizenRunner } from '../models/actions/create/CreateSelfServiceCitizenRunner';
 import { CreateSelfServiceRunner } from '../models/actions/create/CreateSelfServiceRunner';
 import { Runner } from '../models/entities/Runner';
 import { RunnerGroup } from '../models/entities/RunnerGroup';
 import { RunnerOrganization } from '../models/entities/RunnerOrganization';
 import { ScanStation } from '../models/entities/ScanStation';
 import { ResponseEmpty } from '../models/responses/ResponseEmpty';
 import { ResponseScanStation } from '../models/responses/ResponseScanStation';
 import { ResponseSelfServiceOrganisation } from '../models/responses/ResponseSelfServiceOrganisation';
 import { ResponseSelfServiceRunner } from '../models/responses/ResponseSelfServiceRunner';
 import { ResponseSelfServiceScan } from '../models/responses/ResponseSelfServiceScan';
 import { DonationController } from './DonationController';
 import { RunnerCardController } from './RunnerCardController';
 import { ScanController } from './ScanController';
@JsonController()
 export class RunnerSelfServiceController {
 	private runnerRepository: Repository<Runner>;
 	private orgRepository: Repository<RunnerOrganization>;
 	private stationRepository: Repository<ScanStation>;
 	/**
 	 * Gets the repository of this controller's model/entity.
 	 */
 	constructor() {
 		this.runnerRepository = getConnectionManager().get().getRepository(Runner);
 		this.orgRepository = getConnectionManager().get().getRepository(RunnerOrganization);
 		this.stationRepository = getConnectionManager().get().getRepository(ScanStation);
 	}
 	@Get('/runners/me/:jwt')
 	@ResponseSchema(ResponseSelfServiceRunner)
 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
 	@OnUndefined(RunnerNotFoundError)
 	@OpenAPI({ description: 'Lists all information about yourself. <br> Please provide your runner jwt(that code we gave you during registration) for auth. <br> If you lost your jwt/personalized link please use the forgot endpoint.' })
 	async get(@Param('jwt') token: string) {
 		return (new ResponseSelfServiceRunner(await this.getRunner(token)));
 	}
 	@Delete('/runners/me/:jwt')
 	@ResponseSchema(ResponseSelfServiceRunner)
 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
 	@OnUndefined(RunnerNotFoundError)
 	@OpenAPI({ description: 'Deletes all information about yourself. <br> Please provide your runner jwt(that code we gave you during registration) for auth. <br> If you lost your jwt/personalized link please use the forgot endpoint.' })
 	async remove(@Param('jwt') token: string, @QueryParam("force") force: boolean) {
 		const responseRunner = await this.getRunner(token);
 		let runner = await this.runnerRepository.findOne({ id: responseRunner.id });
 		if (!runner) { return null; }
 		if (!runner) {
 			throw new RunnerNotFoundError();
 		}
 		const runnerDonations = (await this.runnerRepository.findOne({ id: runner.id }, { relations: ["distanceDonations"] })).distanceDonations;
 		if (runnerDonations.length > 0 && !force) {
 			throw new RunnerHasDistanceDonationsError();
 		}
 		const donationController = new DonationController();
 		for (let donation of runnerDonations) {
 			await donationController.remove(donation.id, force);
 		}
 		const runnerCards = (await this.runnerRepository.findOne({ id: runner.id }, { relations: ["cards"] })).cards;
 		const cardController = new RunnerCardController;
 		for (let card of runnerCards) {
 			await cardController.remove(card.id, force);
 		}
 		const runnerScans = (await this.runnerRepository.findOne({ id: runner.id }, { relations: ["scans"] })).scans;
 		const scanController = new ScanController;
 		for (let scan of runnerScans) {
 			await scanController.remove(scan.id, force);
 		}
 		await this.runnerRepository.delete(runner);
 		return new ResponseSelfServiceRunner(responseRunner);
 	}
 	@Get('/runners/me/:jwt/scans')
 	@ResponseSchema(ResponseSelfServiceScan, { isArray: true })
 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
 	@OnUndefined(RunnerNotFoundError)
 	@OpenAPI({ description: 'Lists all your (runner) scans. <br> Please provide your runner jwt(that code we gave you during registration) for auth. <br> If you lost your jwt/personalized link please contact support.' })
 	async getScans(@Param('jwt') token: string) {
 		const scans = (await this.getRunner(token)).scans;
 		let responseScans = new Array<ResponseSelfServiceScan>()
 		for (let scan of scans) {
 			responseScans.push(new ResponseSelfServiceScan(scan));
 		}
 		return responseScans;
 	}
 	@Get('/stations/me')
 	@UseBefore(ScanAuth)
 	@ResponseSchema(ResponseScanStation)
 	@ResponseSchema(ScanStationNotFoundError, { statusCode: 404 })
 	@OnUndefined(ScanStationNotFoundError)
 	@OpenAPI({ description: 'Lists basic information about the station whose token got provided. <br> This includes it\'s associated track.', security: [{ "StationApiToken": [] }] })
 	async getStationMe(@Req() req: Request) {
 		let scan = await this.stationRepository.findOne({ id: parseInt(req.headers["station_id"].toString()) }, { relations: ['track'] })
 		if (!scan) { throw new ScanStationNotFoundError(); }
 		return scan.toResponse();
 	}
 	@Post('/runners/forgot')
 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
 	@OnUndefined(ResponseEmpty)
 	@OpenAPI({ description: 'Use this endpoint to reuqest a new selfservice token/link to be sent to your mail address (rate limited to one mail every 24hrs).' })
 	async requestNewToken(@QueryParam('mail') mail: string, @QueryParam("locale") locale: string = "en") {
 		if (!mail) {
 			throw new RunnerNotFoundError();
 		}
 		const runner = await this.runnerRepository.findOne({ email: mail });
 		if (!runner) { throw new RunnerNotFoundError(); }
 		if (runner.resetRequestedTimestamp > (Math.floor(Date.now() / 1000) - 60 * 60 * 24)) { throw new RunnerSelfserviceTimeoutError(); }
 		const token = JwtCreator.createSelfService(runner);
 		try {
 			await Mailer.sendSelfserviceForgottenMail(runner.email, token, locale)
 		} catch (error) {
 			throw new MailSendingError();
 		}
 		runner.resetRequestedTimestamp = Math.floor(Date.now() / 1000);
 		await this.runnerRepository.save(runner);
 		return { token };
 	}
 	@Post('/runners/register')
 	@ResponseSchema(ResponseSelfServiceRunner)
 	@ResponseSchema(RunnerEmailNeededError, { statusCode: 406 })
 	@OpenAPI({ description: 'Create a new selfservice runner in the citizen org. <br> This endpoint shoud be used to allow "everyday citizen" to register themselves. <br> You have to provide a mail address, b/c the future we\'ll implement email verification.' })
 	async registerRunner(@Body({ validate: true }) createRunner: CreateSelfServiceCitizenRunner, @QueryParam("locale") locale: string = "en") {
 		let runner = await createRunner.toEntity();
 		runner = await this.runnerRepository.save(runner);
 		let response = new ResponseSelfServiceRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards', 'distanceDonations', 'distanceDonations.donor', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] }));
 		response.token = JwtCreator.createSelfService(runner);
 		try {
 			await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, locale)
 		} catch (error) {
 			throw new MailSendingError();
 		}
 		return response;
 	}
 	@Post('/runners/register/:token')
 	@ResponseSchema(ResponseSelfServiceRunner)
 	@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
 	@OpenAPI({ description: 'Create a new selfservice runner in a provided org. <br> The orgs get provided and authorized via api tokens that can be optained via the /organizations endpoint.' })
 	async registerOrganizationRunner(@Param('token') token: string, @Body({ validate: true }) createRunner: CreateSelfServiceRunner, @QueryParam("locale") locale: string = "en") {
 		const org = await this.getOrgansisation(token);
 		let runner = await createRunner.toEntity(org);
 		runner = await this.runnerRepository.save(runner);
 		let response = new ResponseSelfServiceRunner(await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards', 'distanceDonations', 'distanceDonations.donor', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] }));
 		response.token = JwtCreator.createSelfService(runner);
 		try {
 			await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, locale)
 		} catch (error) {
 			throw new MailSendingError();
 		}
 		return response;
 	}
 	@Get('/organizations/selfservice/:token')
 	@ResponseSchema(ResponseSelfServiceOrganisation, { isArray: false })
 	@ResponseSchema(RunnerOrganizationNotFoundError, { statusCode: 404 })
 	@OpenAPI({ description: 'Get the basic info and teams for a org.' })
 	async getSelfserviceOrg(@Param('token') token: string) {
 		const orgid = (await this.getOrgansisation(token)).id;
 		const org = await this.orgRepository.findOne({ id: orgid }, { relations: ['teams'] })
 		return new ResponseSelfServiceOrganisation(<RunnerOrganization>org);
 	}
 	/**
 	 * Get's a runner by a provided jwt token.
 	 * @param token The runner jwt provided by the runner to identitfy themselves.
 	 */
 	private async getRunner(token: string): Promise<Runner> {
 		if (token == "") { throw new JwtNotProvidedError(); }
 		let jwtPayload = undefined
 		try {
 			jwtPayload = <any>jwt.verify(token, config.jwt_secret);
 		} catch (error) {
 			throw new InvalidCredentialsError();
 		}
 		const runner = await this.runnerRepository.findOne({ id: jwtPayload["id"] }, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards', 'distanceDonations', 'distanceDonations.donor', 'distanceDonations.runner', 'distanceDonations.runner.scans', 'distanceDonations.runner.scans.track'] });
 		if (!runner) { throw new RunnerNotFoundError() }
 		return runner;
 	}
 	/**
 	 * Get's a runner org by a provided registration api key.
 	 * @param token The organization's registration api token.
 	 */
 	private async getOrgansisation(token: string): Promise<RunnerGroup> {
 		token = Buffer.from(token, 'base64').toString('utf8');
 		const organization = await this.orgRepository.findOne({ key: token });
 		if (!organization) { throw new RunnerOrganizationNotFoundError; }
 		return organization;
 	}
 }
--- a/src/controllers/RunnerTeamController.ts
+++ b/src/controllers/RunnerTeamController.ts
@@ -6,6 +6,7 @@ import { CreateRunnerTeam } from '../models/actions/create/CreateRunnerTeam';
 import { UpdateRunnerTeam } from '../models/actions/update/UpdateRunnerTeam';
 import { RunnerTeam } from '../models/entities/RunnerTeam';
 import { ResponseEmpty } from '../models/responses/ResponseEmpty';
 import { ResponseRunner } from '../models/responses/ResponseRunner';
 import { ResponseRunnerTeam } from '../models/responses/ResponseRunnerTeam';
 import { RunnerController } from './RunnerController';
@@ -25,7 +26,7 @@ export class RunnerTeamController {
 	@Get()
 	@Authorized("TEAM:GET")
 	@ResponseSchema(ResponseRunnerTeam, { isArray: true })
-	@OpenAPI({ description: 'Lists all teams. <br> This includes their parent organisation and contact (if existing/associated).' })
+	@OpenAPI({ description: 'Lists all teams. <br> This includes their parent organization and contact (if existing/associated).' })
 	async getAll() {
 		let responseTeams: ResponseRunnerTeam[] = new Array<ResponseRunnerTeam>();
 		const runners = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'] });
@@ -47,6 +48,20 @@ export class RunnerTeamController {
 		return new ResponseRunnerTeam(runnerTeam);
 	}
 	@Get('/:id/runners')
 	@Authorized(["RUNNER:GET", "SCAN:GET"])
 	@ResponseSchema(ResponseRunner, { isArray: true })
 	@ResponseSchema(RunnerTeamNotFoundError, { statusCode: 404 })
 	@OpenAPI({ description: 'Lists all runners from this team. <br> This includes the runner\'s group and distance ran.' })
 	async getRunners(@Param('id') id: number) {
 		let responseRunners: ResponseRunner[] = new Array<ResponseRunner>();
 		const runners = (await this.runnerTeamRepository.findOne({ id: id }, { relations: ['runners', 'runners.group', 'runners.group.parentGroup', 'runners.scans', 'runners.scans.track'] })).runners;
 		runners.forEach(runner => {
 			responseRunners.push(new ResponseRunner(runner));
 		});
 		return responseRunners;
 	}
 	@Post()
 	@Authorized("TEAM:CREATE")
 	@ResponseSchema(ResponseRunnerTeam)
--- a/src/controllers/ScanController.ts
+++ b/src/controllers/ScanController.ts
@@ -1,4 +1,5 @@
-import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam, UseBefore } from 'routing-controllers';
+import { Request } from "express";
 import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam, Req, UseBefore } from 'routing-controllers';
 import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
 import { getConnectionManager, Repository } from 'typeorm';
 import { RunnerNotFoundError } from '../errors/RunnerErrors';
@@ -14,7 +15,6 @@ import { TrackScan } from '../models/entities/TrackScan';
 import { ResponseEmpty } from '../models/responses/ResponseEmpty';
 import { ResponseScan } from '../models/responses/ResponseScan';
 import { ResponseTrackScan } from '../models/responses/ResponseTrackScan';
@JsonController('/scans')
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
 export class ScanController {
@@ -36,7 +36,7 @@ export class ScanController {
 	@OpenAPI({ description: 'Lists all scans (normal or track) from all runners. <br> This includes the scan\'s runner\'s distance ran.' })
 	async getAll() {
 		let responseScans: ResponseScan[] = new Array<ResponseScan>();
-		const scans = await this.scanRepository.find({ relations: ['runner', 'track', 'runner.scans', 'runner.scans.track', 'card', 'station'] });
+		const scans = await this.scanRepository.find({ relations: ['runner', 'track', 'runner.scans', 'runner.group', 'runner.scans.track', 'card', 'station'] });
 		scans.forEach(scan => {
 			responseScans.push(scan.toResponse());
 		});
@@ -51,7 +51,7 @@ export class ScanController {
 	@OnUndefined(ScanNotFoundError)
 	@OpenAPI({ description: 'Lists all information about the scan whose id got provided. This includes the scan\'s runner\'s distance ran.' })
 	async getOne(@Param('id') id: number) {
-		let scan = await this.scanRepository.findOne({ id: id }, { relations: ['runner', 'track', 'runner.scans', 'runner.scans.track', 'card', 'station'] })
+		let scan = await this.scanRepository.findOne({ id: id }, { relations: ['runner', 'track', 'runner.scans', 'runner.group', 'runner.scans.track', 'card', 'station'] })
 		if (!scan) { throw new ScanNotFoundError(); }
 		return scan.toResponse();
 	}
@@ -60,22 +60,26 @@ export class ScanController {
 	@UseBefore(ScanAuth)
 	@ResponseSchema(ResponseScan)
 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
-	@OpenAPI({ description: 'Create a new scan (not track scan - use /scans/trackscans instead). <br> Please rmemember to provide the scan\'s runner\'s id and distance.', security: [{ "ScanApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
+	@OpenAPI({ description: 'Create a new scan (not track scan - use /scans/trackscans instead). <br> Please rmemember to provide the scan\'s runner\'s id and distance.', security: [{ "StationApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
 	async post(@Body({ validate: true }) createScan: CreateScan) {
 		let scan = await createScan.toEntity();
 		scan = await this.scanRepository.save(scan);
-		return (await this.scanRepository.findOne({ id: scan.id }, { relations: ['runner', 'track', 'runner.scans', 'runner.scans.track', 'card', 'station'] })).toResponse();
+		return (await this.scanRepository.findOne({ id: scan.id }, { relations: ['runner', 'track', 'runner.scans', 'runner.group', 'runner.scans.track', 'card', 'station'] })).toResponse();
 	}
 	@Post("/trackscans")
 	@UseBefore(ScanAuth)
 	@ResponseSchema(ResponseTrackScan)
 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
-	@OpenAPI({ description: 'Create a new track scan (for "normal" scans use /scans instead). <br> Please remember that to provide the scan\'s card\'s station\'s id.', security: [{ "ScanApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
+	@OpenAPI({ description: 'Create a new track scan (for "normal" scans use /scans instead). <br> Please remember that to provide the scan\'s card\'s station\'s id.', security: [{ "StationApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
-	async postTrackScans(@Body({ validate: true }) createScan: CreateTrackScan) {
+	async postTrackScans(@Body({ validate: true }) createScan: CreateTrackScan, @Req() req: Request) {
 		const station_id = req.headers["station_id"];
 		if (station_id) {
 			createScan.station = parseInt(station_id.toString());
 		}
 		let scan = await createScan.toEntity();
 		scan = await this.trackScanRepository.save(scan);
-		return (await this.scanRepository.findOne({ id: scan.id }, { relations: ['runner', 'track', 'runner.scans', 'runner.scans.track', 'card', 'station'] })).toResponse();
+		return (await this.scanRepository.findOne({ id: scan.id }, { relations: ['runner', 'track', 'runner.scans', 'runner.group', 'runner.scans.track', 'card', 'station'] })).toResponse();
 	}
 	@Put('/:id')
@@ -97,7 +101,7 @@ export class ScanController {
 		}
 		await this.scanRepository.save(await scan.update(oldScan));
-		return (await this.scanRepository.findOne({ id: id }, { relations: ['runner', 'track', 'runner.scans', 'runner.scans.track', 'card', 'station'] })).toResponse();
+		return (await this.scanRepository.findOne({ id: id }, { relations: ['runner', 'track', 'runner.scans', 'runner.group', 'runner.scans.track', 'card', 'station'] })).toResponse();
 	}
 	@Put('/trackscans/:id')
@@ -120,7 +124,7 @@ export class ScanController {
 		}
 		await this.trackScanRepository.save(await scan.update(oldScan));
-		return (await this.scanRepository.findOne({ id: id }, { relations: ['runner', 'track', 'runner.scans', 'runner.scans.track', 'card', 'station'] })).toResponse();
+		return (await this.scanRepository.findOne({ id: id }, { relations: ['runner', 'track', 'runner.scans', 'runner.group', 'runner.scans.track', 'card', 'station'] })).toResponse();
 	}
 	@Delete('/:id')
@@ -132,7 +136,7 @@ export class ScanController {
 	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
 		let scan = await this.scanRepository.findOne({ id: id });
 		if (!scan) { return null; }
-		const responseScan = await this.scanRepository.findOne({ id: scan.id }, { relations: ['runner', 'track', 'runner.scans', 'runner.scans.track', 'card', 'station'] });
+		const responseScan = await this.scanRepository.findOne({ id: scan.id }, { relations: ['runner', 'track', 'runner.scans', 'runner.group', 'runner.scans.track', 'card', 'station'] });
 		await this.scanRepository.delete(scan);
 		return responseScan.toResponse();
--- a/src/controllers/StatsController.ts
+++ b/src/controllers/StatsController.ts
@@ -4,12 +4,12 @@ import { getConnection } from 'typeorm';
 import StatsAuth from '../middlewares/StatsAuth';
 import { Donation } from '../models/entities/Donation';
 import { Runner } from '../models/entities/Runner';
-import { RunnerOrganisation } from '../models/entities/RunnerOrganisation';
+import { RunnerOrganization } from '../models/entities/RunnerOrganization';
 import { RunnerTeam } from '../models/entities/RunnerTeam';
 import { Scan } from '../models/entities/Scan';
 import { User } from '../models/entities/User';
 import { ResponseStats } from '../models/responses/ResponseStats';
-import { ResponseStatsOrgnisation } from '../models/responses/ResponseStatsOrganisation';
+import { ResponseStatsOrgnisation } from '../models/responses/ResponseStatsOrganization';
 import { ResponseStatsRunner } from '../models/responses/ResponseStatsRunner';
 import { ResponseStatsTeam } from '../models/responses/ResponseStatsTeam';
@@ -23,7 +23,7 @@ export class StatsController {
        let connection = getConnection();
        let runners = await connection.getRepository(Runner).find({ relations: ['scans', 'scans.track'] });
        let teams = await connection.getRepository(RunnerTeam).find();
-        let orgs = await connection.getRepository(RunnerOrganisation).find();
+        let orgs = await connection.getRepository(RunnerOrganization).find();
        let users = await connection.getRepository(User).find();
        let scans = await connection.getRepository(Scan).find();
        let donations = await connection.getRepository(Donation).find({ relations: ['runner', 'runner.scans', 'runner.scans.track'] });
@@ -94,12 +94,12 @@ export class StatsController {
        return responseTeams;
    }
-    @Get("/organisations/distance")
+    @Get("/organizations/distance")
    @UseBefore(StatsAuth)
    @ResponseSchema(ResponseStatsOrgnisation, { isArray: true })
-    @OpenAPI({ description: "Returns the top ten organisations by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
+    @OpenAPI({ description: "Returns the top ten organizations by distance.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
    async getTopOrgsByDistance() {
-        let orgs = await getConnection().getRepository(RunnerOrganisation).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.scans', 'teams.runners.distanceDonations', 'teams.runners.scans.track'] });
+        let orgs = await getConnection().getRepository(RunnerOrganization).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.scans', 'teams.runners.distanceDonations', 'teams.runners.scans.track'] });
        let topOrgs = orgs.sort((org1, org2) => org1.distance - org2.distance).slice(0, 9);
        let responseOrgs: ResponseStatsOrgnisation[] = new Array<ResponseStatsOrgnisation>();
        topOrgs.forEach(org => {
@@ -108,12 +108,12 @@ export class StatsController {
        return responseOrgs;
    }
-    @Get("/organisations/donations")
+    @Get("/organizations/donations")
    @UseBefore(StatsAuth)
    @ResponseSchema(ResponseStatsOrgnisation, { isArray: true })
-    @OpenAPI({ description: "Returns the top ten organisations by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
+    @OpenAPI({ description: "Returns the top ten organizations by donations.", security: [{ "StatsApiToken": [] }, { "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
    async getTopOrgsByDonations() {
-        let orgs = await getConnection().getRepository(RunnerOrganisation).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.scans', 'teams.runners.distanceDonations', 'teams.runners.scans.track'] });
+        let orgs = await getConnection().getRepository(RunnerOrganization).find({ relations: ['runners', 'runners.scans', 'runners.distanceDonations', 'runners.scans.track', 'teams', 'teams.runners', 'teams.runners.scans', 'teams.runners.distanceDonations', 'teams.runners.scans.track'] });
        let topOrgs = orgs.sort((org1, org2) => org1.distanceDonationAmount - org2.distanceDonationAmount).slice(0, 9);
        let responseOrgs: ResponseStatsOrgnisation[] = new Array<ResponseStatsOrgnisation>();
        topOrgs.forEach(org => {
--- a/src/controllers/UserController.ts
+++ b/src/controllers/UserController.ts
@@ -1,7 +1,7 @@
 import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
 import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
 import { getConnectionManager, Repository } from 'typeorm';
-import { UserDeletionNotConfirmedError, UserIdsNotMatchingError, UsernameContainsIllegalCharacterError, UserNotFoundError } from '../errors/UserErrors';
+import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, UserDeletionNotConfirmedError, UserIdsNotMatchingError, UsernameContainsIllegalCharacterError, UserNotFoundError } from '../errors/UserErrors';
 import { UserGroupNotFoundError } from '../errors/UserGroupErrors';
 import { CreateUser } from '../models/actions/create/CreateUser';
 import { UpdateUser } from '../models/actions/update/UpdateUser';
@@ -66,6 +66,10 @@ export class UserController {
 	@ResponseSchema(ResponseUser)
 	@ResponseSchema(UserGroupNotFoundError, { statusCode: 404 })
 	@ResponseSchema(UsernameContainsIllegalCharacterError, { statusCode: 406 })
 	@ResponseSchema(PasswordMustContainUppercaseLetterError, { statusCode: 406 })
 	@ResponseSchema(PasswordMustContainLowercaseLetterError, { statusCode: 406 })
 	@ResponseSchema(PasswordMustContainNumberError, { statusCode: 406 })
 	@ResponseSchema(PasswordTooShortError, { statusCode: 406 })
 	@OpenAPI({ description: 'Create a new user. <br> If you want to grant permissions to the user you have to create them seperately by posting to /api/permissions after creating the user.' })
 	async post(@Body({ validate: true }) createUser: CreateUser) {
 		let user;
@@ -85,6 +89,10 @@ export class UserController {
 	@ResponseSchema(UserNotFoundError, { statusCode: 404 })
 	@ResponseSchema(UserIdsNotMatchingError, { statusCode: 406 })
 	@ResponseSchema(UsernameContainsIllegalCharacterError, { statusCode: 406 })
 	@ResponseSchema(PasswordMustContainUppercaseLetterError, { statusCode: 406 })
 	@ResponseSchema(PasswordMustContainLowercaseLetterError, { statusCode: 406 })
 	@ResponseSchema(PasswordMustContainNumberError, { statusCode: 406 })
 	@ResponseSchema(PasswordTooShortError, { statusCode: 406 })
 	@OpenAPI({ description: "Update the user whose id you provided. <br> To change the permissions directly granted to the user please use /api/permissions instead. <br> Please remember that ids can't be changed." })
 	async put(@Param('id') id: number, @Body({ validate: true }) updateUser: UpdateUser) {
 		let oldUser = await this.userRepository.findOne({ id: id });
--- a/src/controllers/UserGroupController.ts
+++ b/src/controllers/UserGroupController.ts
@@ -1,13 +1,13 @@
 import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
 import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
 import { getConnectionManager, Repository } from 'typeorm';
 import { EntityFromBody } from 'typeorm-routing-controllers-extensions';
 import { UserGroupIdsNotMatchingError, UserGroupNotFoundError } from '../errors/UserGroupErrors';
 import { CreateUserGroup } from '../models/actions/create/CreateUserGroup';
 import { UpdateUserGroup } from '../models/actions/update/UpdateUserGroup';
 import { UserGroup } from '../models/entities/UserGroup';
 import { ResponseEmpty } from '../models/responses/ResponseEmpty';
 import { ResponseUserGroup } from '../models/responses/ResponseUserGroup';
 import { ResponseUserGroupPermissions } from '../models/responses/ResponseUserGroupPermissions';
 import { PermissionController } from './PermissionController';
@@ -25,20 +25,37 @@ export class UserGroupController {
 	@Get()
 	@Authorized("USERGROUP:GET")
-	@ResponseSchema(UserGroup, { isArray: true })
+	@ResponseSchema(ResponseUserGroup, { isArray: true })
 	@OpenAPI({ description: 'Lists all groups. <br> The information provided might change while the project continues to evolve.' })
-	getAll() {
+	async getAll() {
-		return this.userGroupsRepository.find({ relations: ["permissions"] });
+		let responseGroups: ResponseUserGroup[] = new Array<ResponseUserGroup>();
 		const groups = await this.userGroupsRepository.find({ relations: ['permissions'] });
 		groups.forEach(group => {
 			responseGroups.push(group.toResponse());
 		});
 		return responseGroups;
 	}
 	@Get('/:id')
 	@Authorized("USERGROUP:GET")
-	@ResponseSchema(UserGroup)
+	@ResponseSchema(ResponseUserGroup)
 	@ResponseSchema(UserGroupNotFoundError, { statusCode: 404 })
 	@OnUndefined(UserGroupNotFoundError)
 	@OpenAPI({ description: 'Lists all information about the group whose id got provided. <br> The information provided might change while the project continues to evolve.' })
-	getOne(@Param('id') id: number) {
+	async getOne(@Param('id') id: number) {
-		return this.userGroupsRepository.findOne({ id: id }, { relations: ["permissions"] });
+		return await (await (this.userGroupsRepository.findOne({ id: id }, { relations: ["permissions"] }))).toResponse();
 	}
 	@Get('/:id/permissions')
 	@Authorized("USERGROUP:GET")
 	@ResponseSchema(ResponseUserGroupPermissions)
 	@ResponseSchema(UserGroupNotFoundError, { statusCode: 404 })
 	@OnUndefined(UserGroupNotFoundError)
 	@OpenAPI({ description: 'Lists all permissions granted to the group as permission response objects.' })
 	async getPermissions(@Param('id') id: number) {
 		let group = await this.userGroupsRepository.findOne({ id: id }, { relations: ['permissions', 'permissions.principal'] })
 		if (!group) { throw new UserGroupNotFoundError(); }
 		return new ResponseUserGroupPermissions(group);
 	}
 	@Post()
@@ -54,7 +71,8 @@ export class UserGroupController {
 			throw error;
 		}
-		return this.userGroupsRepository.save(userGroup);
+		userGroup = await this.userGroupsRepository.save(userGroup);
 		return (await (this.userGroupsRepository.findOne({ id: userGroup.id }, { relations: ["permissions"] }))).toResponse();
 	}
 	@Put('/:id')
@@ -63,7 +81,7 @@ export class UserGroupController {
 	@ResponseSchema(UserGroupNotFoundError, { statusCode: 404 })
 	@ResponseSchema(UserGroupIdsNotMatchingError, { statusCode: 406 })
 	@OpenAPI({ description: "Update the group whose id you provided. <br> To change the permissions granted to the group please use /api/permissions instead. <br> Please remember that ids can't be changed." })
-	async put(@Param('id') id: number, @EntityFromBody() updateGroup: UpdateUserGroup) {
+	async put(@Param('id') id: number, @Body({ validate: true }) updateGroup: UpdateUserGroup) {
 		let oldGroup = await this.userGroupsRepository.findOne({ id: id });
 		if (!oldGroup) {
@@ -75,7 +93,7 @@ export class UserGroupController {
 		}
 		await this.userGroupsRepository.save(await updateGroup.update(oldGroup));
-		return (await this.userGroupsRepository.findOne({ id: id }, { relations: ['permissions', 'groups'] })).toResponse();
+		return (await this.userGroupsRepository.findOne({ id: id }, { relations: ['permissions'] })).toResponse();
 	}
 	@Delete('/:id')
@@ -85,7 +103,7 @@ export class UserGroupController {
 	@OnUndefined(204)
 	@OpenAPI({ description: 'Delete the group whose id you provided. <br> If there are any permissions directly granted to the group they will get deleted as well. <br> Users associated with this group won\'t get deleted - just deassociated. <br> If no group with this id exists it will just return 204(no content).' })
 	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
-		let group = await this.userGroupsRepository.findOne({ id: id }, { relations: ["permissions"] });
+		let group = await this.userGroupsRepository.findOne({ id: id });
 		if (!group) { return null; }
 		const responseGroup = await this.userGroupsRepository.findOne({ id: id }, { relations: ['permissions'] });
--- a/src/errors/MailErrors.ts
+++ b/src/errors/MailErrors.ts
@@ -0,0 +1,17 @@
 import { IsString } from 'class-validator';
 import { InternalServerError } from 'routing-controllers';
 /**
 * Error to throw when a permission couldn't be found.
 */
 export class MailSendingError extends InternalServerError {
    @IsString()
    name = "MailSendingError"
    @IsString()
    message = "We had a problem sending the mail!"
    constructor() {
        super("We had a problem sending the mail!");
    }
 }
--- a/src/errors/RunnerErrors.ts
+++ b/src/errors/RunnerErrors.ts
@@ -32,7 +32,29 @@ export class RunnerGroupNeededError extends NotAcceptableError {
 	name = "RunnerGroupNeededError"
 	@IsString()
-	message = "Runner's need to be part of one group (team or organisation)! \n You provided neither."
+	message = "Runner's need to be part of one group (team or organization)! \n You provided neither."
 }
 /**
 * Error to throw when a citizen runner has no mail-address.
 */
 export class RunnerEmailNeededError extends NotAcceptableError {
 	@IsString()
 	name = "RunnerEmailNeededError"
 	@IsString()
 	message = "Citizenrunners have to provide an email address for verification and contacting."
 }
 /**
 * Error to throw when a runner already requested a new selfservice link in the last 24hrs.
 */
 export class RunnerSelfserviceTimeoutError extends NotAcceptableError {
 	@IsString()
 	name = "RunnerSelfserviceTimeoutError"
 	@IsString()
 	message = "You can only reqest a new token every 24hrs."
 }
 /**
--- a/src/errors/RunnerOrganisationErrors.ts
+++ b/src/errors/RunnerOrganisationErrors.ts
@@ -1,58 +0,0 @@
 import { IsString } from 'class-validator';
 import { NotAcceptableError, NotFoundError } from 'routing-controllers';
 /**
 * Error to throw when a runner organisation couldn't be found.
 */
 export class RunnerOrganisationNotFoundError extends NotFoundError {
 	@IsString()
 	name = "RunnerOrganisationNotFoundError"
 	@IsString()
 	message = "RunnerOrganisation not found!"
 }
 /**
 * Error to throw when two runner organisation's ids don't match.
 * Usually occurs when a user tries to change a runner organisation's id.
 */
 export class RunnerOrganisationIdsNotMatchingError extends NotAcceptableError {
 	@IsString()
 	name = "RunnerOrganisationIdsNotMatchingError"
 	@IsString()
 	message = "The ids don't match! \n And if you wanted to change a runner organisation's id: This isn't allowed!"
 }
 /**
 * Error to throw when a organisation still has runners associated.
 */
 export class RunnerOrganisationHasRunnersError extends NotAcceptableError {
 	@IsString()
 	name = "RunnerOrganisationHasRunnersError"
 	@IsString()
 	message = "This organisation still has runners associated with it. \n If you want to delete this organisation with all it's runners and teams add `?force` to your query."
 }
 /**
 * Error to throw when a organisation still has teams associated.
 */
 export class RunnerOrganisationHasTeamsError extends NotAcceptableError {
 	@IsString()
 	name = "RunnerOrganisationHasTeamsError"
 	@IsString()
 	message = "This organisation still has teams associated with it. \n If you want to delete this organisation with all it's runners and teams add `?force` to your query."
 }
 /**
 * Error to throw, when a provided runnerOrganisation doesn't belong to the accepted types.
 */
 export class RunnerOrganisationWrongTypeError extends NotAcceptableError {
 	@IsString()
 	name = "RunnerOrganisationWrongTypeError"
 	@IsString()
 	message = "The runner organisation must be an existing organisation's id. \n You provided a object of another type."
 }
--- a/src/errors/RunnerOrganizationErrors.ts
+++ b/src/errors/RunnerOrganizationErrors.ts
@@ -0,0 +1,58 @@
 import { IsString } from 'class-validator';
 import { NotAcceptableError, NotFoundError } from 'routing-controllers';
 /**
 * Error to throw when a runner organization couldn't be found.
 */
 export class RunnerOrganizationNotFoundError extends NotFoundError {
 	@IsString()
 	name = "RunnerOrganizationNotFoundError"
 	@IsString()
 	message = "RunnerOrganization not found!"
 }
 /**
 * Error to throw when two runner organization's ids don't match.
 * Usually occurs when a user tries to change a runner organization's id.
 */
 export class RunnerOrganizationIdsNotMatchingError extends NotAcceptableError {
 	@IsString()
 	name = "RunnerOrganizationIdsNotMatchingError"
 	@IsString()
 	message = "The ids don't match! \n And if you wanted to change a runner organization's id: This isn't allowed!"
 }
 /**
 * Error to throw when a organization still has runners associated.
 */
 export class RunnerOrganizationHasRunnersError extends NotAcceptableError {
 	@IsString()
 	name = "RunnerOrganizationHasRunnersError"
 	@IsString()
 	message = "This organization still has runners associated with it. \n If you want to delete this organization with all it's runners and teams add `?force` to your query."
 }
 /**
 * Error to throw when a organization still has teams associated.
 */
 export class RunnerOrganizationHasTeamsError extends NotAcceptableError {
 	@IsString()
 	name = "RunnerOrganizationHasTeamsError"
 	@IsString()
 	message = "This organization still has teams associated with it. \n If you want to delete this organization with all it's runners and teams add `?force` to your query."
 }
 /**
 * Error to throw, when a provided runnerOrganization doesn't belong to the accepted types.
 */
 export class RunnerOrganizationWrongTypeError extends NotAcceptableError {
 	@IsString()
 	name = "RunnerOrganizationWrongTypeError"
 	@IsString()
 	message = "The runner organization must be an existing organization's id. \n You provided a object of another type."
 }
--- a/src/errors/RunnerTeamErrors.ts
+++ b/src/errors/RunnerTeamErrors.ts
@@ -43,5 +43,5 @@ export class RunnerTeamNeedsParentError extends NotAcceptableError {
 	name = "RunnerTeamNeedsParentError"
 	@IsString()
-	message = "You provided no runner organisation as this team's parent group."
+	message = "You provided no runner organization as this team's parent group."
 }
--- a/src/errors/UserErrors.ts
+++ b/src/errors/UserErrors.ts
@@ -71,4 +71,33 @@ export class UserDeletionNotConfirmedError extends NotAcceptableError {
 	@IsString()
 	message = "You are trying to delete a user! \n If you're sure about doing this: provide the ?force=true query param."
 }
 export class PasswordMustContainUppercaseLetterError extends NotAcceptableError {
 	@IsString()
 	name = "PasswordMustContainUppercaseLetterError"
 	@IsString()
 	message = "Passwords must contain at least one uppercase letter."
 }
 export class PasswordMustContainLowercaseLetterError extends NotAcceptableError {
 	@IsString()
 	name = "PasswordMustContainLowercaseLetterError"
 	@IsString()
 	message = "Passwords must contain at least one lowercase letter."
 }
 export class PasswordMustContainNumberError extends NotAcceptableError {
 	@IsString()
 	name = "PasswordMustContainNumberError"
 	@IsString()
 	message = "Passwords must contain at least one number."
 }
 export class PasswordTooShortError extends NotAcceptableError {
 	@IsString()
 	name = "PasswordTooShortError"
 	@IsString()
 	message = "Passwords must be at least ten characters long."
 }
--- a/src/jwtcreator.ts
+++ b/src/jwtcreator.ts
@@ -1,6 +1,7 @@
 import { IsBoolean, IsEmail, IsInt, IsNotEmpty, IsOptional, IsString, IsUUID } from 'class-validator';
 import * as jsonwebtoken from "jsonwebtoken";
 import { config } from './config';
 import { Runner } from './models/entities/Runner';
 import { User } from './models/entities/User';
 /**
@@ -34,6 +35,19 @@ export class JwtCreator {
        }, config.jwt_secret)
    }
    /**
     * Creates a new selfservice token for a given runner.
     * @param runner Runner entity that the access token shall be created for.
     * @param expiry_timestamp Timestamp for the token expiry. Will be set about 9999 years if none provided.
     */
    public static createSelfService(runner: Runner, expiry_timestamp?: number) {
        if (!expiry_timestamp) { expiry_timestamp = Math.floor(Date.now() / 1000) + 36000 * 60 * 24 * 365 * 9999; }
        return jsonwebtoken.sign({
            id: runner.id,
            exp: expiry_timestamp
        }, config.jwt_secret)
    }
    /**
     * Creates a new password reset token for a given user.
     * The token is valid for 15 minutes or 1 use - whatever comes first.
--- a/src/loaders/database.ts
+++ b/src/loaders/database.ts
@@ -1,6 +1,9 @@
 import { createConnection } from "typeorm";
 import { runSeeder } from 'typeorm-seeding';
-import { User } from '../models/entities/User';
+import { config } from '../config';
 import { ConfigFlag } from '../models/entities/ConfigFlags';
 import SeedPublicOrg from '../seeds/SeedPublicOrg';
 import SeedTestRunners from '../seeds/SeedTestRunners';
 import SeedUsers from '../seeds/SeedUsers';
 /**
 * Loader for the database that creates the database connection and initializes the database tabels.
@@ -9,8 +12,20 @@ import SeedUsers from '../seeds/SeedUsers';
 export default async () => {
    const connection = await createConnection();
    await connection.synchronize();
-    if (await connection.getRepository(User).count() === 0) {
+
    //The data seeding part
    if (!(await connection.getRepository(ConfigFlag).findOne({ option: "seeded:user", value: "true" }))) {
        await runSeeder(SeedUsers);
        await connection.getRepository(ConfigFlag).save({ option: "seeded:user", value: "true" });
    }
    if (!(await connection.getRepository(ConfigFlag).findOne({ option: "seeded:citizenorg", value: "true" }))) {
        await runSeeder(SeedPublicOrg);
        await connection.getRepository(ConfigFlag).save({ option: "seeded:citizenorg", value: "true" });
    }
    if (!(await connection.getRepository(ConfigFlag).findOne({ option: "seeded:testdata", value: "true" })) && config.seedTestData == true) {
        await runSeeder(SeedTestRunners);
        await connection.getRepository(ConfigFlag).save({ option: "seeded:testdata", value: "true" });
    }
    return connection;
 };
--- a/src/mailer.ts
+++ b/src/mailer.ts
@@ -0,0 +1,64 @@
 import axios from 'axios';
 import { config } from './config';
 import { MailSendingError } from './errors/MailErrors';
 /**
 * This class is responsible for all things mail sending.
 * This uses axios to communicate with the mailer api (https://git.odit.services/lfk/mailer).
 */
 export class Mailer {
    public static base: string = config.mailer_url;
    public static key: string = config.mailer_key;
    public static testing: boolean = config.testing;
    /**
     * Function for sending a password reset mail.
     * @param to_address The address the mail will be sent to. Should always get pulled from a user object.
     * @param token The requested password reset token - will be combined with the app_url to generate a password reset link.
     */
    public static async sendResetMail(to_address: string, token: string, locale: string = "en") {
        try {
            await axios.post(`${Mailer.base}/reset?locale=${locale}&key=${Mailer.key}`, {
                address: to_address,
                resetKey: token
            });
        } catch (error) {
            if (Mailer.testing) { return true; }
            throw new MailSendingError();
        }
    }
    /**
     * Function for sending a runner selfservice welcome mail.
     * @param to_address The address the mail will be sent to. Should always get pulled from a runner object.
     * @param token The requested selfservice token - will be combined with the app_url to generate a selfservice profile link.
     */
    public static async sendSelfserviceWelcomeMail(to_address: string, token: string, locale: string = "en") {
        try {
            await axios.post(`${Mailer.base}/registration?locale=${locale}&key=${Mailer.key}`, {
                address: to_address,
                selfserviceToken: token
            });
        } catch (error) {
            if (Mailer.testing) { return true; }
            throw new MailSendingError();
        }
    }
    /**
     * Function for sending a runner selfservice link forgotten mail.
     * @param to_address The address the mail will be sent to. Should always get pulled from a runner object.
     * @param token The requested selfservice token - will be combined with the app_url to generate a selfservice profile link.
     */
    public static async sendSelfserviceForgottenMail(to_address: string, token: string, locale: string = "en") {
        try {
            await axios.post(`${Mailer.base}/registration_forgot?locale=${locale}&key=${Mailer.key}`, {
                address: to_address,
                selfserviceToken: token
            });
        } catch (error) {
            if (Mailer.testing) { return true; }
            throw new MailSendingError();
        }
    }
 }
--- a/src/middlewares/ScanAuth.ts
+++ b/src/middlewares/ScanAuth.ts
@@ -15,14 +15,14 @@ import authchecker from './authchecker';
 const ScanAuth = async (req: Request, res: Response, next: () => void) => {
    let provided_token: string = req.headers["authorization"];
    if (provided_token == "" || provided_token === undefined || provided_token === null) {
-        res.status(401).send("No api token provided.");
+        res.status(401).send({ http_code: 401, short: "no_token", message: "No api token provided." });
        return;
    }
    try {
        provided_token = provided_token.replace("Bearer ", "");
    } catch (error) {
-        res.status(401).send("No valid jwt or api token provided.");
+        res.status(401).send({ http_code: 401, short: "no_token", message: "No valid jwt or api token provided." });
        return;
    }
@@ -32,7 +32,7 @@ const ScanAuth = async (req: Request, res: Response, next: () => void) => {
    }
    finally {
        if (prefix == "" || prefix == undefined || prefix == null) {
-            res.status(401).send("Api token non-existent or invalid syntax.");
+            res.status(401).send({ http_code: 401, short: "invalid_token", message: "Api token non-existent or invalid syntax." });
            return;
        }
    }
@@ -46,7 +46,7 @@ const ScanAuth = async (req: Request, res: Response, next: () => void) => {
        }
        finally {
            if (user_authorized == false) {
-                res.status(401).send("Api token non-existent or invalid syntax.");
+                res.status(401).send({ http_code: 401, short: "invalid_token", message: "Api token non-existent or invalid syntax." });
                return;
            }
            else {
@@ -56,13 +56,13 @@ const ScanAuth = async (req: Request, res: Response, next: () => void) => {
    }
    else {
        if (station.enabled == false) {
-            res.status(401).send("Station disabled.");
+            res.status(401).send({ http_code: 401, short: "station_disabled", message: "Station is disabled." });
        }
        if (!(await argon2.verify(station.key, provided_token))) {
-            res.status(401).send("Api token invalid.");
+            res.status(401).send({ http_code: 401, short: "invalid_token", message: "Api token non-existent or invalid syntax." });
            return;
        }
-
+        req.headers["station_id"] = station.id.toString();
        next();
    }
 }
--- a/src/middlewares/StatsAuth.ts
+++ b/src/middlewares/StatsAuth.ts
@@ -42,7 +42,7 @@ const StatsAuth = async (req: Request, res: Response, next: () => void) => {
        let user_authorized = false;
        try {
            let action = { request: req, response: res, context: null, next: next }
-            user_authorized = await authchecker(action, ["RUNNER:GET", "TEAM:GET", "ORGANISATION:GET"]);
+            user_authorized = await authchecker(action, ["RUNNER:GET", "TEAM:GET", "ORGANIZATION:GET"]);
        }
        finally {
            if (user_authorized == false) {
--- a/src/models/actions/ImportRunner.ts
+++ b/src/models/actions/ImportRunner.ts
@@ -1,9 +1,9 @@
 import { IsNotEmpty, IsOptional, IsString } from 'class-validator';
 import { getConnectionManager } from 'typeorm';
 import { RunnerGroupNeededError } from '../../errors/RunnerErrors';
-import { RunnerOrganisationNotFoundError } from '../../errors/RunnerOrganisationErrors';
+import { RunnerOrganizationNotFoundError } from '../../errors/RunnerOrganizationErrors';
 import { RunnerGroup } from '../entities/RunnerGroup';
-import { RunnerOrganisation } from '../entities/RunnerOrganisation';
+import { RunnerOrganization } from '../entities/RunnerOrganization';
 import { RunnerTeam } from '../entities/RunnerTeam';
 import { CreateRunner } from './create/CreateRunner';
@@ -78,9 +78,9 @@ export class ImportRunner {
        let team = await getConnectionManager().get().getRepository(RunnerTeam).findOne({ id: groupID });
        if (team) { return team; }
-        let org = await getConnectionManager().get().getRepository(RunnerOrganisation).findOne({ id: groupID });
+        let org = await getConnectionManager().get().getRepository(RunnerOrganization).findOne({ id: groupID });
        if (!org) {
-            throw new RunnerOrganisationNotFoundError();
+            throw new RunnerOrganizationNotFoundError();
        }
        if (this.team === undefined) { return org; }
--- a/src/models/actions/create/CreateResetToken.ts
+++ b/src/models/actions/create/CreateResetToken.ts
@@ -1,39 +1,33 @@
-import { IsEmail, IsOptional, IsString } from 'class-validator';
+import { IsEmail, IsNotEmpty, IsString } from 'class-validator';
 import { getConnectionManager } from 'typeorm';
 import { ResetAlreadyRequestedError, UserDisabledError, UserNotFoundError } from '../../../errors/AuthError';
-import { UsernameOrEmailNeededError } from '../../../errors/UserErrors';
+import { UserEmailNeededError } from '../../../errors/UserErrors';
 import { JwtCreator } from '../../../jwtcreator';
 import { User } from '../../entities/User';
 /**
- * This calss is used to create password reset tokens for users.
+ * This class is used to create password reset tokens for users.
 * These password reset token can be used to set a new password for the user for the next 15mins.
 */
 export class CreateResetToken {
    /**
     * The username of the user that wants to reset their password.
     */
    @IsOptional()
    @IsString()
    username?: string;
    /**
     * The email address of the user that wants to reset their password.
     */
-    @IsOptional()
+    @IsNotEmpty()
    @IsEmail()
    @IsString()
-    email?: string;
+    email: string;
    /**
     * Create a password reset token based on this.
     */
-    public async toResetToken(): Promise<any> {
+    public async toResetToken(): Promise<string> {
-        if (this.email === undefined && this.username === undefined) {
+        if (!this.email) {
-            throw new UsernameOrEmailNeededError();
+            throw new UserEmailNeededError();
        }
-        let found_user = await getConnectionManager().get().getRepository(User).findOne({ where: [{ username: this.username }, { email: this.email }] });
+        let found_user = await getConnectionManager().get().getRepository(User).findOne({ where: [{ email: this.email }] });
        if (!found_user) { throw new UserNotFoundError(); }
        if (found_user.enabled == false) { throw new UserDisabledError(); }
        if (found_user.resetRequestedTimestamp > (Math.floor(Date.now() / 1000) - 15 * 60)) { throw new ResetAlreadyRequestedError(); }
@@ -43,7 +37,7 @@ export class CreateResetToken {
        await getConnectionManager().get().getRepository(User).save(found_user);
        //Create the reset token
-        let reset_token = JwtCreator.createReset(found_user);
+        let reset_token: string = JwtCreator.createReset(found_user);
        return reset_token;
    }
--- a/src/models/actions/create/CreateRunner.ts
+++ b/src/models/actions/create/CreateRunner.ts
@@ -1,7 +1,7 @@
 import { IsInt } from 'class-validator';
 import { getConnectionManager } from 'typeorm';
 import { RunnerGroupNotFoundError } from '../../../errors/RunnerGroupErrors';
-import { RunnerOrganisationWrongTypeError } from '../../../errors/RunnerOrganisationErrors';
+import { RunnerOrganizationWrongTypeError } from '../../../errors/RunnerOrganizationErrors';
 import { RunnerTeamNeedsParentError } from '../../../errors/RunnerTeamErrors';
 import { Address } from '../../entities/Address';
 import { Runner } from '../../entities/Runner';
@@ -50,6 +50,6 @@ export class CreateRunner extends CreateParticipant {
            return group;
        }
-        throw new RunnerOrganisationWrongTypeError;
+        throw new RunnerOrganizationWrongTypeError;
    }
 }
--- a/src/models/actions/create/CreateRunnerOrganisation.ts
+++ b/src/models/actions/create/CreateRunnerOrganisation.ts
@@ -1,30 +0,0 @@
 import { IsObject, IsOptional } from 'class-validator';
 import { Address } from '../../entities/Address';
 import { RunnerOrganisation } from '../../entities/RunnerOrganisation';
 import { CreateRunnerGroup } from './CreateRunnerGroup';
 /**
 * This classed is used to create a new RunnerOrganisation entity from a json body (post request).
 */
 export class CreateRunnerOrganisation extends CreateRunnerGroup {
    /**
     * The new organisation's address.
     */
    @IsOptional()
    @IsObject()
    address?: Address;
    /**
     * Creates a new RunnerOrganisation entity from this.
     */
    public async toEntity(): Promise<RunnerOrganisation> {
        let newRunnerOrganisation: RunnerOrganisation = new RunnerOrganisation();
        newRunnerOrganisation.name = this.name;
        newRunnerOrganisation.contact = await this.getContact();
        newRunnerOrganisation.address = this.address;
        Address.validate(newRunnerOrganisation.address);
        return newRunnerOrganisation;
    }
 }
--- a/src/models/actions/create/CreateRunnerOrganization.ts
+++ b/src/models/actions/create/CreateRunnerOrganization.ts
@@ -0,0 +1,43 @@
 import { IsBoolean, IsObject, IsOptional } from 'class-validator';
 import * as uuid from 'uuid';
 import { Address } from '../../entities/Address';
 import { RunnerOrganization } from '../../entities/RunnerOrganization';
 import { CreateRunnerGroup } from './CreateRunnerGroup';
 /**
 * This classed is used to create a new RunnerOrganization entity from a json body (post request).
 */
 export class CreateRunnerOrganization extends CreateRunnerGroup {
    /**
     * The new organization's address.
     */
    @IsOptional()
    @IsObject()
    address?: Address;
    /**
     * Is registration enabled for the new organization?
     */
    @IsOptional()
    @IsBoolean()
    registrationEnabled?: boolean = false;
    /**
     * Creates a new RunnerOrganization entity from this.
     */
    public async toEntity(): Promise<RunnerOrganization> {
        let newRunnerOrganization: RunnerOrganization = new RunnerOrganization();
        newRunnerOrganization.name = this.name;
        newRunnerOrganization.contact = await this.getContact();
        newRunnerOrganization.address = this.address;
        Address.validate(newRunnerOrganization.address);
        if (this.registrationEnabled) {
            newRunnerOrganization.key = uuid.v4().toUpperCase();
        }
        return newRunnerOrganization;
    }
 }
--- a/src/models/actions/create/CreateRunnerTeam.ts
+++ b/src/models/actions/create/CreateRunnerTeam.ts
@@ -1,8 +1,8 @@
 import { IsInt, IsNotEmpty } from 'class-validator';
 import { getConnectionManager } from 'typeorm';
-import { RunnerOrganisationNotFoundError } from '../../../errors/RunnerOrganisationErrors';
+import { RunnerOrganizationNotFoundError } from '../../../errors/RunnerOrganizationErrors';
 import { RunnerTeamNeedsParentError } from '../../../errors/RunnerTeamErrors';
-import { RunnerOrganisation } from '../../entities/RunnerOrganisation';
+import { RunnerOrganization } from '../../entities/RunnerOrganization';
 import { RunnerTeam } from '../../entities/RunnerTeam';
 import { CreateRunnerGroup } from './CreateRunnerGroup';
@@ -21,12 +21,12 @@ export class CreateRunnerTeam extends CreateRunnerGroup {
    /**
     * Gets the new team's parent org based on it's id.
     */
-    public async getParent(): Promise<RunnerOrganisation> {
+    public async getParent(): Promise<RunnerOrganization> {
        if (this.parentGroup === undefined || this.parentGroup === null) {
            throw new RunnerTeamNeedsParentError();
        }
-        let parentGroup = await getConnectionManager().get().getRepository(RunnerOrganisation).findOne({ id: this.parentGroup });
+        let parentGroup = await getConnectionManager().get().getRepository(RunnerOrganization).findOne({ id: this.parentGroup });
-        if (!parentGroup) { throw new RunnerOrganisationNotFoundError();; }
+        if (!parentGroup) { throw new RunnerOrganizationNotFoundError();; }
        return parentGroup;
    }
--- a/src/models/actions/create/CreateSelfServiceCitizenRunner.ts
+++ b/src/models/actions/create/CreateSelfServiceCitizenRunner.ts
@@ -0,0 +1,52 @@
 import { IsEmail, IsNotEmpty, IsString } from 'class-validator';
 import { getConnection } from 'typeorm';
 import { RunnerEmailNeededError } from '../../../errors/RunnerErrors';
 import { Address } from '../../entities/Address';
 import { Runner } from '../../entities/Runner';
 import { RunnerOrganization } from '../../entities/RunnerOrganization';
 import { CreateParticipant } from './CreateParticipant';
 /**
 * This classed is used to create a new Runner entity from a json body (post request).
 */
 export class CreateSelfServiceCitizenRunner extends CreateParticipant {
    /**
     * The new runners's e-mail address.
     * Must be provided for email-verification to work.
     */
    @IsString()
    @IsNotEmpty()
    @IsEmail()
    email: string;
    /**
     * Creates a new Runner entity from this.
     */
    public async toEntity(): Promise<Runner> {
        let newRunner: Runner = new Runner();
        newRunner.firstname = this.firstname;
        newRunner.middlename = this.middlename;
        newRunner.lastname = this.lastname;
        newRunner.phone = this.phone;
        newRunner.email = this.email;
        if (!newRunner.email) {
            throw new RunnerEmailNeededError();
        }
        newRunner.group = await this.getGroup();
        newRunner.address = this.address;
        Address.validate(newRunner.address);
        return newRunner;
    }
    /**
     * Gets the new runner's group by it's id.
     */
    public async getGroup(): Promise<RunnerOrganization> {
        return await getConnection().getRepository(RunnerOrganization).findOne({ id: 1 });
    }
 }
--- a/src/models/actions/create/CreateSelfServiceRunner.ts
+++ b/src/models/actions/create/CreateSelfServiceRunner.ts
@@ -0,0 +1,55 @@
 import { IsInt, IsOptional } from 'class-validator';
 import { getConnection } from 'typeorm';
 import { RunnerTeamNotFoundError } from '../../../errors/RunnerTeamErrors';
 import { Address } from '../../entities/Address';
 import { Runner } from '../../entities/Runner';
 import { RunnerGroup } from '../../entities/RunnerGroup';
 import { RunnerTeam } from '../../entities/RunnerTeam';
 import { CreateParticipant } from './CreateParticipant';
 /**
 * This classed is used to create a new Runner entity from a json body (post request).
 */
 export class CreateSelfServiceRunner extends CreateParticipant {
    /**
     * The new runner's team's id.
     * The team has to be a part of the runner's org.
     * The team property may get ignored.
     * If no team get's provided the runner's group will be their org.
     */
    @IsInt()
    @IsOptional()
    team?: number;
    /**
     * Creates a new Runner entity from this.
     */
    public async toEntity(group: RunnerGroup): Promise<Runner> {
        let newRunner: Runner = new Runner();
        newRunner.firstname = this.firstname;
        newRunner.middlename = this.middlename;
        newRunner.lastname = this.lastname;
        newRunner.phone = this.phone;
        newRunner.email = this.email;
        newRunner.group = await this.getGroup(group);
        newRunner.address = this.address;
        Address.validate(newRunner.address);
        return newRunner;
    }
    /**
     * Gets the new runner's group by it's id.
     */
    public async getGroup(group: RunnerGroup): Promise<RunnerGroup> {
        if (!this.team) {
            return group;
        }
        const team = await getConnection().getRepository(RunnerTeam).findOne({ id: this.team }, { relations: ["parentGroup"] });
        if (!team) { throw new RunnerTeamNotFoundError(); }
        if (team.parentGroup.id != group.id) { throw new RunnerTeamNotFoundError(); }
        return team;
    }
 }
--- a/src/models/actions/create/CreateTrackScan.ts
+++ b/src/models/actions/create/CreateTrackScan.ts
@@ -1,4 +1,5 @@
-import { IsInt, IsPositive } from 'class-validator';
+import { IsInt, IsOptional, IsPositive } from 'class-validator';
 import { BadRequestError } from 'routing-controllers';
 import { getConnection } from 'typeorm';
 import { RunnerCardNotFoundError } from '../../../errors/RunnerCardErrors';
 import { RunnerNotFoundError } from '../../../errors/RunnerErrors';
@@ -22,10 +23,12 @@ export class CreateTrackScan {
    /**
     * The scanning station's id that created the scan.
     * Mainly used for logging and traceing back scans (or errors).
     * You don't have to provide the station if you're authenticateing via a scanstation token (The server takes care of it for you).
     */
    @IsInt()
    @IsPositive()
-    station: number;
+    @IsOptional()
    station?: number;
    /**
     * Creates a new Track entity from this.
@@ -44,11 +47,15 @@ export class CreateTrackScan {
        }
        newScan.timestamp = Math.round(new Date().getTime() / 1000);
-        newScan.valid = await this.validateScan(newScan);
+        newScan = await this.validateScan(newScan);
        return newScan;
    }
    /**
     * Get's a runnerCard entity via the provided id.
     * @returns The runnerCard whom's id you provided.
     */
    public async getCard(): Promise<RunnerCard> {
        const track = await getConnection().getRepository(RunnerCard).findOne({ id: this.card }, { relations: ["runner"] });
        if (!track) {
@@ -57,7 +64,14 @@ export class CreateTrackScan {
        return track;
    }
    /**
     * Get's a scanstation entity via the provided id.
     * @returns The scanstation whom's id you provided.
     */
    public async getStation(): Promise<ScanStation> {
        if (!this.station) {
            throw new BadRequestError("You are missing the station's id!")
        }
        const station = await getConnection().getRepository(ScanStation).findOne({ id: this.station }, { relations: ["track"] });
        if (!station) {
            throw new ScanStationNotFoundError();
@@ -65,15 +79,22 @@ export class CreateTrackScan {
        return station;
    }
-    public async validateScan(scan: TrackScan): Promise<boolean> {
+    /**
     * Validates the scan and sets it's lap time;
     * @param scan The scan you want to validate
     * @returns The validated scan with it's laptime set.
     */
    public async validateScan(scan: TrackScan): Promise<TrackScan> {
        const scans = await getConnection().getRepository(TrackScan).find({ where: { runner: scan.runner, valid: true }, relations: ["track"] });
-        if (scans.length == 0) { return true; }
+        if (scans.length == 0) {
-
+            scan.lapTime = 0;
-        const newestScan = scans[scans.length - 1];
+            scan.valid = true;
        if ((scan.timestamp - newestScan.timestamp) > scan.track.minimumLapTime) {
            return true;
        }
-
+        else {
-        return false;
+            const newestScan = scans[scans.length - 1];
            scan.lapTime = scan.timestamp - newestScan.timestamp;
            scan.valid = (scan.lapTime > scan.track.minimumLapTime);
        }
        return scan;
    }
 }
--- a/src/models/actions/create/CreateUser.ts
+++ b/src/models/actions/create/CreateUser.ts
@@ -1,9 +1,10 @@
 import * as argon2 from "argon2";
 import { passwordStrength } from "check-password-strength";
 import { IsBoolean, IsEmail, IsNotEmpty, IsOptional, IsPhoneNumber, IsString, IsUrl } from 'class-validator';
 import { getConnectionManager } from 'typeorm';
 import * as uuid from 'uuid';
 import { config } from '../../../config';
-import { UserEmailNeededError, UsernameContainsIllegalCharacterError } from '../../../errors/UserErrors';
+import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, UserEmailNeededError, UsernameContainsIllegalCharacterError } from '../../../errors/UserErrors';
 import { UserGroupNotFoundError } from '../../../errors/UserGroupErrors';
 import { User } from '../../entities/User';
 import { UserGroup } from '../../entities/UserGroup';
@@ -94,7 +95,13 @@ export class CreateUser {
        if (!this.email) {
            throw new UserEmailNeededError();
        }
-        if (this.username.includes("@")) { throw new UsernameContainsIllegalCharacterError(); }
+        if (this.username?.includes("@")) { throw new UsernameContainsIllegalCharacterError(); }
        let password_strength = passwordStrength(this.password);
        if (!password_strength.contains.includes("uppercase")) { throw new PasswordMustContainUppercaseLetterError(); }
        if (!password_strength.contains.includes("lowercase")) { throw new PasswordMustContainLowercaseLetterError(); }
        if (!password_strength.contains.includes("number")) { throw new PasswordMustContainNumberError(); }
        if (!(password_strength.length > 9)) { throw new PasswordTooShortError(); }
        newUser.email = this.email
        newUser.username = this.username
--- a/src/models/actions/update/UpdateRunnerOrganisation.ts
+++ b/src/models/actions/update/UpdateRunnerOrganisation.ts
@@ -1,38 +0,0 @@
 import { IsInt, IsObject, IsOptional } from 'class-validator';
 import { Address } from '../../entities/Address';
 import { RunnerOrganisation } from '../../entities/RunnerOrganisation';
 import { CreateRunnerGroup } from '../create/CreateRunnerGroup';
 /**
 * This class is used to update a RunnerOrganisation entity (via put request).
 */
 export class UpdateRunnerOrganisation extends CreateRunnerGroup {
    /**
     * The updated orgs's id.
     * This shouldn't have changed but it is here in case anyone ever wants to enable id changes (whyever they would want to).
     */
    @IsInt()
    id: number;
    /**
     * The updated organisation's address.
     */
    @IsOptional()
    @IsObject()
    address?: Address;
    /**
     * Updates a provided RunnerOrganisation entity based on this.
     */
    public async update(organisation: RunnerOrganisation): Promise<RunnerOrganisation> {
        organisation.name = this.name;
        organisation.contact = await this.getContact();
        if (!this.address) { organisation.address.reset(); }
        else { organisation.address = this.address; }
        Address.validate(organisation.address);
        return organisation;
    }
 }
--- a/src/models/actions/update/UpdateRunnerOrganization.ts
+++ b/src/models/actions/update/UpdateRunnerOrganization.ts
@@ -0,0 +1,53 @@
 import { IsBoolean, IsInt, IsObject, IsOptional } from 'class-validator';
 import * as uuid from 'uuid';
 import { Address } from '../../entities/Address';
 import { RunnerOrganization } from '../../entities/RunnerOrganization';
 import { CreateRunnerGroup } from '../create/CreateRunnerGroup';
 /**
 * This class is used to update a RunnerOrganization entity (via put request).
 */
 export class UpdateRunnerOrganization extends CreateRunnerGroup {
    /**
     * The updated orgs's id.
     * This shouldn't have changed but it is here in case anyone ever wants to enable id changes (whyever they would want to).
     */
    @IsInt()
    id: number;
    /**
     * The updated organization's address.
     */
    @IsOptional()
    @IsObject()
    address?: Address;
    /**
     * Is registration enabled for the updated organization?
     */
    @IsOptional()
    @IsBoolean()
    registrationEnabled?: boolean = false;
    /**
     * Updates a provided RunnerOrganization entity based on this.
     */
    public async update(organization: RunnerOrganization): Promise<RunnerOrganization> {
        organization.name = this.name;
        organization.contact = await this.getContact();
        if (!this.address) { organization.address.reset(); }
        else { organization.address = this.address; }
        Address.validate(organization.address);
        if (this.registrationEnabled && !organization.key) {
            organization.key = uuid.v4().toUpperCase();
        }
        else {
            organization.key = null;
        }
        return organization;
    }
 }
--- a/src/models/actions/update/UpdateRunnerTeam.ts
+++ b/src/models/actions/update/UpdateRunnerTeam.ts
@@ -1,8 +1,8 @@
 import { IsInt, IsPositive } from 'class-validator';
 import { getConnectionManager } from 'typeorm';
-import { RunnerOrganisationNotFoundError } from '../../../errors/RunnerOrganisationErrors';
+import { RunnerOrganizationNotFoundError } from '../../../errors/RunnerOrganizationErrors';
 import { RunnerTeamNeedsParentError } from '../../../errors/RunnerTeamErrors';
-import { RunnerOrganisation } from '../../entities/RunnerOrganisation';
+import { RunnerOrganization } from '../../entities/RunnerOrganization';
 import { RunnerTeam } from '../../entities/RunnerTeam';
 import { CreateRunnerGroup } from '../create/CreateRunnerGroup';
@@ -28,12 +28,12 @@ export class UpdateRunnerTeam extends CreateRunnerGroup {
    /**
     * Loads the updated teams's parentGroup based on it's id.
     */
-    public async getParent(): Promise<RunnerOrganisation> {
+    public async getParent(): Promise<RunnerOrganization> {
        if (this.parentGroup === undefined || this.parentGroup === null) {
            throw new RunnerTeamNeedsParentError();
        }
-        let parentGroup = await getConnectionManager().get().getRepository(RunnerOrganisation).findOne({ id: this.parentGroup });
+        let parentGroup = await getConnectionManager().get().getRepository(RunnerOrganization).findOne({ id: this.parentGroup });
-        if (!parentGroup) { throw new RunnerOrganisationNotFoundError();; }
+        if (!parentGroup) { throw new RunnerOrganizationNotFoundError();; }
        return parentGroup;
    }
--- a/src/models/actions/update/UpdateTrackScan.ts
+++ b/src/models/actions/update/UpdateTrackScan.ts
@@ -1,9 +1,9 @@
 import { IsBoolean, IsInt, IsOptional, IsPositive } from 'class-validator';
 import { getConnection } from 'typeorm';
 import { RunnerNotFoundError } from '../../../errors/RunnerErrors';
-import { ScanStationNotFoundError } from '../../../errors/ScanStationErrors';
+import { TrackNotFoundError } from '../../../errors/TrackErrors';
 import { Runner } from '../../entities/Runner';
-import { ScanStation } from '../../entities/ScanStation';
+import { Track } from '../../entities/Track';
 import { TrackScan } from '../../entities/TrackScan';
 /**
@@ -38,7 +38,7 @@ export abstract class UpdateTrackScan {
     */
    @IsInt()
    @IsPositive()
-    public station: number;
+    public track: number;
    /**
     * Update a TrackScan entity based on this.
@@ -47,8 +47,7 @@ export abstract class UpdateTrackScan {
    public async update(scan: TrackScan): Promise<TrackScan> {
        scan.valid = this.valid;
        scan.runner = await this.getRunner();
-        scan.station = await this.getStation();
+        scan.track = await this.getTrack();
        scan.track = scan.station.track;
        return scan;
    }
@@ -67,11 +66,11 @@ export abstract class UpdateTrackScan {
    /**
     * Gets a runner based on the runner id provided via this.runner.
     */
-    public async getStation(): Promise<ScanStation> {
+    public async getTrack(): Promise<Track> {
-        const station = await getConnection().getRepository(ScanStation).findOne({ id: this.station }, { relations: ['track'] });
+        const track = await getConnection().getRepository(Track).findOne({ id: this.track });
-        if (!station) {
+        if (!track) {
-            throw new ScanStationNotFoundError();
+            throw new TrackNotFoundError();
        }
-        return station;
+        return track;
    }
 }
--- a/src/models/actions/update/UpdateUser.ts
+++ b/src/models/actions/update/UpdateUser.ts
@@ -1,12 +1,14 @@
 import * as argon2 from "argon2";
 import { passwordStrength } from "check-password-strength";
 import { IsBoolean, IsEmail, IsInt, IsNotEmpty, IsOptional, IsPhoneNumber, IsString, IsUrl } from 'class-validator';
 import { getConnectionManager } from 'typeorm';
 import { config } from '../../../config';
-import { UserEmailNeededError, UsernameContainsIllegalCharacterError } from '../../../errors/UserErrors';
+import { PasswordMustContainLowercaseLetterError, PasswordMustContainNumberError, PasswordMustContainUppercaseLetterError, PasswordTooShortError, UserEmailNeededError, UsernameContainsIllegalCharacterError } from '../../../errors/UserErrors';
 import { UserGroupNotFoundError } from '../../../errors/UserGroupErrors';
 import { User } from '../../entities/User';
 import { UserGroup } from '../../entities/UserGroup';
 /**
 * This class is used to update a User entity (via put request).
 */
@@ -104,6 +106,11 @@ export class UpdateUser {
        if (this.username.includes("@")) { throw new UsernameContainsIllegalCharacterError(); }
        if (this.password) {
            let password_strength = passwordStrength(this.password);
            if (!password_strength.contains.includes("uppercase")) { throw new PasswordMustContainUppercaseLetterError(); }
            if (!password_strength.contains.includes("lowercase")) { throw new PasswordMustContainLowercaseLetterError(); }
            if (!password_strength.contains.includes("number")) { throw new PasswordMustContainNumberError(); }
            if (!(password_strength.length > 9)) { throw new PasswordTooShortError(); }
            user.password = await argon2.hash(this.password + user.uuid);
            user.refreshTokenCount = user.refreshTokenCount + 1;
        }
--- a/src/models/entities/ConfigFlags.ts
+++ b/src/models/entities/ConfigFlags.ts
@@ -0,0 +1,27 @@
 import {
    IsNotEmpty,
    IsString
 } from "class-validator";
 import { Column, Entity, PrimaryColumn } from "typeorm";
 /**
 * Defines the ConfigFlag entity.
 * This entity can be used to set some flags on db init.
 */
@Entity()
 export class ConfigFlag {
    /**
     * The flag's name (primary).
     */
    @PrimaryColumn()
    @IsString()
    option: string;
    /**
     * The flag's value.
     */
    @Column()
    @IsString()
    @IsNotEmpty()
    value: string;
 }
--- a/src/models/entities/Runner.ts
+++ b/src/models/entities/Runner.ts
@@ -1,5 +1,5 @@
-import { IsInt, IsNotEmpty } from "class-validator";
+import { IsInt, IsNotEmpty, IsOptional, IsString } from "class-validator";
-import { ChildEntity, ManyToOne, OneToMany } from "typeorm";
+import { ChildEntity, Column, ManyToOne, OneToMany } from "typeorm";
 import { ResponseRunner } from '../responses/ResponseRunner';
 import { DistanceDonation } from "./DistanceDonation";
 import { Participant } from "./Participant";
@@ -16,7 +16,7 @@ import { Scan } from "./Scan";
 export class Runner extends Participant {
  /**
   * The runner's associated group.
-   * Can be a runner team or organisation.
+   * Can be a runner team or organization.
   */
  @IsNotEmpty()
  @ManyToOne(() => RunnerGroup, group => group.runners)
@@ -43,6 +43,15 @@ export class Runner extends Participant {
  @OneToMany(() => Scan, scan => scan.runner, { nullable: true })
  scans: Scan[];
  /**
  * The last time the runner requested a selfservice link.
  * Used to prevent spamming of the selfservice link forgotten route.
  */
  @Column({ nullable: true, unique: false })
  @IsString()
  @IsOptional()
  resetRequestedTimestamp?: number;
  /**
   * Returns all valid scans associated with this runner.
   * This is implemented here to avoid duplicate code in other files.
@@ -65,7 +74,7 @@ export class Runner extends Participant {
  */
  @IsInt()
  public get distanceDonationAmount(): number {
-    return this.distanceDonations.reduce((sum, current) => sum + current.amountPerDistance, 0) * this.distance;
+    return this.distanceDonations.reduce((sum, current) => sum + current.amount, 0);
  }
  /**
--- a/src/models/entities/RunnerOrganization.ts
+++ b/src/models/entities/RunnerOrganization.ts
@@ -1,34 +1,44 @@
-import { IsInt, IsOptional } from "class-validator";
+import { IsInt, IsOptional, IsString } from "class-validator";
 import { ChildEntity, Column, OneToMany } from "typeorm";
-import { ResponseRunnerOrganisation } from '../responses/ResponseRunnerOrganisation';
+import { ResponseRunnerOrganization } from '../responses/ResponseRunnerOrganization';
 import { Address } from './Address';
 import { Runner } from './Runner';
 import { RunnerGroup } from "./RunnerGroup";
 import { RunnerTeam } from "./RunnerTeam";
 /**
- * Defines the RunnerOrganisation entity.
+ * Defines the RunnerOrganization entity.
 * This usually is a school, club or company.
 */
@ChildEntity()
-export class RunnerOrganisation extends RunnerGroup {
+export class RunnerOrganization extends RunnerGroup {
  /**
-   * The organisations's address.
+   * The organizations's address.
   */
  @IsOptional()
  @Column(type => Address)
  address?: Address;
  /**
-   * The organisation's teams.
+   * The organization's teams.
-   * Used to link teams to a organisation.
+   * Used to link teams to a organization.
   */
  @OneToMany(() => RunnerTeam, team => team.parentGroup, { nullable: true })
  teams: RunnerTeam[];
  /**
-   * Returns all runners associated with this organisation (directly or indirectly via teams).
+   * The organization's api key for self-service registration.
   * The api key can be used for the /runners/register/:token endpoint.
   * Is has to be base64 encoded if used via the api (to keep url-safety).
   */
  @Column({ nullable: true, unique: true })
  @IsString()
  @IsOptional()
  key?: string;
  /**
   * Returns all runners associated with this organization (directly or indirectly via teams).
   */
  public get allRunners(): Runner[] {
    let returnRunners: Runner[] = new Array<Runner>();
@@ -58,7 +68,7 @@ export class RunnerOrganisation extends RunnerGroup {
  /**
   * Turns this entity into it's response class.
   */
-  public toResponse(): ResponseRunnerOrganisation {
+  public toResponse(): ResponseRunnerOrganization {
-    return new ResponseRunnerOrganisation(this);
+    return new ResponseRunnerOrganization(this);
  }
 }
--- a/src/models/entities/RunnerTeam.ts
+++ b/src/models/entities/RunnerTeam.ts
@@ -2,7 +2,7 @@ import { IsNotEmpty } from "class-validator";
 import { ChildEntity, ManyToOne } from "typeorm";
 import { ResponseRunnerTeam } from '../responses/ResponseRunnerTeam';
 import { RunnerGroup } from "./RunnerGroup";
-import { RunnerOrganisation } from "./RunnerOrganisation";
+import { RunnerOrganization } from "./RunnerOrganization";
 /**
 * Defines the RunnerTeam entity.
@@ -13,11 +13,11 @@ export class RunnerTeam extends RunnerGroup {
  /**
   * The team's parent group.
-   * Every team has to be part of a runnerOrganisation - this get's checked on creation and update.
+   * Every team has to be part of a runnerOrganization - this get's checked on creation and update.
   */
  @IsNotEmpty()
-  @ManyToOne(() => RunnerOrganisation, org => org.teams, { nullable: true })
+  @ManyToOne(() => RunnerOrganization, org => org.teams, { nullable: true })
-  parentGroup?: RunnerOrganisation;
+  parentGroup?: RunnerOrganization;
  /**
   * Turns this entity into it's response class.
--- a/src/models/entities/TrackScan.ts
+++ b/src/models/entities/TrackScan.ts
@@ -2,6 +2,8 @@ import {
  IsInt,
  IsNotEmpty,
  IsNumber,
  IsPositive
 } from "class-validator";
 import { ChildEntity, Column, ManyToOne } from "typeorm";
@@ -59,6 +61,14 @@ export class TrackScan extends Scan {
  @IsInt()
  timestamp: number;
  /**
   * The scan's lap time.
   * This simply get's calculated from the last lap time;
   */
  @Column()
  @IsNumber()
  lapTime: number;
  /**
   * Turns this entity into it's response class.
   */
--- a/src/models/entities/UserGroup.ts
+++ b/src/models/entities/UserGroup.ts
@@ -4,7 +4,6 @@ import {
  IsString
 } from "class-validator";
 import { ChildEntity, Column } from "typeorm";
 import { ResponsePrincipal } from '../responses/ResponsePrincipal';
 import { ResponseUserGroup } from '../responses/ResponseUserGroup';
 import { Principal } from './Principal';
@@ -34,7 +33,7 @@ export class UserGroup extends Principal {
  /**
   * Turns this entity into it's response class.
   */
-  public toResponse(): ResponsePrincipal {
+  public toResponse(): ResponseUserGroup {
    return new ResponseUserGroup(this);
  }
 }
--- a/src/models/enums/PermissionTargets.ts
+++ b/src/models/enums/PermissionTargets.ts
@@ -3,7 +3,7 @@
 */
 export enum PermissionTarget {
    RUNNER = 'RUNNER',
-    ORGANISATION = 'ORGANISATION',
+    ORGANIZATION = 'ORGANIZATION',
    TEAM = 'TEAM',
    TRACK = 'TRACK',
    USER = 'USER',
@@ -15,5 +15,6 @@ export enum PermissionTarget {
    STATION = 'STATION',
    CARD = 'CARD',
    DONATION = 'DONATION',
-    CONTACT = 'CONTACT'
+    CONTACT = 'CONTACT',
    MAIL = 'MAIL'
 }
--- a/src/models/enums/ResponseObjectType.ts
+++ b/src/models/enums/ResponseObjectType.ts
@@ -0,0 +1,39 @@
 /**
 * This enum contains all object types/entities a response can contain.
 */
 export enum ResponseObjectType {
    AUTH = 'AUTH',
    DISTANCEDONATION = 'DISTANCEDONATION',
    DONATION = 'DONATION',
    DONOR = 'DONOR',
    EMPTY = 'EMPTY',
    GROUPCONTACT = 'GROUPCONTACT',
    LOGOUT = 'LOGOUT',
    PARTICIPANT = 'PARTICIPANT',
    PERMISSION = 'PERMISSION',
    PRINCIPAL = 'PRINCIPAL',
    RUNNER = 'RUNNER',
    RUNNERCARD = 'RUNNERCARD',
    RUNNERGROUP = 'RUNNERGROUP',
    RUNNERORGANIZATION = 'RUNNERORGANIZATION',
    RUNNERTEAM = 'RUNNERTEAM',
    SCAN = 'SCAN',
    SCANSTATION = 'SCANSTATION',
    SELFSERVICEDONATION = 'SELFSERVICEDONATION',
    SELFSERVICERUNNER = 'SELFSERVICRUNNER',
    SELFSERVICESCAN = 'SELFSERVICESCAN',
    SELFSERVICETRACKSCAN = 'SELFSERVICETRACKSCAN',
    SELFSERVICETEAM = 'SELFSERVICETEAM',
    SELFSERVICEORGANIZATION = 'SELFSERVICEORGANIZATION',
    STATS = 'STATS',
    STATSCLIENT = 'STATSCLIENT',
    STATSORGANIZATION = 'STATSORGANIZATION',
    STATSRUNNER = 'STATSRUNNER',
    STATSTEAM = 'STATSTEAM',
    TRACK = 'TRACK',
    TRACKSCAN = 'TRACKSCAN',
    USER = 'USER',
    USERGROUP = 'USERGROUP',
    USERPERMISSIONS = 'USERPERMISSIONS',
    SELFSERVICEDONOR = 'SELFSERVICEDONOR'
 }
--- a/src/models/responses/IResponse.ts
+++ b/src/models/responses/IResponse.ts
@@ -0,0 +1,13 @@
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 /**
 * Defines the repsonse interface.
 * This forces all response classes to implement the interfaces properties.
 */
 export interface IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType;
 }
--- a/src/models/responses/ResponseAuth.ts
+++ b/src/models/responses/ResponseAuth.ts
@@ -1,9 +1,18 @@
 import { IsInt, IsString } from 'class-validator';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 /**
 * Defines the repsonse auth.
 */
-export class ResponseAuth {
+export class ResponseAuth implements IResponse {
  /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
  responseType: ResponseObjectType = ResponseObjectType.AUTH;
  /**
  * The access_token - JWT shortterm access token.
  */
--- a/src/models/responses/ResponseDistanceDonation.ts
+++ b/src/models/responses/ResponseDistanceDonation.ts
@@ -1,12 +1,19 @@
 import { IsInt, IsObject, IsPositive } from 'class-validator';
 import { DistanceDonation } from '../entities/DistanceDonation';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponseDonation } from './ResponseDonation';
 import { ResponseRunner } from './ResponseRunner';
 /**
 * Defines the distance donation response.
 */
-export class ResponseDistanceDonation extends ResponseDonation {
+export class ResponseDistanceDonation extends ResponseDonation implements IResponse {
    /**
     * The responseType.
     * This contains the type of class/entity this response contains.
     */
    responseType: ResponseObjectType = ResponseObjectType.DISTANCEDONATION;
    /**
     * The donation's associated runner.
@@ -29,7 +36,7 @@ export class ResponseDistanceDonation extends ResponseDonation {
     */
    public constructor(donation: DistanceDonation) {
        super(donation);
-        this.runner = donation.runner.toResponse();
+        if (donation.runner) { this.runner = donation.runner.toResponse(); }
        this.amountPerDistance = donation.amountPerDistance;
    }
 }
--- a/src/models/responses/ResponseDonation.ts
+++ b/src/models/responses/ResponseDonation.ts
@@ -1,11 +1,20 @@
 import { IsInt, IsNotEmpty, IsPositive } from "class-validator";
 import { Donation } from '../entities/Donation';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponseDonor } from './ResponseDonor';
 /**
 * Defines the donation response.
 */
-export class ResponseDonation {
+export class ResponseDonation implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.DONATION;
    /**
     * The donation's id.
     */
--- a/src/models/responses/ResponseDonor.ts
+++ b/src/models/responses/ResponseDonor.ts
@@ -2,12 +2,19 @@ import {
    IsBoolean, IsInt
 } from "class-validator";
 import { Donor } from '../entities/Donor';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponseParticipant } from './ResponseParticipant';
 /**
 * Defines the donor response.
 */
-export class ResponseDonor extends ResponseParticipant {
+export class ResponseDonor extends ResponseParticipant implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.DONOR;
    /**
     * Does this donor need a receipt?
--- a/src/models/responses/ResponseEmpty.ts
+++ b/src/models/responses/ResponseEmpty.ts
@@ -1,9 +1,17 @@
 import { IsString } from 'class-validator';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 /**
 * Defines a empty response object.
 */
-export class ResponseEmpty {
+export class ResponseEmpty implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.EMPTY;
    @IsString()
    response: string = "nothing here"
 }
--- a/src/models/responses/ResponseGroupContact.ts
+++ b/src/models/responses/ResponseGroupContact.ts
@@ -1,12 +1,20 @@
 import { IsInt, IsObject, IsString } from "class-validator";
 import { Address } from '../entities/Address';
 import { GroupContact } from '../entities/GroupContact';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponseRunnerGroup } from './ResponseRunnerGroup';
 /**
 * Defines the group contact response.
 */
-export class ResponseGroupContact {
+export class ResponseGroupContact implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.GROUPCONTACT;
    /**
     * The contact's id.
     */
@@ -69,8 +77,10 @@ export class ResponseGroupContact {
        this.email = contact.email;
        this.address = contact.address;
        this.groups = new Array<ResponseRunnerGroup>();
-        for (let group of contact.groups) {
+        if (contact.groups) {
-            this.groups.push(group.toResponse());
+            for (let group of contact.groups) {
                this.groups.push(group.toResponse());
            }
        }
    }
 }
--- a/src/models/responses/ResponseLogout.ts
+++ b/src/models/responses/ResponseLogout.ts
@@ -1,9 +1,17 @@
 import { IsString } from 'class-validator';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 /**
 * Defines the logout response.
 */
-export class Logout {
+export class Logout implements IResponse {
  /**
   * The responseType.
   * This contains the type of class/entity this response contains.
   */
  responseType: ResponseObjectType = ResponseObjectType.LOGOUT;
  /**
  * The logout's timestamp.
  */
--- a/src/models/responses/ResponseParticipant.ts
+++ b/src/models/responses/ResponseParticipant.ts
@@ -1,11 +1,19 @@
 import { IsInt, IsObject, IsOptional, IsString } from "class-validator";
 import { Address } from '../entities/Address';
 import { Participant } from '../entities/Participant';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 /**
 * Defines the participant response.
 */
-export abstract class ResponseParticipant {
+export abstract class ResponseParticipant implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.PARTICIPANT;
    /**
     * The participant's id.
     */
--- a/src/models/responses/ResponsePermission.ts
+++ b/src/models/responses/ResponsePermission.ts
@@ -7,12 +7,20 @@ import {
 import { Permission } from '../entities/Permission';
 import { PermissionAction } from '../enums/PermissionAction';
 import { PermissionTarget } from '../enums/PermissionTargets';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponsePrincipal } from './ResponsePrincipal';
 /**
 * Defines the permission response.
 */
-export class ResponsePermission {
+export class ResponsePermission implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.PERMISSION;
    /**
     * The permission's id.
     */
--- a/src/models/responses/ResponsePrincipal.ts
+++ b/src/models/responses/ResponsePrincipal.ts
@@ -2,11 +2,19 @@ import {
    IsInt
 } from "class-validator";
 import { Principal } from '../entities/Principal';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 /**
 * Defines the principal response.
 */
-export abstract class ResponsePrincipal {
+export abstract class ResponsePrincipal implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.PRINCIPAL;
    /**
     * The principal's id.
--- a/src/models/responses/ResponseRunner.ts
+++ b/src/models/responses/ResponseRunner.ts
@@ -3,13 +3,20 @@ import {
    IsObject
 } from "class-validator";
 import { Runner } from '../entities/Runner';
-import { RunnerGroup } from '../entities/RunnerGroup';
+import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponseParticipant } from './ResponseParticipant';
 import { ResponseRunnerGroup } from './ResponseRunnerGroup';
 /**
 * Defines the runner response.
 */
-export class ResponseRunner extends ResponseParticipant {
+export class ResponseRunner extends ResponseParticipant implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.RUNNER;
    /**
     * The runner's currently ran distance in meters.
@@ -21,7 +28,7 @@ export class ResponseRunner extends ResponseParticipant {
     * The runner's group.
     */
    @IsObject()
-    group: RunnerGroup;
+    group: ResponseRunnerGroup;
    /**
     * Creates a ResponseRunner object from a runner.
@@ -31,6 +38,6 @@ export class ResponseRunner extends ResponseParticipant {
        super(runner);
        if (!runner.scans) { this.distance = 0 }
        else { this.distance = runner.validScans.reduce((sum, current) => sum + current.distance, 0); }
-        this.group = runner.group;
+        if (runner.group) { this.group = runner.group.toResponse(); }
    }
 }
--- a/src/models/responses/ResponseRunnerCard.ts
+++ b/src/models/responses/ResponseRunnerCard.ts
@@ -1,11 +1,19 @@
 import { IsBoolean, IsEAN, IsInt, IsNotEmpty, IsObject, IsString } from "class-validator";
 import { RunnerCard } from '../entities/RunnerCard';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponseRunner } from './ResponseRunner';
 /**
 * Defines the runner card response.
 */
-export class ResponseRunnerCard {
+export class ResponseRunnerCard implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.RUNNERCARD;
    /**
     * The card's id.
     */
--- a/src/models/responses/ResponseRunnerGroup.ts
+++ b/src/models/responses/ResponseRunnerGroup.ts
@@ -1,11 +1,19 @@
 import { IsInt, IsNotEmpty, IsObject, IsOptional, IsString } from "class-validator";
 import { GroupContact } from '../entities/GroupContact';
 import { RunnerGroup } from '../entities/RunnerGroup';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponseGroupContact } from './ResponseGroupContact';
 /**
 * Defines the runnerGroup response.
 */
-export abstract class ResponseRunnerGroup {
+export abstract class ResponseRunnerGroup implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.RUNNERGROUP;
    /**
     * The runnerGroup's id.
     */
@@ -26,7 +34,7 @@ export abstract class ResponseRunnerGroup {
     */
    @IsObject()
    @IsOptional()
-    contact?: GroupContact;
+    contact?: ResponseGroupContact;
    /**
     * Creates a ResponseRunnerGroup object from a runnerGroup.
@@ -35,6 +43,6 @@ export abstract class ResponseRunnerGroup {
    public constructor(group: RunnerGroup) {
        this.id = group.id;
        this.name = group.name;
-        this.contact = group.contact;
+        if (group.contact) { this.contact = group.contact.toResponse(); };
    }
 }
--- a/src/models/responses/ResponseRunnerOrganisation.ts
+++ b/src/models/responses/ResponseRunnerOrganisation.ts
@@ -1,39 +0,0 @@
 import {
    IsArray,
    IsObject,
    IsOptional
 } from "class-validator";
 import { Address } from '../entities/Address';
 import { RunnerOrganisation } from '../entities/RunnerOrganisation';
 import { RunnerTeam } from '../entities/RunnerTeam';
 import { ResponseRunnerGroup } from './ResponseRunnerGroup';
 /**
 * Defines the runnerOrganisation response.
 */
 export class ResponseRunnerOrganisation extends ResponseRunnerGroup {
    /**
     * The runnerOrganisation's address.
     */
    @IsObject()
    @IsOptional()
    address?: Address;
    /**
     * The runnerOrganisation associated teams.
     */
    @IsArray()
    teams: RunnerTeam[];
    /**
     * Creates a ResponseRunnerOrganisation object from a runnerOrganisation.
     * @param org The runnerOrganisation the response shall be build for.
     */
    public constructor(org: RunnerOrganisation) {
        super(org);
        this.address = org.address;
        this.teams = org.teams;
    }
 }
--- a/src/models/responses/ResponseRunnerOrganization.ts
+++ b/src/models/responses/ResponseRunnerOrganization.ts
@@ -0,0 +1,75 @@
 import {
    IsArray,
    IsBase64,
    IsBoolean,
    IsObject,
    IsOptional,
    IsString
 } from "class-validator";
 import { Address } from '../entities/Address';
 import { RunnerOrganization } from '../entities/RunnerOrganization';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponseRunnerGroup } from './ResponseRunnerGroup';
 import { ResponseRunnerTeam } from './ResponseRunnerTeam';
 /**
 * Defines the runnerOrganization response.
 */
 export class ResponseRunnerOrganization extends ResponseRunnerGroup implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.RUNNERORGANIZATION;
    /**
     * The runnerOrganization's address.
     */
    @IsObject()
    @IsOptional()
    address?: Address;
    /**
     * The runnerOrganization associated teams.
     */
    @IsArray()
    teams: ResponseRunnerTeam[];
    /**
     * The organization's registration key.
     * If registration is disabled this is null.
     */
    @IsString()
    @IsOptional()
    @IsBase64()
    registrationKey?: string;
    /**
     * Is registration enabled for the organization?
     */
    @IsOptional()
    @IsBoolean()
    registrationEnabled?: boolean = true;
    /**
     * Creates a ResponseRunnerOrganization object from a runnerOrganization.
     * @param org The runnerOrganization the response shall be build for.
     */
    public constructor(org: RunnerOrganization) {
        super(org);
        this.address = org.address;
        this.teams = new Array<ResponseRunnerTeam>();
        if (org.teams) {
            for (let team of org.teams) {
                this.teams.push(team.toResponse());
            }
        }
        if (!org.key) { this.registrationEnabled = false; }
        else { this.registrationKey = Buffer.from(org.key).toString('base64'); }
    }
 }
--- a/src/models/responses/ResponseRunnerTeam.ts
+++ b/src/models/responses/ResponseRunnerTeam.ts
@@ -1,19 +1,26 @@
 import { IsNotEmpty, IsObject } from "class-validator";
 import { RunnerOrganisation } from '../entities/RunnerOrganisation';
 import { RunnerTeam } from '../entities/RunnerTeam';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponseRunnerGroup } from './ResponseRunnerGroup';
 import { ResponseRunnerOrganization } from './ResponseRunnerOrganization';
 /**
 * Defines the runnerTeam response.
 */
-export class ResponseRunnerTeam extends ResponseRunnerGroup {
+export class ResponseRunnerTeam extends ResponseRunnerGroup implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.RUNNERTEAM;
    /**
-     * The runnerTeam's parent group (organisation).
+     * The runnerTeam's parent group (organization).
     */
    @IsObject()
    @IsNotEmpty()
-    parentGroup: RunnerOrganisation;
+    parentGroup: ResponseRunnerOrganization;
    /**
     * Creates a ResponseRunnerTeam object from a runnerTeam.
@@ -21,6 +28,6 @@ export class ResponseRunnerTeam extends ResponseRunnerGroup {
     */
    public constructor(team: RunnerTeam) {
        super(team);
-        this.parentGroup = team.parentGroup;
+        if (team.parentGroup) { this.parentGroup = team.parentGroup.toResponse(); }
    }
 }
--- a/src/models/responses/ResponseScan.ts
+++ b/src/models/responses/ResponseScan.ts
@@ -1,11 +1,19 @@
 import { IsBoolean, IsInt, IsNotEmpty, IsPositive } from "class-validator";
 import { Scan } from '../entities/Scan';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponseRunner } from './ResponseRunner';
 /**
 * Defines the scan response.
 */
-export class ResponseScan {
+export class ResponseScan implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.SCAN;
    /**
     * The scans's id.
     */
@@ -39,7 +47,7 @@ export class ResponseScan {
     */
    public constructor(scan: Scan) {
        this.id = scan.id;
-        this.runner = scan.runner.toResponse();
+        if (scan.runner) { this.runner = scan.runner.toResponse(); }
        this.distance = scan.distance;
        this.valid = scan.valid;
    }
--- a/src/models/responses/ResponseScanStation.ts
+++ b/src/models/responses/ResponseScanStation.ts
@@ -11,12 +11,20 @@ import {
    IsString
 } from "class-validator";
 import { ScanStation } from '../entities/ScanStation';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponseTrack } from './ResponseTrack';
 /**
 * Defines the statsClient response.
 */
-export class ResponseScanStation {
+export class ResponseScanStation implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.SCANSTATION;
    /**
     * The client's id.
     */
@@ -64,7 +72,7 @@ export class ResponseScanStation {
        this.description = station.description;
        this.prefix = station.prefix;
        this.key = "Only visible on creation.";
-        this.track = station.track;
+        if (station.track) { this.track = station.track.toResponse(); }
        this.enabled = station.enabled;
    }
 }
--- a/src/models/responses/ResponseSelfServiceDonation.ts
+++ b/src/models/responses/ResponseSelfServiceDonation.ts
@@ -0,0 +1,43 @@
 import { IsInt, IsNotEmpty, IsPositive } from 'class-validator';
 import { DistanceDonation } from '../entities/DistanceDonation';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponseSelfServiceDonor } from './ResponseSelfServiceDonor';
 /**
 * Defines the runner selfservice donation response.
 * Why? B/C runner's are not allowed to view all information available to admin users.
 */
 export class ResponseSelfServiceDonation implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.SELFSERVICEDONATION;
    /**
     * The donation's donor.
     */
    @IsNotEmpty()
    donor: ResponseSelfServiceDonor;
    /**
     * The donation's amount in the smalles unit of your currency (default: euro cent).
     */
    @IsInt()
    amount: number;
    /**
     * The donation's amount donated per distance.
     * The amount the donor set to be donated per kilometer that the runner ran.
     */
    @IsInt()
    @IsPositive()
    amountPerDistance: number;
    public constructor(donation: DistanceDonation) {
        this.donor = new ResponseSelfServiceDonor(donation.donor);
        this.amountPerDistance = donation.amountPerDistance;
        this.amount = donation.amount;
    }
 }
--- a/src/models/responses/ResponseSelfServiceDonor.ts
+++ b/src/models/responses/ResponseSelfServiceDonor.ts
@@ -0,0 +1,51 @@
 import { IsInt, IsString } from "class-validator";
 import { Donor } from '../entities/Donor';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 /**
 * Defines the donor selfservice response.
 * Why? B/C runner's are not allowed to view all information available to admin users.
 */
 export class ResponseSelfServiceDonor implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.SELFSERVICEDONOR;
    /**
     * The participant's id.
     */
    @IsInt()
    id: number;
    /**
     * The participant's first name.
     */
    @IsString()
    firstname: string;
    /**
     * The participant's middle name.
     */
    @IsString()
    middlename?: string;
    /**
     * The participant's last name.
     */
    @IsString()
    lastname: string;
    /**
     * Creates a ResponseSelfServiceDonor object from a runner.
     * @param donor The donor the response shall be build for.
     */
    public constructor(donor: Donor) {
        this.id = donor.id;
        this.firstname = donor.firstname;
        this.middlename = donor.middlename;
        this.lastname = donor.lastname;
    }
 }
--- a/src/models/responses/ResponseSelfServiceOrganisation.ts
+++ b/src/models/responses/ResponseSelfServiceOrganisation.ts
@@ -0,0 +1,38 @@
 import { IsArray, IsNotEmpty, IsString } from 'class-validator';
 import { RunnerOrganization } from '../entities/RunnerOrganization';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponseSelfServiceTeam } from './ResponseSelfServiceTeam';
 /**
 * Defines the runner selfservice organization response.
 * Why? B/C runner's are not allowed to view all information available to admin users.
 */
 export class ResponseSelfServiceOrganisation implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.SELFSERVICEORGANIZATION;
    /**
     * The org's name.
     */
    @IsNotEmpty()
    @IsString()
    name: string;
    /**
     * The org's teams (just containing name and id).
     */
    @IsArray()
    teams: ResponseSelfServiceTeam[];
    public constructor(org: RunnerOrganization) {
        this.name = org.name;
        this.teams = new Array<ResponseSelfServiceTeam>();
        for (let team of org.teams) {
            this.teams.push(new ResponseSelfServiceTeam(team));
        }
    }
 }
--- a/src/models/responses/ResponseSelfServiceRunner.ts
+++ b/src/models/responses/ResponseSelfServiceRunner.ts
@@ -0,0 +1,90 @@
 import { IsInt, IsOptional, IsString } from "class-validator";
 import { DistanceDonation } from '../entities/DistanceDonation';
 import { Runner } from '../entities/Runner';
 import { RunnerGroup } from '../entities/RunnerGroup';
 import { RunnerTeam } from '../entities/RunnerTeam';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponseParticipant } from './ResponseParticipant';
 import { ResponseSelfServiceDonation } from './ResponseSelfServiceDonation';
 /**
 * Defines the runner selfservice response.
 * Why? B/C runner's are not allowed to view all information available to admin users.
 */
 export class ResponseSelfServiceRunner extends ResponseParticipant implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.SELFSERVICERUNNER;
    /**
     * The runner's currently ran distance in meters.
     */
    @IsInt()
    distance: number;
    /**
     * The runner's currently collected donations.
     */
    @IsInt()
    donationAmount: number;
    /**
     * The runner's group as a string (mix of org and team).
     */
    @IsString()
    group: string;
    /**
     * The runner's associated distance donations.
     */
    @IsString()
    distanceDonations: ResponseSelfServiceDonation[]
    /**
     * The runner's self-service jwt for auth.
     * Will only get delivered on registration/via email.
     */
    @IsString()
    @IsOptional()
    token: string;
    /**
     * Creates a ResponseRunner object from a runner.
     * @param runner The user the response shall be build for.
     */
    public constructor(runner: Runner) {
        super(runner);
        this.distance = runner.distance;
        this.donationAmount = runner.distanceDonationAmount;
        this.group = this.getTeamString(runner.group);
        this.distanceDonations = this.getDonations(runner.distanceDonations);
    }
    /**
     * Parses a runner's group into a string.
     * If the runner's group is a team: `org name/team name`
     * If the runner's group is an org: `org name`
     * @param group The group that shall get parsed to a string.
     */
    private getTeamString(group: RunnerGroup): string {
        if (group instanceof RunnerTeam) {
            return group.parentGroup.name + "/" + group.name;
        }
        return group.name;
    }
    /**
     * Converts all of the runner's donations to ResponseSelfServiceDonations.
     * @param donations The donations that shall be converted to ResponseSelfServiceDonations.
     */
    private getDonations(donations: DistanceDonation[]): ResponseSelfServiceDonation[] {
        let responseDonations = new Array<ResponseSelfServiceDonation>();
        for (let donation of donations) {
            responseDonations.push(new ResponseSelfServiceDonation(donation));
        }
        return responseDonations;
    }
 }
--- a/src/models/responses/ResponseSelfServiceScan.ts
+++ b/src/models/responses/ResponseSelfServiceScan.ts
@@ -0,0 +1,57 @@
 import { IsBoolean, IsInt, IsNotEmpty, IsPositive } from "class-validator";
 import { Scan } from '../entities/Scan';
 import { TrackScan } from '../entities/TrackScan';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 /**
 * Defines the scan selfservice response.
 */
 export class ResponseSelfServiceScan implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.SELFSERVICESCAN;
    /**
     * The scans's id (for sorting).
     */
    @IsInt()
    id: number;
    /**
     * Is the scan valid (for fraud reasons).
     * The determination of validity will work differently for every child class.
     */
    @IsBoolean()
    valid: boolean = true;
    /**
     * The scans's length/distance in meters.
     */
    @IsInt()
    @IsPositive()
    distance: number;
    /**
     * The scans's lap time (0 if non is availdable).
     */
    @IsInt()
    @IsNotEmpty()
    lapTime: number = 0;
    /**
     * Creates a ResponseScan object from a scan.
     * @param scan The scan the response shall be build for.
     */
    public constructor(scan: Scan | TrackScan) {
        this.id = scan.id;
        this.distance = scan.distance;
        this.valid = scan.valid;
        if (scan instanceof TrackScan) {
            this.lapTime = scan.lapTime;
            this.responseType = ResponseObjectType.SELFSERVICETRACKSCAN;
        }
    }
 }
--- a/src/models/responses/ResponseSelfServiceTeam.ts
+++ b/src/models/responses/ResponseSelfServiceTeam.ts
@@ -0,0 +1,36 @@
 import { IsInt, IsNotEmpty, IsPositive, IsString } from 'class-validator';
 import { RunnerTeam } from '../entities/RunnerTeam';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 /**
 * Defines the runner selfservice team response.
 * Why? B/C runner's are not allowed to view all information available to admin users.
 */
 export class ResponseSelfServiceTeam implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.SELFSERVICETEAM;
    /**
     * The team's name.
     */
    @IsNotEmpty()
    @IsString()
    name: string;
    /**
     * The team's id.
     * Will be used to insert runners it into that team.
     */
    @IsInt()
    @IsPositive()
    id: number;
    public constructor(team: RunnerTeam) {
        this.name = team.name;
        this.id = team.id;
    }
 }
--- a/src/models/responses/ResponseStats.ts
+++ b/src/models/responses/ResponseStats.ts
@@ -3,16 +3,24 @@ import {
 } from "class-validator";
 import { Donation } from '../entities/Donation';
 import { Runner } from '../entities/Runner';
-import { RunnerOrganisation } from '../entities/RunnerOrganisation';
+import { RunnerOrganization } from '../entities/RunnerOrganization';
 import { RunnerTeam } from '../entities/RunnerTeam';
 import { Scan } from '../entities/Scan';
 import { User } from '../entities/User';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 /**
 * Defines the stats response.
 * The stats response calculates some basic stats for a dashboard or public display.
 */
-export class ResponseStats {
+export class ResponseStats implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.STATS;
    /**
     * The amount of runners registered in the system.
     */
@@ -26,7 +34,7 @@ export class ResponseStats {
    total_teams: number;
    /**
-     * The amount of organisations registered in the system.
+     * The amount of organizations registered in the system.
     */
    @IsInt()
    total_orgs: number;
@@ -70,7 +78,7 @@ export class ResponseStats {
     * @param scans Array containing all scans - no relations have to be resolved.
     * @param donations Array containing all donations - the following relations have to be resolved: runner, runner.scans, runner.scans.track
     */
-    public constructor(runners: Runner[], teams: RunnerTeam[], orgs: RunnerOrganisation[], users: User[], scans: Scan[], donations: Donation[]) {
+    public constructor(runners: Runner[], teams: RunnerTeam[], orgs: RunnerOrganization[], users: User[], scans: Scan[], donations: Donation[]) {
        this.total_runners = runners.length;
        this.total_teams = teams.length;
        this.total_orgs = orgs.length;
--- a/src/models/responses/ResponseStatsClient.ts
+++ b/src/models/responses/ResponseStatsClient.ts
@@ -8,11 +8,19 @@ import {
    IsString
 } from "class-validator";
 import { StatsClient } from '../entities/StatsClient';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 /**
 * Defines the statsClient response.
 */
-export class ResponseStatsClient {
+export class ResponseStatsClient implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.STATSCLIENT;
    /**
     * The client's id.
     */
--- a/src/models/responses/ResponseStatsOrganization.ts
+++ b/src/models/responses/ResponseStatsOrganization.ts
@@ -3,13 +3,21 @@ import {
    IsString
 } from "class-validator";
-import { RunnerOrganisation } from '../entities/RunnerOrganisation';
+import { RunnerOrganization } from '../entities/RunnerOrganization';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 /**
 * Defines the org stats response.
 * This differs from the normal org responce.
 */
-export class ResponseStatsOrgnisation {
+export class ResponseStatsOrgnisation implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.STATSORGANIZATION;
    /**
     * The orgs's id.
     */
@@ -35,10 +43,10 @@ export class ResponseStatsOrgnisation {
    donationAmount: number;
    /**
-     * Creates a new organisation stats response from a organisation
+     * Creates a new organization stats response from a organization
-     * @param org The organisation whoes response shall be generated - the following relations have to be resolved: runners, runners.scans, runners.distanceDonations, runners.scans.track, teams, teams.runners, teams.runners.scans, teams.runners.distanceDonations, teams.runners.scans.track
+     * @param org The organization whoes response shall be generated - the following relations have to be resolved: runners, runners.scans, runners.distanceDonations, runners.scans.track, teams, teams.runners, teams.runners.scans, teams.runners.distanceDonations, teams.runners.scans.track
     */
-    public constructor(org: RunnerOrganisation) {
+    public constructor(org: RunnerOrganization) {
        this.name = org.name;
        this.id = org.id;
        this.distance = org.distance;
--- a/src/models/responses/ResponseStatsRunner.ts
+++ b/src/models/responses/ResponseStatsRunner.ts
@@ -4,13 +4,21 @@ import {
    IsString
 } from "class-validator";
 import { Runner } from '../entities/Runner';
-import { RunnerGroup } from '../entities/RunnerGroup';
+import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponseRunnerGroup } from './ResponseRunnerGroup';
 /**
 * Defines the runner stats response.
 * This differs from the normal runner responce.
 */
-export class ResponseStatsRunner {
+export class ResponseStatsRunner implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.STATSRUNNER;
    /**
     * The runner's id.
     */
@@ -51,7 +59,7 @@ export class ResponseStatsRunner {
     * The runner's group.
     */
    @IsObject()
-    group: RunnerGroup;
+    group: ResponseRunnerGroup;
    /**
     * Creates a new runner stats response from a runner
@@ -64,6 +72,6 @@ export class ResponseStatsRunner {
        this.lastname = runner.lastname;
        this.distance = runner.distance;
        this.donationAmount = runner.distanceDonationAmount;
-        this.group = runner.group;
+        this.group = runner.group.toResponse();
    }
 }
--- a/src/models/responses/ResponseStatsTeam.ts
+++ b/src/models/responses/ResponseStatsTeam.ts
@@ -3,14 +3,22 @@ import {
    IsObject,
    IsString
 } from "class-validator";
 import { RunnerGroup } from '../entities/RunnerGroup';
 import { RunnerTeam } from '../entities/RunnerTeam';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponseRunnerGroup } from './ResponseRunnerGroup';
 /**
 * Defines the team stats response.
 * This differs from the normal team responce.
 */
-export class ResponseStatsTeam {
+export class ResponseStatsTeam implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.STATSTEAM;
    /**
     * The team's id.
     */
@@ -39,7 +47,7 @@ export class ResponseStatsTeam {
     * The teams's parent group.
     */
    @IsObject()
-    parent: RunnerGroup;
+    parent: ResponseRunnerGroup;
    /**
     * Creates a new team stats response from a team
@@ -48,7 +56,7 @@ export class ResponseStatsTeam {
    public constructor(team: RunnerTeam) {
        this.name = team.name;
        this.id = team.id;
-        this.parent = team.parentGroup;
+        this.parent = team.parentGroup.toResponse();
        this.distance = team.distance;
        this.donationAmount = team.distanceDonationAmount;
    }
--- a/src/models/responses/ResponseTrack.ts
+++ b/src/models/responses/ResponseTrack.ts
@@ -1,11 +1,19 @@
 import { IsInt, IsOptional, IsString } from "class-validator";
 import { TrackLapTimeCantBeNegativeError } from '../../errors/TrackErrors';
 import { Track } from '../entities/Track';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 /**
 * Defines the track response.
 */
-export class ResponseTrack {
+export class ResponseTrack implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.TRACK;
    /**
     * The track's id.
     */
--- a/src/models/responses/ResponseTrackScan.ts
+++ b/src/models/responses/ResponseTrackScan.ts
@@ -1,5 +1,7 @@
-import { IsDateString, IsNotEmpty } from "class-validator";
+import { IsDateString, IsNotEmpty, IsNumber } from "class-validator";
 import { TrackScan } from '../entities/TrackScan';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponseRunnerCard } from './ResponseRunnerCard';
 import { ResponseScan } from './ResponseScan';
 import { ResponseScanStation } from './ResponseScanStation';
@@ -8,10 +10,16 @@ import { ResponseTrack } from './ResponseTrack';
 /**
 * Defines the trackScan response.
 */
-export class ResponseTrackScan extends ResponseScan {
+export class ResponseTrackScan extends ResponseScan implements IResponse {
    /**
-   * The scan's associated track.
+    * The responseType.
-   */
+    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.TRACKSCAN;
    /**
     * The scan's associated track.
     */
    @IsNotEmpty()
    track: ResponseTrack;
@@ -34,6 +42,13 @@ export class ResponseTrackScan extends ResponseScan {
    @IsNotEmpty()
    timestamp: number;
    /**
   * The scan's lap time.
   * This simply get's calculated from the last lap time;
   */
    @IsNumber()
    lapTime: number;
    /**
     * Creates a ResponseTrackScan object from a scan.
     * @param scan The trackSscan the response shall be build for.
@@ -41,9 +56,10 @@ export class ResponseTrackScan extends ResponseScan {
    public constructor(scan: TrackScan) {
        super(scan);
        this.track = new ResponseTrack(scan.track);
-        this.card = scan.card.toResponse();
+        if (scan.card) { scan.card.toResponse(); }
-        this.station = scan.station.toResponse();
+        if (scan.station) { scan.station.toResponse(); }
        this.timestamp = scan.timestamp;
        this.distance = scan.distance;
        this.lapTime = scan.lapTime;
    }
 }
--- a/src/models/responses/ResponseUser.ts
+++ b/src/models/responses/ResponseUser.ts
@@ -6,13 +6,21 @@ import {
    IsString
 } from "class-validator";
 import { User } from '../entities/User';
-import { UserGroup } from '../entities/UserGroup';
+import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponsePrincipal } from './ResponsePrincipal';
 import { ResponseUserGroup } from './ResponseUserGroup';
 /**
 * Defines the user response.
 */
-export class ResponseUser extends ResponsePrincipal {
+export class ResponseUser extends ResponsePrincipal implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.USER;
    /**
     * The user's first name.
     */
@@ -66,7 +74,7 @@ export class ResponseUser extends ResponsePrincipal {
     */
    @IsArray()
    @IsOptional()
-    groups: UserGroup[];
+    groups: ResponseUserGroup[];
    /**
     * The user's permissions.
@@ -90,10 +98,13 @@ export class ResponseUser extends ResponsePrincipal {
        this.username = user.username;
        this.enabled = user.enabled;
        this.profilePic = user.profilePic;
-        this.groups = user.groups;
+        this.groups = new Array<ResponseUserGroup>();
        this.permissions = user.allPermissions;
-        if (this.groups) {
+        if (user.groups) {
-            this.groups.forEach(function (g) { delete g.permissions });
+            for (let group of user.groups) {
                delete group.permissions;
                this.groups.push(group.toResponse());
            }
        }
    }
 }
--- a/src/models/responses/ResponseUserGroup.ts
+++ b/src/models/responses/ResponseUserGroup.ts
@@ -1,12 +1,19 @@
 import { IsArray, IsNotEmpty, IsOptional, IsString } from "class-validator";
 import { Permission } from '../entities/Permission';
 import { UserGroup } from '../entities/UserGroup';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponsePrincipal } from './ResponsePrincipal';
 /**
 * Defines the userGroup response.
 */
-export class ResponseUserGroup extends ResponsePrincipal {
+export class ResponseUserGroup extends ResponsePrincipal implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.USERGROUP;
    /**
     * The userGroup's name.
     */
@@ -26,7 +33,7 @@ export class ResponseUserGroup extends ResponsePrincipal {
     */
    @IsArray()
    @IsOptional()
-    permissions: Permission[];
+    permissions: string[] = new Array<string>();
    /**
     * Creates a ResponseUserGroup object from a userGroup.
@@ -36,6 +43,10 @@ export class ResponseUserGroup extends ResponsePrincipal {
        super(group);
        this.name = group.name;
        this.description = group.description;
-        this.permissions = group.permissions;
+        if (group.permissions) {
            for (let permission of group.permissions) {
                this.permissions.push(permission.toString());
            }
        }
    }
 }
--- a/src/models/responses/ResponseUserGroupPermissions.ts
+++ b/src/models/responses/ResponseUserGroupPermissions.ts
@@ -0,0 +1,43 @@
 import {
    IsArray,
    IsOptional
 } from "class-validator";
 import { UserGroup } from '../entities/UserGroup';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponsePermission } from './ResponsePermission';
 /**
 * Defines the group permission response (get /api/groups/:id/permissions).
 */
 export class ResponseUserGroupPermissions implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.USERPERMISSIONS;
    /**
     * The permissions directly granted to the group.
     */
    @IsArray()
    @IsOptional()
    directlyGranted: ResponsePermission[] = new Array<ResponsePermission>();
    /**
     * Is just here for compatability.
     */
    @IsArray()
    @IsOptional()
    inherited: ResponsePermission[] = new Array<ResponsePermission>();
    /**
     * Creates a ResponseUserPermissions object from a group.
     * @param group The group the response shall be build for.
     */
    public constructor(group: UserGroup) {
        for (let permission of group.permissions) {
            this.directlyGranted.push(permission.toResponse());
        }
    }
 }
--- a/src/models/responses/ResponseUserPermissions.ts
+++ b/src/models/responses/ResponseUserPermissions.ts
@@ -5,12 +5,20 @@ import {
    IsOptional
 } from "class-validator";
 import { User } from '../entities/User';
 import { ResponseObjectType } from '../enums/ResponseObjectType';
 import { IResponse } from './IResponse';
 import { ResponsePermission } from './ResponsePermission';
 /**
 * Defines the user permission response (get /api/users/:id/permissions).
 */
-export class ResponseUserPermissions {
+export class ResponseUserPermissions implements IResponse {
    /**
    * The responseType.
    * This contains the type of class/entity this response contains.
    */
    responseType: ResponseObjectType = ResponseObjectType.USERPERMISSIONS;
    /**
     * The permissions directly granted to the user.
     */
--- a/src/seeds/SeedPublicOrg.ts
+++ b/src/seeds/SeedPublicOrg.ts
@@ -0,0 +1,15 @@
 import { Connection } from 'typeorm';
 import { Factory, Seeder } from 'typeorm-seeding';
 import { CreateRunnerOrganization } from '../models/actions/create/CreateRunnerOrganization';
 import { RunnerOrganization } from '../models/entities/RunnerOrganization';
 /**
 * Seeds the public runner org (named: "Citizen" by default).
 */
 export default class SeedPublicOrg implements Seeder {
    public async run(factory: Factory, connection: Connection): Promise<any> {
        let publicOrg = new CreateRunnerOrganization();
        publicOrg.name = "Citizen";
        await connection.getRepository(RunnerOrganization).save(await publicOrg.toEntity());
    }
 }
--- a/src/seeds/SeedTestRunners.ts
+++ b/src/seeds/SeedTestRunners.ts
@@ -0,0 +1,93 @@
 import { Connection } from 'typeorm';
 import { Factory, Seeder } from 'typeorm-seeding';
 import { CreateGroupContact } from '../models/actions/create/CreateGroupContact';
 import { CreateRunner } from '../models/actions/create/CreateRunner';
 import { CreateRunnerOrganization } from '../models/actions/create/CreateRunnerOrganization';
 import { CreateRunnerTeam } from '../models/actions/create/CreateRunnerTeam';
 import { Address } from '../models/entities/Address';
 import { GroupContact } from '../models/entities/GroupContact';
 import { Runner } from '../models/entities/Runner';
 import { RunnerGroup } from '../models/entities/RunnerGroup';
 import { RunnerOrganization } from '../models/entities/RunnerOrganization';
 import { RunnerTeam } from '../models/entities/RunnerTeam';
 /**
 * Seeds a test runner org with a test runner team ans some test runners.
 * Usefull for testing or demo instances.
 */
 export default class SeedTestRunners implements Seeder {
    public async run(factory: Factory, connection: Connection): Promise<any> {
        let testOrg: RunnerOrganization = await this.createTestOrg(connection);
        let testTeam: RunnerTeam = await this.createTestTeam(connection, testOrg);
        await this.createTestContact(connection, testOrg);
        await this.createTestRunners(connection, testOrg);
        await this.createTestRunners(connection, testTeam);
    }
    public async createTestOrg(connection: Connection): Promise<RunnerOrganization> {
        let testOrg = new CreateRunnerOrganization();
        testOrg.name = "Test Org";
        testOrg.address = new Address();
        testOrg.address.address1 = "Test street 1";
        testOrg.address.city = "Herzogenaurach";
        testOrg.address.country = "Germany";
        testOrg.address.postalcode = "90174";
        return await connection.getRepository(RunnerOrganization).save(await testOrg.toEntity());
    }
    public async createTestTeam(connection: Connection, org: RunnerOrganization): Promise<RunnerTeam> {
        let testTeam = new CreateRunnerTeam();
        testTeam.name = "Test Team";
        testTeam.parentGroup = org.id;
        return await connection.getRepository(RunnerTeam).save(await testTeam.toEntity());
    }
    public async createTestRunners(connection: Connection, group: RunnerGroup) {
        for (let first of this.firstnames) {
            for (let last of this.lastnames) {
                let runner = new CreateRunner;
                runner.firstname = first;
                runner.lastname = last;
                runner.middlename = group.name;
                runner.group = group.id;
                await connection.getRepository(Runner).save(await runner.toEntity());
            }
        }
    }
    public async createTestContact(connection: Connection, group: RunnerGroup) {
        let contact = new CreateGroupContact;
        contact.firstname = "Test";
        contact.lastname = "Contact";
        contact.email = "test.contact@dev.lauf-fuer-kaya.de";
        contact.groups = group.id;
        contact.address = new Address();
        contact.address.address1 = "First Contact Street 100";
        contact.address.city = "Herzogenaurach";
        contact.address.country = "Germany";
        contact.address.postalcode = "90174";
        await connection.getRepository(GroupContact).save(await contact.toEntity());
    }
    private firstnames = [
        "Peter",
        "Matze",
        "Tine",
        "Uta",
        "Fabian",
        "Unicode:ÖÄ?✔⚠"
    ]
    private lastnames = [
        "Muster",
        "Example",
        "Müller",
        "Unicode:搆Ǩ>ÙՠƳ|"
    ]
 }
--- a/src/seeds/SeedUsers.ts
+++ b/src/seeds/SeedUsers.ts
@@ -1,14 +1,14 @@
 import * as argon2 from "argon2";
 import { Connection } from 'typeorm';
 import { Factory, Seeder } from 'typeorm-seeding';
 import * as uuid from 'uuid';
 import { CreatePermission } from '../models/actions/create/CreatePermission';
 import { CreateUser } from '../models/actions/create/CreateUser';
 import { CreateUserGroup } from '../models/actions/create/CreateUserGroup';
 import { Permission } from '../models/entities/Permission';
 import { User } from '../models/entities/User';
 import { UserGroup } from '../models/entities/UserGroup';
 import { PermissionAction } from '../models/enums/PermissionAction';
 import { PermissionTarget } from '../models/enums/PermissionTargets';
 /**
 * Seeds a admin group with a demo user into the database for initial setup and auto recovery.
 * We know that the nameing isn't perfectly fitting. Feel free to change it.
@@ -16,7 +16,7 @@ import { PermissionTarget } from '../models/enums/PermissionTargets';
 export default class SeedUsers implements Seeder {
    public async run(factory: Factory, connection: Connection): Promise<any> {
        let adminGroup: UserGroup = await this.createAdminGroup(connection);
-        await this.createUser(connection, adminGroup.id);
+        await this.createUser(connection, adminGroup);
        await this.createPermissions(connection, adminGroup.id);
    }
@@ -27,15 +27,16 @@ export default class SeedUsers implements Seeder {
        return await connection.getRepository(UserGroup).save(await adminGroup.toEntity());
    }
-    public async createUser(connection: Connection, group: number) {
+    public async createUser(connection: Connection, group: UserGroup) {
-        let initialUser = new CreateUser();
+        let initialUser = new User();
        initialUser.firstname = "demo";
        initialUser.lastname = "demo";
        initialUser.username = "demo";
-        initialUser.password = "demo";
+        initialUser.uuid = uuid.v4();
        initialUser.password = await argon2.hash("demo" + initialUser.uuid);
        initialUser.email = "demo@dev.lauf-fuer-kaya.de"
-        initialUser.groups = group;
+        initialUser.groups = [group];
-        return await connection.getRepository(User).save(await initialUser.toEntity());
+        return await connection.getRepository(User).save(initialUser);
    }
    public async createPermissions(connection: Connection, principal: number) {
--- a/src/tests/auth/auth_login.spec.ts
+++ b/src/tests/auth/auth_login.spec.ts
@@ -5,6 +5,7 @@ const base = "http://localhost:" + config.internal_port
 let axios_config;
 beforeAll(async () => {
    jest.setTimeout(20000);
    axios_config = {
        validateStatus: undefined
    };
--- a/src/tests/auth/auth_logout.spec.ts
+++ b/src/tests/auth/auth_logout.spec.ts
@@ -8,14 +8,15 @@ const axios_config = {
 };;
 beforeAll(async () => {
    jest.setTimeout(20000);
    const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
    await axios.post(base + '/api/users', {
-        "firstname": "demo_logout",
+        "firstname": "demo_logoutASD123",
-        "middlename": "demo_logout",
+        "middlename": "demo_logoutASD123",
-        "lastname": "demo_logout",
+        "lastname": "demo_logoutASD123",
-        "username": "demo_logout",
+        "username": "demo_logoutASD123",
-        "password": "demo_logout",
+        "password": "demo_logoutASD123",
-        "email": "demo_logout@dev.lauf-fuer-kaya.de"
+        "email": "demo_logoutASD123@dev.lauf-fuer-kaya.de"
    }, {
        headers: { "authorization": "Bearer " + res_login.data["access_token"] },
        validateStatus: undefined
@@ -25,7 +26,7 @@ beforeAll(async () => {
 describe('POST /api/auth/logout valid', () => {
    let refresh_coookie;
    it('valid logout with token in cookie should return 200', async () => {
-        const res_login = await axios.post(base + '/api/auth/login', { username: "demo_logout", password: "demo_logout" });
+        const res_login = await axios.post(base + '/api/auth/login', { username: "demo_logoutASD123", password: "demo_logoutASD123" });
        refresh_coookie = res_login.headers["set-cookie"];
        const res = await axios.post(base + '/api/auth/logout', null, {
            headers: { "Cookie": refresh_coookie },
@@ -34,7 +35,7 @@ describe('POST /api/auth/logout valid', () => {
        expect(res.status).toEqual(200);
    });
    it('valid logout with token in body should return 200', async () => {
-        const res_login = await axios.post(base + '/api/auth/login', { username: "demo_logout", password: "demo_logout" });
+        const res_login = await axios.post(base + '/api/auth/login', { username: "demo_logoutASD123", password: "demo_logoutASD123" });
        const res = await axios.post(base + '/api/auth/logout', { token: res_login.data["refresh_token"] }, axios_config);
        expect(res.status).toEqual(200);
    });
--- a/Show More
+++ b/Show More