From 390a2162606316dffccabb66ac7c63ed252664eb Mon Sep 17 00:00:00 2001 From: John Costa Date: Tue, 19 Aug 2025 21:44:11 +0100 Subject: [PATCH] implementing get list items --- backend/models/lists.go | 23 ++++++++++++++++++ backend/stacks/handler.go | 50 +++++++++++++++++++++++++++++++++++---- 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/backend/models/lists.go b/backend/models/lists.go index b15aa77..b9111d5 100644 --- a/backend/models/lists.go +++ b/backend/models/lists.go @@ -105,6 +105,29 @@ func (m ListModel) List(ctx context.Context, userId uuid.UUID) ([]ListWithItems, return lists, err } +type ImageWithSchema struct { + model.ImageLists + + Items []model.ImageSchemaItems +} + +func (m ListModel) ListItems(ctx context.Context, listID uuid.UUID) ([]ImageWithSchema, error) { + getListItems := SELECT( + ImageLists.AllColumns, + ImageSchemaItems.AllColumns, + ). + FROM( + ImageLists. + INNER_JOIN(ImageSchemaItems, ImageSchemaItems.ImageID.EQ(ImageLists.ImageID)), + ). + WHERE(ImageLists.ListID.EQ(UUID(listID))) + + listItems := make([]ImageWithSchema, 0) + err := getListItems.QueryContext(ctx, m.dbPool, &listItems) + + return listItems, err +} + type IDValue struct { ID string `json:"id"` Value string `json:"value"` diff --git a/backend/stacks/handler.go b/backend/stacks/handler.go index 315d339..6a345ea 100644 --- a/backend/stacks/handler.go +++ b/backend/stacks/handler.go @@ -10,8 +10,21 @@ import ( "github.com/charmbracelet/log" "github.com/go-chi/chi/v5" + "github.com/google/uuid" ) +func writeJsonOrError[K any](logger *log.Logger, object K, w http.ResponseWriter) { + jsonObject, err := json.Marshal(object) + if err != nil { + logger.Warn("could not marshal json object", "err", err) + w.WriteHeader(http.StatusBadRequest) + return + } + + w.Write(jsonObject) + w.WriteHeader(http.StatusOK) +} + type StackHandler struct { logger *log.Logger stackModel models.ListModel @@ -34,15 +47,43 @@ func (h *StackHandler) getAllStacks(w http.ResponseWriter, r *http.Request) { return } - jsonLists, err := json.Marshal(lists) + writeJsonOrError(h.logger, lists, w) +} + +func (h *StackHandler) getStackItems(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + + _, err := middleware.GetUserID(ctx) if err != nil { - h.logger.Warn("could not marshal json lists", "err", err) + h.logger.Warn("could not get users in get all stacks", "err", err) + w.WriteHeader(http.StatusUnauthorized) + return + } + + listID := r.PathValue("listID") + if len(listID) == 0 { + h.logger.Warn("listID is not present in path") w.WriteHeader(http.StatusBadRequest) return } - w.Write(jsonLists) - w.WriteHeader(http.StatusOK) + uuidListID, err := uuid.Parse(listID) + if err != nil { + h.logger.Warn("could not parse list id uuid", "err", err) + w.WriteHeader(http.StatusUnauthorized) + return + } + + // TODO: must check for permission here. + + lists, err := h.stackModel.ListItems(ctx, uuidListID) + if err != nil { + h.logger.Warn("could not get list items", "err", err) + w.WriteHeader(http.StatusBadRequest) + return + } + + writeJsonOrError(h.logger, lists, w) } func (h *StackHandler) CreateRoutes(r chi.Router) { @@ -53,6 +94,7 @@ func (h *StackHandler) CreateRoutes(r chi.Router) { r.Use(middleware.SetJson) r.Get("/", h.getAllStacks) + r.Get("/{listID}", h.getStackItems) }) }