Disconnect memberList from the gateway

Introduced in-between MemberGroups which removes the logic from the gateway about the structure of the memberList inside the poker-room.
The poker-room has the methods to fill this memberGroup, which is being collected in the PokerService.

Author: moorscode

backend/src/pokers/poker-room.ts

@@ -68,6 +68,36 @@ export class PokerRoom {
 		return this.members;
 	}
 
+	/**
+	 * Lists voters in a room.
+	 *
+	 * @returns {Member[]} List of voters.
+	 */
+	public getVoters(): Member[] {
+		return Object.values( this.members )
+			.filter( ( member: Member ) => member.type === 'voter' && member.connected );
+	}
+
+	/**
+	 * Lists clients in a room.
+	 *
+	 * @returns {Member[]} List of observers.
+	 */
+	public getObservers(): Member[] {
+		return Object.values( this.members )
+			.filter( ( member: Member ) => member.type === 'observer' && member.connected );
+	}
+
+	/**
+	 * Lists disconnected members in a room.
+	 *
+	 * @returns {Member[]} List of disconnected members.
+	 */
+	public getDisconnected(): Member[] {
+		return Object.values( this.members )
+			.filter( ( member: Member ) => ! member.connected );
+	}
+
 	/**
 	 * Lists all poker voters.
 	 *

backend/src/pokers/pokers.gateway.ts

@@ -2,8 +2,8 @@ import { OnGatewayInit, SubscribeMessage, WebSocketGateway, WebSocketServer } fr
 // eslint-disable-next-line camelcase
 import { Server, Socket } from "socket.io";
 import { PointsService } from "../points/points.service";
-import { Member, MemberList, Story, Vote, VoteValue } from "./poker-room";
-import { PokersService } from "./pokers.service";
+import { Member, Story, Vote, VoteValue } from "./poker-room";
+import { PokersService, MemberGroups } from "./pokers.service";
 
 interface ClientResponse {
 	name: string;
@@ -242,8 +242,8 @@ export class PokersGateway implements OnGatewayInit {
 	 * @private
 	 */
 	private sendMembers( room: string ): void {
-		const clients: MemberList = this.pokersService.getClients( room );
-		this.server.to( room ).emit( "memberList", this.formatMembersResponse( clients ) );
+		const memberGroups: MemberGroups = this.pokersService.getMembers( room );
+		this.server.to( room ).emit( "memberList", this.formatMembersResponse( memberGroups ) );
 	}
 
 	/**
@@ -333,19 +333,19 @@ export class PokersGateway implements OnGatewayInit {
 	}
 
 	/**
-	 * Formats a memberlist for response.
+	 * Formats the members in a room for response.
 	 *
-	 * @param {MemberList} memberList The memberlist.
+	 * @param {MemberGroups} memberGroups The members in their groups.
 	 *
 	 * @returns {MembersResponse} The formatted list.
 	 */
-	private formatMembersResponse( memberList: MemberList ): MembersResponse {
+	private formatMembersResponse( memberGroups: MemberGroups ): MembersResponse {
 		const mapCallback = this.formatClientResponse;
 
 		return {
-			voters: Object.values( memberList ).filter( member => member.type === "voter" && member.connected ).map( mapCallback ),
-			observers: Object.values( memberList ).filter( member => member.type === "observer" && member.connected ).map( mapCallback ),
-			disconnected: Object.values( memberList ).filter( member => ! member.connected ).map( mapCallback ),
+			voters: memberGroups.voters.map( mapCallback ),
+			observers: memberGroups.observers.map( mapCallback ),
+			disconnected: memberGroups.disconnected.map( mapCallback ),
 		};
 	}
 

backend/src/pokers/pokers.service.ts

@@ -17,6 +17,12 @@ export interface Users {
 	[ socketId: string ]: string;
 }
 
+export interface MemberGroups {
+	voters: Member[];
+	observers: Member[];
+	disconnected: Member[];
+}
+
 @Injectable()
 /**
  * The Pokers service.
@@ -240,6 +246,22 @@ export class PokersService {
 		return this.getRoom( poker ).getClients();
 	}
 
+	/**
+	 * Retrieves all members.
+	 *
+	 * @param {string} poker The poker.
+	 *
+	 * @returns {MemberList} All clients in a room.
+	 */
+	public getMembers( poker: string ): MemberGroups {
+		const room = this.getRoom( poker );
+		return {
+			voters: room.getVoters(),
+			observers: room.getObservers(),
+			disconnected: room.getDisconnected()
+		};
+	}
+
 	/**
 	 * Retrieves all names of voted voters.
 	 *