mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 21:06:06 +00:00
fix direct room
This commit is contained in:
@@ -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)
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -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)
|
||||
|
||||
@@ -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')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user