peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 13:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix direct room

Browse Source
This commit is contained in:
Peter Maquiran
2024-09-18 11:47:23 +01:00
parent eeaade9aab
commit 01c2f5efb5
19 changed files with 184 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/module/chat/data/async/list/rooms/roomListChangeDetector.ts
+4 -2
View File
@@ -11,11 +11,13 @@ export function roomListDetermineChanges(serverRooms: RoomListItemOutPutDTO[], l
const roomsToUpdate = serverRooms.filter(room => {
const localRoom = localRoomMap.get(room.chatRoom.id);
console.log(room.chatRoom, localRoom)
return localRoom && (
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.createdAt !== localRoom.createdAt
//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/room/room-local-repository.service.ts
+9
View File
@@ -47,6 +47,10 @@ export class RoomLocalRepository extends DexieRepository<RoomTable, RoomTable> i
(modifications as Partial<RoomTable>).local = IDBoolean.true
}
if((modifications as Partial<RoomTable>).id && !oldValue.id && oldValue.roomType == RoomType.Direct) {
return this.listenCreateSyncSubject.next({...oldValue, ...modifications})
}
return modifications
});
@@ -60,5 +64,10 @@ export class RoomLocalRepository extends DexieRepository<RoomTable, RoomTable> i
return from(liveQuery(() => chatDatabase.room.get(id)));
}
OnSetIdToDirectRoom() {
return this.listenCreateSyncSubject.asObservable()
}
}
src/app/module/chat/domain/chat-service.service.ts
+7 -1
View File
@@ -42,6 +42,7 @@ import { BoldRemoveByRoomIdInput, BoldRemoveByRoomIdService } from 'src/app/modu
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';
@@ -115,7 +116,8 @@ export class ChatServiceService {
private messageLocalGetByIdService: MessageLocalGetByIdService,
private roomGetLocalByIdService: RoomGetLocalByIdService,
private roomSetLocalToFalseByIdService: RoomSetLocalToFalseByIdService,
private roomUpdateNameSyncService: RoomUpdateNameSyncService
private roomUpdateNameSyncService: RoomUpdateNameSyncService,
private RoomDirectOnSetIdUseCaseService: RoomDirectOnSetIdUseCaseService
) {
this.MessageSocketRepositoryService.listenToDeleteMessages()
.pipe()
@@ -187,6 +189,10 @@ export class ChatServiceService {
return this.RemoveMemberUseCaseService.execute(data)
}
roomDirectOnSetId(input: RoomDirectOnSetIdUseCaseInputSchema) {
return this.RoomDirectOnSetIdUseCaseService.execute(input)
}
messageDelete(data: {roomId, messageId}) {
const params = {
src/app/module/chat/domain/use-case/contact/contact-list.service.ts
+5 -2
View File
@@ -1,7 +1,9 @@
import { Injectable } from '@angular/core';
import { RoomType } from 'src/app/core/chat/entity/group';
import { IRoomLocalRepository } from 'src/app/core/chat/repository/room/room-local-repository';
import { IDBoolean } from 'src/app/infra/database/dexie/type';
import { ContactRepositoryService } from 'src/app/services/Repositorys/contacts/repository/contacts-repository.service';
import { SessionStore } from 'src/app/store/session.service';
@Injectable({
providedIn: 'root'
@@ -20,12 +22,13 @@ export class ContactListService {
])
if(userContact.isOk() && localDirectRooms.isOk()) {
const existNames = localDirectRooms.value.map(e => e.roomName);
const existNames = localDirectRooms.value.filter(e => e.local == IDBoolean.false).map(e => e.roomName);
//const existNames = localDirectRooms.value.map(e => e.roomName);
return userContact.map((list) => {
return list.data.result.filter((e) => {
return !existNames.includes(e.wxFullName)
return !existNames.includes(e.wxFullName) && e.wxUserId != SessionStore.user.UserId
})
})
} else if (userContact.isErr()) {
src/app/module/chat/domain/use-case/message/message-create-use-case.service.ts
+1 -1
View File
@@ -181,7 +181,7 @@ export class MessageCreateUseCaseService {
$id : message.$id
}
this.messageLocalDataSourceService.update(message.$id, {...clone, sending: false, roomId: message.roomId}).then((data)=> {
this.messageLocalDataSourceService.update(message.$id, {...clone, sending: false, roomId: clone.roomId}).then((data)=> {
if(data.isOk()) {
} else {
src/app/module/chat/domain/use-case/room/room-direct-on-set-id-use-case.service.ts
+27
View File
@@ -0,0 +1,27 @@
import { Injectable } from '@angular/core';
import { filter } from 'rxjs/operators';
import { IRoomLocalRepository } from 'src/app/core/chat/repository/room/room-local-repository';
import { z } from 'zod';
const RoomDirectOnSetIdUseCaseInputSchema = z.object({
$roomId: z.string()
})
export type RoomDirectOnSetIdUseCaseInputSchema = z.infer<typeof RoomDirectOnSetIdUseCaseInputSchema>
@Injectable({
providedIn: 'root'
})
export class RoomDirectOnSetIdUseCaseService {
constructor(
private roomLocalRepository: IRoomLocalRepository
) { }
execute(input: RoomDirectOnSetIdUseCaseInputSchema) {
return this.roomLocalRepository.OnSetIdToDirectRoom().pipe(
filter((data)=> data?.$id == input.$roomId)
)
}
}
src/app/module/chat/domain/use-case/room/room-get-list-use-case.service.ts
+18 -11
View File
@@ -70,7 +70,7 @@ export class GetRoomListUseCaseService {
const filterValidateRooms = result.value.data.filter(e => {
if(e.chatRoom.roomType == RoomType.Direct) {
if(e.chatRoom.user1 != null && e.chatRoom.user2 != null) {
if(e.chatRoom.user1 != null && e.chatRoom.user2 != null || e.chatRoom.user1?.wxUserId == e.chatRoom.user2?.wxUserId) {
return true
} else {
Logger.error("direct room invalid data", {
@@ -92,18 +92,25 @@ export class GetRoomListUseCaseService {
const roomsToInsertEntity = GetRoomListMapper.toDomain(roomsToInsert)
for( const room of roomsToInsertEntity) {
this.roomLocalDataSourceService.insert(room).then((result) => {
if(room.roomType == RoomType.Direct) {
if(room.$id) {
this.roomLocalDataSourceService.insert(room).then((result) => {
if( result.isErr() &&
room.roomType == RoomType.Direct &&
result.error.DBErrorName == 'ConstraintError') {
this.roomLocalDataSourceService.update(room.$id, room).then((result) => {
if(result.isErr()) {
console.log('failed to update room id')
}
})
if( result.isErr() &&
result.error.DBErrorName == 'ConstraintError') {
this.roomLocalDataSourceService.update(room.$id, room).then((result) => {
if(result.isErr()) {
console.log('failed to update room id')
}
})
}
})
}
})
} else {
this.roomLocalDataSourceService.insert(room)
}
if(room.expirationDate) {
this.CronJobService.createCronJob('remove expired room', new Date(room.expirationDate), this.execute)
src/app/module/chat/domain/use-case/room/room-set-last-message.service.ts
+1 -2
View File
@@ -42,7 +42,6 @@ export class RoomSetLastMessageService {
for(const room of roomList) {
if(room.messages?.[0]?.id == message.id) {
console.log('listenToUpdateMessage', message.roomId)
const result = await this.roomLocalRepository.update(room.$id, {
messages: [message]
@@ -51,7 +50,7 @@ export class RoomSetLastMessageService {
if(result.isErr()) {
console.log('failed to update last message')
} else {
console.log('set last message')
// console.log('set last message')
}
}
}