diff --git a/src/app/core/chat/mapper/getRoomByIdMapper.ts b/src/app/core/chat/mapper/getRoomByIdMapper.ts index a0d50eaf9..23c8e9c15 100644 --- a/src/app/core/chat/mapper/getRoomByIdMapper.ts +++ b/src/app/core/chat/mapper/getRoomByIdMapper.ts @@ -1,4 +1,4 @@ -import { RoomByIdOutputDTO } from "src/app/module/chat/domain/use-case/room/room-get-by-id-use-case.service"; +import { RoomByIdOutputDTO } from "src/app/core/chat/usecase/room/room-get-by-id-use-case.service"; import { RoomEntity } from "../entity/group"; export class GetRoomByIdMapper { @@ -14,4 +14,4 @@ export class GetRoomByIdMapper { roomType: input.data.roomType, }) } -} \ No newline at end of file +} diff --git a/src/app/core/chat/mapper/getRoomListMapper.ts b/src/app/core/chat/mapper/getRoomListMapper.ts index a9c0bc66c..b5a07e785 100644 --- a/src/app/core/chat/mapper/getRoomListMapper.ts +++ b/src/app/core/chat/mapper/getRoomListMapper.ts @@ -1,4 +1,4 @@ -import { RoomListItemOutPutDTO } from "src/app/module/chat/domain/use-case/room/room-get-list-use-case.service"; +import { RoomListItemOutPutDTO } from "src/app/core/chat/usecase/room/room-get-list-use-case.service"; import { RoomEntity } from "../entity/group"; export class GetRoomListMapper{ @@ -28,4 +28,4 @@ export class GetRoomListMapper{ })); } -} \ No newline at end of file +} diff --git a/src/app/module/chat/domain/mapper/memberLIstMapper.ts b/src/app/core/chat/mapper/memberLIstMapper.ts similarity index 82% rename from src/app/module/chat/domain/mapper/memberLIstMapper.ts rename to src/app/core/chat/mapper/memberLIstMapper.ts index 953912f2c..00205f121 100644 --- a/src/app/module/chat/domain/mapper/memberLIstMapper.ts +++ b/src/app/core/chat/mapper/memberLIstMapper.ts @@ -1,6 +1,6 @@ import { MemberTable } from "src/app/infra/database/dexie/instance/chat/schema/members"; -import { RoomByIdMemberItemOutputDTO } from "../use-case/room/room-get-by-id-use-case.service"; +import { RoomByIdMemberItemOutputDTO } from "../usecase/room/room-get-by-id-use-case.service"; export function MemberListMapper(outputDto: RoomByIdMemberItemOutputDTO, roomId: string): MemberTable { return { diff --git a/src/app/module/chat/domain/mapper/messageMapper.ts b/src/app/core/chat/mapper/messageMapper.ts similarity index 85% rename from src/app/module/chat/domain/mapper/messageMapper.ts rename to src/app/core/chat/mapper/messageMapper.ts index 4e7bc021d..6cbb5daa0 100644 --- a/src/app/module/chat/domain/mapper/messageMapper.ts +++ b/src/app/core/chat/mapper/messageMapper.ts @@ -1,6 +1,6 @@ -import { MessageEntity, IMessage } from "../../../../core/chat/entity/message"; +import { MessageEntity, IMessage } from "../entity/message"; import { MessageOutPutDataDTO } from "src/app/core/chat/repository/dto/messageOutputDTO"; -import { MessageInputDTO } from "../use-case/message/message-create-use-case.service"; +import { MessageInputDTO } from "../usecase/message/message-create-use-case.service"; export class MessageMapper { static toDomain(DTO: MessageOutPutDataDTO) : MessageEntity { diff --git a/src/app/core/chat/repository/member/member-local-repository.ts b/src/app/core/chat/repository/member/member-local-repository.ts index 155c50bc9..f1e404224 100644 --- a/src/app/core/chat/repository/member/member-local-repository.ts +++ b/src/app/core/chat/repository/member/member-local-repository.ts @@ -5,7 +5,7 @@ import { Result } from "neverthrow"; import { MemberTable, MemberTableSchema } from "src/app/infra/database/dexie/instance/chat/schema/members"; import { RepositoryResult } from "src/app/infra/repository"; import { z } from "zod"; -import { MemberListUPdateStatusInputDTO } from "src/app/module/chat/domain/use-case/socket/member-list-update-status-use-case.service"; +import { MemberListUPdateStatusInputDTO } from "src/app/core/chat/usecase/socket/member-list-update-status-use-case.service"; import { Observable } from "rxjs"; diff --git a/src/app/core/chat/repository/member/member-remote-repository.ts b/src/app/core/chat/repository/member/member-remote-repository.ts index 54ff89303..75eedde05 100644 --- a/src/app/core/chat/repository/member/member-remote-repository.ts +++ b/src/app/core/chat/repository/member/member-remote-repository.ts @@ -1,12 +1,12 @@ import { DataSourceReturn } from "src/app/services/Repositorys/type"; import { Result } from "neverthrow"; -import { AddMemberToRoomInputDTO } from "src/app/module/chat/domain/use-case/member/member-add-use-case.service"; -import { MemberSetAdminDTO } from "src/app/module/chat/domain/use-case/member/member-admin-use-case.service"; -import { UserRemoveListInputDTO } from "src/app/module/chat/domain/use-case/room/room-leave-by-id-use-case.service"; +import { AddMemberToRoomInputDTO } from "src/app/core/chat/usecase/member/member-add-use-case.service"; +import { MemberSetAdminDTO } from "src/app/core/chat/usecase/member/member-admin-use-case.service"; +import { UserRemoveListInputDTO } from "src/app/core/chat/usecase/room/room-leave-by-id-use-case.service"; export abstract class IMemberRemoteRepository { abstract addMemberToRoom(data: AddMemberToRoomInputDTO): DataSourceReturn abstract removeMemberFromRoom(data: UserRemoveListInputDTO): Promise> - abstract setAmin(data: MemberSetAdminDTO): Promise> -} \ No newline at end of file + abstract setAmin(data: MemberSetAdminDTO): Promise> +} diff --git a/src/app/core/chat/repository/member/member-socket-repository.ts b/src/app/core/chat/repository/member/member-socket-repository.ts index 2149e9aa5..ab7b998b2 100644 --- a/src/app/core/chat/repository/member/member-socket-repository.ts +++ b/src/app/core/chat/repository/member/member-socket-repository.ts @@ -1,5 +1,5 @@ import { Observable } from 'rxjs'; -import { IRemoveRoomMemberOutput, RemoveRoomMemberInput } from 'src/app/module/chat/domain/use-case/member/member-remove-socket-use-case.service'; +import { IRemoveRoomMemberOutput, RemoveRoomMemberInput } from 'src/app/core/chat/usecase/member/member-remove-socket-use-case.service'; export abstract class IMemberSocketRepository { abstract removeMember(input: RemoveRoomMemberInput): Promise diff --git a/src/app/core/chat/repository/message/message-remote-repository.ts b/src/app/core/chat/repository/message/message-remote-repository.ts index a05038fbf..0e06c7ca3 100644 --- a/src/app/core/chat/repository/message/message-remote-repository.ts +++ b/src/app/core/chat/repository/message/message-remote-repository.ts @@ -1,6 +1,11 @@ import { DataSourceReturn } from "src/app/services/Repositorys/type"; import { IMessageGetAllByRoomIdOutPut } from "../../usecase/message/message-get-all-by-room-Id"; +export interface IGetMessagesFromRoomParams { + roomId: string + lastMessageDate?: string +} + export abstract class IMessageRemoteRepository { - abstract getMessagesFromRoom(id: string): DataSourceReturn -} \ No newline at end of file + abstract getMessagesFromRoom(input: IGetMessagesFromRoomParams): DataSourceReturn +} diff --git a/src/app/core/chat/repository/message/message-socket-repository.ts b/src/app/core/chat/repository/message/message-socket-repository.ts index d6c5e5480..99d42bb9a 100644 --- a/src/app/core/chat/repository/message/message-socket-repository.ts +++ b/src/app/core/chat/repository/message/message-socket-repository.ts @@ -1,12 +1,12 @@ import { HubConnection } from "@microsoft/signalr"; import { Result } from "neverthrow"; -import { MessageCreateOutPutDataDTO, MessageInputDTO } from "src/app/module/chat/domain/use-case/message/message-create-use-case.service"; -import { MessageMarkAsReadInput } from "src/app/module/chat/domain/use-case/message/message-mark-as-read-use-case.service"; -import { MessageDeleteInputDTO } from "src/app/module/chat/domain/use-case/message/message-delete-by-id-live-use-case.service"; +import { MessageCreateOutPutDataDTO, MessageInputDTO } from "src/app/core/chat/usecase/message/message-create-use-case.service"; +import { MessageMarkAsReadInput } from "src/app/core/chat/usecase/message/message-mark-as-read-use-case.service"; +import { MessageDeleteInputDTO } from "src/app/core/chat/usecase/message/message-delete-by-id-live-use-case.service"; import { MessageOutPutDataDTO } from "../dto/messageOutputDTO"; import { Observable } from "rxjs"; -import { MessageReactionInput } from "src/app/module/chat/domain/use-case/message/message-reaction-by-id-use-case.service"; -import { MessageUpdateInput } from "src/app/module/chat/domain/use-case/message/message-update-by-id-use-case.service"; +import { MessageReactionInput } from "src/app/core/chat/usecase/message/message-reaction-by-id-use-case.service"; +import { MessageUpdateInput } from "src/app/core/chat/usecase/message/message-update-by-id-use-case.service"; import { SocketMessage } from "src/app/infra/socket/signalR/signalR"; export abstract class IMessageSocketRepository { diff --git a/src/app/core/chat/repository/room/room-remote-repository.ts b/src/app/core/chat/repository/room/room-remote-repository.ts index 7e000d29d..2b6af476c 100644 --- a/src/app/core/chat/repository/room/room-remote-repository.ts +++ b/src/app/core/chat/repository/room/room-remote-repository.ts @@ -1,17 +1,17 @@ import { DataSourceReturn } from "src/app/services/Repositorys/type"; import { IMessageGetAllByRoomIdOutPut } from "../../usecase/message/message-get-all-by-room-Id"; -import { CreateRoomInputDTO, RoomOutPutDTO } from "src/app/module/chat/domain/use-case/room/room-create-use-case.service"; -import { RoomByIdInputDTO, 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 { CreateRoomInputDTO, RoomOutPutDTO } from "src/app/core/chat/usecase/room/room-create-use-case.service"; +import { RoomByIdInputDTO, RoomByIdOutputDTO } from "src/app/core/chat/usecase/room/room-get-by-id-use-case.service"; +import { RoomUpdateInputDTO, RoomUpdateOutputDTO } from "src/app/core/chat/usecase/room/room-update-by-id-use-case.service"; import { Result } from "neverthrow"; -import { AddMemberToRoomInputDTO } from "src/app/module/chat/domain/use-case/member/member-add-use-case.service"; -import { RoomListOutPutDTO } from "src/app/module/chat/domain/use-case/room/room-get-list-use-case.service"; +import { AddMemberToRoomInputDTO } from "src/app/core/chat/usecase/member/member-add-use-case.service"; +import { RoomListOutPutDTO } from "src/app/core/chat/usecase/room/room-get-list-use-case.service"; export abstract class IRoomRemoteRepository { abstract createRoom(data: CreateRoomInputDTO): DataSourceReturn - abstract getRoomList(): Promise> + abstract getRoomList(): Promise> abstract getRoom(id: RoomByIdInputDTO): DataSourceReturn abstract updateRoom(data: RoomUpdateInputDTO): Promise> abstract deleteRoom(id: string): Promise> abstract addMemberToRoomSocket(data: AddMemberToRoomInputDTO): Promise> -} \ No newline at end of file +} diff --git a/src/app/core/chat/repository/room/room-socket-repository.ts b/src/app/core/chat/repository/room/room-socket-repository.ts index 27f721bd1..9e08e9591 100644 --- a/src/app/core/chat/repository/room/room-socket-repository.ts +++ b/src/app/core/chat/repository/room/room-socket-repository.ts @@ -2,7 +2,7 @@ import { HubConnection } from "@microsoft/signalr"; import { Result } from "neverthrow"; import { BehaviorSubject, Observable } from "rxjs"; import { ListenToDeleteRoomInput, RoomSocketOutPutDTO } from "src/app/module/chat/data/repository/room/room-socket-repository.service"; -import { CreateRoomInputDTO } from "src/app/module/chat/domain/use-case/room/room-create-use-case.service"; +import { CreateRoomInputDTO } from "src/app/core/chat/usecase/room/room-create-use-case.service"; import { z } from "zod"; diff --git a/src/app/core/chat/repository/user-photo/user-photo-remote-repository.ts b/src/app/core/chat/repository/user-photo/user-photo-remote-repository.ts index 9e20ffa80..4f7cb30c7 100644 --- a/src/app/core/chat/repository/user-photo/user-photo-remote-repository.ts +++ b/src/app/core/chat/repository/user-photo/user-photo-remote-repository.ts @@ -1,5 +1,5 @@ import { HttpResult, IHttPReturn } from "src/app/infra/http/type" -import { UserPhotoGetByIdInputSchema } from "src/app/module/chat/domain/use-case/user-photo/user-photo-get-by-id-use-case.service" +import { UserPhotoGetByIdInputSchema } from "src/app/core/chat/usecase/user-photo/user-photo-get-by-id-use-case.service" import { z } from "zod" export const IGetUserPhotoByAttachmentIdInputSchema = z.object({ diff --git a/src/app/module/chat/domain/use-case/bold/bold-remove-by-room-id.service.spec.ts b/src/app/core/chat/usecase/bold/bold-remove-by-room-id.service.spec.ts similarity index 100% rename from src/app/module/chat/domain/use-case/bold/bold-remove-by-room-id.service.spec.ts rename to src/app/core/chat/usecase/bold/bold-remove-by-room-id.service.spec.ts diff --git a/src/app/module/chat/domain/use-case/bold/bold-remove-by-room-id.service.ts b/src/app/core/chat/usecase/bold/bold-remove-by-room-id.service.ts similarity index 100% rename from src/app/module/chat/domain/use-case/bold/bold-remove-by-room-id.service.ts rename to src/app/core/chat/usecase/bold/bold-remove-by-room-id.service.ts diff --git a/src/app/module/chat/domain/use-case/contact/contact-list.service.ts b/src/app/core/chat/usecase/contact/contact-list.service.ts similarity index 100% rename from src/app/module/chat/domain/use-case/contact/contact-list.service.ts rename to src/app/core/chat/usecase/contact/contact-list.service.ts diff --git a/src/app/module/chat/domain/use-case/member/-use-case.service.ts b/src/app/core/chat/usecase/member/-use-case.service.ts similarity index 83% rename from src/app/module/chat/domain/use-case/member/-use-case.service.ts rename to src/app/core/chat/usecase/member/-use-case.service.ts index c0bbd23bf..7bca64c83 100644 --- a/src/app/module/chat/domain/use-case/member/-use-case.service.ts +++ b/src/app/core/chat/usecase/member/-use-case.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { captureAndReraiseAsync } from 'src/app/services/decorators/captureAndReraiseAsync'; -import { MemberListRemoteRepository } from '../../../data/repository/member/member-list-remote-repository.service'; import { UserRemoveListInputDTO } from '../room/room-leave-by-id-use-case.service'; +import { MemberListRemoteRepository } from 'src/app/module/chat/data/repository/member/member-list-remote-repository.service'; @Injectable({ providedIn: 'root' diff --git a/src/app/module/chat/domain/use-case/member/member-add-use-case.service.ts b/src/app/core/chat/usecase/member/member-add-use-case.service.ts similarity index 100% rename from src/app/module/chat/domain/use-case/member/member-add-use-case.service.ts rename to src/app/core/chat/usecase/member/member-add-use-case.service.ts diff --git a/src/app/module/chat/domain/use-case/member/member-admin-use-case.service.ts b/src/app/core/chat/usecase/member/member-admin-use-case.service.ts similarity index 100% rename from src/app/module/chat/domain/use-case/member/member-admin-use-case.service.ts rename to src/app/core/chat/usecase/member/member-admin-use-case.service.ts diff --git a/src/app/module/chat/domain/use-case/member/member-list-http-sync-use-case.ts.service.ts b/src/app/core/chat/usecase/member/member-list-http-sync-use-case.ts.service.ts similarity index 88% rename from src/app/module/chat/domain/use-case/member/member-list-http-sync-use-case.ts.service.ts rename to src/app/core/chat/usecase/member/member-list-http-sync-use-case.ts.service.ts index a0ef1c59a..c8058807f 100644 --- a/src/app/module/chat/domain/use-case/member/member-list-http-sync-use-case.ts.service.ts +++ b/src/app/core/chat/usecase/member/member-list-http-sync-use-case.ts.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; import { filter, map } from 'rxjs/operators'; import { HttpAdapter } from 'src/app/infra/http/adapter'; -import { RoomByIdOutputDTO } from '../../../domain/use-case/room/room-get-by-id-use-case.service'; import { IMemberLocalRepository } from 'src/app/core/chat/repository/member/member-local-repository'; -import { MemberListMapper } from '../../../domain/mapper/memberLIstMapper'; -import { roomMemberListDetermineChanges } from '../../../data/async/list/rooms/roomMembersChangeDetector'; +import { roomMemberListDetermineChanges } from 'src/app/module/chat/data/async/list/rooms/roomMembersChangeDetector'; +import { MemberListMapper } from 'src/app/core/chat/mapper/memberLIstMapper'; +import { RoomByIdOutputDTO } from '../room/room-get-by-id-use-case.service'; @Injectable({ providedIn: 'root' }) diff --git a/src/app/module/chat/domain/use-case/member/member-remove-socket-use-case.service.ts b/src/app/core/chat/usecase/member/member-remove-socket-use-case.service.ts similarity index 100% rename from src/app/module/chat/domain/use-case/member/member-remove-socket-use-case.service.ts rename to src/app/core/chat/usecase/member/member-remove-socket-use-case.service.ts diff --git a/src/app/module/chat/domain/use-case/message/listen-message-by-roomId.service.ts b/src/app/core/chat/usecase/message/listen-message-by-roomId.service.ts similarity index 87% rename from src/app/module/chat/domain/use-case/message/listen-message-by-roomId.service.ts rename to src/app/core/chat/usecase/message/listen-message-by-roomId.service.ts index f2a79f822..241935024 100644 --- a/src/app/module/chat/domain/use-case/message/listen-message-by-roomId.service.ts +++ b/src/app/core/chat/usecase/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 { MessageEntity } from '../../../../../core/chat/entity/message'; import { z } from 'zod'; import { IMessageSocketRepository } from 'src/app/core/chat/repository/message/message-socket-repository'; +import { MessageEntity } from '../../entity/message'; +import { InstanceId } from 'src/app/module/chat/domain/chat-service.service'; export const ListenMessageByRoomIdNewInputDTOSchema = z.object({ diff --git a/src/app/module/chat/domain/use-case/message/listen-message-update-by-roomId.service.ts b/src/app/core/chat/usecase/message/listen-message-update-by-roomId.service.ts similarity index 100% rename from src/app/module/chat/domain/use-case/message/listen-message-update-by-roomId.service.ts rename to src/app/core/chat/usecase/message/listen-message-update-by-roomId.service.ts diff --git a/src/app/module/chat/domain/use-case/message/listen-send-message.service.ts b/src/app/core/chat/usecase/message/listen-send-message.service.ts similarity index 77% rename from src/app/module/chat/domain/use-case/message/listen-send-message.service.ts rename to src/app/core/chat/usecase/message/listen-send-message.service.ts index 69d860032..9ba8ac6e1 100644 --- a/src/app/module/chat/domain/use-case/message/listen-send-message.service.ts +++ b/src/app/core/chat/usecase/message/listen-send-message.service.ts @@ -1,8 +1,9 @@ import { Injectable } from '@angular/core'; import { MessageSocketRepositoryService } from 'src/app/module/chat/data/repository/message/message-live-signalr-data-source.service' -import { InstanceId } from '../../chat-service.service'; +import { InstanceId } from '../../../../module/chat/domain/chat-service.service'; import { filter, map } from 'rxjs/operators'; import { z } from 'zod'; +import { IMessageSocketRepository } from '../../repository/message/message-socket-repository'; export const ListenSendMessageInputDTOSchema = z.object({ roomId: z.string(), @@ -17,7 +18,7 @@ export type ListenSendMessageInputDTO = z.infer }) export class MessageDeleteLiveUseCaseService { constructor( - public repository: MessageSocketRepositoryService + public repository: IMessageSocketRepository ) { } @XTracerAsync({name:'MessageDeleteLiveUseCaseService', module:'chat', bugPrint: true, waitNThrow: 5000}) diff --git a/src/app/module/chat/domain/use-case/message/message-download-attachment-user-case.service.ts b/src/app/core/chat/usecase/message/message-download-attachment-user-case.service.ts similarity index 85% rename from src/app/module/chat/domain/use-case/message/message-download-attachment-user-case.service.ts rename to src/app/core/chat/usecase/message/message-download-attachment-user-case.service.ts index 9d093b02f..037ff83cd 100644 --- a/src/app/module/chat/domain/use-case/message/message-download-attachment-user-case.service.ts +++ b/src/app/core/chat/usecase/message/message-download-attachment-user-case.service.ts @@ -6,6 +6,8 @@ import { AttachmentLocalDataSource } from 'src/app/module/chat/data/repository/a import { z } from 'zod'; import { zodSafeValidation } from 'src/app/utils/zodValidation'; import { IMessage, MessageEntitySchema } from 'src/app/core/chat/entity/message'; +import { IAttachmentRemoteRepository } from '../../repository/attachment/attachment-remote-repository'; +import { IAttachmentLocalRepository } from '../../repository/typing/typing-local-repository'; const DownloadMessageAttachmentByMessageIdSchema = z.object({ $messageId: z.string(), @@ -21,8 +23,8 @@ export type DownloadMessageAttachmentByMessageId = z.infer export class MessageUpdateUseCaseService { constructor( - public repository: MessageSocketRepositoryService + public repository: IMessageSocketRepository ) { } @ValidateSchema(MessageUpdateInputDTOSchema) diff --git a/src/app/module/chat/domain/use-case/message/messages-send-offline-use-case.service.ts b/src/app/core/chat/usecase/message/messages-send-offline-use-case.service.ts similarity index 72% rename from src/app/module/chat/domain/use-case/message/messages-send-offline-use-case.service.ts rename to src/app/core/chat/usecase/message/messages-send-offline-use-case.service.ts index 79f78956a..4c0cc9471 100644 --- a/src/app/module/chat/domain/use-case/message/messages-send-offline-use-case.service.ts +++ b/src/app/core/chat/usecase/message/messages-send-offline-use-case.service.ts @@ -1,17 +1,22 @@ 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 { InstanceId } from '../../chat-service.service'; +import { MessageLocalDataSourceService } from '../../../../module/chat/data/repository/message/message-local-data-source.service'; +import { MessageSocketRepositoryService } from '../../../../module/chat/data/repository/message/message-live-signalr-data-source.service'; +import { InstanceId } from '../../../../module/chat/domain/chat-service.service'; import { MessageMapper } from '../../mapper/messageMapper'; import { v4 as uuidv4 } from 'uuid' -import { AttachmentLocalDataSource } from '../../../data/repository/attachment/attachment-local-repository.service'; -import { RoomLocalRepository } from '../../../data/repository/room/room-local-repository.service'; +import { AttachmentLocalDataSource } from '../../../../module/chat/data/repository/attachment/attachment-local-repository.service'; +import { RoomLocalRepository } from '../../../../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 { Result } from 'neverthrow'; import { RoomType } from 'src/app/core/chat/entity/group'; import { MessageTable } from 'src/app/infra/database/dexie/instance/chat/schema/message'; import { MessageOutPutDataDTO } from 'src/app/core/chat/repository/dto/messageOutputDTO'; import { IDBoolean } from 'src/app/infra/database/dexie/type'; +import { IMemberLocalRepository } from '../../repository/member/member-local-repository'; +import { IMessageLocalRepository } from '../../repository/message/message-local-repository'; +import { IMessageSocketRepository } from '../../repository/message/message-socket-repository'; +import { IRoomLocalRepository } from '../../repository/room/room-local-repository'; +import { IAttachmentLocalRepository } from '../../repository/typing/typing-local-repository'; @Injectable({ providedIn: 'root' @@ -19,12 +24,12 @@ import { IDBoolean } from 'src/app/infra/database/dexie/type'; export class SendLocalMessagesUseCaseService { constructor( - private MessageSocketRepositoryService: MessageSocketRepositoryService, - private messageLocalDataSourceService: MessageLocalDataSourceService, - private AttachmentRepositoryService: AttachmentLocalDataSource, - private roomLocalDataSourceService: RoomLocalRepository, - private MemberListLocalRepository: MemberListLocalRepository, - private messageSocketRepositoryService: MessageSocketRepositoryService, + private MessageSocketRepositoryService: IMessageSocketRepository, + private messageLocalDataSourceService: IMessageLocalRepository, + private AttachmentRepositoryService: IAttachmentLocalRepository, + private roomLocalDataSourceService: IRoomLocalRepository, + private MemberListLocalRepository: IMemberLocalRepository, + private messageSocketRepositoryService: IMessageSocketRepository, ) { } async execute() { diff --git a/src/app/module/chat/domain/use-case/message/sync-all-room-messages.service.ts b/src/app/core/chat/usecase/message/sync-all-room-messages.service.ts similarity index 64% rename from src/app/module/chat/domain/use-case/message/sync-all-room-messages.service.ts rename to src/app/core/chat/usecase/message/sync-all-room-messages.service.ts index bb4cdbb74..a6c565b44 100644 --- a/src/app/module/chat/domain/use-case/message/sync-all-room-messages.service.ts +++ b/src/app/core/chat/usecase/message/sync-all-room-messages.service.ts @@ -1,14 +1,17 @@ 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 { MessageRemoteDataSourceService } from '../../../data/repository/message/message-remote-data-source.service'; -import { MessageSocketRepositoryService } from '../../../data/repository/message/message-live-signalr-data-source.service'; +import { messageListDetermineChanges } from '../../../../module/chat/data/async/list/rooms/messageListChangedetector'; +import { MessageRemoteDataSourceService } from '../../../../module/chat/data/repository/message/message-remote-data-source.service'; +import { MessageSocketRepositoryService } from '../../../../module/chat/data/repository/message/message-live-signalr-data-source.service'; import { ok } from 'neverthrow'; -import { RoomLocalRepository } from '../../../data/repository/room/room-local-repository.service'; +import { RoomLocalRepository } from '../../../../module/chat/data/repository/room/room-local-repository.service'; import { Logger } from 'src/app/services/logger/main/service'; import { XTracerAsync, TracingType } from 'src/app/services/monitoring/opentelemetry/tracer'; import { MessageTable } from 'src/app/infra/database/dexie/instance/chat/schema/message'; import { IDBoolean } from 'src/app/infra/database/dexie/type'; +import { IMessageLocalRepository } from '../../repository/message/message-local-repository'; +import { IMessageRemoteRepository } from '../../repository/message/message-remote-repository'; +import { IMessageSocketRepository } from '../../repository/message/message-socket-repository'; +import { IRoomLocalRepository } from '../../repository/room/room-local-repository'; @Injectable({ providedIn: 'root' @@ -16,10 +19,10 @@ import { IDBoolean } from 'src/app/infra/database/dexie/type'; export class SyncAllRoomMessagesService { constructor( - private messageLocalDataSourceService: MessageLocalDataSourceService, - private messageRemoteDataSourceService: MessageRemoteDataSourceService, - private MessageSocketRepositoryService: MessageSocketRepositoryService, - private roomLocalDataSourceService: RoomLocalRepository, + private messageLocalDataSourceService: IMessageLocalRepository, + private messageRemoteDataSourceService: IMessageRemoteRepository, + private MessageSocketRepositoryService: IMessageSocketRepository, + private roomLocalDataSourceService: IRoomLocalRepository, ) { } @XTracerAsync({name:'SyncAllRoomMessagesService', module:'chat', bugPrint: true}) @@ -39,8 +42,10 @@ export class SyncAllRoomMessagesService { const removeLocalRooms = allRooms.value.filter((e)=> e.local != IDBoolean.true) const roomPromises = removeLocalRooms.map(async (room) => { + const lastMessage = room.messages.find(e => e.sentAt && e.id) + const [result, localResult] = await Promise.all([ - this.messageRemoteDataSourceService.getMessagesFromRoom(room.id), + this.messageRemoteDataSourceService.getMessagesFromRoom({roomId:room.id, lastMessageDate: lastMessage?.sentAt}), this.messageLocalDataSourceService.getItems(room.id) ]); diff --git a/src/app/module/chat/domain/use-case/room/room-bold-sync-use-case.service.ts b/src/app/core/chat/usecase/room/room-bold-sync-use-case.service.ts similarity index 95% rename from src/app/module/chat/domain/use-case/room/room-bold-sync-use-case.service.ts rename to src/app/core/chat/usecase/room/room-bold-sync-use-case.service.ts index 8c9c82d4a..e60fb8c09 100644 --- a/src/app/module/chat/domain/use-case/room/room-bold-sync-use-case.service.ts +++ b/src/app/core/chat/usecase/room/room-bold-sync-use-case.service.ts @@ -4,14 +4,14 @@ import { IMessageSocketRepository } from 'src/app/core/chat/repository/message/m import { MessageEntity } from 'src/app/core/chat/entity/message'; import { IBoldLocalRepository } from 'src/app/core/chat/repository/bold/bold-local-repository'; import { IMessageLocalRepository } from 'src/app/core/chat/repository/message/message-local-repository'; -import { InstanceId } from '../../chat-service.service'; +import { InstanceId } from '../../../../module/chat/domain/chat-service.service'; import { HttpAdapter } from 'src/app/infra/http/adapter'; import { SessionStore } from 'src/app/store/session.service'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { IRoomLocalRepository } from 'src/app/core/chat/repository/room/room-local-repository'; import { IMessageGetAllByRoomIdOutPut } from 'src/app/core/chat/usecase/message/message-get-all-by-room-Id'; import { RoomEntity } from 'src/app/core/chat/entity/group'; -import { messageListDetermineChanges } from '../../../data/async/list/rooms/messageListChangedetector'; +import { messageListDetermineChanges } from '../../../../module/chat/data/async/list/rooms/messageListChangedetector'; @Injectable({ @@ -94,8 +94,8 @@ export class RoomBoldSyncUseCaseService { const regex = new RegExp("Room\\/([0-9a-fA-F]{8})-([0-9a-fA-F]{4})-([0-9a-fA-F]{4})-([0-9a-fA-F]{4})-([0-9a-fA-F]{12})\\/Messages"); return this.http.listen().pipe( - filter((response: any)=> { - return response?.isOk() && regex.test(response.value.url) && response.value.url.endsWith('/Messages') + filter((response)=> { + return response?.isOk() && regex.test(response.value.url) }), map((response: any) => response.value.data as IMessageGetAllByRoomIdOutPut) ).subscribe(async (data)=> { diff --git a/src/app/module/chat/domain/use-case/room/room-create-local-direct-message.service.ts b/src/app/core/chat/usecase/room/room-create-local-direct-message.service.ts similarity index 100% rename from src/app/module/chat/domain/use-case/room/room-create-local-direct-message.service.ts rename to src/app/core/chat/usecase/room/room-create-local-direct-message.service.ts diff --git a/src/app/module/chat/domain/use-case/room/room-create-use-case.service.ts b/src/app/core/chat/usecase/room/room-create-use-case.service.ts similarity index 100% rename from src/app/module/chat/domain/use-case/room/room-create-use-case.service.ts rename to src/app/core/chat/usecase/room/room-create-use-case.service.ts diff --git a/src/app/module/chat/domain/use-case/room/room-delete-by-id-use-case.service.ts b/src/app/core/chat/usecase/room/room-delete-by-id-use-case.service.ts similarity index 100% rename from src/app/module/chat/domain/use-case/room/room-delete-by-id-use-case.service.ts rename to src/app/core/chat/usecase/room/room-delete-by-id-use-case.service.ts diff --git a/src/app/module/chat/domain/use-case/room/room-direct-on-set-id-use-case.service.ts b/src/app/core/chat/usecase/room/room-direct-on-set-id-use-case.service.ts similarity index 100% rename from src/app/module/chat/domain/use-case/room/room-direct-on-set-id-use-case.service.ts rename to src/app/core/chat/usecase/room/room-direct-on-set-id-use-case.service.ts diff --git a/src/app/module/chat/domain/use-case/room/room-get-by-id-use-case.service.ts b/src/app/core/chat/usecase/room/room-get-by-id-use-case.service.ts similarity index 100% rename from src/app/module/chat/domain/use-case/room/room-get-by-id-use-case.service.ts rename to src/app/core/chat/usecase/room/room-get-by-id-use-case.service.ts diff --git a/src/app/module/chat/domain/use-case/room/room-get-list-on-create-use-case.service.ts b/src/app/core/chat/usecase/room/room-get-list-on-create-use-case.service.ts similarity index 83% rename from src/app/module/chat/domain/use-case/room/room-get-list-on-create-use-case.service.ts rename to src/app/core/chat/usecase/room/room-get-list-on-create-use-case.service.ts index 46d8a102b..c873b712d 100644 --- a/src/app/module/chat/domain/use-case/room/room-get-list-on-create-use-case.service.ts +++ b/src/app/core/chat/usecase/room/room-get-list-on-create-use-case.service.ts @@ -1,7 +1,8 @@ import { Injectable } from '@angular/core'; import { GetRoomListUseCaseService } from './room-get-list-use-case.service' -import { RoomSocketRepositoryService } from '../../../data/repository/room/room-socket-repository.service' +import { RoomSocketRepositoryService } from '../../../../module/chat/data/repository/room/room-socket-repository.service' import { IRoomLocalRepository } from 'src/app/core/chat/repository/room/room-local-repository'; +import { IRoomSocketRepository } from '../../repository/room/room-socket-repository'; @Injectable({ providedIn: 'root' @@ -9,7 +10,7 @@ import { IRoomLocalRepository } from 'src/app/core/chat/repository/room/room-loc export class RoomGetListOnCreateUseCaseService { constructor( - private RoomSocketRepositoryService: RoomSocketRepositoryService, + private RoomSocketRepositoryService: IRoomSocketRepository, private getRoomListUseCaseService: GetRoomListUseCaseService, private roomLocalDataSourceService: IRoomLocalRepository, ) { @@ -32,7 +33,7 @@ export class RoomGetListOnCreateUseCaseService { if(findLocally.isOk() && !findLocally.value) { this.getRoomListUseCaseService.execute() } - + }, 1000); diff --git a/src/app/module/chat/domain/use-case/room/room-get-list-use-case.service.ts b/src/app/core/chat/usecase/room/room-get-list-use-case.service.ts similarity index 97% rename from src/app/module/chat/domain/use-case/room/room-get-list-use-case.service.ts rename to src/app/core/chat/usecase/room/room-get-list-use-case.service.ts index 43acc163b..fe8b3055e 100644 --- a/src/app/module/chat/domain/use-case/room/room-get-list-use-case.service.ts +++ b/src/app/core/chat/usecase/room/room-get-list-use-case.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { roomListDetermineChanges } from '../../../data/async/list/rooms/roomListChangeDetector'; +import { roomListDetermineChanges } from '../../../../module/chat/data/async/list/rooms/roomListChangeDetector'; import { captureAndReraiseAsync } from 'src/app/services/decorators/captureAndReraiseAsync'; import { CronJobService } from 'src/app/utils/task-scheduler' import { z } from "zod"; diff --git a/src/app/module/chat/domain/use-case/room/room-getlocal-by-id.service.ts b/src/app/core/chat/usecase/room/room-getlocal-by-id.service.ts similarity index 100% rename from src/app/module/chat/domain/use-case/room/room-getlocal-by-id.service.ts rename to src/app/core/chat/usecase/room/room-getlocal-by-id.service.ts diff --git a/src/app/module/chat/domain/use-case/room/room-leave-by-id-use-case.service.ts b/src/app/core/chat/usecase/room/room-leave-by-id-use-case.service.ts similarity index 100% rename from src/app/module/chat/domain/use-case/room/room-leave-by-id-use-case.service.ts rename to src/app/core/chat/usecase/room/room-leave-by-id-use-case.service.ts diff --git a/src/app/module/chat/domain/use-case/room/room-set-last-message.service.ts b/src/app/core/chat/usecase/room/room-set-last-message.service.ts similarity index 98% rename from src/app/module/chat/domain/use-case/room/room-set-last-message.service.ts rename to src/app/core/chat/usecase/room/room-set-last-message.service.ts index 6a87bb86e..d5983b0bf 100644 --- a/src/app/module/chat/domain/use-case/room/room-set-last-message.service.ts +++ b/src/app/core/chat/usecase/room/room-set-last-message.service.ts @@ -8,7 +8,7 @@ import { IMessageGetAllByRoomIdOutPut } from 'src/app/core/chat/usecase/message/ import { RoomEntity } from 'src/app/core/chat/entity/group'; import { RoomTable } from 'src/app/infra/database/dexie/instance/chat/schema/room'; import { IMessageLocalRepository } from 'src/app/core/chat/repository/message/message-local-repository'; -import { messageListDetermineChanges } from '../../../data/async/list/rooms/messageListChangedetector'; +import { messageListDetermineChanges } from '../../../../module/chat/data/async/list/rooms/messageListChangedetector'; import { IDBoolean } from 'src/app/infra/database/dexie/type'; @Injectable({ @@ -166,7 +166,7 @@ export class RoomSetLastMessageService { return this.http.listen().pipe( filter((response: any)=> { - return response?.isOk() && regex.test(response.value.url) && response.value.url.endsWith('/Messages') + return response?.isOk() && regex.test(response.value.url) }), map((response: any) => response.value.data as IMessageGetAllByRoomIdOutPut) ).subscribe(async (data)=> { diff --git a/src/app/module/chat/domain/use-case/room/room-set-local-to-false-by-id.service.ts b/src/app/core/chat/usecase/room/room-set-local-to-false-by-id.service.ts similarity index 100% rename from src/app/module/chat/domain/use-case/room/room-set-local-to-false-by-id.service.ts rename to src/app/core/chat/usecase/room/room-set-local-to-false-by-id.service.ts diff --git a/src/app/module/chat/domain/use-case/room/room-update-by-id-use-case.service.ts b/src/app/core/chat/usecase/room/room-update-by-id-use-case.service.ts similarity index 100% rename from src/app/module/chat/domain/use-case/room/room-update-by-id-use-case.service.ts rename to src/app/core/chat/usecase/room/room-update-by-id-use-case.service.ts diff --git a/src/app/module/chat/domain/use-case/room/room-update-name-sync.service.ts b/src/app/core/chat/usecase/room/room-update-name-sync.service.ts similarity index 100% rename from src/app/module/chat/domain/use-case/room/room-update-name-sync.service.ts rename to src/app/core/chat/usecase/room/room-update-name-sync.service.ts diff --git a/src/app/module/chat/domain/use-case/socket-connect-use-case.service.ts b/src/app/core/chat/usecase/socket-connect-use-case.service.ts similarity index 77% rename from src/app/module/chat/domain/use-case/socket-connect-use-case.service.ts rename to src/app/core/chat/usecase/socket-connect-use-case.service.ts index 1e33628b9..9b6911c26 100644 --- a/src/app/module/chat/domain/use-case/socket-connect-use-case.service.ts +++ b/src/app/core/chat/usecase/socket-connect-use-case.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { MessageSocketRepositoryService } from 'src/app/module/chat/data/repository/message/message-live-signalr-data-source.service'; import { XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; +import { IMessageSocketRepository } from '../repository/message/message-socket-repository'; @Injectable({ providedIn: 'root' @@ -8,7 +9,7 @@ import { XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; export class SocketConnectUseCaseService { constructor( - private MessageSocketRepositoryService: MessageSocketRepositoryService + private MessageSocketRepositoryService: IMessageSocketRepository ) { } @XTracerAsync({name:'SocketConnectUseCaseService', module:'chat', bugPrint: true}) diff --git a/src/app/module/chat/domain/use-case/socket-join-use-case.service.ts b/src/app/core/chat/usecase/socket-join-use-case.service.ts similarity index 69% rename from src/app/module/chat/domain/use-case/socket-join-use-case.service.ts rename to src/app/core/chat/usecase/socket-join-use-case.service.ts index 32accb991..230632703 100644 --- a/src/app/module/chat/domain/use-case/socket-join-use-case.service.ts +++ b/src/app/core/chat/usecase/socket-join-use-case.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; import { MessageSocketRepositoryService } from 'src/app/module/chat/data/repository/message/message-live-signalr-data-source.service'; +import { IMessageSocketRepository } from '../repository/message/message-socket-repository'; @Injectable({ @@ -8,7 +9,7 @@ import { MessageSocketRepositoryService } from 'src/app/module/chat/data/reposit export class SocketJoinUseCaseService { constructor( - private MessageSocketRepositoryService: MessageSocketRepositoryService + private MessageSocketRepositoryService: IMessageSocketRepository ) { } diff --git a/src/app/module/chat/domain/use-case/socket/member-list-update-status-use-case.service.ts b/src/app/core/chat/usecase/socket/member-list-update-status-use-case.service.ts similarity index 100% rename from src/app/module/chat/domain/use-case/socket/member-list-update-status-use-case.service.ts rename to src/app/core/chat/usecase/socket/member-list-update-status-use-case.service.ts diff --git a/src/app/module/chat/domain/use-case/socket/socket-message-create-use-case.service.ts b/src/app/core/chat/usecase/socket/socket-message-create-use-case.service.ts similarity index 95% rename from src/app/module/chat/domain/use-case/socket/socket-message-create-use-case.service.ts rename to src/app/core/chat/usecase/socket/socket-message-create-use-case.service.ts index dce15d831..34ac94796 100644 --- a/src/app/module/chat/domain/use-case/socket/socket-message-create-use-case.service.ts +++ b/src/app/core/chat/usecase/socket/socket-message-create-use-case.service.ts @@ -1,5 +1,5 @@ import { Injectable, Input } from '@angular/core'; -import { MessageLocalDataSourceService } from '../../../data/repository/message/message-local-data-source.service'; +import { MessageLocalDataSourceService } from '../../../../module/chat/data/repository/message/message-local-data-source.service'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { ParamsValidation } from 'src/app/services/decorators/validate-schema.decorator'; import { MessageEntitySchema } from 'src/app/core/chat/entity/message'; diff --git a/src/app/module/chat/domain/use-case/socket/socket-message-delete-use-case.service.ts b/src/app/core/chat/usecase/socket/socket-message-delete-use-case.service.ts similarity index 82% rename from src/app/module/chat/domain/use-case/socket/socket-message-delete-use-case.service.ts rename to src/app/core/chat/usecase/socket/socket-message-delete-use-case.service.ts index d103a7782..f2d805836 100644 --- a/src/app/module/chat/domain/use-case/socket/socket-message-delete-use-case.service.ts +++ b/src/app/core/chat/usecase/socket/socket-message-delete-use-case.service.ts @@ -1,8 +1,9 @@ import { Injectable } from '@angular/core'; -import { MessageLocalDataSourceService } from '../../../data/repository/message/message-local-data-source.service'; +import { MessageLocalDataSourceService } from '../../../../module/chat/data/repository/message/message-local-data-source.service'; import { MessageEntitySchema } from 'src/app/core/chat/entity/message'; import { z } from 'zod'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; +import { IMessageLocalRepository } from '../../repository/message/message-local-repository'; const SocketMessageDeleteOutputSchema = MessageEntitySchema.pick({ id: true, @@ -32,7 +33,7 @@ export type ISocketMessageDeleteOutput = z.infer { - httpParams = httpParams.append(key, String(options.params[key])); + if(options.params[key]) { + httpParams = httpParams.append(key, options.params[key]); + } + }); } diff --git a/src/app/module/chat/data/async/list/rooms/roomByIdChangeDetector.ts b/src/app/module/chat/data/async/list/rooms/roomByIdChangeDetector.ts index 8807d3f26..f3ba85012 100644 --- a/src/app/module/chat/data/async/list/rooms/roomByIdChangeDetector.ts +++ b/src/app/module/chat/data/async/list/rooms/roomByIdChangeDetector.ts @@ -1,6 +1,6 @@ import { RoomTable } from "src/app/infra/database/dexie/instance/chat/schema/room"; -import { RoomByIdOutputDTO } from "src/app/module/chat/domain/use-case/room/room-get-by-id-use-case.service"; -import { RoomListItemOutPutDTO } from "src/app/module/chat/domain/use-case/room/room-get-list-use-case.service"; +import { RoomByIdOutputDTO } from "src/app/core/chat/usecase/room/room-get-by-id-use-case.service"; +import { RoomListItemOutPutDTO } from "src/app/core/chat/usecase/room/room-get-list-use-case.service"; export function roomByIdDetermineChanges(serverResponse: RoomByIdOutputDTO, localRooms: RoomTable[]) { diff --git a/src/app/module/chat/data/async/list/rooms/roomListChangeDetector.ts b/src/app/module/chat/data/async/list/rooms/roomListChangeDetector.ts index 460083653..6b9554784 100644 --- a/src/app/module/chat/data/async/list/rooms/roomListChangeDetector.ts +++ b/src/app/module/chat/data/async/list/rooms/roomListChangeDetector.ts @@ -1,6 +1,6 @@ import { RoomType } from "src/app/core/chat/entity/group"; import { RoomTable } from "src/app/infra/database/dexie/instance/chat/schema/room"; -import { RoomListItemOutPutDTO } from "src/app/module/chat/domain/use-case/room/room-get-list-use-case.service"; +import { RoomListItemOutPutDTO } from "src/app/core/chat/usecase/room/room-get-list-use-case.service"; import { SessionStore } from "src/app/store/session.service"; export function roomListDetermineChanges(serverRooms: RoomListItemOutPutDTO[], localRooms: RoomTable[]) { diff --git a/src/app/module/chat/data/async/list/rooms/roomMembersChangeDetector.ts b/src/app/module/chat/data/async/list/rooms/roomMembersChangeDetector.ts index a521e9df2..92e7c8da5 100644 --- a/src/app/module/chat/data/async/list/rooms/roomMembersChangeDetector.ts +++ b/src/app/module/chat/data/async/list/rooms/roomMembersChangeDetector.ts @@ -1,5 +1,5 @@ import { MemberTable } from "src/app/infra/database/dexie/instance/chat/schema/members"; -import { RoomByIdMemberItemOutputDTO } from "src/app/module/chat/domain/use-case/room/room-get-by-id-use-case.service"; +import { RoomByIdMemberItemOutputDTO } from "src/app/core/chat/usecase/room/room-get-by-id-use-case.service"; export function roomMemberListDetermineChanges(____serverRooms: RoomByIdMemberItemOutputDTO[], localRooms: MemberTable[], roomId: string) { diff --git a/src/app/module/chat/data/repository/member/member-list-local-repository.service.ts b/src/app/module/chat/data/repository/member/member-list-local-repository.service.ts index 74c172e0b..0928a3d3d 100644 --- a/src/app/module/chat/data/repository/member/member-list-local-repository.service.ts +++ b/src/app/module/chat/data/repository/member/member-list-local-repository.service.ts @@ -4,7 +4,7 @@ import { z } from 'zod'; import { DexieRepository } from 'src/app/infra/repository/dexie/dexie-repository.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 { MemberListUPdateStatusInputDTO } from '../../../../../core/chat/usecase/socket/member-list-update-status-use-case.service'; 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/instance/chat/service'; diff --git a/src/app/module/chat/data/repository/member/member-list-remote-repository.service.ts b/src/app/module/chat/data/repository/member/member-list-remote-repository.service.ts index 1d3608fcc..b86150048 100644 --- a/src/app/module/chat/data/repository/member/member-list-remote-repository.service.ts +++ b/src/app/module/chat/data/repository/member/member-list-remote-repository.service.ts @@ -4,9 +4,9 @@ import { ValidateSchema } from 'src/app/services/decorators/validate-schema.deco import { HttpService } from 'src/app/services/http.service'; import { DataSourceReturn } from 'src/app/services/Repositorys/type'; import { IMemberRemoteRepository } from 'src/app/core/chat/repository/member/member-remote-repository'; -import { AddMemberToRoomInputDTO, AddMemberToRoomInputDTOSchema } from '../../../domain/use-case/member/member-add-use-case.service'; -import { MemberSetAdminDTO } from '../../../domain/use-case/member/member-admin-use-case.service'; -import { UserRemoveListInputDTOSchema, UserRemoveListInputDTO } from '../../../domain/use-case/room/room-leave-by-id-use-case.service'; +import { UserRemoveListInputDTOSchema, UserRemoveListInputDTO } from '../../../../../core/chat/usecase/room/room-leave-by-id-use-case.service'; +import { AddMemberToRoomInputDTOSchema, AddMemberToRoomInputDTO } from 'src/app/core/chat/usecase/member/member-add-use-case.service'; +import { MemberSetAdminDTO } from 'src/app/core/chat/usecase/member/member-admin-use-case.service'; @Injectable({ providedIn: 'root' }) diff --git a/src/app/module/chat/data/repository/member/member-socket-repository.service.ts b/src/app/module/chat/data/repository/member/member-socket-repository.service.ts index 417cd7e33..3d5231865 100644 --- a/src/app/module/chat/data/repository/member/member-socket-repository.service.ts +++ b/src/app/module/chat/data/repository/member/member-socket-repository.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; import { SignalRService } from 'src/app/infra/socket/signalR/signal-r.service'; import { IMemberSocketRepository } from 'src/app/core/chat/repository/member/member-socket-repository'; -import { IRemoveRoomMemberOutput, RemoveRoomMemberInput } from '../../../domain/use-case/member/member-remove-socket-use-case.service'; import { InstanceId } from '../../../domain/chat-service.service'; import { v4 as uuidv4 } from 'uuid' import { filter, map, tap } from 'rxjs/operators'; import { SocketMessage } from 'src/app/infra/socket/signalR/signalR'; +import { RemoveRoomMemberInput, IRemoveRoomMemberOutput } from 'src/app/core/chat/usecase/member/member-remove-socket-use-case.service'; @Injectable({ providedIn: 'root' diff --git a/src/app/module/chat/data/repository/message/message-live-signalr-data-source.service.ts b/src/app/module/chat/data/repository/message/message-live-signalr-data-source.service.ts index a2766d106..1b4316bec 100644 --- a/src/app/module/chat/data/repository/message/message-live-signalr-data-source.service.ts +++ b/src/app/module/chat/data/repository/message/message-live-signalr-data-source.service.ts @@ -1,16 +1,16 @@ import { Injectable } from '@angular/core'; import { v4 as uuidv4 } from 'uuid' import { InstanceId } from '../../../domain/chat-service.service'; -import { MessageUpdateInput } from '../../../domain/use-case/message/message-update-by-id-use-case.service'; -import { MessageReactionInput } from '../../../domain/use-case/message/message-reaction-by-id-use-case.service'; +import { MessageUpdateInput } from '../../../../../core/chat/usecase/message/message-update-by-id-use-case.service'; +import { MessageReactionInput } from '../../../../../core/chat/usecase/message/message-reaction-by-id-use-case.service'; import { SignalRService } from 'src/app/infra/socket/signalR/signal-r.service'; import { filter, map } from 'rxjs/operators'; import { SocketMessage } from 'src/app/infra/socket/signalR/signalR'; import { IMessageSocketRepository } from 'src/app/core/chat/repository/message/message-socket-repository'; -import { MessageCreateOutPutDataDTO, MessageInputDTO } from '../../../domain/use-case/message/message-create-use-case.service'; -import { MessageMarkAsReadInput } from '../../../domain/use-case/message/message-mark-as-read-use-case.service'; +import { MessageCreateOutPutDataDTO, MessageInputDTO } from '../../../../../core/chat/usecase/message/message-create-use-case.service'; +import { MessageMarkAsReadInput } from '../../../../../core/chat/usecase/message/message-mark-as-read-use-case.service'; import { MessageOutPutDataDTO } from 'src/app/core/chat/repository/dto/messageOutputDTO'; -import { MessageDeleteInputDTO } from '../../../domain/use-case/message/message-delete-by-id-live-use-case.service'; +import { MessageDeleteInputDTO } from '../../../../../core/chat/usecase/message/message-delete-by-id-live-use-case.service'; import { BehaviorSubject, Observable } from 'rxjs'; interface sendDeliverAt { diff --git a/src/app/module/chat/data/repository/message/message-remote-data-source.service.ts b/src/app/module/chat/data/repository/message/message-remote-data-source.service.ts index cea7e1c2a..f46718d9b 100644 --- a/src/app/module/chat/data/repository/message/message-remote-data-source.service.ts +++ b/src/app/module/chat/data/repository/message/message-remote-data-source.service.ts @@ -4,7 +4,7 @@ import { DataSourceReturn } from 'src/app/services/Repositorys/type'; import { SignalRService } from 'src/app/infra/socket/signalR/signal-r.service'; import { HttpAdapter } from 'src/app/infra/http/adapter'; import { IMessageGetAllByRoomIdOutPut } from 'src/app/core/chat/usecase/message/message-get-all-by-room-Id'; -import { IMessageRemoteRepository } from 'src/app/core/chat/repository/message/message-remote-repository'; +import { IGetMessagesFromRoomParams, IMessageRemoteRepository } from 'src/app/core/chat/repository/message/message-remote-repository'; @Injectable({ providedIn: 'root' @@ -21,9 +21,9 @@ export class MessageRemoteDataSourceService implements IMessageRemoteRepository // @APIReturn(MessageOutPutDTOSchema, 'get/Messages') - async getMessagesFromRoom(id: string): DataSourceReturn { + async getMessagesFromRoom(input: IGetMessagesFromRoomParams): DataSourceReturn { - var a = await this.http.get(`${this.baseUrl}/Room/${id}/Messages`) + var a = await this.http.get(`${this.baseUrl}/Room/${input.roomId}/Messages?startDate=${encodeURIComponent(input.lastMessageDate)}`) return a.map((e) => { return e.data diff --git a/src/app/module/chat/data/repository/room/room-local-repository.service.ts b/src/app/module/chat/data/repository/room/room-local-repository.service.ts index 4f0dd9bd2..5964b4703 100644 --- a/src/app/module/chat/data/repository/room/room-local-repository.service.ts +++ b/src/app/module/chat/data/repository/room/room-local-repository.service.ts @@ -41,8 +41,6 @@ export class RoomLocalRepository extends DexieRepository i // (modifications as Partial).messages[0].sentAt = oldValue.messages?.[0]?.sentAt // } - console.log({modifications, oldValue}) - if((modifications as Partial).id || oldValue.id) { (modifications as Partial).local = IDBoolean.false } else { diff --git a/src/app/module/chat/data/repository/room/room-remote-repository.service.ts b/src/app/module/chat/data/repository/room/room-remote-repository.service.ts index 1110bc5c5..483ec6763 100644 --- a/src/app/module/chat/data/repository/room/room-remote-repository.service.ts +++ b/src/app/module/chat/data/repository/room/room-remote-repository.service.ts @@ -1,18 +1,18 @@ import { Injectable } from '@angular/core'; import { Result } from 'neverthrow'; import { HttpService } from 'src/app/services/http.service'; -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 { SignalRService } from 'src/app/infra/socket/signalR/signal-r.service'; import { v4 as uuidv4 } from 'uuid' -import { CreateRoomInputDTO, RoomOutPutDTO } from '../../../domain/use-case/room/room-create-use-case.service'; +import { CreateRoomInputDTO, RoomOutPutDTO } from '../../../../../core/chat/usecase/room/room-create-use-case.service'; import { IRoomRemoteRepository } from 'src/app/core/chat/repository/room/room-remote-repository'; -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 { RoomByIdOutputDTO } from 'src/app/core/chat/usecase/room/room-get-by-id-use-case.service'; +import { RoomUpdateInputDTO, RoomUpdateOutputDTO } from 'src/app/core/chat/usecase/room/room-update-by-id-use-case.service'; +import { RoomListOutPutDTO } from '../../../../../core/chat/usecase/room/room-get-list-use-case.service'; import { z } from 'zod'; import { HttpAdapter } from 'src/app/infra/http/adapter'; +import { AddMemberToRoomInputDTO } from 'src/app/core/chat/usecase/member/member-add-use-case.service'; const RoomByIdInputDTOSchema = z.string() type RoomByIdInputDTO = z.infer diff --git a/src/app/module/chat/data/repository/room/room-socket-repository.service.ts b/src/app/module/chat/data/repository/room/room-socket-repository.service.ts index c28f6e3c3..c3f7b0452 100644 --- a/src/app/module/chat/data/repository/room/room-socket-repository.service.ts +++ b/src/app/module/chat/data/repository/room/room-socket-repository.service.ts @@ -5,7 +5,7 @@ import { z } from 'zod'; import { SocketMessage } from 'src/app/infra/socket/signalR/signalR'; import { v4 as uuidv4 } from 'uuid' import { IRoomSocketRepository, SocketRoomUpdateOutPut } from 'src/app/core/chat/repository/room/room-socket-repository'; -import { CreateRoomInputDTO } from '../../../domain/use-case/room/room-create-use-case.service'; +import { CreateRoomInputDTO } from '../../../../../core/chat/usecase/room/room-create-use-case.service'; const listenToDeleteRoomInputSchema = z.object({ roomId: z.string() diff --git a/src/app/module/chat/domain/chat-service.service.ts b/src/app/module/chat/domain/chat-service.service.ts index f469af6af..dcbe116d0 100644 --- a/src/app/module/chat/domain/chat-service.service.ts +++ b/src/app/module/chat/domain/chat-service.service.ts @@ -1,57 +1,56 @@ import { Injectable } from '@angular/core'; -import { MessageDeleteLiveUseCaseService } from 'src/app/module/chat/domain/use-case/message/message-delete-by-id-live-use-case.service' +import { MessageDeleteLiveUseCaseService } from 'src/app/core/chat/usecase/message/message-delete-by-id-live-use-case.service' import { SessionStore } from 'src/app/store/session.service'; -import { MessageReactionInput, MessageReactionUseCaseService } from 'src/app/module/chat/domain/use-case/message/message-reaction-by-id-use-case.service'; -import { MessageUpdateInput, MessageUpdateUseCaseService } from 'src/app/module/chat/domain/use-case/message/message-update-by-id-use-case.service'; -import { MemberAdminUseCaseService, MemberSetAdminDTO } from 'src/app/module/chat/domain/use-case/member/member-admin-use-case.service'; -import { MessageCreateUseCaseService } from 'src/app/module/chat/domain/use-case/message/message-create-use-case.service'; +import { MessageReactionInput, MessageReactionUseCaseService } from 'src/app/core/chat/usecase/message/message-reaction-by-id-use-case.service'; +import { MessageUpdateInput, MessageUpdateUseCaseService } from 'src/app/core/chat/usecase/message/message-update-by-id-use-case.service'; +import { MemberAdminUseCaseService, MemberSetAdminDTO } from 'src/app/core/chat/usecase/member/member-admin-use-case.service'; +import { MessageCreateUseCaseService } from 'src/app/core/chat/usecase/message/message-create-use-case.service'; 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 { 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'; -import { ListenMessageUpdateByRoomIdUseCase } from './use-case/message/listen-message-update-by-roomId.service'; -import { GetRoomByIdUseCaseService } from './use-case/room/room-get-by-id-use-case.service'; -import { DeleteRoomUseCaseService } from './use-case/room/room-delete-by-id-use-case.service'; -import { CreateRoomInputDTO, CreateRoomUseCaseService } from './use-case/room/room-create-use-case.service'; -import { RoomLeaveUseCase, UserRemoveListInputDTO } from './use-case/room/room-leave-by-id-use-case.service'; -import { SyncAllRoomMessagesService } from './use-case/message/sync-all-room-messages.service'; -import { ListenSendMessageUseCase } from './use-case/message/listen-send-message.service'; -import { SendLocalMessagesUseCaseService } from './use-case/message/messages-send-offline-use-case.service' -import { RemoveMemberUseCaseService } from './use-case/member/-use-case.service' -import { AddMemberUseCaseService } from './use-case/member/member-add-use-case.service' -import { MemberRemoveSocketUseCaseService, RemoveRoomMemberInput } from './use-case/member/member-remove-socket-use-case.service' -import { RoomUpdateInputDTO, UpdateRoomByIdUseCaseService } from './use-case/room/room-update-by-id-use-case.service' -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 { GetRoomListUseCaseService } from 'src/app/module/chat/domain/use-case/room/room-get-list-use-case.service'; +import { SocketMessageDeleteUseCaseService } from 'src/app/core/chat/usecase/socket/socket-message-delete-use-case.service'; +import { SocketMessageUpdateUseCaseService } from 'src/app/core/chat/usecase/socket/socket-message-update-use-case.service'; +import { SocketMessageCreateUseCaseService } from 'src/app/core/chat/usecase/socket/socket-message-create-use-case.service'; +import { DownloadMessageAttachmentByMessageId, DownloadMessageAttachmentUserCaseService } from 'src/app/core/chat/usecase/message/message-download-attachment-user-case.service'; +import { ListenMessageByRoomIdNewUseCase } from 'src/app/core/chat/usecase/message/listen-message-by-roomId.service'; +import { MemberListUpdateStatusUseCaseService } from 'src/app/core/chat/usecase/socket/member-list-update-status-use-case.service'; +import { ListenMessageDeleteByRoomIdService } from 'src/app/core/chat/usecase/message/listene-message-delete-by-roomId.service'; +import { ListenMessageUpdateByRoomIdUseCase } from 'src/app/core/chat/usecase/message/listen-message-update-by-roomId.service'; +import { GetRoomByIdUseCaseService } from '../../../core/chat/usecase/room/room-get-by-id-use-case.service'; +import { DeleteRoomUseCaseService } from '../../../core/chat/usecase/room/room-delete-by-id-use-case.service'; +import { CreateRoomInputDTO, CreateRoomUseCaseService } from '../../../core/chat/usecase/room/room-create-use-case.service'; +import { RoomLeaveUseCase, UserRemoveListInputDTO } from '../../../core/chat/usecase/room/room-leave-by-id-use-case.service'; +import { SyncAllRoomMessagesService } from 'src/app/core/chat/usecase/message/sync-all-room-messages.service'; +import { ListenSendMessageUseCase } from '../../../core/chat/usecase/message/listen-send-message.service'; +import { SendLocalMessagesUseCaseService } from 'src/app/core/chat/usecase/message/messages-send-offline-use-case.service' +import { RemoveMemberUseCaseService } from 'src/app/core/chat/usecase/member/-use-case.service' +import { AddMemberToRoomInputDTO, AddMemberUseCaseService } from 'src/app/core/chat/usecase/member/member-add-use-case.service' +import { MemberRemoveSocketUseCaseService, RemoveRoomMemberInput } from 'src/app/core/chat/usecase/member/member-remove-socket-use-case.service' +import { RoomUpdateInputDTO, UpdateRoomByIdUseCaseService } from '../../../core/chat/usecase/room/room-update-by-id-use-case.service' +import { SocketConnectUseCaseService } from 'src/app/core/chat/usecase/socket-connect-use-case.service' +import { MessageMarkAsReadUseCaseService } from 'src/app/core/chat/usecase/message/message-mark-as-read-use-case.service' +import { MessageMarkAllMessageAsReadByRoomIdInputSchema, MessageMarkAllMessageAsReadByRoomIdService } from 'src/app/core/chat/usecase/message/message-mark-all-message-as-read-by-room-id.service' +import { GetRoomListUseCaseService } from 'src/app/core/chat/usecase/room/room-get-list-use-case.service'; import { filter, map } from 'rxjs/operators'; import { v4 as uuidv4 } from 'uuid' import { IMessage, MessageEntity } from '../../../core/chat/entity/message'; -import { MessageAttachmentByMessageIdInput, MessageAttachmentByMessageIdUseCase } from './use-case/message/message-attachment-by-message-id.service'; -import { AddMemberToRoomInputDTO } from '../domain/use-case/member/member-add-use-case.service'; +import { MessageAttachmentByMessageIdInput, MessageAttachmentByMessageIdUseCase } from 'src/app/core/chat/usecase/message/message-attachment-by-message-id.service'; import { RoomType } from "src/app/core/chat/entity/group"; import { HttpListenToMessageLoadHistoryAdapter } from './adapter' import { HttpListenToMessageLoadHistoryUseCaseInput } from 'src/app/core/chat/usecase/message/http-listen-to-message-load-history-by-roomId-use-case'; import { MessageSocketRepositoryService } from 'src/app/module/chat/data/repository/message/message-live-signalr-data-source.service' -import { MessageMarkAsReadInput } from "src/app/module/chat/domain/use-case/message/message-mark-as-read-use-case.service"; -import { BoldRemoveByRoomIdInput, BoldRemoveByRoomIdService } from 'src/app/module/chat/domain/use-case/bold/bold-remove-by-room-id.service'; -import { MemberListHttpSyncUseCase } from 'src/app/module/chat/domain/use-case/member/member-list-http-sync-use-case.ts.service' -import { RoomBoldSyncUseCaseService } from 'src/app/module/chat/domain/use-case/room/room-bold-sync-use-case.service' -import { RoomSetLastMessageService } from 'src/app/module/chat/domain/use-case/room/room-set-last-message.service'; -import { RoomDirectOnSetIdUseCaseInputSchema, RoomDirectOnSetIdUseCaseService } from 'src/app/module/chat/domain/use-case/room/room-direct-on-set-id-use-case.service'; -import { RoomCreateLocalDirectMessageInputDTOInputDTO, RoomCreateLocalDirectMessageService } from 'src/app/module/chat/domain/use-case/room/room-create-local-direct-message.service'; -import { RoomGetListOnCreateUseCaseService } from 'src/app/module/chat/domain/use-case/room/room-get-list-on-create-use-case.service'; -import { IRoomSetLocalToFalseByIdInput, RoomSetLocalToFalseByIdService } from 'src/app/module/chat/domain/use-case/room/room-set-local-to-false-by-id.service'; -import { RoomUpdateNameSyncService } from 'src/app/module/chat/domain/use-case/room/room-update-name-sync.service'; -import { IUserPhotoGetByIdInput, UserPhotoGetByIdUseCase } from 'src/app/module/chat/domain/use-case/user-photo/user-photo-get-by-id-use-case.service' -import { IMessageLocalGetByIdServiceInput, MessageLocalGetByIdService } from 'src/app/module/chat/domain/use-case/message/message-local-get-by-id.service' -import { ContactListService } from './use-case/contact/contact-list.service'; -import { IRoomGetLocalByIdServiceInput, RoomGetLocalByIdService } from './use-case/room/room-getlocal-by-id.service'; +import { MessageMarkAsReadInput } from "src/app/core/chat/usecase/message/message-mark-as-read-use-case.service"; +import { BoldRemoveByRoomIdInput, BoldRemoveByRoomIdService } from 'src/app/core/chat/usecase/bold/bold-remove-by-room-id.service'; +import { MemberListHttpSyncUseCase } from 'src/app/core/chat/usecase/member/member-list-http-sync-use-case.ts.service' +import { RoomBoldSyncUseCaseService } from 'src/app/core/chat/usecase/room/room-bold-sync-use-case.service' +import { RoomSetLastMessageService } from 'src/app/core/chat/usecase/room/room-set-last-message.service'; +import { RoomDirectOnSetIdUseCaseInputSchema, RoomDirectOnSetIdUseCaseService } from 'src/app/core/chat/usecase/room/room-direct-on-set-id-use-case.service'; +import { RoomCreateLocalDirectMessageInputDTOInputDTO, RoomCreateLocalDirectMessageService } from 'src/app/core/chat/usecase/room/room-create-local-direct-message.service'; +import { RoomGetListOnCreateUseCaseService } from 'src/app/core/chat/usecase/room/room-get-list-on-create-use-case.service'; +import { IRoomSetLocalToFalseByIdInput, RoomSetLocalToFalseByIdService } from 'src/app/core/chat/usecase/room/room-set-local-to-false-by-id.service'; +import { RoomUpdateNameSyncService } from 'src/app/core/chat/usecase/room/room-update-name-sync.service'; +import { IUserPhotoGetByIdInput, UserPhotoGetByIdUseCase } from 'src/app/core/chat/usecase/user-photo/user-photo-get-by-id-use-case.service' +import { IMessageLocalGetByIdServiceInput, MessageLocalGetByIdService } from 'src/app/core/chat/usecase/message/message-local-get-by-id.service' +import { ContactListService } from 'src/app/core/chat/usecase/contact/contact-list.service'; +import { IRoomGetLocalByIdServiceInput, RoomGetLocalByIdService } from '../../../core/chat/usecase/room/room-getlocal-by-id.service'; export const getInstanceId = (): string => { diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 4e28bca31..f23517b3d 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -228,10 +228,6 @@
-
- Hoje,  {{ todayDateFormat() }} -
-
@@ -240,7 +236,8 @@
-
+
+ Hoje {{ day.daysInfo.dayName }}
{{month.monthInfo.monthName}}
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 2aa2261db..ea7625c27 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -183,7 +183,7 @@ export class AgendaPage implements OnInit { environment = environment selectedUserCalendar: number | string = null hasEventToday = false - isSelectedDayHasEvent = true + isSelectedDayIsToday = true sharedCalendar: Observable @@ -854,22 +854,27 @@ export class AgendaPage implements OnInit { if(YearIndex == 0) { let MonthNameIndex = year[YearIndex].months.findIndex( x => x.monthInfo.monthName == monthName) if(MonthNameIndex == 0) { - let DayNameIndex = year[YearIndex].months[MonthNameIndex].days.findIndex( x => x.daysInfo.dayName == dayName) - if(DayNameIndex == 0) { - this.hasEventToday = true - } else { - this.hasEventToday = false + let events = year[YearIndex].months[MonthNameIndex].days.filter( x => x.daysInfo.dayName == dayName) + + for(const e of events) { + for(const b of e.events) { + const equal = (momentG(new Date(), 'dd MMMM yyyy', 'pt') == momentG((b as any).start, 'dd MMMM yyyy', 'pt')) + + if(equal) { + this.isSelectedDayIsToday = true + return true + } + } } + this.isSelectedDayIsToday = false + } else { - this.hasEventToday = false + this.isSelectedDayIsToday = false } } else { - this.hasEventToday = false + this.isSelectedDayIsToday = false } - - this.isSelectedDayHasEvent = momentG(new Date(), 'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate, 'dd MMMM yyyy', 'pt'); - } diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index eeaacfbc0..78dfb8c18 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -258,4 +258,3 @@
- diff --git a/src/app/store/publication-folder.service.ts b/src/app/store/publication-folder.service.ts index 42147b3e4..13116f2b6 100644 --- a/src/app/store/publication-folder.service.ts +++ b/src/app/store/publication-folder.service.ts @@ -176,11 +176,8 @@ export class PublicationFolderService { if (!found) { this.publicationList[folderId].push(publicationDetails) this.revertPublicationOrder(folderId); - console.log('found') } else { - console.log('try') - let a: any = this.publicationList[folderId][findIndex] let b: any = publicationDetails diff --git a/src/app/ui/chat/chat.page.ts b/src/app/ui/chat/chat.page.ts index 5f26a6879..598044181 100644 --- a/src/app/ui/chat/chat.page.ts +++ b/src/app/ui/chat/chat.page.ts @@ -383,7 +383,6 @@ export class ChatPage implements OnInit { else { this.roomId = null; this.selectedRoomId = room.$id; - console.log('RoomSelected', room) this.RoomSelected = room this.closeAllDesktopComponents(); this.showEmptyComponent = false; @@ -524,7 +523,6 @@ export class ChatPage implements OnInit { modal.onDidDismiss().then(e => { this.roomId = null; this.selectedRoomId = null; - console.log('RoomSelected', room) this.RoomSelected = null }) } diff --git a/src/app/ui/chat/component/messages/messages.page.html b/src/app/ui/chat/component/messages/messages.page.html index 37ecd206e..f5d844461 100644 --- a/src/app/ui/chat/component/messages/messages.page.html +++ b/src/app/ui/chat/component/messages/messages.page.html @@ -69,6 +69,7 @@
-
+
{ + + if (!clickedInside) { + this.selectedMessage = null; + } + }, 100); + + } messageStatus(message: MessageViewModal) { if(this.allViewed(message)) { @@ -1059,6 +1064,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { } addReaction(message: any, emoji: string) { + console.log('reaction==') // Logic to add reaction to the message this.selectedMessage = null; // Close the picker after adding reaction diff --git a/src/app/ui/chat/store/roomStore.ts b/src/app/ui/chat/store/roomStore.ts index fdf2cd9d4..4de7b10e3 100644 --- a/src/app/ui/chat/store/roomStore.ts +++ b/src/app/ui/chat/store/roomStore.ts @@ -51,7 +51,6 @@ export class RoomStore { scrollToBottomClicked = ()=> {} constructor( - private messageLocalDataSourceService: MessageLocalDataSourceService, private RoomLocalRepository: RoomLocalRepository, private chatServiceService: ChatServiceService, private MemberListLocalRepository: MemberListLocalRepository, diff --git a/version/git-version.ts b/version/git-version.ts index 4aa4decc9..6a7101350 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "5ae4bc241", - "SHA": "5ae4bc24113d5e9223d3b4e94b9734469f8825bb", + "shortSHA": "bfd4e44b5", + "SHA": "bfd4e44b5b32a7c340edff7c24e25b95dda58564", "branch": "feature/chat-new-api-peter", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Oct 15 10:41:21 2024 +0100'", + "lastCommitTime": "'Tue Oct 15 10:42:03 2024 +0100'", "lastCommitMessage": "fix message", - "lastCommitNumber": "6095", - "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is ahead of 'origin/feature/chat-new-api-peter' by 10 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: version/git-version.ts", + "lastCommitNumber": "6096", + "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is up to date with 'origin/feature/chat-new-api-peter'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/core/chat/mapper/getRoomByIdMapper.ts\n\tmodified: src/app/core/chat/mapper/getRoomListMapper.ts\n\trenamed: src/app/module/chat/domain/mapper/memberLIstMapper.ts -> src/app/core/chat/mapper/memberLIstMapper.ts\n\trenamed: src/app/module/chat/domain/mapper/messageMapper.ts -> src/app/core/chat/mapper/messageMapper.ts\n\tmodified: src/app/core/chat/repository/member/member-local-repository.ts\n\tmodified: src/app/core/chat/repository/member/member-remote-repository.ts\n\tmodified: src/app/core/chat/repository/member/member-socket-repository.ts\n\tmodified: src/app/core/chat/repository/message/message-remote-repository.ts\n\tmodified: src/app/core/chat/repository/message/message-socket-repository.ts\n\tmodified: src/app/core/chat/repository/room/room-remote-repository.ts\n\tmodified: src/app/core/chat/repository/room/room-socket-repository.ts\n\tmodified: src/app/core/chat/repository/user-photo/user-photo-remote-repository.ts\n\trenamed: src/app/module/chat/domain/use-case/bold/bold-remove-by-room-id.service.spec.ts -> src/app/core/chat/usecase/bold/bold-remove-by-room-id.service.spec.ts\n\trenamed: src/app/module/chat/domain/use-case/bold/bold-remove-by-room-id.service.ts -> src/app/core/chat/usecase/bold/bold-remove-by-room-id.service.ts\n\trenamed: src/app/module/chat/domain/use-case/contact/contact-list.service.ts -> src/app/core/chat/usecase/contact/contact-list.service.ts\n\trenamed: src/app/module/chat/domain/use-case/member/-use-case.service.ts -> src/app/core/chat/usecase/member/-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/member/member-add-use-case.service.ts -> src/app/core/chat/usecase/member/member-add-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/member/member-admin-use-case.service.ts -> src/app/core/chat/usecase/member/member-admin-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/member/member-list-http-sync-use-case.ts.service.ts -> src/app/core/chat/usecase/member/member-list-http-sync-use-case.ts.service.ts\n\trenamed: src/app/module/chat/domain/use-case/member/member-remove-socket-use-case.service.ts -> src/app/core/chat/usecase/member/member-remove-socket-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/listen-message-by-roomId.service.ts -> src/app/core/chat/usecase/message/listen-message-by-roomId.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/listen-message-update-by-roomId.service.ts -> src/app/core/chat/usecase/message/listen-message-update-by-roomId.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/listen-send-message.service.ts -> src/app/core/chat/usecase/message/listen-send-message.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/listene-message-delete-by-roomId.service.ts -> src/app/core/chat/usecase/message/listene-message-delete-by-roomId.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-attachment-by-message-id.service.ts -> src/app/core/chat/usecase/message/message-attachment-by-message-id.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-create-use-case.service.ts -> src/app/core/chat/usecase/message/message-create-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-delete-by-id-live-use-case.service.ts -> src/app/core/chat/usecase/message/message-delete-by-id-live-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-download-attachment-user-case.service.ts -> src/app/core/chat/usecase/message/message-download-attachment-user-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-get-attachment-localy-use-case.service.ts -> src/app/core/chat/usecase/message/message-get-attachment-localy-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-local-get-by-id.service.ts -> src/app/core/chat/usecase/message/message-local-get-by-id.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-mark-all-message-as-read-by-room-id.service.ts -> src/app/core/chat/usecase/message/message-mark-all-message-as-read-by-room-id.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-mark-as-read-use-case.service.ts -> src/app/core/chat/usecase/message/message-mark-as-read-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-reaction-by-id-use-case.service.ts -> src/app/core/chat/usecase/message/message-reaction-by-id-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-update-by-id-use-case.service.ts -> src/app/core/chat/usecase/message/message-update-by-id-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/messages-send-offline-use-case.service.ts -> src/app/core/chat/usecase/message/messages-send-offline-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/sync-all-room-messages.service.ts -> src/app/core/chat/usecase/message/sync-all-room-messages.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-bold-sync-use-case.service.ts -> src/app/core/chat/usecase/room/room-bold-sync-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-create-local-direct-message.service.ts -> src/app/core/chat/usecase/room/room-create-local-direct-message.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-create-use-case.service.ts -> src/app/core/chat/usecase/room/room-create-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-delete-by-id-use-case.service.ts -> src/app/core/chat/usecase/room/room-delete-by-id-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-direct-on-set-id-use-case.service.ts -> src/app/core/chat/usecase/room/room-direct-on-set-id-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-get-by-id-use-case.service.ts -> src/app/core/chat/usecase/room/room-get-by-id-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-get-list-on-create-use-case.service.ts -> src/app/core/chat/usecase/room/room-get-list-on-create-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-get-list-use-case.service.ts -> src/app/core/chat/usecase/room/room-get-list-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-getlocal-by-id.service.ts -> src/app/core/chat/usecase/room/room-getlocal-by-id.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-leave-by-id-use-case.service.ts -> src/app/core/chat/usecase/room/room-leave-by-id-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-set-last-message.service.ts -> src/app/core/chat/usecase/room/room-set-last-message.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-set-local-to-false-by-id.service.ts -> src/app/core/chat/usecase/room/room-set-local-to-false-by-id.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-update-by-id-use-case.service.ts -> src/app/core/chat/usecase/room/room-update-by-id-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-update-name-sync.service.ts -> src/app/core/chat/usecase/room/room-update-name-sync.service.ts\n\trenamed: src/app/module/chat/domain/use-case/socket-connect-use-case.service.ts -> src/app/core/chat/usecase/socket-connect-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/socket-join-use-case.service.ts -> src/app/core/chat/usecase/socket-join-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/socket/member-list-update-status-use-case.service.ts -> src/app/core/chat/usecase/socket/member-list-update-status-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/socket/socket-message-create-use-case.service.ts -> src/app/core/chat/usecase/socket/socket-message-create-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/socket/socket-message-delete-use-case.service.ts -> src/app/core/chat/usecase/socket/socket-message-delete-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/socket/socket-message-update-use-case.service.ts -> src/app/core/chat/usecase/socket/socket-message-update-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/typing/typing-send-use-case.service.ts -> src/app/core/chat/usecase/typing/typing-send-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/user-photo/user-photo-get-by-id-use-case.service.ts -> src/app/core/chat/usecase/user-photo/user-photo-get-by-id-use-case.service.ts\n\tmodified: src/app/infra/http/http.service.ts\n\tmodified: src/app/module/chat/data/async/list/rooms/roomByIdChangeDetector.ts\n\tmodified: src/app/module/chat/data/async/list/rooms/roomListChangeDetector.ts\n\tmodified: src/app/module/chat/data/async/list/rooms/roomMembersChangeDetector.ts\n\tmodified: src/app/module/chat/data/repository/member/member-list-local-repository.service.ts\n\tmodified: src/app/module/chat/data/repository/member/member-list-remote-repository.service.ts\n\tmodified: src/app/module/chat/data/repository/member/member-socket-repository.service.ts\n\tmodified: src/app/module/chat/data/repository/message/message-live-signalr-data-source.service.ts\n\tmodified: src/app/module/chat/data/repository/message/message-remote-data-source.service.ts\n\tmodified: src/app/module/chat/data/repository/room/room-local-repository.service.ts\n\tmodified: src/app/module/chat/data/repository/room/room-remote-repository.service.ts\n\tmodified: src/app/module/chat/data/repository/room/room-socket-repository.service.ts\n\tmodified: src/app/module/chat/domain/chat-service.service.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/store/publication-folder.service.ts\n\tmodified: src/app/ui/chat/chat.page.ts\n\tmodified: src/app/ui/chat/component/messages/messages.page.html\n\tmodified: src/app/ui/chat/component/messages/messages.page.scss\n\tmodified: src/app/ui/chat/modal/messages/messages.page.html\n\tmodified: src/app/ui/chat/modal/messages/messages.page.scss\n\tmodified: src/app/ui/chat/modal/messages/messages.page.ts\n\tmodified: src/app/ui/chat/store/roomStore.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file