fix delete member and add member

src/app/core/chat/entity/group.ts

@@ -63,34 +63,34 @@ export class RoomEntity  extends BaseEntity<RoomEntity>(RoomEntitySchema) implem
 
     if(data.roomType == RoomType.Direct) {
       this.setName()
-    }
 
-    if(!this.$id) {
+      if(!this.$id) {
-      this.setLocalId()
+        this.$id = this.getReceiverId()
-    }
+      }
 
-
+      if(!this.receiverId  && this.members.length == 2) {
-    if(this.roomType == RoomType.Direct  && !this.receiverId  && this.members.length == 2) {
+        this.setReceiver()
-      this.setReceiver()
+      }
     }
   }
 
+  // direct room only
+  getReceiverId() {
+    const receiver = this.members?.find((e) => e.user.wxUserId != SessionStore.user.UserId)
+    return receiver.user.wxUserId.toString()
+  }
+
+  // direct room only
   setLocalId() {
-    const receiver = this.members?.find((e) => e.user.wxUserId != SessionStore.user.UserId)
+    this.$id = this.getReceiverId()
-
-    if(receiver) {
-      this.$id =receiver.user.wxUserId.toString()
-    }
   }
 
+  // direct room only
   setReceiver() {
-    const receiver = this.members?.find((e) => e.user.wxUserId != SessionStore.user.UserId)
+    this.receiverId = parseInt(this.getReceiverId())
-
-    if(receiver) {
-      this.receiverId = receiver.user.wxUserId
-    }
   }
 
+  // direct room only
   setName() {
     const userChatName = this.members?.find((e) => e.user.wxUserId != SessionStore.user.UserId)
     if(userChatName) {

src/app/module/chat/data/repository/member/member-list-remote-repository.service.ts

@@ -25,7 +25,7 @@ export class MemberListRemoteRepository implements IMemberRemoteRepository {
 
   @ValidateSchema(UserRemoveListInputDTOSchema)
   async removeMemberFromRoom(data: UserRemoveListInputDTO): Promise<Result<any ,any>> {
-    return await this.httpService.delete<any>(`${this.baseUrl}/Room/${data.id}/Member`, {members:data.members});
+    return await this.httpService.delete<any>(`${this.baseUrl}/Room/${data.id}/Member`, {} , {members:data.members});
   }
 
   async setAmin(data: MemberSetAdminDTO): Promise<Result<any ,any>> {

src/app/module/chat/domain/use-case/message/sync-all-room-messages.service.ts

@@ -50,7 +50,6 @@ export class SyncAllRoomMessagesService {
         if (result.isOk()) {
           const { addedItems, changedItems, deletedItems } = messageListDetermineChanges(result.value.data, localResult);
 
-          console.log({changedItems})
           for (const message of changedItems) {
 
             let clone: MessageTable = { ...message, roomId: room.id };

src/app/module/chat/domain/use-case/room/room-bold-sync-use-case.service.ts

@@ -89,7 +89,7 @@ export class RoomBoldSyncUseCaseService {
           await this.boldLocalRepository.open()
           const result = await this.boldLocalRepository.findOne({roomId: newMessage.roomId})
 
-          if(result.isOk() && !result.value?.bold) {
+          if(result.isOk() && !result.value) {
             const result = await this.boldLocalRepository.insert({roomId: newMessage.roomId, bold: 1})
           } else if(result.isOk() && result.value.bold == 0) {
             const result = await this.boldLocalRepository.update(newMessage.roomId, {bold: 1})

src/app/services/http.service.ts

@@ -98,7 +98,7 @@ export class HttpService {
 
   }
 
-  async delete<T>(url: string, httpParamsObj = {}): Promise<Result<T, HttpErrorResponse>>   {
+  async delete<T>(url: string, httpParamsObj = {}, body = {}): Promise<Result<T, HttpErrorResponse>>   {
 
     let httpParams = new HttpParams();
 
@@ -110,7 +110,8 @@ export class HttpService {
     }
 
     let opts = {
-      params : httpParams
+      params : httpParams,
+      body
     }
 
     try {
@@ -121,7 +122,6 @@ export class HttpService {
     }
   }
 
-
   async patch<T>(url: string, body  ={}): Promise<Result<T, HttpErrorResponse>> {
     try {
       const result = await this.http.patch<T>(url, body).toPromise();

src/app/ui/chat/chat.page.ts

@@ -356,7 +356,7 @@ export class ChatPage implements OnInit {
         this.showMessages = true;
       }
     } else {
-      console.log('conversa não existe');
+      console.log('conversa não existe', $roomId);
       // this.toastService._badRequest("Pedimos desculpa mas não foi possível executar a acção. Por favor, contacte o apoio técnico.")
     }
 

src/app/ui/chat/component/messages/messages.page.ts

@@ -1005,7 +1005,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   openGroupContactsPage() {
-    this.openGroupContacts.emit(this.room.$id);
+    this.openGroupContacts.emit(this.room.id);
   }
 
   async takePictureMobile() {

workspace.code-workspace

@@ -8,6 +8,9 @@
 		},
 		{
 			"path": "../sentium"
+		},
+		{
+			"path": "../GDoc"
 		}
 	],
     "settings": {