peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix last message

Browse Source
This commit is contained in:
Peter Maquiran
2024-09-01 14:27:32 +01:00
parent 41c63b6c56
commit d4776a5d7a
21 changed files with 132 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/module/chat/data/async/list/rooms/roomListChangeDetector.ts
+2 -2
View File
@@ -14,8 +14,8 @@ export function roomListDetermineChanges(serverRooms: RoomListItemOutPutDTO[], l
room.chatRoom.roomName !== localRoom.roomName && room.chatRoom.roomType == RoomType.Group ||
room.chatRoom.createdBy.wxUserId !== localRoom.createdBy.wxUserId ||
room.chatRoom.createdAt !== localRoom.createdAt ||
room.chatRoom.expirationDate !== localRoom.expirationDate ||
room.chatRoom.messages?.[0]?.id !== localRoom.messages?.[0]?.id
room.chatRoom.expirationDate !== localRoom.expirationDate // ||
// room.chatRoom.messages?.[0]?.id !== localRoom.messages?.[0]?.id
// room.chatRoom.roomType !== localRoom.roomType
);
});
src/app/module/chat/data/repository/message/message-live-signalr-data-source.service.ts
+24 -5
View File
@@ -7,11 +7,11 @@ 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 } from '../../../domain/use-case/message/message-create-use-case.service';
import { MessageInputDTO } from 'src/app/core/chat/repository/dto/messageInputDtO'
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 { 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 { BehaviorSubject, Observable } from 'rxjs';
interface sendDeliverAt {
memberId: number,
@@ -25,6 +25,8 @@ interface sendDeliverAt {
})
export class MessageSocketRepositoryService implements IMessageSocketRepository {
private sendDataSubject: BehaviorSubject<{method: string, data: any}> = new BehaviorSubject<{method: string, data: any}>(null);
constructor(
private socket: SignalRService
) {}
@@ -49,9 +51,10 @@ export class MessageSocketRepositoryService implements IMessageSocketRepository
data: data,
})
if(result.isOk()) {
console.log('recieve', result.value)
}
this.sendDataSubject.next({
method: 'sendMessage',
data: data,
})
return result;
}
@@ -66,6 +69,10 @@ export class MessageSocketRepositoryService implements IMessageSocketRepository
data: data as any,
})
this.sendDataSubject.next({
method: 'SendDirectMessage',
data: data,
})
return result;
}
@@ -121,6 +128,18 @@ export class MessageSocketRepositoryService implements IMessageSocketRepository
)
}
listenToSendMessage() {
return this.sendDataSubject.pipe(
filter((e) : e is SocketMessage<MessageInputDTO>=> {
console.log(e, e?.method == 'sendMessage' || e?.method == 'SendDirectMessage')
return e?.method == 'sendMessage' || e?.method == 'SendDirectMessage'
}
))
}
reactToMessageSocket(data: MessageReactionInput) {
this.socket.sendData({
src/app/module/chat/domain/chat-service.service.ts
+3 -1
View File
@@ -40,6 +40,7 @@ import { MessageSocketRepositoryService } from 'src/app/module/chat/data/reposit
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 { RoomSetLastMessageService } from 'src/app/module/chat/domain/use-case/room/room-set-last-message.service'
export const InstanceId = uuidv4();
@Injectable({
@@ -80,7 +81,8 @@ export class ChatServiceService {
private HttpListenToMessageLoadHistory: HttpListenToMessageLoadHistoryAdapter,
private MessageSocketRepositoryService: MessageSocketRepositoryService,
private BoldRemoveByRoomIdService: BoldRemoveByRoomIdService,
private MemberListHttpSyncUseCase: MemberListHttpSyncUseCase
private MemberListHttpSyncUseCase: MemberListHttpSyncUseCase,
private RoomSetLastMessageService: RoomSetLastMessageService
) {
this.MessageSocketRepositoryService.listenToDeleteMessages()
.pipe()
src/app/module/chat/domain/mapper/messageMapper.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import { MessageInputDTO } from "src/app/core/chat/repository/dto/messageInputDtO";
import { MessageEntity } from "../../../../core/chat/entity/message";
import { MessageOutPutDataDTO } from "src/app/core/chat/repository/dto/messageOutputDTO";
import { MessageInputDTO } from "../use-case/message/message-create-use-case.service";
export class MessageMapper {
static toDomain(DTO: MessageOutPutDataDTO) : MessageEntity {
src/app/module/chat/domain/use-case/member/member-list-http-sync-use-case.ts.service.ts
+12 -12
View File
@@ -15,20 +15,20 @@ export class MemberListHttpSyncUseCase {
private memberLocalRepository: IMemberLocalRepository
) {
// this.http.listen().pipe(
// filter((response)=> {
// if(response?.isOk()) {
// return response.value.url.includes('/Room/') && typeof response.value?.data?.data?.roomName == 'string'
// }
this.http.listen().pipe(
filter((response)=> {
if(response?.isOk()) {
return response.value.url.includes('/Room/') && typeof response.value?.data?.data?.roomName == 'string'
}
// return false
// }),
// map((response: any) => response.value.data as RoomByIdOutputDTO)
// )
// .subscribe(async (data) => {
return false
}),
map((response: any) => response.value.data as RoomByIdOutputDTO)
)
.subscribe(async (data) => {
// this.syncMembers(data)
// })
this.syncMembers(data)
})
}
private async syncMembers(roomData: RoomByIdOutputDTO): Promise<void> {
src/app/module/chat/domain/use-case/message/message-create-use-case.service.ts
+23 -4
View File
@@ -19,12 +19,31 @@ import { IMessageLocalRepository } from 'src/app/core/chat/repository/message/me
import { IMessageSocketRepository } from 'src/app/core/chat/repository/message/message-socket-repository';
import { IMemberLocalRepository } from 'src/app/core/chat/repository/member/member-local-repository';
import { IAttachmentLocalRepository } from 'src/app/core/chat/repository/typing/typing-local-repository';
import { base64Schema } from 'src/app/utils/zod';
export enum MessageEnum {
Direct = 1,
group = 2
}
export const MessageInputDTOSchema = z.object({
roomId: z.string().uuid().optional(),
receiverId: z.number().optional(),
senderId: z.number(),
message: z.string().nullable().optional(),
messageType: z.number(),
canEdit: z.boolean(),
oneShot: z.boolean(),
requireUnlock: z.boolean(),
requestId: z.string(),
attachment: z.object({
fileType: z.nativeEnum(MessageAttachmentFileType),
source: z.nativeEnum(MessageAttachmentSource),
file: base64Schema.optional(),
fileName: z.string().optional(),
applicationId: z.number().optional(),
docId: z.number().optional(),
mimeType: z.string().optional()
}).optional()
});
export type MessageInputDTO = z.infer<typeof MessageInputDTOSchema>
export const MessageCreatePutDataDTOSchema = z.object({
src/app/module/chat/domain/use-case/room/room-get-list-use-case.service.ts
+2 -5
View File
@@ -6,7 +6,6 @@ import { z } from "zod";
import { IRoomRemoteRepository } from 'src/app/core/chat/repository/room/room-remote-repository';
import { IRoomLocalRepository } from 'src/app/core/chat/repository/room/room-local-repository';
import { MessageEntitySchema } from 'src/app/core/chat/entity/message';
import { RoomEntity, RoomType } from 'src/app/core/chat/entity/group';
import { GetRoomListMapper } from 'src/app/core/chat/mapper/getRoomListMapper';
@@ -52,7 +51,6 @@ export class GetRoomListUseCaseService {
constructor(
private roomRemoteDataSourceService: IRoomRemoteRepository,
// private roomMemoryDataSourceService: Store<RoomRemoteDataSourceState>,
private roomLocalDataSourceService: IRoomLocalRepository,
private CronJobService: CronJobService
) { }
@@ -65,7 +63,7 @@ export class GetRoomListUseCaseService {
if(localList.isOk()) {
if(result.isOk()) {
const { roomsToDelete, roomsToInsert, roomsToUpdate } = roomListDetermineChanges(result.value.data, localList.value)
if(roomsToInsert) {
@@ -73,12 +71,11 @@ export class GetRoomListUseCaseService {
for( const room of roomsToInsertEntity) {
this.roomLocalDataSourceService.insert(room)
if(room.expirationDate) {
console.log('room expiration date schedule')
this.CronJobService.createCronJob('remove expired room', new Date(room.expirationDate), this.execute)
}
}
}
const roomsToUpdateEntity = GetRoomListMapper.toDomain(roomsToUpdate)
this.roomLocalDataSourceService.updateMany(roomsToUpdateEntity)
src/app/module/chat/domain/use-case/room/room-set-last-message.service.spec.ts
-16
View File
@@ -1,16 +0,0 @@
import { TestBed } from '@angular/core/testing';
import { RoomSetLastMessageService } from './room-set-last-message.service';
describe('RoomSetLastMessageService', () => {
let service: RoomSetLastMessageService;
beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(RoomSetLastMessageService);
});
it('should be created', () => {
expect(service).toBeTruthy();
});
});
src/app/module/chat/domain/use-case/room/room-set-last-message.service.ts
+23 -4
View File
@@ -4,6 +4,7 @@ import { IRoomLocalRepository } from 'src/app/core/chat/repository/room/room-loc
import { filter, map } from 'rxjs/operators';
import { InstanceId } from '../../chat-service.service';
import { MessageEntity } from 'src/app/core/chat/entity/message';
import { SessionStore } from 'src/app/store/session.service';
@Injectable({
providedIn: 'root'
@@ -11,14 +12,15 @@ import { MessageEntity } from 'src/app/core/chat/entity/message';
export class RoomSetLastMessageService {
constructor(
private MessageSocketRepositoryService: IMessageSocketRepository,
private roomLocalRepository: IRoomLocalRepository
private roomLocalRepository: IRoomLocalRepository,
private messageSocketRepository: IMessageSocketRepository
) {
// this.listenToIncomingMessage()
this.listenToIncomingMessage()
this.listenToOnSendDataToSocket()
}
listenToIncomingMessage() {
return this.MessageSocketRepositoryService.listenToMessages().pipe(
return this.messageSocketRepository.listenToMessages().pipe(
filter((message) => !message?.requestId?.startsWith(InstanceId)),
map(message => Object.assign(new MessageEntity(), message))
).subscribe(async (message) => {
@@ -31,6 +33,23 @@ export class RoomSetLastMessageService {
}
listenToOnSendDataToSocket() {
this.messageSocketRepository.listenToSendMessage().subscribe(async (e) => {
e.data['sender'] = {
userPhoto: '',
wxeMail: SessionStore.user.Email,
wxFullName: SessionStore.user.FullName,
wxUserId: SessionStore.user.UserId
}
e.data['sentAt'] = new Date().toISOString()
const result = await this.roomLocalRepository.update(e.data.roomId, {
messages: [e.data]
})
if(result.isErr()) {
console.log(result.error)
}
})
}
}