Merge pull request 'Release 0.8.0' (#176) from dev into main

Reviewed-on: #176
Reviewed-by: Philipp Dormann <philipp@philippdormann.de>

CHANGELOG.md

@@ -2,8 +2,100 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
-#### [v0.6.1](https://git.odit.services/lfk/backend/compare/v0.5.0...v0.6.1)
+#### [v0.7.1](https://git.odit.services/lfk/backend/compare/v0.7.1...v0.7.1)
 
+- 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)
@@ -17,12 +109,12 @@ All notable changes to this project will be documented in this file. Dates are d
 - 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] [`a1a94ec`](https://git.odit.services/lfk/backend/commit/a1a94ec9dafecd9b4c453cc8cfe32c2e90acccf5)
 - 🧾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)
@@ -30,16 +122,17 @@ All notable changes to this project will be documented in this file. Dates are d
 - 🚀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)
-- Changed endpoint url to avoid conflicts [`e5dab34`](https://git.odit.services/lfk/backend/commit/e5dab3469c3cef6298fc8deb1192a38f7d18406b)
 - 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)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odit/lfk-backend",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "main": "src/app.ts",
   "repository": "https://git.odit.services/lfk/backend",
   "author": {

src/controllers/MeController.ts

@@ -32,7 +32,7 @@ export class MeController {
 		return new ResponseUser(user);
 	}
 
-	@Get('/')
+	@Get('/permissions')
 	@ResponseSchema(ResponseUserPermissions)
 	@ResponseSchema(UserNotFoundError, { statusCode: 404 })
 	@OnUndefined(UserNotFoundError)

src/controllers/RunnerCardController.ts

@@ -28,7 +28,7 @@ export class RunnerCardController {
 	@OpenAPI({ description: 'Lists all card.' })
 	async getAll() {
 		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 => {
 			responseCards.push(new ResponseRunnerCard(card));
 		});
@@ -42,11 +42,26 @@ export class RunnerCardController {
 	@OnUndefined(RunnerCardNotFoundError)
 	@OpenAPI({ description: "Lists all information about the card whose id got provided." })
 	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(); }
 		return card.toResponse();
 	}
 
+	@Post('/bulk')
+	@Authorized("CARD:CREATE")
+	@ResponseSchema(ResponseEmpty, { statusCode: 200 })
+	@OpenAPI({ description: "Create blank cards in bulk. <br> Just provide the count as a query param and wait for the 200 response." })
+	async postBlancoBulk(@QueryParam("count") count: number) {
+		let createPromises = new Array<any>();
+		for (let index = 0; index < count; index++) {
+			createPromises.push(this.cardRepository.save({ runner: null, enabled: true }))
+		}
+		await Promise.all(createPromises);
+		let response = new ResponseEmpty();
+		response.response = `Created ${count} new blanco cards.`
+		return response;
+	}
+
 	@Post()
 	@Authorized("CARD:CREATE")
 	@ResponseSchema(ResponseRunnerCard)
@@ -55,7 +70,7 @@ export class RunnerCardController {
 	async post(@Body({ validate: true }) createCard: CreateRunnerCard) {
 		let card = await createCard.toEntity();
 		card = await this.cardRepository.save(card);
-		return (await this.cardRepository.findOne({ id: card.id }, { relations: ['runner'] })).toResponse();
+		return (await this.cardRepository.findOne({ id: card.id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse();
 	}
 
 	@Put('/:id')
@@ -77,7 +92,7 @@ export class RunnerCardController {
 		}
 
 		await this.cardRepository.save(await card.update(oldCard));
-		return (await this.cardRepository.findOne({ id: id }, { relations: ['runner'] })).toResponse();
+		return (await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse();
 	}
 
 	@Delete('/:id')

src/controllers/RunnerSelfServiceController.ts

@@ -1,12 +1,12 @@
 import { Request } from "express";
 import * as jwt from "jsonwebtoken";
-import { Body, Get, JsonController, OnUndefined, Param, Post, QueryParam, Req, UseBefore } from 'routing-controllers';
+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, RunnerNotFoundError, RunnerSelfserviceTimeoutError } from '../errors/RunnerErrors';
+import { RunnerEmailNeededError, RunnerHasDistanceDonationsError, RunnerNotFoundError, RunnerSelfserviceTimeoutError } from '../errors/RunnerErrors';
 import { RunnerOrganizationNotFoundError } from '../errors/RunnerOrganizationErrors';
 import { ScanStationNotFoundError } from '../errors/ScanStationErrors';
 import { JwtCreator } from '../jwtcreator';
@@ -23,6 +23,9 @@ 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 {
@@ -43,11 +46,50 @@ export class RunnerSelfServiceController {
 	@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 contact support.' })
+	@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 })
@@ -67,7 +109,7 @@ export class RunnerSelfServiceController {
 	@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: [{ "ScanApiToken": [] }] })
+	@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(); }
@@ -77,7 +119,7 @@ export class RunnerSelfServiceController {
 	@Post('/runners/forgot')
 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
 	@OnUndefined(ResponseEmpty)
-	@OpenAPI({ description: 'TODO' })
+	@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) {
 		if (!mail) {
 			throw new RunnerNotFoundError();

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 {
@@ -60,7 +60,7 @@ 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);
@@ -71,8 +71,12 @@ export class ScanController {
 	@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": [] }] })
-	async postTrackScans(@Body({ validate: true }) createScan: CreateTrackScan) {
+	@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, @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.group', 'runner.scans.track', 'card', 'station'] })).toResponse();

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,12 +47,15 @@ export class CreateTrackScan {
         }
 
         newScan.timestamp = Math.round(new Date().getTime() / 1000);
-        newScan.lapTime = await this.getLaptime(newScan)
-        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) {
@@ -58,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();
@@ -66,15 +79,22 @@ export class CreateTrackScan {
         return station;
     }
 
-    public validateScan(scan: TrackScan): boolean {
-        return (scan.lapTime > scan.track.minimumLapTime);
-    }
-
-    public async getLaptime(scan: TrackScan): Promise<number> {
+    /**
+     * 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 0; }
-
-        const newestScan = scans[scans.length - 1];
-        return (scan.timestamp - newestScan.timestamp);
+        if (scans.length == 0) {
+            scan.lapTime = 0;
+            scan.valid = true;
+        }
+        else {
+            const newestScan = scans[scans.length - 1];
+            scan.lapTime = scan.timestamp - newestScan.timestamp;
+            scan.valid = (scan.lapTime > scan.track.minimumLapTime);
+        }
+        return scan;
     }
 }

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 = scan.station.track;
+        scan.track = await this.getTrack();
 
         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> {
-        const station = await getConnection().getRepository(ScanStation).findOne({ id: this.station }, { relations: ['track'] });
-        if (!station) {
-            throw new ScanStationNotFoundError();
+    public async getTrack(): Promise<Track> {
+        const track = await getConnection().getRepository(Track).findOne({ id: this.track });
+        if (!track) {
+            throw new TrackNotFoundError();
         }
-        return station;
+        return track;
     }
 }

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
     };

src/tests/auth/auth_logout.spec.ts

@@ -8,6 +8,7 @@ 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",

src/tests/auth/auth_refresh.spec.ts

@@ -8,6 +8,7 @@ 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_refresh",

src/tests/auth/auth_reset.spec.ts

@@ -8,6 +8,7 @@ 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_reset",

src/tests/cards/cards_add.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {
@@ -85,7 +86,6 @@ describe('POST /api/cards successfully (with runner)', () => {
 			"lastname": "last",
 			"group": added_org.id
 		}, axios_config);
-		delete res2.data.group;
 		added_runner = res2.data;
 		expect(res2.status).toEqual(200);
 		expect(res2.headers['content-type']).toContain("application/json")
@@ -148,4 +148,27 @@ describe('POST /api/cards successfully (with runner)', () => {
 			"responseType": "RUNNERCARD"
 		});
 	});
+});
+// ---------------
+describe('POST /api/cards/bulk successfully', () => {
+	it('creating a single new bulk card should return 200', async () => {
+		const res = await axios.post(base + '/api/cards/bulk?count=1', {}, axios_config);
+		expect(res.status).toEqual(200);
+		expect(res.headers['content-type']).toContain("application/json");
+	});
+	it('creating 50 new bulk card should return 200', async () => {
+		const res = await axios.post(base + '/api/cards/bulk?count=50', {}, axios_config);
+		expect(res.status).toEqual(200);
+		expect(res.headers['content-type']).toContain("application/json");
+	});
+	it('creating 250 new bulk card should return 200', async () => {
+		const res = await axios.post(base + '/api/cards/bulk?count=250', {}, axios_config);
+		expect(res.status).toEqual(200);
+		expect(res.headers['content-type']).toContain("application/json");
+	});
+	it('creating 2000 new bulk card should return 200', async () => {
+		const res = await axios.post(base + '/api/cards/bulk?count=2000', {}, axios_config);
+		expect(res.status).toEqual(200);
+		expect(res.headers['content-type']).toContain("application/json");
+	});
 });

src/tests/cards/cards_delete.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/cards/cards_get.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/cards/cards_update.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {
@@ -63,7 +64,6 @@ describe('adding + updating card.runner successfully', () => {
 			"lastname": "last",
 			"group": added_org.id
 		}, axios_config);
-		delete res2.data.group;
 		added_runner = res2.data;
 		expect(res2.status).toEqual(200);
 		expect(res2.headers['content-type']).toContain("application/json")
@@ -74,7 +74,6 @@ describe('adding + updating card.runner successfully', () => {
 			"lastname": "last",
 			"group": added_org.id
 		}, axios_config);
-		delete res2.data.group;
 		added_runner2 = res2.data;
 		expect(res2.status).toEqual(200);
 		expect(res2.headers['content-type']).toContain("application/json")

src/tests/contacts/contact_add.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/contacts/contact_delete.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/contacts/contact_get.spec.ts

@@ -5,6 +5,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/contacts/contact_update.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/donations/donations_add.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/donations/donations_delete.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/donations/donations_get.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/donations/donations_update.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/donors/donor_add.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/donors/donor_delete.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/donors/donor_get.spec.ts

@@ -5,6 +5,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/donors/donor_update.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/runnerOrgs/org_add.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/runnerOrgs/org_delete.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/runnerOrgs/org_get.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/runnerOrgs/org_update.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/runnerTeams/team_add.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/runnerTeams/team_delete.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/runnerTeams/team_get.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/runnerTeams/team_update.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/runners/runner_add.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/runners/runner_delete.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/runners/runner_get.spec.ts

@@ -5,6 +5,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/runners/runner_update.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/scans/scans_add.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/scans/scans_delete.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/scans/scans_get.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/scans/scans_update.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/scanstations/scanstations_add.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/scanstations/scanstations_delete.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/scanstations/scanstations_get.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/scanstations/scanstations_update.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/selfservice/selfservice_delete.spec.ts

@@ -0,0 +1,66 @@
+import axios from 'axios';
+import { config } from '../../config';
+const base = "http://localhost:" + config.internal_port
+
+let access_token;
+let axios_config;
+
+beforeAll(async () => {
+    jest.setTimeout(20000);
+    const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
+    access_token = res.data["access_token"];
+    axios_config = {
+        headers: { "authorization": "Bearer " + access_token },
+        validateStatus: undefined
+    };
+});
+// ---------------
+describe('delete selfservice runner invalid', () => {
+    let added_runner;
+    it('registering as citizen with minimal params should return 200', async () => {
+        const res = await axios.post(base + '/api/runners/register', {
+            "firstname": "string",
+            "lastname": "string",
+            "email": "user@example.com"
+        }, axios_config);
+        added_runner = res.data;
+        expect(res.status).toEqual(200);
+        expect(res.headers['content-type']).toContain("application/json");
+    });
+    it('delete with valid jwt should return 200', async () => {
+        const res = await axios.delete(base + '/api/runners/me/' + added_runner.token, axios_config);
+        expect(res.status).toEqual(200);
+        expect(res.headers['content-type']).toContain("application/json");
+    });
+    it('delete with valid jwt but non-existant runner should return 200', async () => {
+        const res = await axios.delete(base + '/api/runners/me/' + added_runner.token, axios_config);
+        expect(res.status).toEqual(404);
+        expect(res.headers['content-type']).toContain("application/json");
+    });
+    it('delete with invalid jwt should return 401', async () => {
+        const res = await axios.delete(base + '/api/runners/me/123.123', axios_config);
+        expect(res.status).toEqual(401);
+        expect(res.headers['content-type']).toContain("application/json");
+    });
+});
+// ---------------
+describe('delete selfservice runner valid', () => {
+    let added_runner;
+    it('registering as citizen with minimal params should return 200', async () => {
+        const res = await axios.post(base + '/api/runners/register', {
+            "firstname": "string",
+            "lastname": "string",
+            "email": "user@example.com"
+        }, axios_config);
+        added_runner = res.data;
+        expect(res.status).toEqual(200);
+        expect(res.headers['content-type']).toContain("application/json");
+    });
+    it('delete with valid jwt should return 200', async () => {
+        const res = await axios.delete(base + '/api/runners/me/' + added_runner.token, axios_config);
+        expect(res.status).toEqual(200);
+        expect(res.headers['content-type']).toContain("application/json");
+        delete added_runner.token;
+        expect(res.data).toEqual(added_runner);
+    });
+});

src/tests/selfservice/selfservice_forgotten.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/selfservice/selfservice_get.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/selfservice/selfservice_org.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/selfservice/selfservice_register.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+    jest.setTimeout(20000);
     const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
     access_token = res.data["access_token"];
     axios_config = {

src/tests/tracks/track_add.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/tracks/track_delete.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/tracks/track_update.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/tracks/tracks_get.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/trackscans/trackscans_add.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/trackscans/trackscans_delete.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/trackscans/trackscans_get.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {

src/tests/trackscans/trackscans_update.spec.ts

@@ -6,6 +6,7 @@ let access_token;
 let axios_config;
 
 beforeAll(async () => {
+	jest.setTimeout(20000);
 	const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
 	access_token = res.data["access_token"];
 	axios_config = {
@@ -86,7 +87,7 @@ describe('adding + updating illegally', () => {
 	it('updating with wrong id should return 406', async () => {
 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, {
 			"id": added_scan.id + 1,
-			"station": added_station.id,
+			"track": added_track.id,
 			"runner": added_runner.id
 		}, axios_config);
 		expect(res2.status).toEqual(406);
@@ -95,7 +96,7 @@ describe('adding + updating illegally', () => {
 	it('updating with invalid station should return 404', async () => {
 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, {
 			"id": added_scan.id,
-			"station": 9999999999999999,
+			"track": 9999999999999999,
 			"runner": added_runner.id
 		}, axios_config);
 		expect(res2.status).toEqual(404);
@@ -104,7 +105,7 @@ describe('adding + updating illegally', () => {
 	it('updating with invalid runner should return 404', async () => {
 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, {
 			"id": added_scan.id,
-			"station": added_station.id,
+			"track": added_station.id,
 			"runner": 9999999999999999999
 		}, axios_config);
 		expect(res2.status).toEqual(404);
@@ -211,7 +212,7 @@ describe('adding + updating successfilly', () => {
 	it('updating with new runner should return 200', async () => {
 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, {
 			"id": added_scan.id,
-			"station": added_station.id,
+			"track": added_track.id,
 			"runner": added_runner2.id
 		}, axios_config);
 		expect(res2.status).toEqual(200);
@@ -220,7 +221,7 @@ describe('adding + updating successfilly', () => {
 	it('updating with new station should return 200', async () => {
 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, {
 			"id": added_scan.id,
-			"station": added_station2.id,
+			"track": added_track2.id,
 			"runner": added_runner.id
 		}, axios_config);
 		expect(res2.status).toEqual(200);
@@ -229,7 +230,7 @@ describe('adding + updating successfilly', () => {
 	it('updating with valid=false should return 200', async () => {
 		const res2 = await axios.put(base + '/api/scans/trackscans/' + added_scan.id, {
 			"id": added_scan.id,
-			"station": added_station2.id,
+			"track": added_track2.id,
 			"runner": added_runner.id,
 			"valid": false
 		}, axios_config);