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', 'runner.group', 'runner.group.parentGroup'] });
+		const cards = await this.cardRepository.find({ relations: ['runner'] });
 		cards.forEach(card => {
 			responseCards.push(new ResponseRunnerCard(card));
 		});
@@ -42,7 +42,7 @@ 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', 'runner.group', 'runner.group.parentGroup'] });
+		let card = await this.cardRepository.findOne({ id: id }, { relations: ['runner'] });
 		if (!card) { throw new RunnerCardNotFoundError(); }
 		return card.toResponse();
 	}
@@ -70,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', 'runner.group', 'runner.group.parentGroup'] })).toResponse();
+		return (await this.cardRepository.findOne({ id: card.id }, { relations: ['runner'] })).toResponse();
 	}
 
 	@Put('/:id')
@@ -92,7 +92,7 @@ export class RunnerCardController {
 		}
 
 		await this.cardRepository.save(await card.update(oldCard));
-		return (await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse();
+		return (await this.cardRepository.findOne({ id: id }, { relations: ['runner'] })).toResponse();
 	}
 
 	@Delete('/:id')

src/tests/auth/auth_login.spec.ts

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

src/tests/cards/cards_delete.spec.ts

@@ -6,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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 = {
@@ -64,6 +63,7 @@ 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,6 +74,7 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +5,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +5,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +5,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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_forgotten.spec.ts

@@ -6,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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,7 +6,6 @@ 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 = {