fix last message

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
@@ -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)
@@ -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();
});
});
@@ -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)
}
})
}
}