reorganizde file path

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

@@ -5,10 +5,10 @@ import { SessionStore } from 'src/app/store/session.service';
 import { MessageDeleteInputDTO } from '../../dto/message/messageDeleteInputDTO';
 import { v4 as uuidv4 } from 'uuid'
 import { InstanceId } from '../../../domain/chat-service.service';
-import { MessageUpdateInput } from '../../../domain/use-case/message-update-by-id-use-case.service';
+import { MessageUpdateInput } from '../../../domain/use-case/message/message-update-by-id-use-case.service';
 import { MessageOutPutDataDTO } from '../../dto/message/messageOutputDTO';
 import { MessageInputDTO } from '../../dto/message/messageInputDtO';
-import { MessageReactionInput } from '../../../domain/use-case/message-reaction-by-id-use-case.service';
+import { MessageReactionInput } from '../../../domain/use-case/message/message-reaction-by-id-use-case.service';
 
 interface msgObj {
   roomId: string;
@@ -56,8 +56,8 @@ export class MessageSocketRepositoryService {
 
   async sendGroupMessage(data: MessageInputDTO) {
 
-    if(data['requestId']) {
-      data['requestId'] = InstanceId +'@'+ uuidv4();
+    if(!data.requestId) {
+      data.requestId = InstanceId +'@'+ uuidv4();
     }
 
     const result =  await this.socket.sendData<MessageOutPutDataDTO>({
@@ -70,8 +70,8 @@ export class MessageSocketRepositoryService {
 
   async sendDirectMessage(data: MessageInputDTO) {
 
-    if(data['requestId']) {
-      data['requestId'] = InstanceId +'@'+ uuidv4();
+    if(!data.requestId) {
+      data.requestId = InstanceId +'@'+ uuidv4();
     }
     const result =  await this.socket.sendData<MessageOutPutDataDTO>({
       method: 'SendDirectMessage',

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

@@ -14,7 +14,6 @@ import { Observable as  DexieObservable, PromiseExtended } from 'Dexie';
 })
 export class MessageLocalDataSourceService extends DexieRepository<MessageTable, MessageEntity>  {
 
-  messageSubject = new Subject();
 
   constructor() {
     super(chatDatabase.message, MessageTableSchema)
@@ -33,128 +32,6 @@ export class MessageLocalDataSourceService extends DexieRepository<MessageTable,
     }
   }
 
-  async getLastMessageByRoomId(roomId: string): Promise<Result<undefined|MessageTable, any>> {
-    try {
-      console.log({roomId})
-      const lastMessage = await chatDatabase.message
-        .where('roomId')
-        .equals(roomId)
-        .reverse()
-        .sortBy('id');
-
-      return ok(lastMessage[0]); // Get the last message
-    } catch (error) {
-      return err(error);
-    }
-  }
-
-  async deleteByMessageId(id: string): Promise<Result<undefined|number, any>> {
-    try {
-      console.log(id)
-      const lastMessage = await chatDatabase.message
-        .where('id')
-        .equals(id).delete()
-
-      return ok(lastMessage[0]); // Get the last message
-    } catch (error) {
-      return err(error);
-    }
-  }
-
-
-  async sendMessage(data: MessageTable) {
-
-    const dataValidation = MessageTableSchema.safeParse(data)
-    if(dataValidation.success) {
-
-      const safeData = dataValidation.data
-      safeData.sending = true
-
-      try {
-        const result = await chatDatabase.message.add(safeData)
-        this.messageSubject.next({roomId: safeData.roomId});
-        return ok(result as number)
-      } catch (e) {
-        return err(false)
-      }
-
-    } else {
-      console.log(dataValidation)
-      return err(dataValidation)
-    }
-  }
-
-
- //  @ValidateSchema(tableSchema)
-  async createMessage(data: MessageTable) {
-
-    try {
-      const result = await chatDatabase.message.add(data)
-      this.messageSubject.next({roomId: data.roomId});
-      return ok(result)
-    } catch (e) {
-      return err(false)
-    }
-
-  }
-
-  async createManyMessage(data: MessageTable[]) {
-
-    try {
-      const result = await chatDatabase.message.bulkAdd(data)
-      this.messageSubject.next({roomId: data[0].roomId});
-      return ok(result)
-    } catch (e) {
-      return err(false)
-    }
-
-  }
-
-  async messageExist({id}) {
-    try {
-
-      console.log({id});
-
-      const existingMessage = await chatDatabase.message
-      .where('id')
-      .equals(id)
-      .first();
-
-      if (existingMessage) {
-        return ok(existingMessage)
-      } else {
-        return err(false)
-      }
-
-    } catch (error) {
-      return err(false);
-    }
-
-  }
-
-  // not used
-  async updateByMessageId(data: MessageTable ) {
-
-    try {
-      const result = await chatDatabase.message.update(data.id as any, data)
-      return ok(result)
-    } catch (e) {
-      return err(false)
-    }
-
-  }
-
-
-  async findOrUpdate(data: MessageTable) {
-    const findResult = await this.findMessageById(data.id)
-
-    if(findResult.isOk()) {
-      return this.update(findResult.value.$id, data)
-    } else  {
-      return this.createMessage(data)
-    }
-  }
-
   getItems(roomId: string): PromiseExtended<MessageEntity[]> {
     return chatDatabase.message.where('roomId').equals(roomId).sortBy('$id') as any
   }
@@ -163,33 +40,6 @@ export class MessageLocalDataSourceService extends DexieRepository<MessageTable,
     return liveQuery(() => chatDatabase.message.where('roomId').equals(roomId).sortBy('$id') as any)
   }
 
-
-  async findMessageById(id: string) {
-    try {
-      const a = await chatDatabase.message.where('id').equals(id).first()
-
-      if(a) {
-        return ok(a)
-      } else {
-        return err('not found')
-      }
-
-    } catch (e) {
-      return err('DB error')
-    }
-
-  }
-
-
-  subscribeToNewMessage(roomId: string): Observable<MessageTable>  {
-    return this.messageSubject.pipe(
-      filter((message: MessageTable) =>
-        message.roomId === roomId
-      )
-    )
-  }
-
-
   async getOfflineMessages () {
     try {
       const allMessages = await chatDatabase.message

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

@@ -6,7 +6,7 @@ import { APIReturn } from 'src/app/services/decorators/api-validate-schema.decor
 import { MessageOutPutDataDTOSchema, MessageOutPutDTO, MessageOutPutDTOSchema } from '../../dto/message/messageOutputDTO';
 import { DataSourceReturn } from 'src/app/services/Repositorys/type';
 import { SignalRService } from '../../../infra/socket/signal-r.service';
-import { MessageUpdateInput } from '../../../domain/use-case/message-update-by-id-use-case.service';
+import { MessageUpdateInput } from '../../../domain/use-case/message/message-update-by-id-use-case.service';
 import { SessionStore } from 'src/app/store/session.service';
 import { MessageDeleteInputDTO } from '../../dto/message/messageDeleteInputDTO';
 import { InstanceId } from '../../../domain/chat-service.service';
@@ -30,9 +30,9 @@ export class MessageRemoteDataSourceService {
     return await this.httpService.post<MessageOutPutDTO>(`${this.baseUrl}/Messages`, data);
   }
 
-  async reactToMessage(id: string, reaction: any) {
-    return await this.httpService.post<any>(`${this.baseUrl}/Messages/${id}/React`, reaction);
-  }
+  // async reactToMessage(id: string, reaction: any) {
+  //   return await this.httpService.post<any>(`${this.baseUrl}/Messages/${id}/React`, reaction);
+  // }
 
 
   // @APIReturn(MessageOutPutDTOSchema, 'get/Messages')