fix, open file

src/app/module/chat/data/async/list/rooms/messageListChangedetector.ts

@@ -26,7 +26,7 @@ export function messageListDetermineChanges(serverList: MessageTable[], localLis
       item.$id = localItem.$id
     }
 
-    return localItem && (item.editedAt !== localItem.editedAt || item.reactions.some((r, index) => {
+    return localItem && (item.editedAt !== localItem.editedAt || item.sentAt != item.sentAt  || item.reactions.some((r, index) => {
       const localReaction = localItem.reactions[index];
       return !localReaction || r.reactedAt !== localReaction.reactedAt;
     }));

src/app/module/chat/data/repository/message/message-local-data-source.service.ts

@@ -76,11 +76,11 @@ export class MessageLocalDataSourceService extends DexieRepository<MessageTable,
   }
 
   getItems(roomId: string): PromiseExtended<MessageEntity[]> {
-    return chatDatabase.message.where('roomId').equals(roomId).sortBy('$createAt') as any
+    return chatDatabase.message.where('roomId').equals(roomId).sortBy('sentAt') as any
   }
 
   getItemsLive(roomId: string): DexieObservable<MessageEntity[]> {
-    return liveQuery(() => chatDatabase.message.where('roomId').equals(roomId).sortBy('$createAt') as any)
+    return liveQuery(() => chatDatabase.message.where('roomId').equals(roomId).sortBy('sentAt') as any)
   }
 
   async getOfflineMessages () {

src/app/module/chat/data/repository/room/room-local-repository.service.ts

@@ -13,19 +13,14 @@ export class RoomLocalRepository extends DexieRepository<RoomTable, RoomTable> i
 
   constructor() {
     super(chatDatabase.room, RoomTableSchema)
-    // chatDatabase.room.hook('creating', (primaryKey, obj, transaction) => {
-    //   if(obj.messages?.[0].attachments?.[0]) {
-    //     delete obj.messages[0].attachments[0].file
-    //   }
-    // });
 
     chatDatabase.room.hook('updating', (modifications, primKey, oldValue, transaction) => {
 
-      if((modifications as Partial<RoomTable>).messages?.[0].requestId == oldValue.messages?.[0].requestId) {
-        (modifications as Partial<RoomTable>).messages[0].sentAt = oldValue.messages?.[0]?.sentAt;
-      } else if ((modifications as Partial<RoomTable>).messages?.[0].id == oldValue.messages?.[0].id) {
-        (modifications as Partial<RoomTable>).messages[0].sentAt = oldValue.messages?.[0]?.sentAt
-      }
+      // if((modifications as Partial<RoomTable>).messages?.[0].requestId == oldValue.messages?.[0].requestId) {
+      //   (modifications as Partial<RoomTable>).messages[0].sentAt = oldValue.messages?.[0]?.sentAt;
+      // } else if ((modifications as Partial<RoomTable>).messages?.[0].id == oldValue.messages?.[0].id) {
+      //   (modifications as Partial<RoomTable>).messages[0].sentAt = oldValue.messages?.[0]?.sentAt
+      // }
 
       return modifications
     });

src/app/module/chat/domain/chat-service.service.ts

@@ -148,8 +148,8 @@ export class ChatServiceService {
   }
 
   async start() {
-    await this.chatSync()
-    await this.SocketConnectUseCaseService.execute();
+    this.chatSync()
+    this.SocketConnectUseCaseService.execute();
   }
 
 

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

@@ -5,10 +5,8 @@ import { MessageRemoteDataSourceService } from '../../../data/repository/message
 import { MessageSocketRepositoryService } from '../../../data/repository/message/message-live-signalr-data-source.service';
 import { ok } from 'neverthrow';
 import { RoomLocalRepository } from '../../../data/repository/room/room-local-repository.service';
-import { SessionStore } from 'src/app/store/session.service';
 import { Logger } from 'src/app/services/logger/main/service';
 import { XTracerAsync, TracingType } from 'src/app/services/monitoring/opentelemetry/tracer';
-import { v4 as uuidv4 } from 'uuid'
 import { MessageTable } from 'src/app/infra/database/dexie/instance/chat/schema/message';
 
 @Injectable({
@@ -51,7 +49,7 @@ export class SyncAllRoomMessagesService {
           for (const message of changedItems) {
             delete message.sentAt
             let clone: MessageTable = { ...message, roomId: room.id };
-            await this.messageLocalDataSourceService.update(clone.$id, clone);
+            this.messageLocalDataSourceService.update(clone.$id, clone);
 
             // const me = message.info.find(e => e.memberId === SessionStore.user.UserId && typeof e.deliverAt === 'string');
 
@@ -72,7 +70,7 @@ export class SyncAllRoomMessagesService {
             // You can perform operations with addedItems here if needed
           }
 
-          await this.messageLocalDataSourceService.insertMany(addedItems.reverse().map(e => {
+          this.messageLocalDataSourceService.insertMany(addedItems.reverse().map(e => {
             e.origin = 'history'
             return e
           }));

src/app/module/chat/domain/use-case/room/room-set-last-message.service.ts

@@ -41,6 +41,7 @@ export class RoomSetLastMessageService {
 
       for(const room of roomList) {
         if(room.messages?.[0]?.id == message.id) {
+          console.log('listenToUpdateMessage', message.roomId)
           const result = await this.roomLocalRepository.update(message.roomId, {
             messages: [message]
           })
@@ -67,6 +68,7 @@ export class RoomSetLastMessageService {
       map(message => Object.assign(new MessageEntity(), message))
     ).subscribe(async (message) => {
       if(message?.roomId) {
+        console.log('listenToIncomingMessage', message.roomId)
         const result = await this.roomLocalRepository.update(message.roomId, {
           messages: [message]
         })
@@ -88,9 +90,11 @@ export class RoomSetLastMessageService {
       if(message?.roomId) {
 
         setTimeout(async() => {
-          const result = await this.roomLocalRepository.update(message.roomId, {
-            messages: [message]
-          })
+          if(message.origin != 'history') {
+            const result = await this.roomLocalRepository.update(message.roomId, {
+              messages: [message]
+            })
+          }
         }, 100)
       }