Refactoring events to connect/disconnect a user to a group

back/src/Model/Group.ts

@@ -1,4 +1,4 @@
-import { World } from "./World";
+import { World, ConnectCallback, DisconnectCallback } from "./World";
 import { UserInterface } from "./UserInterface";
 import {PositionInterface} from "_Model/PositionInterface";
 
@@ -6,11 +6,11 @@ export class Group {
     static readonly MAX_PER_GROUP = 4;
 
     private users: UserInterface[];
-    private connectCallback: (user1: string, user2: string) => void;
-    private disconnectCallback: (user1: string, user2: string) => void;
+    private connectCallback: ConnectCallback;
+    private disconnectCallback: DisconnectCallback;
 
 
-    constructor(users: UserInterface[], connectCallback: (user1: string, user2: string) => void, disconnectCallback: (user1: string, user2: string) => void) {
+    constructor(users: UserInterface[], connectCallback: ConnectCallback, disconnectCallback: DisconnectCallback) {
         this.users = [];
         this.connectCallback = connectCallback;
         this.disconnectCallback = disconnectCallback;
@@ -54,9 +54,7 @@ export class Group {
     join(user: UserInterface): void
     {
         // Broadcast on the right event
-        this.users.forEach((groupUser: UserInterface) => {
-            this.connectCallback(user.id, groupUser.id);
-        });
+        this.connectCallback(user.id, this);
         this.users.push(user);
         user.group = this;
     }
@@ -105,9 +103,7 @@ export class Group {
         user.group = undefined;
 
         // Broadcast on the right event
-        this.users.forEach((groupUser: UserInterface) => {
-            this.disconnectCallback(user.id, groupUser.id);
-        });
+        this.disconnectCallback(user.id, this);
     }
 
     /**

back/src/Model/World.ts

@@ -6,6 +6,9 @@ import {UserInterface} from "./UserInterface";
 import {ExSocketInterface} from "_Model/Websocket/ExSocketInterface";
 import {PositionInterface} from "_Model/PositionInterface";
 
+export type ConnectCallback = (user: string, group: Group) => void;
+export type DisconnectCallback = (user: string, group: Group) => void;
+
 export class World {
     static readonly MIN_DISTANCE = 160;
 
@@ -13,10 +16,10 @@ export class World {
     private users: Map<string, UserInterface>;
     private groups: Group[];
 
-    private connectCallback: (user1: string, user2: string) => void;
-    private disconnectCallback: (user1: string, user2: string) => void;
+    private connectCallback: ConnectCallback;
+    private disconnectCallback: DisconnectCallback;
 
-    constructor(connectCallback: (user1: string, user2: string) => void, disconnectCallback: (user1: string, user2: string) => void)
+    constructor(connectCallback: ConnectCallback, disconnectCallback: DisconnectCallback)
     {
         this.users = new Map<string, UserInterface>();
         this.groups = [];