From 074b750b564a7ef3f69a982648351bdb7b770e2b Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 5 Sep 2024 13:18:36 +0100
Subject: [PATCH] fit message sernder can be null

---
 src/app/core/chat/entity/message.ts           |  6 ++--
 .../room/room-bold-sync-use-case.service.ts   |  3 +-
 ...oom-get-list-on-create-use-case.service.ts | 36 +++++++++++++++++++
 src/app/services/monitoring/socket/socket.ts  |  4 +--
 4 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100644 src/app/module/chat/domain/use-case/room/room-get-list-on-create-use-case.service.ts

diff --git a/src/app/core/chat/entity/message.ts b/src/app/core/chat/entity/message.ts
index 99aa9d009..c74aaf2f3 100644
--- a/src/app/core/chat/entity/message.ts
+++ b/src/app/core/chat/entity/message.ts
@@ -50,7 +50,7 @@ export const MessageEntitySchema = z.object({
     wxFullName: z.string(),
     wxeMail: z.string(),
     userPhoto: z.string().nullable(),
-  }),
+  }).nullable(),
   reactions: z.object({
     id: z.string(),
     reactedAt: z.string(),
@@ -65,7 +65,7 @@ export const MessageEntitySchema = z.object({
   sending: z.boolean().optional(),
   attachments: z.array(MessageEntityAttachmentSchema).optional(),
   origin: z.enum(['history', 'local', 'incoming']).optional(),
-  requestId: z.string().optional(),
+  requestId: z.string().nullable().optional(),
   sendAttemp: z.number().optional(),
   hasAttachment: z.boolean().optional()
 })
@@ -110,7 +110,7 @@ export class MessageEntity {
   }
 
   meSender() {
-    return this.sender.wxUserId == SessionStore.user.UserId
+    return this.sender?.wxUserId == SessionStore.user.UserId
   }
 
 }
diff --git a/src/app/module/chat/domain/use-case/room/room-bold-sync-use-case.service.ts b/src/app/module/chat/domain/use-case/room/room-bold-sync-use-case.service.ts
index 0deb27dbb..69cebc7fa 100644
--- a/src/app/module/chat/domain/use-case/room/room-bold-sync-use-case.service.ts
+++ b/src/app/module/chat/domain/use-case/room/room-bold-sync-use-case.service.ts
@@ -5,7 +5,6 @@ import { MessageEntity } from 'src/app/core/chat/entity/message';
 import { IBoldLocalRepository } from 'src/app/core/chat/repository/bold/bold-local-repository';
 import { IMessageLocalRepository } from 'src/app/core/chat/repository/message/message-local-repository';
 import { InstanceId } from '../../chat-service.service';
-import { IMessageGetAllByRoomIdOutPut } from 'src/app/core/chat/usecase/message/message-get-all-by-room-Id';
 import { HttpAdapter } from 'src/app/infra/http/adapter';
 import { SessionStore } from 'src/app/store/session.service';
 import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer';
@@ -95,7 +94,7 @@ export class RoomBoldSyncUseCaseService {
           } else if(result.isOk() && result.value.bold == 0) {
             const result = await this.boldLocalRepository.update(newMessage.roomId, {bold: 1})
           } else {
-            tracing.hasError("failed to set bold",{})
+            // tracing.hasError("failed to set bold",{})
           }
         }
 
diff --git a/src/app/module/chat/domain/use-case/room/room-get-list-on-create-use-case.service.ts b/src/app/module/chat/domain/use-case/room/room-get-list-on-create-use-case.service.ts
new file mode 100644
index 000000000..c9088fd0f
--- /dev/null
+++ b/src/app/module/chat/domain/use-case/room/room-get-list-on-create-use-case.service.ts
@@ -0,0 +1,36 @@
+import { Injectable } from '@angular/core';
+import { GetRoomListUseCaseService } from './room-get-list-use-case.service'
+import { RoomSocketRepositoryService } from '../../../data/repository/room/room-socket-repository.service'
+
+@Injectable({
+  providedIn: 'root'
+})
+export class RoomGetListOnCreateUseCaseService {
+
+  constructor(
+    private RoomSocketRepositoryService: RoomSocketRepositoryService,
+    private getRoomListUseCaseService: GetRoomListUseCaseService
+  ) {
+    this.init()
+  }
+
+
+  private init() {
+    this.OnReceiveCreateRoom()
+    this.OnDeleteCreateRoom()
+  }
+
+
+  private OnReceiveCreateRoom() {
+    this.RoomSocketRepositoryService.listenToCreateRoom().subscribe((data)=> {
+      console.log('OnReceiveCreateRoom', data)
+      this.getRoomListUseCaseService.execute()
+    })
+  }
+
+  private OnDeleteCreateRoom() {
+    this.RoomSocketRepositoryService.listenToDeleteRoom().subscribe((data)=> {
+      console.log('OnDeleteCreateRoom7', data)
+    })
+  }
+}
diff --git a/src/app/services/monitoring/socket/socket.ts b/src/app/services/monitoring/socket/socket.ts
index cbc87fffe..2affd42e8 100644
--- a/src/app/services/monitoring/socket/socket.ts
+++ b/src/app/services/monitoring/socket/socket.ts
@@ -26,12 +26,12 @@ export class WebSocketGraylogService {
     };
 
     this.adminSocketGlobal.onclose = () => {
-      console.log('Admin WebSocket is closed now.');
+      // console.log('Admin WebSocket is closed now.');
       this.connect();
     };
 
     this.adminSocketGlobal.onerror = (error: Event) => {
-      console.error('Admin WebSocket error:', error);
+      // console.error('Admin WebSocket error:', error);
     };
   }