From 2dd9f333032c43a6ccc39d4af40a34be9aad34f8 Mon Sep 17 00:00:00 2001 From: John Costa Date: Sat, 30 Aug 2025 21:38:01 +0100 Subject: [PATCH] feat: allowing users to delete images from lists --- backend/models/lists.go | 46 +++++++---- backend/models/user.go | 2 +- backend/schema.sql | 2 +- backend/stacks/handler.go | 52 +++++++++++- frontend/src/contexts/SearchImageContext.tsx | 6 +- frontend/src/network/index.ts | 43 ++++++++-- frontend/src/pages/list/index.tsx | 84 +++++++++++++++----- 7 files changed, 188 insertions(+), 47 deletions(-) diff --git a/backend/models/lists.go b/backend/models/lists.go index 0e2cd14..529af2e 100644 --- a/backend/models/lists.go +++ b/backend/models/lists.go @@ -195,7 +195,23 @@ func (m ListModel) Save(ctx context.Context, userId uuid.UUID, name string, desc return listWithItems, err } -func (m ListModel) SaveInto(ctx context.Context, listId uuid.UUID, imageId uuid.UUID, schemaValues []IDValue) error { +func (m ListModel) SaveInto(ctx context.Context, listID uuid.UUID, imageID uuid.UUID, schemaValues []IDValue) error { + tx, err := m.dbPool.BeginTx(ctx, nil) + if err != nil { + return err + } + + var imageList model.ImageLists + stmt := ImageLists.INSERT(ImageLists.ListID, ImageLists.ImageID). + VALUES(listID, imageID). + RETURNING(ImageLists.ID) + + err = stmt.QueryContext(ctx, m.dbPool, &imageList) + if err != nil { + tx.Rollback() + return fmt.Errorf("Could not insert new list. %s", err) + } + imageSchemaItems := make([]model.ImageSchemaItems, len(schemaValues)) for i, v := range schemaValues { @@ -205,24 +221,10 @@ func (m ListModel) SaveInto(ctx context.Context, listId uuid.UUID, imageId uuid. } imageSchemaItems[i].SchemaItemID = parsedId - imageSchemaItems[i].ImageID = imageId + imageSchemaItems[i].ImageID = imageList.ID imageSchemaItems[i].Value = &v.Value } - tx, err := m.dbPool.BeginTx(ctx, nil) - if err != nil { - return err - } - - stmt := ImageLists.INSERT(ImageLists.ListID, ImageLists.ImageID). - VALUES(listId, imageId) - - _, err = stmt.ExecContext(ctx, tx) - if err != nil { - tx.Rollback() - return fmt.Errorf("Could not insert new list. %s", err) - } - insertSchemaItemsStmt := ImageSchemaItems. INSERT(ImageSchemaItems.Value, ImageSchemaItems.SchemaItemID, ImageSchemaItems.ImageID). MODELS(imageSchemaItems) @@ -251,6 +253,18 @@ func (m ListModel) SaveProcessing(ctx context.Context, userID uuid.UUID, title s // DELETE methods // ======================================== +func (m ListModel) DeleteImage(ctx context.Context, listID uuid.UUID, imageID uuid.UUID) error { + deleteImageListStmt := ImageLists.DELETE(). + WHERE( + ImageLists.ListID.EQ(UUID(listID)). + AND(ImageLists.ImageID.EQ(UUID(imageID))), + ) + + _, err := deleteImageListStmt.ExecContext(ctx, m.dbPool) + + return err +} + func (m ListModel) Delete(ctx context.Context, listID uuid.UUID, userID uuid.UUID) error { // First verify the list belongs to the user checkOwnershipStmt := Lists. diff --git a/backend/models/user.go b/backend/models/user.go index 9b4636a..4af2999 100644 --- a/backend/models/user.go +++ b/backend/models/user.go @@ -107,7 +107,7 @@ func (m UserModel) ListWithImages(ctx context.Context, userId uuid.UUID) ([]List INNER_JOIN(Schemas, Schemas.ListID.EQ(Lists.ID)). INNER_JOIN(SchemaItems, SchemaItems.SchemaID.EQ(Schemas.ID)). LEFT_JOIN(ImageLists, ImageLists.ListID.EQ(Lists.ID)). - LEFT_JOIN(ImageSchemaItems, ImageSchemaItems.ImageID.EQ(ImageLists.ImageID)), + LEFT_JOIN(ImageSchemaItems, ImageSchemaItems.ImageID.EQ(ImageLists.ID)), ). WHERE(Lists.UserID.EQ(UUID(userId))) diff --git a/backend/schema.sql b/backend/schema.sql index f2e8dc6..f032a2b 100644 --- a/backend/schema.sql +++ b/backend/schema.sql @@ -93,7 +93,7 @@ CREATE TABLE haystack.image_schema_items ( value TEXT, schema_item_id UUID NOT NULL REFERENCES haystack.schema_items (id), - image_id UUID NOT NULL REFERENCES haystack.image (id) ON DELETE CASCADE + image_id UUID NOT NULL REFERENCES haystack.image_lists (id) ON DELETE CASCADE ); /* -----| Indexes |----- */ diff --git a/backend/stacks/handler.go b/backend/stacks/handler.go index 7e350e1..5bcb41d 100644 --- a/backend/stacks/handler.go +++ b/backend/stacks/handler.go @@ -13,11 +13,15 @@ import ( "github.com/charmbracelet/log" "github.com/go-chi/chi/v5" + "github.com/google/uuid" ) type StackHandler struct { - logger *log.Logger - stackModel models.ListModel + logger *log.Logger + + imageModel models.ImageModel + stackModel models.ListModel + limitsManager limits.LimitsManagerMethods } @@ -94,6 +98,47 @@ func (h *StackHandler) deleteStack(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) } +func (h *StackHandler) deleteImageFromStack(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + + stringImageID := chi.URLParam(r, "imageID") + stringListID := chi.URLParam(r, "listID") + + imageID, err := uuid.Parse(stringImageID) + if err != nil { + w.WriteHeader(http.StatusBadRequest) + return + } + + listID, err := uuid.Parse(stringListID) + if err != nil { + w.WriteHeader(http.StatusBadRequest) + return + } + + // TODO: this should be extracted into a middleware of sorts + userID, err := middleware.GetUserID(ctx, h.logger, w) + if err != nil { + w.WriteHeader(http.StatusUnauthorized) + return + } + + isAuthorized := h.imageModel.IsUserAuthorized(ctx, imageID, userID) + if !isAuthorized { + w.WriteHeader(http.StatusUnauthorized) + return + } + + err = h.stackModel.DeleteImage(ctx, listID, imageID) + if err != nil { + h.logger.Warn("failed to delete image from list", "error", err) + w.WriteHeader(http.StatusInternalServerError) + return + } + + w.WriteHeader(http.StatusOK) +} + type CreateStackBody struct { Title string `json:"title"` @@ -149,15 +194,18 @@ func (h *StackHandler) CreateRoutes(r chi.Router) { r.Post("/", middleware.WithLimit(h.logger, h.limitsManager.HasReachedStackLimit, middleware.WithValidatedPost(h.createStack))) r.Patch("/{listID}", middleware.WithValidatedPost(h.editStack)) r.Delete("/{listID}", h.deleteStack) + r.Delete("/{listID}/{imageID}", h.deleteImageFromStack) }) } func CreateStackHandler(db *sql.DB, limitsManager limits.LimitsManagerMethods) StackHandler { stackModel := models.NewListModel(db) + imageModel := models.NewImageModel(db) logger := log.New(os.Stdout).WithPrefix("Stacks") return StackHandler{ logger, + imageModel, stackModel, limitsManager, } diff --git a/frontend/src/contexts/SearchImageContext.tsx b/frontend/src/contexts/SearchImageContext.tsx index ac7171c..e6d87ac 100644 --- a/frontend/src/contexts/SearchImageContext.tsx +++ b/frontend/src/contexts/SearchImageContext.tsx @@ -7,7 +7,7 @@ import { createResource, useContext, } from "solid-js"; -import { deleteImage, getUserImages, JustTheImageWhatAreTheseNames } from "../network"; +import { deleteImage, deleteImageFromStack, getUserImages, JustTheImageWhatAreTheseNames } from "../network"; export type SearchImageStore = { imagesByDate: Accessor< @@ -24,6 +24,7 @@ export type SearchImageStore = { onRefetchImages: () => void; onDeleteImage: (imageID: string) => void; + onDeleteImageFromStack: (stackID: string, imageID: string) => void; }; const SearchImageContext = createContext(); @@ -71,6 +72,9 @@ export const SearchImageContextProvider: Component = (props) => { onRefetchImages: refetch, onDeleteImage: (imageID: string) => { deleteImage(imageID).then(refetch); + }, + onDeleteImageFromStack: (stackID: string, imageID: string) => { + deleteImageFromStack(stackID, imageID).then(refetch); } }} > diff --git a/frontend/src/network/index.ts b/frontend/src/network/index.ts index 8672f00..715c109 100644 --- a/frontend/src/network/index.ts +++ b/frontend/src/network/index.ts @@ -6,8 +6,8 @@ import { literal, null_, nullable, - parse, pipe, + safeParse, strictObject, string, transform, @@ -64,8 +64,14 @@ export const sendImageFile = async ( request.headers.set("Content-Type", "application/oclet-stream"); const res = await fetch(request).then((res) => res.json()); + const parsedRes = safeParse(sendImageResponseValidator, res); - return parse(sendImageResponseValidator, res); + if (!parsedRes.success) { + console.log(parsedRes.issues) + throw new Error(JSON.stringify(parsedRes.issues)); + } + + return parsedRes.output; }; export const deleteImage = async ( @@ -79,6 +85,15 @@ export const deleteImage = async ( await fetch(request); } +export const deleteImageFromStack = async (listID: string, imageID: string): Promise => { + const request = getBaseAuthorizedRequest({ + path: `stacks/${listID}/${imageID}`, + method: "DELETE", + }); + + await fetch(request); +} + export class ImageLimitReached extends Error { constructor() { super(); @@ -104,7 +119,13 @@ export const sendImage = async ( const res = await rawRes.json(); - return parse(sendImageResponseValidator, res); + const parsedRes = safeParse(sendImageResponseValidator, res); + if (!parsedRes.success) { + console.log(parsedRes.issues) + throw new Error(JSON.stringify(parsedRes.issues)); + } + + return parsedRes.output; }; const imageMetaValidator = strictObject({ @@ -207,7 +228,13 @@ export const getUserImages = async (): Promise< console.log("Backend response: ", res); - return parse(imageRequestValidator, res); + const parsedRes = safeParse(imageRequestValidator, res); + if (!parsedRes.success) { + console.log(parsedRes.issues) + throw new Error(JSON.stringify(parsedRes.issues)); + } + + return parsedRes.output; }; export const postLogin = async (email: string): Promise => { @@ -237,7 +264,13 @@ export const postCode = async ( const res = await fetch(request).then((res) => res.json()); - return parse(codeValidator, res); + const parsedRes = safeParse(codeValidator, res); + if (!parsedRes.success) { + console.log(parsedRes.issues) + throw new Error(JSON.stringify(parsedRes.issues)); + } + + return parsedRes.output; }; export class ReachedListLimit extends Error { diff --git a/frontend/src/pages/list/index.tsx b/frontend/src/pages/list/index.tsx index f88a99e..d449675 100644 --- a/frontend/src/pages/list/index.tsx +++ b/frontend/src/pages/list/index.tsx @@ -1,12 +1,56 @@ import { useSearchImageContext } from "@contexts/SearchImageContext"; import { useParams } from "@solidjs/router"; -import { Component, For, Show } from "solid-js"; +import { Component, For, Show, createSignal } from "solid-js"; import { base } from "../../network"; +import { Dialog } from "@kobalte/core"; + +const DeleteButton: Component<{ onDelete: () => void }> = (props) => { + const [isOpen, setIsOpen] = createSignal(false); + + return ( + <> + + + + + +
+ + + Confirm Delete + + + Are you sure you want to delete this image from + this list? + +
+ + + + +
+ +
+ + + + ); +}; export const List: Component = () => { const { listId } = useParams(); - const { lists } = useSearchImageContext(); + const { lists, onDeleteImageFromStack } = useSearchImageContext(); const list = () => lists().find((l) => l.ID === listId); @@ -24,14 +68,13 @@ export const List: Component = () => { {(item, index) => ( {item.Item} @@ -43,17 +86,16 @@ export const List: Component = () => { {(image, rowIndex) => ( -
+
{ alt="List item" /> + onDeleteImageFromStack(l().ID, image.ImageID)} />
{(item, colIndex) => (