From 4de443139034e9fb78a07e96081c02c7c0036ffb Mon Sep 17 00:00:00 2001 From: John Costa Date: Tue, 29 Jul 2025 15:48:41 +0100 Subject: [PATCH] feat: getting list that an image belongs in --- backend/models/user.go | 12 ++++++++++-- frontend/src/network/index.ts | 11 ++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/backend/models/user.go b/backend/models/user.go index 1fc35f7..9b10e3b 100644 --- a/backend/models/user.go +++ b/backend/models/user.go @@ -51,7 +51,10 @@ func (m UserModel) Save(ctx context.Context, user model.Users) (model.Users, err type UserImageWithImage struct { model.UserImages - Image model.Image + Image struct { + model.Image + ImageLists []model.ImageLists + } } func (m UserModel) GetUserImages(ctx context.Context, userId uuid.UUID) ([]UserImageWithImage, error) { @@ -60,8 +63,13 @@ func (m UserModel) GetUserImages(ctx context.Context, userId uuid.UUID) ([]UserI Image.ID, Image.ImageName, Image.Description, + ImageLists.AllColumns, ). - FROM(UserImages.INNER_JOIN(Image, Image.ID.EQ(UserImages.ImageID))). + FROM( + UserImages. + INNER_JOIN(Image, Image.ID.EQ(UserImages.ImageID)). + INNER_JOIN(ImageLists, ImageLists.ImageID.EQ(UserImages.ImageID)), + ). WHERE(UserImages.UserID.EQ(UUID(userId))) userImages := []UserImageWithImage{} diff --git a/frontend/src/network/index.ts b/frontend/src/network/index.ts index 97d7f83..5da3eba 100644 --- a/frontend/src/network/index.ts +++ b/frontend/src/network/index.ts @@ -96,7 +96,16 @@ const userImageValidator = strictObject({ CreatedAt: pipe(string()), ImageID: pipe(string(), uuid()), UserID: pipe(string(), uuid()), - Image: imageMetaValidator, + Image: strictObject({ + ...imageMetaValidator.entries, + ImageLists: array( + strictObject({ + ID: pipe(string(), uuid()), + ImageID: pipe(string(), uuid()), + ListID: pipe(string(), uuid()), + }), + ), + }), }); const userProcessingImageValidator = strictObject({