diff --git a/src/app/module/chat/data/repository/room-repository.service.ts b/src/app/module/chat/data/repository/room-repository.service.ts index 5826fff2e..f04fc1e7e 100644 --- a/src/app/module/chat/data/repository/room-repository.service.ts +++ b/src/app/module/chat/data/repository/room-repository.service.ts @@ -227,11 +227,11 @@ export class RoomRepositoryService { @captureAndReraiseAsync('RoomRepositoryService/addMemberToRoom') async addMemberToRoom(data: AddMemberToRoomInputDTO) { - return this.roomLiveSignalRDataSourceService.addMemberToRoom(data) + //return this.roomLiveSignalRDataSourceService.addMemberToRoom(data) - // const result = await this.roomRemoteDataSourceService.addMemberToRoom(data) + const result = await this.roomRemoteDataSourceService.addMemberToRoom(data) - // return result + return result } async updateMemberStatus(data: MemberListUPdateStatusInputDTO) { diff --git a/src/app/module/chat/infra/socket/signalR.ts b/src/app/module/chat/infra/socket/signalR.ts index 507f7477e..ef9da66bd 100644 --- a/src/app/module/chat/infra/socket/signalR.ts +++ b/src/app/module/chat/infra/socket/signalR.ts @@ -241,7 +241,7 @@ export class SignalRConnection { } - sendData(input: ISignalRInput) { + sendData(input: ISignalRInput): Promise> { return new Promise((resolve, reject) => { if(this.connectionStateSubject.value == true) { @@ -320,6 +320,22 @@ export class SignalRConnection { }) }) + + this.hubConnection.on('GroupAddedMembers', (_message) => { + console.log('GroupAddedMembers', _message) + this.sendDataSubject.next({ + method: 'GroupAddedMembers', + data: _message + }) + }) + + this.hubConnection.on('GroupDeletedMembers', (_message) => { + console.log('GroupDeletedMembers', _message) + this.sendDataSubject.next({ + method: 'GroupDeletedMembers', + data: _message + }) + }) } public getMessageUpdateSubject() { diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts index 51ca17c0a..bf2109f5d 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts @@ -57,13 +57,16 @@ export class GroupContactsPage implements OnInit { id: this.roomId, members: this.selectedUsers }) - // if(addMembers.isOk()) { - // // this.addContacts(this.roomId); - // this.openGroupMessage.emit(this.roomId); - // this.RoomRepositoryService.getRoomById(this.roomId) - // } else if(addMembers.error instanceof HttpRequest) { - // this.httpErrorHandle.httpStatusHandle(addMembers.error) - // } + + + if(addMembers.isOk()) { + console.log('addMembers', addMembers) + // this.addContacts(this.roomId); + this.openGroupMessage.emit(this.roomId); + this.RoomRepositoryService.getRoomById(this.roomId); + } else if(addMembers.error instanceof HttpRequest) { + this.httpErrorHandle.httpStatusHandle(addMembers.error) + } } else { this.openGroupMessage.emit(this.roomId); }