mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 04:57:52 +00:00
remove duplicate
This commit is contained in:
+4
@@ -49,6 +49,10 @@ export class MessageSocketRepositoryService implements IMessageSocketRepository
|
||||
data: data,
|
||||
})
|
||||
|
||||
if(result.isOk()) {
|
||||
console.log('recieve', result.value)
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@@ -6,6 +6,8 @@ import { Observable as DexieObservable, PromiseExtended } from 'Dexie';
|
||||
import { MessageTable, MessageTableSchema } from 'src/app/infra/database/dexie/instance/chat/schema/message';
|
||||
import { chatDatabase } from 'src/app/infra/database/dexie/service';
|
||||
import { IMessageLocalRepository } from 'src/app/core/chat/repository/message/message-local-repository';
|
||||
import { combineLatest, from, Observable } from 'rxjs';
|
||||
import { map } from 'rxjs/operators';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
@@ -49,5 +51,25 @@ export class MessageLocalDataSourceService extends DexieRepository<MessageTable,
|
||||
console.error('Error fetching messages:', error);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
getLastMessageForRooms(roomIds: string[]): Observable<any[]> {
|
||||
const observables = roomIds.map(roomId =>
|
||||
from (liveQuery(async() =>{
|
||||
const messages = await chatDatabase.message
|
||||
.where('roomId')
|
||||
.equals(roomId)
|
||||
.reverse()
|
||||
.sortBy('timestamp')
|
||||
|
||||
return messages[0] || null; // Return the first item (latest message) or null if no message
|
||||
})).pipe(
|
||||
map((message) => ({ roomId, message: message || null })) // Attach roomId to the result
|
||||
)
|
||||
);
|
||||
|
||||
return combineLatest(observables); // Combine all observables into one array of results
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ export class RoomLocalRepository extends DexieRepository<RoomTable, RoomTable> i
|
||||
}
|
||||
|
||||
getRoomByIdLive(id: any) {
|
||||
return liveQuery(() => chatDatabase.room.get(id));
|
||||
return from(liveQuery(() => chatDatabase.room.get(id)));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ import { RoomByIdOutputDTO } from 'src/app/module/chat/domain/use-case/room/room
|
||||
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 { z } from 'zod';
|
||||
import { HttpAdapter } from 'src/app/infra/http/adapter';
|
||||
|
||||
const RoomByIdInputDTOSchema = z.string()
|
||||
type RoomByIdInputDTO = z.infer<typeof RoomByIdInputDTOSchema>
|
||||
@@ -27,6 +28,7 @@ export class RoomRemoteDataSourceService implements IRoomRemoteRepository {
|
||||
constructor(
|
||||
private httpService: HttpService,
|
||||
private socket: SignalRService,
|
||||
private Http: HttpAdapter
|
||||
) {}
|
||||
|
||||
|
||||
@@ -39,13 +41,17 @@ export class RoomRemoteDataSourceService implements IRoomRemoteRepository {
|
||||
|
||||
//@APIReturn(RoomListOutPutDTOSchema, 'get/Room')
|
||||
async getRoomList(): Promise<DataSourceReturn<RoomListOutPutDTO>> {
|
||||
return await this.httpService.get<RoomListOutPutDTO>(`${this.baseUrl}/Room?userId=${SessionStore.user.UserId}`);
|
||||
const result = await this.Http.get<RoomListOutPutDTO>(`${this.baseUrl}/Room?userId=${SessionStore.user.UserId}`);
|
||||
|
||||
return result.map((e)=> e.data)
|
||||
}
|
||||
|
||||
//@ValidateSchema(RoomByIdInputDTOSchema)
|
||||
//@APIReturn(RoomByIdOutputDTOSchema,'get/Room/${id}')
|
||||
async getRoom(id: RoomByIdInputDTO): DataSourceReturn<RoomByIdOutputDTO> {
|
||||
return await this.httpService.get(`${this.baseUrl}/Room/${id}`);
|
||||
const result = await this.Http.get(`${this.baseUrl}/Room/${id}`);
|
||||
|
||||
return result.map((e)=> e.data)
|
||||
}
|
||||
|
||||
//@ValidateSchema(RoomUpdateInputDTOSchema)
|
||||
|
||||
@@ -5,6 +5,8 @@ import { filter, map } from 'rxjs/operators';
|
||||
import { SocketMessage } from 'src/app/infra/socket/signalR/signalR';
|
||||
import { ITypingRemoteRepository } from 'src/app/core/chat/repository/typing/typing-remote-repository';
|
||||
import { z } from "zod"
|
||||
import { InstanceId } from '../../../domain/chat-service.service';
|
||||
import { v4 as uuidv4 } from 'uuid'
|
||||
|
||||
export const UserTypingDTOSchema = z.object({
|
||||
requestId: z.string(),
|
||||
@@ -29,10 +31,10 @@ export class UserTypingRemoteRepositoryService implements ITypingRemoteRepositor
|
||||
return this.socket.sendData({
|
||||
method: 'Typing',
|
||||
data: {
|
||||
roomId,
|
||||
roomId,
|
||||
UserName:SessionStore.user.FullName,
|
||||
userId:SessionStore.user.UserId,
|
||||
requestId: '',
|
||||
requestId: InstanceId +'@'+ uuidv4(),
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user