diff --git a/backend/models/user.go b/backend/models/user.go index eade86c..2d402c8 100644 --- a/backend/models/user.go +++ b/backend/models/user.go @@ -256,14 +256,33 @@ func (m UserModel) GetUserImages(ctx context.Context, userId uuid.UUID) ([]UserI type ListsWithImages struct { model.Lists - Images []model.ImageLists + Scheme struct { + model.Schemas + + SchemaItems []model.SchemaItems + } + + Images []struct { + model.ImageLists + + Items []model.ImageSchemaItems + } } func (m UserModel) ListWithImages(ctx context.Context, userId uuid.UUID) ([]ListsWithImages, error) { - stmt := SELECT(Lists.AllColumns, ImageLists.AllColumns). + stmt := SELECT( + Lists.AllColumns, + ImageLists.AllColumns, + Schemas.AllColumns, + SchemaItems.AllColumns, + ImageSchemaItems.AllColumns, + ). FROM( Lists. - INNER_JOIN(ImageLists, ImageLists.ListID.EQ(Lists.ID)), + INNER_JOIN(ImageLists, ImageLists.ListID.EQ(Lists.ID)). + INNER_JOIN(Schemas, Schemas.ListID.EQ(Lists.ID)). + INNER_JOIN(SchemaItems, SchemaItems.SchemaID.EQ(Schemas.ID)). + INNER_JOIN(ImageSchemaItems, ImageSchemaItems.ImageID.EQ(ImageLists.ImageID)), ). WHERE(Lists.UserID.EQ(UUID(userId)))