Skip to content
Snippets Groups Projects

Development to testing

Merged Ghost User requested to merge Development into testing
2 files
+ 28
23
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -132,10 +132,29 @@ export class FactionService {
// get the groups in the given Faction
async showGroups(factionId) {
return await this.game_GroupRepository.find({
relations: ['leader', 'players'],
let groups = await this.game_GroupRepository.find({
where: { faction: factionId },
relations: ['leader', 'leader.person', 'players', 'players.person'],
});
let players = await Promise.all(
groups.map(async group => {
let groupPlayers = await Promise.all(
group.players.map(async player => {
return await player.person.name;
}),
);
return await {
id: group.id,
name: group.name,
class: group.class,
players: groupPlayers,
leader: group.leader.person.name,
};
}),
);
return players;
}
// puts a non admin or faction leader player into a specified group
Loading