From 01c3054e7682051b16ec15655524a41314712d90 Mon Sep 17 00:00:00 2001 From: Georges-Antoine Assi Date: Thu, 8 Feb 2024 13:11:36 -0500 Subject: [PATCH] fix from_orm_with_request --- backend/endpoints/responses/rom.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py index 3a0b66ae3..c03048a37 100644 --- a/backend/endpoints/responses/rom.py +++ b/backend/endpoints/responses/rom.py @@ -99,13 +99,19 @@ def from_orm_with_request(cls, db_rom: Rom, request: Request) -> "RomSchema": rom = cls.model_validate(db_rom) user_id = request.user.id - rom.sibling_roms = db_rom.get_sibling_roms() - rom.user_saves = [save for save in db_rom.saves if save.user_id == user_id] - rom.user_states = [state for state in db_rom.states if state.user_id == user_id] + rom.sibling_roms = [ + RomSchema.model_validate(r) for r in db_rom.get_sibling_roms() + ] + rom.user_saves = [ + SaveSchema.model_validate(s) for s in db_rom.saves if s.user_id == user_id + ] + rom.user_states = [ + StateSchema.model_validate(s) for s in db_rom.states if s.user_id == user_id + ] rom.user_screenshots = [ - screenshot - for screenshot in db_rom.screenshots - if screenshot.user_id == user_id + ScreenshotSchema.model_validate(s) + for s in db_rom.screenshots + if s.user_id == user_id ] return rom