fix donwload attachment and modal to edit message

src/app/module/chat/chat.module.ts

@@ -7,10 +7,30 @@ import { Subject, timer } from 'rxjs';
 import { UserTypingLocalRepository } from './data/repository/typing/user-typing-local-data-source.service';
 import { UserTypingRemoteRepositoryService } from './data/repository/typing/user-typing-live-data-source.service';
 import { RoomService } from 'src/app/module/chat/domain/service/room.service'
-import { HttpListenToMessageLoadHistoryAdapter, SocketOnReconnectAdapter } from './domain/adapter';
+import { HttpListenToMessageLoadHistoryAdapter } from './domain/adapter';
 import { ISignalRService } from 'src/app/infra/socket/adapter';
 import { HttpModule } from 'src/app/infra/http/http.module';
 import { HttpListenToMessageLoadHistoryUseCase } from 'src/app/core/chat/usecase/message/http-listen-to-message-load-history-use-case';
+import { IMessageLocalRepository } from 'src/app/core/chat/repository/message/message-local-repository';
+import { MessageLocalDataSourceService } from './data/repository/message/message-local-data-source.service';
+import { MessageRemoteDataSourceService } from './data/repository/message/message-remote-data-source.service';
+import { IMessageRemoteRepository } from 'src/app/core/chat/repository/message/message-remote-repository';
+import { IMessageSocketRepository } from 'src/app/core/chat/repository/message/message-socket-repository';
+import { MessageSocketRepositoryService } from './data/repository/message/message-live-signalr-data-source.service';
+import { MemberListLocalRepository } from './data/repository/member/member-list-local-repository.service';
+import { IMemberLocalRepository } from 'src/app/core/chat/repository/member/member-local-repository';
+import { MemberListRemoteRepository } from './data/repository/member/member-list-remote-repository.service';
+import { IMemberRemoteRepository } from 'src/app/core/chat/repository/member/member-remote-repository';
+import { IRoomLocalRepository } from 'src/app/core/chat/repository/room/room-local-repository';
+import { RoomLocalRepository } from './data/repository/room/room-local-repository.service';
+import { RoomRemoteDataSourceService } from './data/repository/room/room-remote-repository.service';
+import { IRoomRemoteRepository } from 'src/app/core/chat/repository/room/room-remote-repository';
+import { RoomSocketRepositoryService } from './data/repository/room/room-socket-repository.service';
+import { IRoomSocketRepository } from 'src/app/core/chat/repository/room/room-socket-repository';
+import { IAttachmentLocalRepository } from 'src/app/core/chat/repository/typing/typing-local-repository';
+import { AttachmentLocalDataSource } from './data/repository/attachment/attachment-local-repository.service';
+import { IAttachmentRemoteRepository } from 'src/app/core/chat/repository/attachment/attachment-remote-repository';
+import { AttachmentRemoteDataSourceService } from './data/repository/attachment/attachment-remote-repository.service';
 @NgModule({
   imports: [HttpModule],
   providers: [
@@ -22,6 +42,50 @@ import { HttpListenToMessageLoadHistoryUseCase } from 'src/app/core/chat/usecase
       provide: HttpListenToMessageLoadHistoryAdapter,
       useClass: HttpListenToMessageLoadHistoryUseCase, // or MockDataService
     },
+    // message repository
+    {
+      provide: IMessageLocalRepository,
+      useClass: MessageLocalDataSourceService
+    },
+    {
+      provide: IMessageRemoteRepository,
+      useClass: MessageRemoteDataSourceService
+    },
+    {
+      provide: IMessageSocketRepository,
+      useClass: MessageSocketRepositoryService
+    },
+    // member repository
+    {
+      provide: IMemberLocalRepository,
+      useClass: MemberListLocalRepository
+    },
+    {
+      provide: IMemberRemoteRepository,
+      useClass: MemberListRemoteRepository
+    },
+    // room repository
+    {
+      provide: IRoomLocalRepository,
+      useClass: RoomLocalRepository
+    },
+    {
+      provide: IRoomRemoteRepository,
+      useClass: RoomRemoteDataSourceService
+    },
+    {
+      provide: IRoomSocketRepository,
+      useClass: RoomSocketRepositoryService
+    },
+    // attachment
+    {
+      provide: IAttachmentLocalRepository,
+      useClass: AttachmentLocalDataSource
+    },
+    {
+      provide: IAttachmentRemoteRepository,
+      useClass: AttachmentRemoteDataSourceService
+    },
   ],
   declarations: [],
   schemas: [],

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

@@ -1,8 +1,5 @@
 import { Injectable } from '@angular/core';
 import { liveQuery } from 'Dexie';
-import { err, ok, Result } from 'neverthrow';
-import { Observable, Subject } from 'rxjs';
-import { filter } from 'rxjs/operators';
 import { MessageEntity } from '../../../../../core/chat/entity/message';
 import { DexieRepository } from 'src/app/infra/repository/dexie/dexie-repository.service';
 import { Observable as  DexieObservable, PromiseExtended } from 'Dexie';

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

@@ -1,19 +1,21 @@
 import { Injectable } from '@angular/core';
 import { Result } from 'neverthrow';
 import { HttpService } from 'src/app/services/http.service';
-import { AddMemberToRoomInputDTO, AddMemberToRoomInputDTOSchema } from '../../../domain/use-case/member/member-add-use-case.service';
-import { ValidateSchema } from 'src/app/services/decorators/validate-schema.decorator';
-import { APIReturn } from 'src/app/services/decorators/api-validate-schema.decorator';
+import { AddMemberToRoomInputDTO } from '../../../domain/use-case/member/member-add-use-case.service';
 import { DataSourceReturn } from 'src/app/services/Repositorys/type';
 import { SessionStore } from 'src/app/store/session.service';
-import { MemberSetAdminDTO } from '../../../domain/use-case/member/member-admin-use-case.service';
 import { SignalRService } from 'src/app/infra/socket/signalR/signal-r.service';
 import { v4 as uuidv4 } from 'uuid'
-import { CreateRoomInputDTOSchema, CreateRoomInputDTO, RoomOutPutDTOSchema, RoomOutPutDTO } from '../../../domain/use-case/room/room-create-use-case.service';
+import { CreateRoomInputDTO, RoomOutPutDTO } from '../../../domain/use-case/room/room-create-use-case.service';
 import { IRoomRemoteRepository } from 'src/app/core/chat/repository/room/room-remote-repository';
-import { RoomByIdInputDTO, RoomByIdInputDTOSchema, RoomByIdOutputDTO, RoomByIdOutputDTOSchema } from 'src/app/module/chat/domain/use-case/room/room-get-by-id-use-case.service';
-import { RoomUpdateInputDTO, RoomUpdateInputDTOSchema, RoomUpdateOutputDTO } from 'src/app/module/chat/domain/use-case/room/room-update-by-id-use-case.service';
-import { RoomListOutPutDTO, RoomListOutPutDTOSchema } from '../../../domain/use-case/room/room-get-list-use-case.service';
+import { RoomByIdOutputDTO } from 'src/app/module/chat/domain/use-case/room/room-get-by-id-use-case.service';
+import { RoomUpdateInputDTO, RoomUpdateOutputDTO } from 'src/app/module/chat/domain/use-case/room/room-update-by-id-use-case.service';
+import { RoomListOutPutDTO } from '../../../domain/use-case/room/room-get-list-use-case.service';
+import { z } from 'zod';
+
+const RoomByIdInputDTOSchema =  z.string()
+type RoomByIdInputDTO = z.infer<typeof RoomByIdInputDTOSchema>
+
 
 @Injectable({
   providedIn: 'root'
@@ -28,25 +30,25 @@ export class RoomRemoteDataSourceService implements IRoomRemoteRepository {
   ) {}
 
 
-  @ValidateSchema(CreateRoomInputDTOSchema)
-  @APIReturn(RoomOutPutDTOSchema, 'post/Room')
+  //@ValidateSchema(CreateRoomInputDTOSchema)
+  //@APIReturn(RoomOutPutDTOSchema, 'post/Room')
   async createRoom(data: CreateRoomInputDTO): DataSourceReturn<RoomOutPutDTO> {
     return await this.httpService.post<RoomOutPutDTO>(`${this.baseUrl}/Room`, data);
   }
 
 
-  @APIReturn(RoomListOutPutDTOSchema, 'get/Room')
+  //@APIReturn(RoomListOutPutDTOSchema, 'get/Room')
   async getRoomList(): Promise<DataSourceReturn<RoomListOutPutDTO>> {
     return await this.httpService.get<RoomListOutPutDTO>(`${this.baseUrl}/Room?userId=${SessionStore.user.UserId}`);
   }
 
-  @ValidateSchema(RoomByIdInputDTOSchema)
-  @APIReturn(RoomByIdOutputDTOSchema,'get/Room/${id}')
+  //@ValidateSchema(RoomByIdInputDTOSchema)
+ //@APIReturn(RoomByIdOutputDTOSchema,'get/Room/${id}')
   async getRoom(id: RoomByIdInputDTO): DataSourceReturn<RoomByIdOutputDTO> {
     return await this.httpService.get(`${this.baseUrl}/Room/${id}`);
   }
 
-  @ValidateSchema(RoomUpdateInputDTOSchema)
+  //@ValidateSchema(RoomUpdateInputDTOSchema)
   //@APIReturn(RoomByIdOutputDTOSchema,'update/Room/${id}')
   async updateRoom(data: RoomUpdateInputDTO): Promise<DataSourceReturn<RoomUpdateOutputDTO>> {
     const id = data.roomId

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

@@ -9,7 +9,7 @@ import { SignalRService } from 'src/app/infra/socket/signalR/signal-r.service';
 import { SocketMessageDeleteUseCaseService } from 'src/app/module/chat/domain/use-case/socket/socket-message-delete-use-case.service';
 import { SocketMessageUpdateUseCaseService } from 'src/app/module/chat/domain/use-case/socket/socket-message-update-use-case.service';
 import { SocketMessageCreateUseCaseService } from 'src/app/module/chat/domain/use-case/socket/socket-message-create-use-case.service';
-import { DownloadMessageAttachmentUserCaseService } from 'src/app/module/chat/domain/use-case/message/message-download-attachment-user-case.service';
+import { DownloadMessageAttachmentByMessageId, DownloadMessageAttachmentUserCaseService } from 'src/app/module/chat/domain/use-case/message/message-download-attachment-user-case.service';
 import { ListenMessageByRoomIdNewUseCase } from 'src/app/module/chat/domain/use-case/message/listen-message-by-roomId.service';
 import { MemberListUpdateStatusUseCaseService } from 'src/app/module/chat/domain/use-case/socket/member-list-update-status-use-case.service';
 import { ListenMessageDeleteByRoomIdService } from './use-case/message/listene-message-delete-by-roomId.service';
@@ -27,7 +27,7 @@ import { RoomUpdateInputDTO, UpdateRoomByIdUseCaseService } from './use-case/roo
 import { SocketConnectUseCaseService } from './use-case/socket-connect-use-case.service'
 import { MessageMarkAsReadUseCaseService } from './use-case/message/message-mark-as-read-use-case.service'
 import { MessageMarkAllMessageAsReadByRoomIdInputSchema, MessageMarkAllMessageAsReadByRoomIdService } from './use-case/message/message-mark-all-message-as-read-by-room-id.service'
-import { GetMessageAttachmentLocallyUseCaseService } from 'src/app/module/chat/domain/use-case/message/message-get-attachment-localy-use-case.service';
+import { GetMessageAttachmentLocallyByMessageId, GetMessageAttachmentLocallyUseCaseService } from 'src/app/module/chat/domain/use-case/message/message-get-attachment-localy-use-case.service';
 import { GetRoomListUseCaseService } from 'src/app/module/chat/domain/use-case/room/room-get-list-use-case.service';
 import { filter } from 'rxjs/operators';
 import { v4 as uuidv4 } from 'uuid'
@@ -174,13 +174,13 @@ export class ChatServiceService {
     return this.MessageAttachmentByMessageIdService.execute(input)
   }
 
-  downloadMessageAttachmentByMessageId(input: MessageAttachmentByMessageIdInput) {
+  downloadMessageAttachmentByMessageId(input: DownloadMessageAttachmentByMessageId) {
     return this.DownloadMessageAttachmentUserCaseService.execute(input)
   }
 
-  getMessageAttachmentLocallyByMessageId(input: MessageAttachmentByMessageIdInput) {
-    return this.GetMessageAttachmentLocallyUseCaseService.execute(input)
-  }
+  // getMessageAttachmentLocallyByMessageId(input: GetMessageAttachmentLocallyByMessageId) {
+  //   return this.GetMessageAttachmentLocallyUseCaseService.execute(input)
+  // }
 
 
   listenToMessageLoadHistory(input: HttpListenToMessageLoadHistoryUseCaseInput) {

src/app/module/chat/domain/use-case/member/member-add-use-case.service.ts

@@ -1,8 +1,7 @@
 import { Injectable } from '@angular/core';
 import { captureAndReraiseAsync } from 'src/app/services/decorators/captureAndReraiseAsync';
-import { RoomRemoteDataSourceService } from '../../../data/repository/room/room-remote-repository.service';
 import { z } from 'zod';
-import { MemberListRemoteRepository } from '../../../data/repository/member/member-list-remote-repository.service';
+import { IMemberRemoteRepository } from 'src/app/core/chat/repository/member/member-remote-repository';
 
 
 export const AddMemberToRoomInputDTOSchema = z.object({
@@ -19,7 +18,7 @@ export type AddMemberToRoomInputDTO = z.infer<typeof AddMemberToRoomInputDTOSche
 export class AddMemberUseCaseService {
 
   constructor(
-    private memberRemoteDataSourceService: MemberListRemoteRepository,
+    private memberRemoteDataSourceService: IMemberRemoteRepository,
   ) { }
 
 

src/app/module/chat/domain/use-case/member/member-admin-use-case.service.ts

@@ -1,8 +1,7 @@
 import { Injectable } from '@angular/core';
 import { z } from "zod";
 import { ValidateSchema } from 'src/app/services/decorators/validate-schema.decorator';
-import { RoomRemoteDataSourceService } from '../../../data/repository/room/room-remote-repository.service';
-import { MemberListRemoteRepository } from '../../../data/repository/member/member-list-remote-repository.service';
+import { IMemberRemoteRepository } from 'src/app/core/chat/repository/member/member-remote-repository';
 
 // Define the schema for the entire response
 const MemberSetAdminDTOSchema = z.object({
@@ -19,7 +18,7 @@ export type MemberSetAdminDTO = z.infer<typeof MemberSetAdminDTOSchema>
 export class MemberAdminUseCaseService {
 
   constructor(
-    public repository: MemberListRemoteRepository
+    public repository: IMemberRemoteRepository
   ) { }
 
   @ValidateSchema(MemberSetAdminDTOSchema)

src/app/module/chat/domain/use-case/message/listen-message-by-roomId.service.ts

@@ -1,9 +1,9 @@
 import { Injectable } from '@angular/core';
 import { filter, map } from 'rxjs/operators';
 import { InstanceId } from '../../chat-service.service';
-import { MessageSocketRepositoryService } from 'src/app/module/chat/data/repository/message/message-live-signalr-data-source.service'
 import { MessageEntity } from '../../../../../core/chat/entity/message';
 import { z } from 'zod';
+import { IMessageSocketRepository } from 'src/app/core/chat/repository/message/message-socket-repository';
 
 
 export const ListenMessageByRoomIdNewInputDTOSchema = z.object({
@@ -18,7 +18,7 @@ export type ListenMessageByRoomIdNewInputDTO = z.infer<typeof ListenMessageByRoo
 export class ListenMessageByRoomIdNewUseCase {
 
   constructor(
-    private MessageSocketRepositoryService: MessageSocketRepositoryService
+    private MessageSocketRepositoryService: IMessageSocketRepository
   ) { }
 
   execute(data: ListenMessageByRoomIdNewInputDTO) {

src/app/module/chat/domain/use-case/message/listen-message-update-by-roomId.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { filter } from 'rxjs/operators';
-import { MessageSocketRepositoryService } from '../../../data/repository/message/message-live-signalr-data-source.service';
 import { z } from 'zod';
+import { IMessageSocketRepository } from 'src/app/core/chat/repository/message/message-socket-repository';
 
 export const ListenMessageUpdateByRoomIdInputDTOSchema = z.object({
   roomId: z.string(),
@@ -16,7 +16,7 @@ export type ListenMessageUpdateByRoomIdInputDTO = z.infer<typeof ListenMessageUp
 export class ListenMessageUpdateByRoomIdUseCase {
 
   constructor(
-    private messageLiveSignalRDataSourceService: MessageSocketRepositoryService,
+    private messageLiveSignalRDataSourceService: IMessageSocketRepository,
   ) { }
 
   execute(input: ListenMessageUpdateByRoomIdInputDTO) {

src/app/module/chat/domain/use-case/message/message-attachment-by-message-id.service.ts

@@ -2,14 +2,16 @@ import { Injectable } from '@angular/core';
 import { z } from 'zod';
 import { AttachmentRemoteDataSourceService } from 'src/app/module/chat/data/repository/attachment/attachment-remote-repository.service'
 import { AttachmentLocalDataSource } from 'src/app/module/chat/data/repository/attachment/attachment-local-repository.service'
-import { convertBlobToDataURL } from 'src/app/utils/ToBase64';
-import { Result } from 'neverthrow';
+import { createBlobUrl } from 'src/app/utils/ToBase64';
+import { err, Result } from 'neverthrow';
 import { Logger } from 'src/app/services/logger/main/service';
 import { MessageEntity } from '../../../../../core/chat/entity/message';
+import { AttachmentTableSchema } from 'src/app/infra/database/dexie/instance/chat/schema/attachment';
+import { XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer';
 
-const MessageAttachmentByMessageIdSchema = z.object({
-  $messageId: z.number(),
-  id: z.string()
+const MessageAttachmentByMessageIdSchema = AttachmentTableSchema.pick({
+  $messageId: true,
+  id: true
 })
 
 export type MessageAttachmentByMessageIdInput = z.infer<typeof MessageAttachmentByMessageIdSchema>
@@ -24,6 +26,7 @@ export class MessageAttachmentByMessageIdUseCase {
     private AttachmentLocalDataSource: AttachmentLocalDataSource
   ) { }
 
+  @XTracerAsync({name:'Message-Attachment-By-MessageIdUseCase', module:'chat',  bugPrint: true, waitNThrow: 15000})
   async execute(input: MessageEntity): Promise<Result<string, any>> {
 
     const getLocalAttachment = await this.AttachmentLocalDataSource.findOne({
@@ -31,10 +34,31 @@ export class MessageAttachmentByMessageIdUseCase {
     })
 
     if(getLocalAttachment.isOk() && getLocalAttachment.value) {
-      if(getLocalAttachment.value) {
-        return getLocalAttachment.map(e => e.file)
+
+      // has blob
+      if(getLocalAttachment.value.file) {
+        const dataUrl = await createBlobUrl(getLocalAttachment.value.file)
+
+        if(dataUrl.isOk()) {
+          return dataUrl
+        } else {
+          return dataUrl
+        }
+      } else {
+        // has data url
+        return getLocalAttachment.map((e) => {
+          
+          // Logger.info('restored file .', {
+          //   data: e.base64.slice(0, 100)+'...'
+          // })
+
+          return e.base64
+        })
       }
+
+      
     } else {
+      console.log('donwload')
       const result = await this.AttachmentRemoteDataSourceService.getAttachment(input.attachments[0].id)
 
       if(result.isErr()) {
@@ -46,33 +70,48 @@ export class MessageAttachmentByMessageIdUseCase {
         })
       }
 
-      return result.asyncMap(async (e) => {
 
-        const dataUrl = await convertBlobToDataURL(e)
-        // Logger.info('downloaded file .', {
-        //   data: dataUrl.slice(0, 100)+'...'
-        // })
+      if(result.isOk()) {
 
-        this.AttachmentLocalDataSource.insert({
-          $messageId: input.$id,
-          file: dataUrl,
-          fileType: input.attachments[0].fileType,
-          source: input.attachments[0].source,
-          fileName: input.attachments[0].fileName,
-          applicationId: input.attachments[0].applicationId,
-          docId: input.attachments[0].docId,
-          mimeType: input.attachments[0].mimeType,
-        }).then((e) => {
-          if(e.isErr()) {
-            Logger.error('failed to create attachment locally on send message', {
-              error: e.error,
-              data: dataUrl.slice(0, 100)+'...'
-            })
-          }
-        })
+        console.log('convert')
+        const dataUrl = await createBlobUrl(result.value)
+
+        if(dataUrl.isOk()) {
+
+          //console.log('done convert')
+          Logger.info('downloaded file .', {
+            // data: dataUrl.value.slice(0, 100)+'...'
+          })
+
+          this.AttachmentLocalDataSource.insert({
+            $messageId: input.$id,
+            file: result.value,
+            fileType: input.attachments[0].fileType,
+            source: input.attachments[0].source,
+            fileName: input.attachments[0].fileName,
+            applicationId: input.attachments[0].applicationId,
+            docId: input.attachments[0].docId,
+            mimeType: input.attachments[0].mimeType,
+          }).then((e) => {
+            if(e.isErr()) {
+              Logger.error('failed to create attachment locally on send message', {
+                error: e.error,
+                // data: dataUrl.value.slice(0, 100)+'...'
+              })
+            }
+          })
+
+          return dataUrl
+        } else {
+          console.log('dataUrl eerror', dataUrl.error)
+          return err(false)
+        }
+
+
+      } else {
+        return result as any
+      }
 
-        return dataUrl
-      })
     }
 
   }

src/app/module/chat/domain/use-case/message/message-create-use-case.service.ts

@@ -4,11 +4,9 @@ import { AttachmentLocalDataSource } from "src/app/module/chat/data/repository/a
 import { z } from 'zod';
 import { v4 as uuidv4 } from 'uuid';
 import { InstanceId } from '../../chat-service.service';
-import { createDataURL } from 'src/app/utils/ToBase64';
+import { createBlobFromBase64, createDataURL } from 'src/app/utils/ToBase64';
 import { zodSafeValidation } from 'src/app/utils/zodValidation';
 import { Logger } from 'src/app/services/logger/main/service';
-import { MessageLocalDataSourceService } from '../../../data/repository/message/message-local-data-source.service';
-import { MessageSocketRepositoryService } from '../../../data/repository/message/message-live-signalr-data-source.service';
 import { err, Result } from 'neverthrow';
 import { MessageMapper } from '../../mapper/messageMapper';
 import { RoomType } from "src/app/core/chat/entity/group";
@@ -17,6 +15,10 @@ import { MemberListLocalRepository } from 'src/app/module/chat/data/repository/m
 import { SessionStore } from 'src/app/store/session.service';
 import { MessageTable } from 'src/app/infra/database/dexie/instance/chat/schema/message';
 import { MessageAttachmentFileType, MessageOutPutDataDTO } from 'src/app/core/chat/repository/dto/messageOutputDTO';
+import { IMessageLocalRepository } from 'src/app/core/chat/repository/message/message-local-repository';
+import { IMessageSocketRepository } from 'src/app/core/chat/repository/message/message-socket-repository';
+import { IMemberLocalRepository } from 'src/app/core/chat/repository/member/member-local-repository';
+import { IAttachmentLocalRepository } from 'src/app/core/chat/repository/typing/typing-local-repository';
 
 
 export enum MessageEnum {
@@ -71,11 +73,10 @@ export type MessageCreateOutPutDataDTO = z.infer<typeof MessageCreatePutDataDTOS
 export class MessageCreateUseCaseService {
 
   constructor(
-    private AttachmentLocalRepositoryService: AttachmentLocalDataSource,
-    private messageLocalDataSourceService: MessageLocalDataSourceService,
-    private MessageSocketRepositoryService: MessageSocketRepositoryService,
-    private messageSocketRepositoryService: MessageSocketRepositoryService,
-    private MemberListLocalRepository: MemberListLocalRepository
+    private AttachmentLocalRepositoryService: IAttachmentLocalRepository,
+    private messageLocalDataSourceService: IMessageLocalRepository,
+    private messageSocketRepositoryService: IMessageSocketRepository,
+    private MemberListLocalRepository: IMemberLocalRepository
   ) { }
 
 
@@ -104,7 +105,7 @@ export class MessageCreateUseCaseService {
 
               this.AttachmentLocalRepositoryService.insert({
                 $messageId: createMessageLocally.value,
-                file: createDataURL(attachment.file, attachment.mimeType),
+                base64: createDataURL(attachment.file, attachment.mimeType),
                 fileType: attachment.fileType,
                 source: attachment.source,
                 fileName: attachment.fileName,
@@ -133,7 +134,7 @@ export class MessageCreateUseCaseService {
         let sendMessageResult: Result<MessageOutPutDataDTO, any>
         if(messageEnum == RoomType.Group) {
           const DTO = MessageMapper.fromDomain(message, message.requestId)
-          sendMessageResult = await this.MessageSocketRepositoryService.sendGroupMessage(DTO)
+          sendMessageResult = await this.messageSocketRepositoryService.sendGroupMessage(DTO)
         } else {
 
           if(message.receiverId) {
@@ -182,6 +183,10 @@ export class MessageCreateUseCaseService {
           return err('no connection')
         }
 
+      } else {
+        Logger.error('failed to insert locally', {
+          error: createMessageLocally.error
+        })
       }
     } else {
 

src/app/module/chat/domain/use-case/message/message-download-attachment-user-case.service.ts

@@ -1,9 +1,16 @@
 import { Injectable } from '@angular/core';
 import { AttachmentRemoteDataSourceService } from 'src/app/module/chat/data/repository/attachment/attachment-remote-repository.service'
 import { Logger } from 'src/app/services/logger/main/service';
-import { convertBlobToDataURL } from 'src/app/utils/ToBase64';
+import { convertBlobToDataURL, createBlobUrl } from 'src/app/utils/ToBase64';
 import { AttachmentLocalDataSource } from 'src/app/module/chat/data/repository/attachment/attachment-local-repository.service'
-import { MessageAttachmentByMessageIdInput } from './message-attachment-by-message-id.service';
+import { z } from 'zod';
+
+const DownloadMessageAttachmentByMessageIdSchema = z.object({
+  $messageId: z.number(),
+  id: z.string()
+})
+
+export type DownloadMessageAttachmentByMessageId = z.infer<typeof DownloadMessageAttachmentByMessageIdSchema>
 
 
 @Injectable({
@@ -16,23 +23,29 @@ export class DownloadMessageAttachmentUserCaseService {
     private AttachmentLocalDataSource: AttachmentLocalDataSource
   ) { }
 
-  async execute(input: MessageAttachmentByMessageIdInput) {
+  async execute(input: DownloadMessageAttachmentByMessageId) {
     const result = await this.AttachmentRemoteDataSourceService.getAttachment(input.$messageId)
-    return result.asyncMap(async (e) => {
+    return result.asyncMap(async (blob) => {
 
-      const dataUrl = await convertBlobToDataURL(e)
-      Logger.info('downloaded file #1', {
-        data: dataUrl.slice(0, 100)+'...',
-        context: 'DownloadMessageAttachmentUserCaseService'
-      })
+      const dataUrl = await createBlobUrl(blob)
 
-      this.AttachmentLocalDataSource.insert({
-        $messageId: input.$messageId,
-        id: input.id,
-        file: dataUrl
-      })
+      if(dataUrl.isOk()) {
+          
+        Logger.info('downloaded file #1', {
+          // data: dataUrl.slice(0, 100)+'...',
+          context: 'DownloadMessageAttachmentUserCaseService'
+        })
 
-      return dataUrl
+        this.AttachmentLocalDataSource.insert({
+          $messageId: input.$messageId,
+          id: input.id,
+          file: blob
+        })
+
+        return dataUrl
+      } else {
+
+      }
     })
   }
 }

src/app/module/chat/domain/use-case/message/message-get-attachment-localy-use-case.service.ts

@@ -3,6 +3,17 @@ import { MessageAttachmentByMessageIdInput } from './message-attachment-by-messa
 import { AttachmentRemoteDataSourceService } from 'src/app/module/chat/data/repository/attachment/attachment-remote-repository.service'
 import { AttachmentLocalDataSource } from 'src/app/module/chat/data/repository/attachment/attachment-local-repository.service'
 import { err, Result } from 'neverthrow';
+import { AttachmentTableSchema } from 'src/app/infra/database/dexie/instance/chat/schema/attachment';
+import { z } from 'zod';
+import { createBlobUrl } from 'src/app/utils/ToBase64';
+
+const GetMessageAttachmentLocallyByMessageIdSchema = AttachmentTableSchema.pick({
+  $messageId: true
+})
+
+export type GetMessageAttachmentLocallyByMessageId = z.infer<typeof GetMessageAttachmentLocallyByMessageIdSchema>
+
+
 
 @Injectable({
   providedIn: 'root'
@@ -15,7 +26,7 @@ export class GetMessageAttachmentLocallyUseCaseService {
   ) { }
 
 
-  async execute(input: MessageAttachmentByMessageIdInput): Promise<Result<string, any>> {
+  async execute(input: GetMessageAttachmentLocallyByMessageId): Promise<Result<string, any>> {
 
     const getLocalAttachment = await this.AttachmentLocalDataSource.findOne({
       $messageId: input.$messageId
@@ -23,7 +34,9 @@ export class GetMessageAttachmentLocallyUseCaseService {
 
     if(getLocalAttachment.isOk()) {
       if(getLocalAttachment.value) {
-        return getLocalAttachment.map(e => e.file)
+        const dataUrl = await createBlobUrl(getLocalAttachment.value.file)
+
+        return dataUrl
       }
     } else  {
       return err(getLocalAttachment.error) 

src/app/module/chat/domain/use-case/message/messages-send-offline-use-case.service.ts

@@ -53,7 +53,7 @@ export class SendLocalMessagesUseCaseService {
             id: e.id,
             mimeType: e.mimeType,
             description: e.description,
-            file: e.file.split(',')[1]
+            file: e.base64.split(',')[1]
           }))
           console.log('to upload', messages)
           const requestId = InstanceId +'@'+ uuidv4();

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

@@ -87,7 +87,6 @@ export class SyncAllRoomMessagesService {
             // }
           }
 
-
         this.messageLocalDataSourceService.insertMany(addedItems.reverse())
 
         } else {

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

@@ -1,10 +1,10 @@
 import { Injectable } from '@angular/core';
 import { SessionStore } from 'src/app/store/session.service';
-import { RoomRemoteDataSourceService } from '../../../data/repository/room/room-remote-repository.service';
-import { RoomSocketRepositoryService } from '../../../data/repository/room/room-socket-repository.service';
-import { RoomLocalRepository } from '../../../data/repository/room/room-local-repository.service';
 import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer';
 import { z } from "zod";
+import { IRoomRemoteRepository } from 'src/app/core/chat/repository/room/room-remote-repository';
+import { IRoomLocalRepository } from 'src/app/core/chat/repository/room/room-local-repository';
+import { IRoomSocketRepository } from 'src/app/core/chat/repository/room/room-socket-repository';
 
 export const CreateRoomInputDTOSchema = z.object({
   roomName: z.string(),
@@ -36,9 +36,9 @@ export type RoomOutPutDTO = z.infer<typeof RoomOutPutDTOSchema>
 export class CreateRoomUseCaseService {
 
   constructor(
-    private roomRemoteDataSourceService: RoomRemoteDataSourceService,
-    private roomLocalDataSourceService: RoomLocalRepository,
-    private RoomSocketRepositoryService: RoomSocketRepositoryService
+    private roomRemoteDataSourceService: IRoomRemoteRepository,
+    private roomLocalDataSourceService: IRoomLocalRepository,
+    private RoomSocketRepositoryService: IRoomSocketRepository
   ) { }
 
   @XTracerAsync({name:'room-create-use-case.service', module:'chat',  bugPrint: true, waitNThrow: 5000})

src/app/module/chat/domain/use-case/room/room-delete-by-id-use-case.service.ts

@@ -1,9 +1,9 @@
 import { Injectable } from '@angular/core';
 import { captureAndReraiseAsync } from 'src/app/services/decorators/captureAndReraiseAsync';
 import { isHttpResponse } from 'src/app/services/http.service';
-import { RoomRemoteDataSourceService } from '../../../data/repository/room/room-remote-repository.service';
-import { RoomLocalRepository } from '../../../data/repository/room/room-local-repository.service';
 import { z } from "zod";
+import { IRoomRemoteRepository } from 'src/app/core/chat/repository/room/room-remote-repository';
+import { IRoomLocalRepository } from 'src/app/core/chat/repository/room/room-local-repository';
 
 export const DeleteRoomByIdInputDTOSchema =  z.string()
 export type DeleteRoomByIdInputDTO = z.infer<typeof DeleteRoomByIdInputDTOSchema>
@@ -15,9 +15,9 @@ export type DeleteRoomByIdInputDTO = z.infer<typeof DeleteRoomByIdInputDTOSchema
 export class DeleteRoomUseCaseService {
 
   constructor(
-    private roomRemoteDataSourceService: RoomRemoteDataSourceService,
+    private roomRemoteDataSourceService: IRoomRemoteRepository,
     // private roomMemoryDataSourceService: Store<RoomRemoteDataSourceState>,
-    private roomLocalDataSourceService: RoomLocalRepository,
+    private roomLocalDataSourceService: IRoomLocalRepository,
   ) { }
 
 

src/app/module/chat/domain/use-case/room/room-get-by-id-use-case.service.ts

@@ -3,12 +3,12 @@ import { id } from 'date-fns/locale';
 import { isHttpResponse } from 'src/app/services/http.service';
 import { roomListDetermineChanges } from '../../../data/async/list/rooms/roomListChangeDetector';
 import { roomMemberListDetermineChanges } from '../../../data/async/list/rooms/roomMembersChangeDetector';
-import { RoomRemoteDataSourceService } from '../../../data/repository/room/room-remote-repository.service';
-import { RoomLocalRepository } from '../../../data/repository/room/room-local-repository.service';
-import { MemberListLocalRepository } from '../../../data/repository/member/member-list-local-repository.service';
 import { MemberListMapper } from '../../mapper/memberLIstMapper';
 import { captureAndReraiseAsync } from 'src/app/services/decorators/captureAndReraiseAsync';
 import { z } from 'zod';
+import { IRoomRemoteRepository } from 'src/app/core/chat/repository/room/room-remote-repository';
+import { IMemberLocalRepository } from 'src/app/core/chat/repository/member/member-local-repository';
+import { IRoomLocalRepository } from 'src/app/core/chat/repository/room/room-local-repository';
 
 const UserSchema = z.object({
   wxUserId: z.number(),
@@ -44,8 +44,6 @@ export type RoomByIdOutputDTO = z.infer<typeof RoomByIdOutputDTOSchema>
 
 
 export const RoomByIdInputDTOSchema =  z.string()
-
-
 export type RoomByIdInputDTO = z.infer<typeof RoomByIdInputDTOSchema>
 
 @Injectable({
@@ -54,14 +52,14 @@ export type RoomByIdInputDTO = z.infer<typeof RoomByIdInputDTOSchema>
 export class GetRoomByIdUseCaseService {
 
   constructor(
-    private roomRemoteDataSourceService: RoomRemoteDataSourceService,
+    private roomRemoteDataSourceService: IRoomRemoteRepository,
     // private roomMemoryDataSourceService: Store<RoomRemoteDataSourceState>,
-    private roomLocalDataSourceService: RoomLocalRepository,
-    private MemberListLocalRepository: MemberListLocalRepository
+    private roomLocalDataSourceService: IRoomLocalRepository,
+    private MemberListLocalRepository: IMemberLocalRepository
   ) { }
 
   @captureAndReraiseAsync('RoomRepositoryService/getRoomById')
-  async execute(id: string) {
+  async execute(id: RoomByIdInputDTO) {
     const result = await this.roomRemoteDataSourceService.getRoom(id)
 
     if(result.isOk()) {

src/app/module/chat/domain/use-case/room/room-get-list-use-case.service.ts

@@ -1,10 +1,10 @@
 import { Injectable } from '@angular/core';
 import { roomListDetermineChanges } from '../../../data/async/list/rooms/roomListChangeDetector';
-import { RoomRemoteDataSourceService } from '../../../data/repository/room/room-remote-repository.service';
-import { RoomLocalRepository } from '../../../data/repository/room/room-local-repository.service';
 import { captureAndReraiseAsync } from 'src/app/services/decorators/captureAndReraiseAsync';
 import { CronJobService } from 'src/app/utils/task-scheduler'
 import { z } from "zod";
+import { IRoomRemoteRepository } from 'src/app/core/chat/repository/room/room-remote-repository';
+import { IRoomLocalRepository } from 'src/app/core/chat/repository/room/room-local-repository';
 
 
 const CreatedBySchema = z.object({
@@ -46,9 +46,9 @@ export type RoomListOutPutDTO = z.infer<typeof RoomListOutPutDTOSchema>
 export class GetRoomListUseCaseService {
 
   constructor(
-    private roomRemoteDataSourceService: RoomRemoteDataSourceService,
+    private roomRemoteDataSourceService: IRoomRemoteRepository,
     // private roomMemoryDataSourceService: Store<RoomRemoteDataSourceState>,
-    private roomLocalDataSourceService: RoomLocalRepository,
+    private roomLocalDataSourceService: IRoomLocalRepository,
     private CronJobService: CronJobService
   ) { }
 

src/app/module/chat/domain/use-case/room/room-leave-by-id-use-case.service.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
 import { isHttpResponse } from 'src/app/services/http.service';
-import { RoomLocalRepository } from '../../../data/repository/room/room-local-repository.service';
-import { MemberListRemoteRepository } from '../../../data/repository/member/member-list-remote-repository.service';
 import { z } from "zod";
+import { IMemberRemoteRepository } from 'src/app/core/chat/repository/member/member-remote-repository';
+import { IRoomLocalRepository } from 'src/app/core/chat/repository/room/room-local-repository';
 
 // Define the schema for the entire response
 export const UserRemoveListInputDTOSchema = z.object({
@@ -19,8 +19,8 @@ export type UserRemoveListInputDTO = z.infer<typeof UserRemoveListInputDTOSchema
 export class RoomLeaveUseCase {
 
   constructor(
-    private memberRemoteDataSourceService: MemberListRemoteRepository,
-    private roomLocalDataSourceService: RoomLocalRepository,
+    private memberRemoteDataSourceService: IMemberRemoteRepository,
+    private roomLocalDataSourceService: IRoomLocalRepository,
   ) { }
 
 

src/app/module/chat/domain/use-case/room/room-update-by-id-use-case.service.ts

@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
 import { captureAndReraiseAsync } from 'src/app/services/decorators/captureAndReraiseAsync';
-import { RoomRemoteDataSourceService } from '../../../data/repository/room/room-remote-repository.service';
-import { RoomLocalRepository } from '../../../data/repository/room/room-local-repository.service';
 import { z } from "zod";
+import { DataSourceReturn } from 'src/app/services/Repositorys/type';
+import { IRoomLocalRepository } from 'src/app/core/chat/repository/room/room-local-repository';
+import { IRoomRemoteRepository } from 'src/app/core/chat/repository/room/room-remote-repository';
 
 export const RoomUpdateInputDTOSchema = z.object({
   roomName: z.string(),
@@ -47,13 +48,13 @@ export type RoomUpdateOutputDTO = z.infer<typeof RoomUpdateOutputDTOSchema>
 export class UpdateRoomByIdUseCaseService {
 
   constructor(
-    private roomRemoteDataSourceService: RoomRemoteDataSourceService,
-    private roomLocalDataSourceService: RoomLocalRepository,
+    private roomRemoteDataSourceService: IRoomRemoteRepository,
+    private roomLocalDataSourceService: IRoomLocalRepository,
   ) { }
 
 
   @captureAndReraiseAsync('RoomRepositoryService/updateRoomBy')
-  async execute(data: RoomUpdateInputDTO) {
+  async execute(data: RoomUpdateInputDTO): Promise<DataSourceReturn<RoomUpdateOutputDTO>> {
 
     const result = await this.roomRemoteDataSourceService.updateRoom(data)