wip validation dto

This commit is contained in:
simplonco
2023-01-11 13:16:27 +01:00
parent dcf129b4f1
commit 8e7efbb65a
3 changed files with 33 additions and 18 deletions

View File

@@ -82,22 +82,7 @@ null
async getAllRooms(@Req() req, @Res() res): Promise<void>
{
console.log("- in getAllRooms controller");
const all_rooms = await this.chatService.getAllNotMyRooms(req.user.username);
const all_users = await this.chatService.getAllUsersNotMyRooms(req.user.username);
let row_rooms = all_rooms.map(room => {
return {
room_name: room.name,
room_type: "direct",
}
});
let users = all_users.map(user => {
return {
room_name: user.username,
room_type: "direct",
}
});
let rooms: roomDto[] = row_rooms.concat(users);
const rooms = await this.chatService.getAllOtherRoomsAndUsers(req.user.username)
res.status(HttpStatus.OK).json({ rooms: rooms });
console.log("- out getAllRooms controller");

View File

@@ -78,6 +78,36 @@ export class ChatService {
return rooms;
}
//async getAllOtherRoomsAndUsers(username: string): Promise<roomDto[]>
async getAllOtherRoomsAndUsers(username: string): Promise<roomDto>
{
console.log("-- in getAllOtherRoomsAndUsers service");
const all_rooms = await this.getAllNotMyRooms(username);
const all_users = await this.getAllUsersNotMyRooms(username);
// let row_rooms = all_rooms.map(room => {
// return {
// room_name: room.name,
// room_type: "",
// };
// });
// let users = all_users.map(user => {
// return {
// room_name: user.username,
// room_type: "",
// };
// });
// let rooms = row_rooms.concat(users);
let rooms: roomDto = {
room_name: "room.name",
room_type: "",
};
console.log("-- in getAllOtherRoomsAndUsers service");
return rooms;
}
async getMessagesFromCurrentRoom(username: string): Promise<messagesDto[]>
{
console.log("-- in getMessagesFromCurrentRoom service");

View File

@@ -9,9 +9,9 @@ export class roomDto
room_name: string;
@Expose()
@IsString()
//@IsString()
@IsNotEmpty()
@IsIn(["public", "protected", "private", "direct", "user"])
//@IsIn(["public", "protected", "private", "direct", "user"])
room_type: string;
}