realtime

src/app/module/chat/data/async/repository/message-repository-aync.service.spec.ts

@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { MessageRepositoryAyncService } from './message-repository-aync.service';
-
-describe('MessageRepositoryAyncService', () => {
-  let service: MessageRepositoryAyncService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(MessageRepositoryAyncService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});

src/app/module/chat/data/async/repository/message-repository-aync.service.ts

@@ -3,10 +3,9 @@ import { Injectable } from '@angular/core';
 @Injectable({
   providedIn: 'root'
 })
-export class MessageRepositoryAyncService {
+export class MessageRepositorySyncService {
 
   constructor() {
 
-    // alert('hellor')
   }
 }

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

@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { Observable, Subject } from 'rxjs';
+import { DexieRepository } from 'src/app/infra/repository/dexie/dexie-repository.service';
+import { chatDatabase } from '../../../infra/database/dexie/service';
+import { Observable as  DexieObservable, PromiseExtended } from 'Dexie';
+import { AttachmentTable } from '../../../infra/database/dexie/schema/attachment';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class AttachmentLocalDataSourceService extends DexieRepository<AttachmentTable>  {
+
+  messageSubject = new Subject();
+
+  constructor() {
+    super(chatDatabase.attachment)
+  }
+
+ 
+}
+

src/app/module/chat/data/data-source/message/message-live-signalr-data-source.service.ts

@@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
 import { err, ok } from 'neverthrow';
 import { SignalRService } from '../../../infra/socket/signal-r.service';
 
-
 interface msgObj {
   roomId: string;
   senderId: string;
@@ -35,4 +34,18 @@ export class MessageLiveDataSourceService {
 
   }
 
+  listenToMessages() {
+    return this.messageLiveSignalRDataSourceService.getMessage()
+  }
+
+
+  listenToDeleteMessages() {
+    return this.messageLiveSignalRDataSourceService.getMessageDelete()
+  }
+
+
+  listenToUpdateMessages() {
+    return this.messageLiveSignalRDataSourceService.getMessageUpdate()
+  }
+
 }

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

@@ -1,13 +1,13 @@
 import { Injectable } from '@angular/core';
-import { Dexie, EntityTable, liveQuery } from 'Dexie';
+import { liveQuery } from 'Dexie';
 import { err, ok, Result } from 'neverthrow';
-import { from, Observable, Subject } from 'rxjs';
+import { Observable, Subject } from 'rxjs';
 import { filter } from 'rxjs/operators';
-import { MessageInputDTO } from '../../dto/message/messageInputDtO';
 import { MessageEntity } from '../../../domain/entity/message';
 import { DexieRepository } from 'src/app/infra/repository/dexie/dexie-repository.service';
 import { MessageTable } from 'src/app/module/chat/infra/database/dexie/schema/message';
 import { chatDatabase } from '../../../infra/database/dexie/service';
+import { Observable as  DexieObservable, PromiseExtended } from 'Dexie';
 
 @Injectable({
   providedIn: 'root'
@@ -61,7 +61,7 @@ export class MessageLocalDataSourceService extends DexieRepository<MessageTable>
   }
 
 
-  async sendMessage(data: MessageInputDTO) {
+  async sendMessage(data: MessageTable) {
 
     (data as MessageTable).sending = true
 
@@ -76,9 +76,8 @@ export class MessageLocalDataSourceService extends DexieRepository<MessageTable>
   }
 
 
-
  //  @ValidateSchema(tableSchema)
-  async createMessage(data: MessageInputDTO) {
+  async createMessage(data: MessageTable) {
 
     try {
       const result = await chatDatabase.message.add(data)
@@ -90,7 +89,7 @@ export class MessageLocalDataSourceService extends DexieRepository<MessageTable>
 
   }
 
-  async createManyMessage(data: MessageInputDTO[]) {
+  async createManyMessage(data: MessageTable[]) {
 
     try {
       const result = await chatDatabase.message.bulkAdd(data)
@@ -147,12 +146,12 @@ export class MessageLocalDataSourceService extends DexieRepository<MessageTable>
     }
   }
 
-  getItems(roomId: string) {
-    return  chatDatabase.message.where('roomId').equals(roomId).toArray()
+  getItems(roomId: string): PromiseExtended<MessageEntity[]> {
+    return chatDatabase.message.where('roomId').equals(roomId).sortBy('$id') as any
   }
 
-  getItemsLive(roomId: string) {
-    return liveQuery(() => chatDatabase.message.where('roomId').equals(roomId).sortBy('$id'))
+  getItemsLive(roomId: string): DexieObservable<MessageEntity[]> {
+    return liveQuery(() => chatDatabase.message.where('roomId').equals(roomId).sortBy('$id') as any)
   }
 
 

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

@@ -0,0 +1,11 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class MessageMemoryDataSourceService {
+
+  messages: {[roomId: string]: string[]} = {}
+
+  constructor() {}
+}

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

@@ -31,4 +31,10 @@ export class MessageRemoteDataSourceService {
     return await this.httpService.get(`${this.baseUrl}/Room/${id}/Messages`);
   }
 
+
+  @APIReturn(MessageOutPutDTOSchema, 'get/Messages/attachment')
+  async getAttachment(id: string): DataSourceReturn<MessageOutPutDTO>  {
+    return await this.httpService.get(`${this.baseUrl}/attachment/${id}`);
+  }
+
 }

src/app/module/chat/data/data-source/room/room-live-data-source.service.ts

@@ -1,13 +1,15 @@
 import { Injectable } from '@angular/core';
-import { WebSocketMessage, WebSocketService } from '../../../infra/socket/socket';
-import { err, ok } from 'neverthrow';
-
+import { SignalRService } from '../../../infra/socket/signal-r.service';
+import { AddMemberToRoomInputDTO } from '../../dto/room/addMemberToRoomInputDto';
+import { v4 as uuidv4 } from 'uuid'
 @Injectable({
   providedIn: 'root'
 })
 export class RoomLiveDataSourceService {
 
-  // constructor(private socket: WebSocketService) {}
+  constructor(
+    private socket: SignalRService,
+  ) {}
 
   // async getRoomById(data: WebSocketMessage) {
 
@@ -24,4 +26,19 @@ export class RoomLiveDataSourceService {
 
   // }
 
+  async addMemberToRoom(data: AddMemberToRoomInputDTO) {
+
+    const result = await this.socket.sendData({
+      method: 'AddRoomMember',
+      data: {
+        requestId: uuidv4(),
+        roomId: data.id,
+        members: data.members
+      }
+    })
+
+    console.log({result})
+
+    return result
+  }
 }

src/app/module/chat/data/data-source/userTyping/user-typing-local-data-source.service.ts

@@ -12,9 +12,20 @@ import { TypingTable } from '../../../infra/database/dexie/schema/typing';
 })
 export class UserTypingLocalDataSourceService {
 
-  constructor() { }
+  constructor() { 
+    this.clear();
+  }
 
 
+  async clear() {
+    try {
+      const result = await chatDatabase.typing.clear()
+      return ok(result)
+    } catch (e) {
+      return err(false)
+    }
+  }
+
   async addUserTyping(data: TypingTable) {
 
     data.id = data.chatRoomId + '@' + data.userName

src/app/module/chat/data/dto/message/messageInputDtO.ts

@@ -10,14 +10,15 @@ export const MessageInputDTOSchema = z.object({
   oneShot: z.boolean(),
   requireUnlock: z.boolean(),
   requestId: z.string(),
-  attachments: z.array(z.object({
+  attachment: z.object({
     fileType: z.nativeEnum(MessageAttachmentFileType),
     source: z.nativeEnum(MessageAttachmentSource),
     file: z.string(),
     fileName: z.string(),
     applicationId: z.string(),
-    docId: z.string()
-  })).optional()
+    docId: z.string(),
+    mimeType: z.string().optional()
+  }).optional()
 });
 
 

src/app/module/chat/data/dto/message/messageOutputDTO.ts

@@ -24,7 +24,6 @@ export const MessageOutPutDataDTOSchema = z.object({
   message: z.string().nullable(),
   messageType: z.number(),
   sentAt: z.string(),
-  deliverAt: z.string().datetime().nullable(),
   canEdit: z.boolean(),
   oneShot: z.boolean(),
   requireUnlock: z.boolean(),
@@ -39,10 +38,11 @@ export const MessageOutPutDataDTOSchema = z.object({
   attachments: z.array(z.object({
     fileType: z.nativeEnum(MessageAttachmentFileType),
     source: z.nativeEnum(MessageAttachmentSource),
-    file: z.string(),
-    fileName: z.string(),
+    file: z.string().optional(),
+    fileName: z.string().optional(),
     applicationId: z.string().optional(),
-    docId: z.string().optional()
+    docId: z.string().optional(),
+    id: z.string()
   }))
 });
 

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

@@ -1,7 +1,5 @@
 import { Injectable } from '@angular/core';
 import { MessageRemoteDataSourceService } from '../data-source/message/message-remote-data-source.service';
-import { MessageLiveDataSourceService } from '../data-source/message/message-live-data-source.service';
-import { MessageLocalDataSourceService } from '../data-source/message/message-local-data-source.service';
 import { SessionStore } from 'src/app/store/session.service';
 import { SignalRService } from '../../infra/socket/signal-r.service';
 import { v4 as uuidv4 } from 'uuid'
@@ -14,7 +12,10 @@ import { InstanceId } from '../../domain/chat-service.service';
 import { MessageMapper } from '../../domain/mapper/messageMapper';
 import { MessageOutPutDataDTO } from '../dto/message/messageOutputDTO';
 import { MessageTable } from 'src/app/module/chat/infra/database/dexie/schema/message';
-
+import { MessageLocalDataSourceService } from '../data-source/message/message-local-data-source.service';
+import { MessageLiveDataSourceService } from '../data-source/message/message-live-signalr-data-source.service';
+import { AttachmentLocalDataSourceService } from 'src/app/module/chat/data/data-source/attachment/message-local-data-source.service'
+import { Subject } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
@@ -25,7 +26,8 @@ export class MessageRepositoryService {
     private messageRemoteDataSourceService: MessageRemoteDataSourceService,
     private messageLiveDataSourceService: MessageLiveDataSourceService,
     private messageLiveSignalRDataSourceService: SignalRService,
-    private messageLocalDataSourceService: MessageLocalDataSourceService
+    private messageLocalDataSourceService: MessageLocalDataSourceService,
+    private AttachmentLocalDataSourceService: AttachmentLocalDataSourceService
   ) {}
 
 
@@ -37,17 +39,30 @@ export class MessageRepositoryService {
 
   }
 
-  async sendMessage(entity: MessageEntity) {
 
-    const requestId = InstanceId +'@'+ uuidv4();
+  async createMessage(entity: MessageEntity) {
+    //const requestId = InstanceId +'@'+ uuidv4();
+
+    const localActionResult = await this.messageLocalDataSourceService.sendMessage(entity)
+
+    return localActionResult.map(e => {
+      entity.$id = e
+      return entity
+    })
+  }
+
+  async sendMessage(entity: MessageEntity) {
+    const messageSubject = new Subject<MessageTable | string>();
+
     const roomId = entity.roomId
 
     entity.sending = true
     const localActionResult = await this.messageLocalDataSourceService.sendMessage(entity)
 
     if(localActionResult.isOk()) {
-      const DTO = MessageMapper.fromDomain(entity, requestId)
+      const DTO = MessageMapper.fromDomain(entity, entity.requestId)
       const sendMessageResult = await this.messageLiveSignalRDataSourceService.sendMessage<MessageOutPutDataDTO>(DTO)
+      // return this sendMessageResult
 
       if(sendMessageResult.isOk()) {
 
@@ -62,6 +77,8 @@ export class MessageRepositoryService {
           $id : localActionResult.value
         }
 
+        // console.log('sendMessageResult.value', sendMessageResult.value)
+        // this.attachment(sendMessageResult.value.attachments[0].id)
         return this.messageLocalDataSourceService.update(localActionResult.value, {...clone, sending: false, roomId: entity.roomId})
       } else {
         await this.messageLocalDataSourceService.update(localActionResult.value, {sending: false, $id: localActionResult.value})
@@ -113,12 +130,14 @@ export class MessageRepositoryService {
 
     if(result.isOk()) {
 
-      const { addedItems, changedItems } = messageListDetermineChanges(result.value.data, localResult)
+      const { addedItems, changedItems, deletedItems } = messageListDetermineChanges(result.value.data, localResult)
+
+      console.log({addedItems, changedItems});
 
       for(const message of changedItems) {
         let clone: MessageTable = message
         clone.roomId = id
-        await this.messageLocalDataSourceService.findOrUpdate(clone)
+        this.messageLocalDataSourceService.findOrUpdate(clone)
       }
 
       for(const message of addedItems) {
@@ -126,7 +145,14 @@ export class MessageRepositoryService {
         clone.roomId = id
 
       }
-      await this.messageLocalDataSourceService.createManyMessage(addedItems.reverse())
+      this.messageLocalDataSourceService.createManyMessage(addedItems.reverse())
+
+
+      for(const message of deletedItems) {
+        this.messageLocalDataSourceService.deleteByMessageId(message.id)
+      }
+      
+
     }
     return result
   }
@@ -135,6 +161,10 @@ export class MessageRepositoryService {
     return this.messageLocalDataSourceService.getItemsLive(roomId)
   }
 
+  getItems (roomId: string) {
+    return this.messageLocalDataSourceService.getItems(roomId)
+  }
+
   subscribeToNewMessages(roomId: any) {
     return this.messageLocalDataSourceService.subscribeToNewMessage(roomId)
   }
@@ -147,4 +177,9 @@ export class MessageRepositoryService {
     })
   }
 
+
+  attachment(roomId: string) {
+    console.log('attachment')
+    return this.messageRemoteDataSourceService.getAttachment(roomId)
+  }
 }

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

@@ -16,6 +16,7 @@ import { MessageLiveDataSourceService } from '../data-source/message/message-liv
 import { MemberListUPdateStatusInputDTO } from '../../domain/use-case/socket/member-list-update-status-use-case.service';
 import { MemberSetAdminDTO } from '../../domain/use-case/member-admin-use-case.service';
 import { MemberListMapper } from '../../domain/mapper/memberLIstMapper';
+import { SignalRService } from '../../infra/socket/signal-r.service';
 
 
 function date(isoDateString) {
@@ -43,8 +44,7 @@ export class RoomRepositoryService {
     private roomRemoteDataSourceService: RoomRemoteDataSourceService,
     // private roomMemoryDataSourceService: Store<RoomRemoteDataSourceState>,
     private roomLocalDataSourceService: RoomLocalDataSourceService,
-    private roomLiveDataSourceService: RoomLiveDataSourceService,
-    private messageLiveDataSourceService: MessageLiveDataSourceService,
+    private roomLiveSignalRDataSourceService: RoomLiveDataSourceService,
   ) {}
 
   @captureAndReraiseAsync('RoomRepositoryService/list')
@@ -80,13 +80,13 @@ export class RoomRepositoryService {
               this.list()
             }, timeRemaining)
           }
-          
+
         }
       } catch (error) {
         console.log(error)
       }
 
-  
+
     }
     return result
   }
@@ -223,9 +223,12 @@ export class RoomRepositoryService {
 
   @captureAndReraiseAsync('RoomRepositoryService/addMemberToRoom')
   async addMemberToRoom(data: AddMemberToRoomInputDTO) {
-    const result = await this.roomRemoteDataSourceService.addMemberToRoom(data)
 
-    return result
+    return this.roomLiveSignalRDataSourceService.addMemberToRoom(data)
+
+    // const result = await this.roomRemoteDataSourceService.addMemberToRoom(data)
+
+    // return result
   }
 
   async updateMemberStatus(data: MemberListUPdateStatusInputDTO) {