Development to testing

src/faction/faction.service.ts

@@ -110,13 +110,9 @@ export class FactionService {
     });
   }
 
-  async joinGroup(person, gameId, data: JoinGameGroupDTO) {
-    const gamePerson = await this.game_PersonRepository.findOne({
-      person: person,
-      game: gameId,
-    });
-    gamePerson.group = data.groupId;
-    await this.game_PersonRepository.save(gamePerson);
+  async joinGroup(gameperson, data: JoinGameGroupDTO) {
+    gameperson.group = data.groupId;
+    await this.game_PersonRepository.save(gameperson);
     return {
       message: 'Joined group',
     };
@@ -138,12 +134,16 @@ export class FactionService {
       where: { person, game },
       relations: ['faction'],
     });
-    if (gameperson) {
+    if (gameperson.faction) {
       return {
-        message: gameperson,
+        factionId: gameperson.faction.factionId,
+        factionName: gameperson.faction.factionName,
       };
     } else {
-      throw new HttpException('No faction was found', HttpStatus.BAD_REQUEST);
+      throw new HttpException(
+        gameperson ? 'You are admin for this game!' : 'No faction was found',
+        HttpStatus.BAD_REQUEST,
+      );
     }
   }
 }