From 45c8bb83be0814bed8856a617de435f4694db76c Mon Sep 17 00:00:00 2001
From: Nicolai Ort <info@nicolai-ort.com>
Date: Thu, 21 Jan 2021 20:01:44 +0100
Subject: [PATCH] Fixed tests testing for a old responseclass

ref #112
---
 src/controllers/GroupContactController.ts | 10 +++++-----
 src/tests/contacts/contact_add.spec.ts    |  1 -
 src/tests/contacts/contact_update.spec.ts |  2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/controllers/GroupContactController.ts b/src/controllers/GroupContactController.ts
index 3d6f83e..f6f6364 100644
--- 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);
diff --git a/src/tests/contacts/contact_add.spec.ts b/src/tests/contacts/contact_add.spec.ts
index 0cb5160..f17233f 100644
--- a/src/tests/contacts/contact_add.spec.ts
+++ b/src/tests/contacts/contact_add.spec.ts
@@ -123,7 +123,6 @@ describe('POST /api/contacts working (with group)', () => {
             "parentGroup": added_org.id
         }, axios_config);
         delete res.data.contact;
-        delete res.data.parentGroup;
         added_team = res.data;
         expect(res.status).toEqual(200);
         expect(res.headers['content-type']).toContain("application/json")
diff --git a/src/tests/contacts/contact_update.spec.ts b/src/tests/contacts/contact_update.spec.ts
index e6d733d..89af1b3 100644
--- a/src/tests/contacts/contact_update.spec.ts
+++ b/src/tests/contacts/contact_update.spec.ts
@@ -74,7 +74,6 @@ describe('Update contact group after adding (should work)', () => {
             "parentGroup": added_org.id
         }, axios_config);
         delete res.data.contact;
-        delete res.data.parentGroup;
         added_team = res.data;
         expect(res.status).toEqual(200);
         expect(res.headers['content-type']).toContain("application/json")
@@ -112,6 +111,7 @@ describe('Update contact group after adding (should work)', () => {
             "lastname": "last",
             "groups": added_team.id
         }, axios_config);
+        console.log(res.data)
         expect(res.status).toEqual(200);
         expect(res.headers['content-type']).toContain("application/json");
         expect(res.data).toEqual({