move database to infra

src/app/core/chat/entity/message.ts

@@ -1,6 +1,5 @@
 import { z } from "zod";
 import { MessageAttachmentFileType, MessageAttachmentSource } from "../../../module/chat/data/dto/message/messageOutputDTO";
-import { SafeResourceUrl } from "@angular/platform-browser";
 import { base64Schema } from "src/app/utils/zod";
 
 export const MessageEntitySchema = z.object({
@@ -48,7 +47,7 @@ export const MessageEntitySchema = z.object({
   })).optional()
 })
 
-type Message = z.infer<typeof MessageEntitySchema>;
+export type IMessage = z.infer<typeof MessageEntitySchema>;
 
 export class MessageEntity {
 

src/app/infra/database/dexie/service.ts

@@ -1,11 +1,11 @@
 
 import { Dexie } from 'Dexie';
-import { DexieMessageTable, messageTableColumn, MessageTable } from './schema/message';
-import { DexieMembersTableSchema, MemberTableColumn } from './schema/members';
-import { DexieRoomsTable, RoomTableColumn } from './schema/room';
-import { DexieTypingsTable, TypingTableColumn } from './schema/typing';
-import { MessageEntity } from '../../../../../core/chat/entity/message';
-import { AttachmentTableColumn, DexieAttachmentsTableSchema } from './schema/attachment';
+import { DexieMessageTable, messageTableColumn, MessageTable } from 'src/app/infra/database/dexie/instance/chat/schema/message';
+import { DexieMembersTableSchema, MemberTableColumn } from 'src/app/infra/database/dexie/instance/chat/schema/members';
+import { DexieRoomsTable, RoomTableColumn } from 'src/app/infra/database/dexie/instance/chat/schema/room';
+import { DexieTypingsTable, TypingTableColumn } from 'src/app/infra/database/dexie/instance/chat/schema/typing';
+import { MessageEntity } from 'src/app/core/chat/entity/message';
+import { AttachmentTableColumn, DexieAttachmentsTableSchema } from 'src/app/infra/database/dexie/instance/chat/schema/attachment';
 // import FDBFactory from 'fake-indexeddb/lib/FDBFactory';
 // import FDBKeyRange from 'fake-indexeddb/lib/FDBKeyRange';
 

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

@@ -1,4 +1,4 @@
-import { MessageTable } from "src/app/module/chat/infra/database/dexie/schema/message";
+import { MessageTable } from "src/app/infra/database/dexie/instance/chat/schema/message";
 import { RoomListItemOutPutDTO, RoomListOutPutDTO } from "../../../dto/room/roomListOutputDTO";
 
 export function messageListDetermineChanges(serverList: MessageTable[], localList: MessageTable[]) {

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

@@ -1,4 +1,4 @@
-import { RoomTable } from "src/app/module/chat/infra/database/dexie/schema/room";
+import { RoomTable } from "src/app/infra/database/dexie/instance/chat/schema/room";
 import { RoomListItemOutPutDTO, RoomListOutPutDTO } from "../../../dto/room/roomListOutputDTO";
 
 export function roomListDetermineChanges(serverRooms: RoomListItemOutPutDTO[], localRooms: RoomTable[]) {

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

@@ -1,4 +1,4 @@
-import { MemberTable } from "src/app/module/chat/infra/database/dexie/schema/members";
+import { MemberTable } from "src/app/infra/database/dexie/instance/chat/schema/members";
 import { RoomByIdMemberItemOutputDTO } from "../../../dto/room/roomByIdOutputDTO";
 
 export function roomMemberListDetermineChanges(____serverRooms: RoomByIdMemberItemOutputDTO[], localRooms: MemberTable[], roomId: string) {

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

@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
 import { Subject } from 'rxjs';
+import { AttachmentTable, AttachmentTableSchema } from 'src/app/infra/database/dexie/instance/chat/schema/attachment';
+import { chatDatabase } from 'src/app/infra/database/dexie/service';
 import { DexieRepository } from 'src/app/infra/repository/dexie/dexie-repository.service';
-import { chatDatabase } from '../../../infra/database/dexie/service';
-import { AttachmentTable, AttachmentTableSchema } from '../../../infra/database/dexie/schema/attachment';
 
 @Injectable({
   providedIn: 'root'

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

@@ -2,12 +2,12 @@ import { Injectable } from '@angular/core';
 import { Dexie, EntityTable, liveQuery, Observable } from 'Dexie';
 import { z } from 'zod';
 import { DexieRepository } from 'src/app/infra/repository/dexie/dexie-repository.service';
-import { chatDatabase } from '../../../infra/database/dexie/service';
 import { ok } from 'neverthrow';
 import { err, Result } from 'neverthrow';
 import { MemberListUPdateStatusInputDTO } from '../../../domain/use-case/socket/member-list-update-status-use-case.service';
-import { MemberTable, MemberTableSchema } from '../../../infra/database/dexie/schema/members';
 import { from } from 'rxjs';
+import { MemberTable, MemberTableSchema } from 'src/app/infra/database/dexie/instance/chat/schema/members';
+import { chatDatabase } from 'src/app/infra/database/dexie/service';
 
 @Injectable({
   providedIn: 'root'

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

@@ -5,9 +5,9 @@ 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 { MessageTable, MessageTableSchema } from 'src/app/module/chat/infra/database/dexie/schema/message';
-import { chatDatabase } from '../../../infra/database/dexie/service';
 import { Observable as  DexieObservable, PromiseExtended } from 'Dexie';
+import { MessageTable, MessageTableSchema } from 'src/app/infra/database/dexie/instance/chat/schema/message';
+import { chatDatabase } from 'src/app/infra/database/dexie/service';
 
 @Injectable({
   providedIn: 'root'

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

@@ -4,10 +4,10 @@ import { liveQuery, Observable } from 'Dexie';
 import { err, ok, Result } from 'neverthrow';
 import { z } from 'zod';
 import { ValidateSchema } from 'src/app/services/decorators/validate-schema.decorator';
-import { chatDatabase } from '../../../infra/database/dexie/service';
-import { RoomTable, RoomTableSchema } from '../../../infra/database/dexie/schema/room';
 import { DexieRepository } from 'src/app/infra/repository/dexie/dexie-repository.service';
 import { from } from 'rxjs';
+import { RoomTable, RoomTableSchema } from 'src/app/infra/database/dexie/instance/chat/schema/room';
+import { chatDatabase } from 'src/app/infra/database/dexie/service';
 
 @Injectable({
   providedIn: 'root'

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

@@ -2,8 +2,8 @@ import { Injectable } from '@angular/core';
 import { z } from 'zod';
 import { Dexie, EntityTable, liveQuery, Observable } from 'Dexie';
 import { err, ok } from 'neverthrow';
-import { chatDatabase } from '../../../infra/database/dexie/service';
-import { TypingTable } from '../../../infra/database/dexie/schema/typing';
+import { chatDatabase } from 'src/app/infra/database/dexie/service';
+import { TypingTable } from 'src/app/infra/database/dexie/instance/chat/schema/typing';
 
 
 

src/app/module/chat/domain/mapper/memberLIstMapper.ts

@@ -1,6 +1,6 @@
 
+import { MemberTable } from "src/app/infra/database/dexie/instance/chat/schema/members";
 import { RoomByIdMemberItemOutputDTO } from "../../data/dto/room/roomByIdOutputDTO";
-import { MemberTable } from "../../infra/database/dexie/schema/members";
 
 export function MemberListMapper(outputDto: RoomByIdMemberItemOutputDTO, roomId: string): MemberTable {
   return {

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

@@ -11,12 +11,12 @@ import { MessageAttachmentSource, MessageOutPutDataDTO } from '../../../data/dto
 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 { MessageTable } from '../../../infra/database/dexie/schema/message';
 import { MessageMapper } from '../../mapper/messageMapper';
 import { RoomType } from "src/app/core/chat/entity/group";
 import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer';
 import { MemberListLocalRepository } from 'src/app/module/chat/data/repository/member/member-list-local-repository.service'
 import { SessionStore } from 'src/app/store/session.service';
+import { MessageTable } from 'src/app/infra/database/dexie/instance/chat/schema/message';
 
 const MessageInputUseCaseSchema = z.object({
   memberId: z.number(),

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

@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import { MessageLocalDataSourceService } from '../../../data/repository/message/message-local-data-source.service';
 import { MessageSocketRepositoryService } from '../../../data/repository/message/message-live-signalr-data-source.service';
-import { MessageTable } from '../../../infra/database/dexie/schema/message';
 import { InstanceId } from '../../chat-service.service';
 import { MessageMapper } from '../../mapper/messageMapper';
 import { v4 as uuidv4 } from 'uuid'
@@ -12,6 +11,7 @@ import { Result } from 'neverthrow';
 import { RoomType } from 'src/app/core/chat/entity/group';
 import { SessionStore } from 'src/app/store/session.service';
 import { MessageOutPutDataDTO } from '../../../data/dto/message/messageOutputDTO';
+import { MessageTable } from 'src/app/infra/database/dexie/instance/chat/schema/message';
 
 @Injectable({
   providedIn: 'root'

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

@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import { MessageLocalDataSourceService } from '../../../data/repository/message/message-local-data-source.service';
 import { messageListDetermineChanges } from '../../../data/async/list/rooms/messageListChangedetector';
-import { MessageTable } from '../../../infra/database/dexie/schema/message';
 import { MessageRemoteDataSourceService } from '../../../data/repository/message/message-remote-data-source.service';
 import { MessageSocketRepositoryService } from '../../../data/repository/message/message-live-signalr-data-source.service';
 import { ok } from 'neverthrow';
@@ -10,6 +9,7 @@ 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({
   providedIn: 'root'

src/app/module/chat/infra/socket/signalR.ts

@@ -133,7 +133,7 @@ export class SignalRConnection {
             first()
           ).subscribe(value => {
             resolve(ok(value.data as unknown  as T))
-            console.log('Received valid value:', value);
+            // console.log('Received valid value:', value);
           });
 
         } catch(error) {

src/app/ui/chat/chat.page.ts

@@ -20,9 +20,9 @@ import { Observable as  DexieObservable } from 'Dexie';
 import { EditGroupPage } from './modal/edit-group/edit-group.page';
 import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service'
 import { RoomLocalRepository } from 'src/app/module/chat/data/repository/room/room-local-repository.service'
-import { RoomTable } from 'src/app/module/chat/infra/database/dexie/schema/room';
 import { map, tap } from 'rxjs/operators';
 import { interval, Subscription } from 'rxjs';
+import { RoomTable } from 'src/app/infra/database/dexie/instance/chat/schema/room';
 
 @Component({
   selector: 'app-chat',

src/app/ui/chat/component/messages/messages.page.ts

@@ -24,12 +24,9 @@ import { Observable as  DexieObservable } from 'Dexie';
 import { Observable, Subscription } from 'rxjs';
 import { RoomLocalRepository } from 'src/app/module/chat/data/repository/room/room-local-repository.service'
 import { MemberListLocalRepository } from 'src/app/module/chat/data/repository/member/member-list-local-repository.service'
-import { MessageTable } from 'src/app/module/chat/infra/database/dexie/schema/message';
 import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service';
 import { EditMessagePage } from 'src/app/modals/edit-message/edit-message.page';
 import { MessageEntity } from 'src/app/core/chat/entity/message';
-import { MemberTable } from 'src/app/module/chat/infra/database/dexie/schema/members';
-import { TypingTable } from 'src/app/module/chat/infra/database/dexie/schema/typing';
 import { MessageAttachmentFileType, MessageAttachmentSource } from 'src/app/module/chat/data/dto/message/messageOutputDTO';
 import { JSFileToDataUrl } from 'src/app/utils/ToBase64';
 import { CameraService } from 'src/app/infra/camera/camera.service'
@@ -44,11 +41,14 @@ import { UserTypingLocalRepository } from 'src/app/module/chat/data/repository/t
 import { UserTypingRemoteRepositoryService } from 'src/app/module/chat/data/repository/typing/user-typing-live-data-source.service';
 import { MessageLocalDataSourceService } from 'src/app/module/chat/data/repository/message/message-local-data-source.service';
 import { RoomType } from "src/app/core/chat/entity/group";
-import { RoomTable } from 'src/app/module/chat/infra/database/dexie/schema/room';
 import { Logger } from 'src/app/services/logger/main/service';
 import { tap } from 'rxjs/operators';
 import { AlertController } from '@ionic/angular';
 import { ViewOncesImagePage, ViewOncesImagePageInput } from '../../modal/view-onces/view-onces.page';
+import { MemberTable } from 'src/app/infra/database/dexie/instance/chat/schema/members';
+import { MessageTable } from 'src/app/infra/database/dexie/instance/chat/schema/message';
+import { RoomTable } from 'src/app/infra/database/dexie/instance/chat/schema/room';
+import { TypingTable } from 'src/app/infra/database/dexie/instance/chat/schema/typing';
 
 @Component({
   selector: 'app-messages',

src/app/ui/chat/modal/messages/messages.page.ts

@@ -21,13 +21,13 @@ import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 //======
 import { Observable as  DexieObservable } from 'Dexie';
 import { Subscription } from 'rxjs';
-import { MessageTable } from 'src/app/module/chat/infra/database/dexie/schema/message';
+import { MessageTable } from 'src/app/infra/database/dexie/instance/chat/schema/message';
 import { RoomListItemOutPutDTO } from 'src/app/module/chat/data/dto/room/roomListOutputDTO';
 import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service';
 import { EditMessagePage } from 'src/app/modals/edit-message/edit-message.page';
 import { MessageEntity } from 'src/app/core/chat/entity/message';
-import { MemberTable } from 'src/app/module/chat/infra/database/dexie/schema/members';
-import { TypingTable } from 'src/app/module/chat/infra/database/dexie/schema/typing';
+import { MemberTable } from 'src/app/infra/database/dexie/instance/chat/schema/members';
+import { TypingTable } from 'src/app/infra/database/dexie/instance/chat/schema/typing';
 import { MessageAttachmentFileType, MessageAttachmentSource } from 'src/app/module/chat/data/dto/message/messageOutputDTO';
 import { compressImageBase64 } from 'src/app/utils/imageCompressore';
 import { FilePickerService } from 'src/app/infra/file-picker/file-picker.service'
@@ -47,7 +47,7 @@ import { UserTypingRemoteRepositoryService } from 'src/app/module/chat/data/repo
 import { MessageLocalDataSourceService } from 'src/app/module/chat/data/repository/message/message-local-data-source.service';
 import { MessageEnum } from 'src/app/module/chat/domain/use-case/message/message-create-use-case.service';
 import { RoomType } from "src/app/core/chat/entity/group";
-import { RoomTable } from 'src/app/module/chat/infra/database/dexie/schema/room';
+import { RoomTable } from 'src/app/infra/database/dexie/instance/chat/schema/room';
 
 
 

src/app/ui/chat/modal/room-info/room-info.page.ts

@@ -1,11 +1,11 @@
 import { Component, OnInit } from '@angular/core';
-import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { NavParams } from '@ionic/angular';
 import { Observable } from 'rxjs';
-import { MemberTable } from 'src/app/module/chat/infra/database/dexie/schema/members';
 import { MemberListLocalRepository } from 'src/app/module/chat/data/repository/member/member-list-local-repository.service'
 import { Observable as  DexieObservable } from 'Dexie';
-import { RoomTable } from 'src/app/module/chat/infra/database/dexie/schema/room';
 import { RoomLocalRepository } from 'src/app/module/chat/data/repository/room/room-local-repository.service'
+import { MemberTable } from 'src/app/infra/database/dexie/instance/chat/schema/members';
+import { RoomTable } from 'src/app/infra/database/dexie/instance/chat/schema/room';
 
 @Component({
   selector: 'app-room-info',

src/app/ui/chat/modal/set-room-owner/set-room-owner.page.ts

@@ -6,8 +6,8 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { ToastService } from 'src/app/services/toast.service';
 import { Observable as  DexieObservable } from 'Dexie';
 import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service';
-import { MemberTable } from 'src/app/module/chat/infra/database/dexie/schema/members';
 import { MemberListLocalRepository } from 'src/app/module/chat/data/repository/member/member-list-local-repository.service'
+import { MemberTable } from 'src/app/infra/database/dexie/instance/chat/schema/members';
 
 @Component({
   selector: 'app-set-room-owner',