summaryrefslogtreecommitdiff
path: root/internal/handlers
diff options
context:
space:
mode:
Diffstat (limited to 'internal/handlers')
-rw-r--r--internal/handlers/handlers.go14
-rw-r--r--internal/handlers/handlers_test.go15
-rw-r--r--internal/handlers/shopping.go89
-rw-r--r--internal/handlers/shopping_sources_test.go159
4 files changed, 203 insertions, 74 deletions
diff --git a/internal/handlers/handlers.go b/internal/handlers/handlers.go
index c5df00d..147db07 100644
--- a/internal/handlers/handlers.go
+++ b/internal/handlers/handlers.go
@@ -715,6 +715,20 @@ func (h *Handler) HandleUnifiedAdd(w http.ResponseWriter, r *http.Request) {
}
_ = h.store.InvalidateCache(store.CacheKeyTrelloBoards)
+ case "shopping":
+ // The quick-action modal's Shopping tab. This used to create a Trello
+ // card on the Shopping board; that board is no longer a shopping
+ // source, so an item added there would have vanished from the list.
+ storeName := strings.TrimSpace(r.FormValue("store"))
+ if storeName == "" {
+ JSONError(w, http.StatusBadRequest, "Store is required for a shopping item", nil)
+ return
+ }
+ if err := h.store.SaveUserShoppingItem(title, storeName); err != nil {
+ JSONError(w, http.StatusInternalServerError, "Failed to save shopping item", err)
+ return
+ }
+
default:
JSONError(w, http.StatusBadRequest, "Invalid source", nil)
return
diff --git a/internal/handlers/handlers_test.go b/internal/handlers/handlers_test.go
index 61fb75d..7630e5d 100644
--- a/internal/handlers/handlers_test.go
+++ b/internal/handlers/handlers_test.go
@@ -480,11 +480,13 @@ func TestHandleShoppingModeComplete(t *testing.T) {
}
})
+ // PlanToEat is the only remaining external source; Trello was removed as a
+ // shopping source, so completing one of its items is no longer meaningful.
t.Run("complete external item marks it checked", func(t *testing.T) {
req := httptest.NewRequest("POST", "/shopping/mode/TestStore/complete", nil)
req.Form = map[string][]string{
- "id": {"trello-123"},
- "source": {"trello"},
+ "id": {"pte-123"},
+ "source": {"plantoeat"},
}
rctx := chi.NewRouteContext()
@@ -499,9 +501,9 @@ func TestHandleShoppingModeComplete(t *testing.T) {
}
// Verify item is marked as checked
- checks, _ := db.GetShoppingItemChecks("trello")
- if !checks["trello-123"] {
- t.Error("Expected trello item to be marked as checked")
+ checks, _ := db.GetShoppingItemChecks("plantoeat")
+ if !checks["pte-123"] {
+ t.Error("Expected plantoeat item to be marked as checked")
}
})
}
@@ -787,7 +789,8 @@ func TestShoppingComplete_ExternalItemMarkedChecked(t *testing.T) {
source string
itemID string
}{
- {"trello", "trello-card-123"},
+ // Trello is no longer a shopping source; plantoeat is the only
+ // external one whose items can be checked off.
{"plantoeat", "pte-item-456"},
}
diff --git a/internal/handlers/shopping.go b/internal/handlers/shopping.go
index 1c58126..e06cad6 100644
--- a/internal/handlers/shopping.go
+++ b/internal/handlers/shopping.go
@@ -16,7 +16,7 @@ import (
"task-dashboard/internal/models"
)
-// HandleTabShopping renders the Shopping tab (Trello Shopping board + PlanToEat + User items)
+// HandleTabShopping renders the Shopping tab (PlanToEat + user-added items)
func (h *Handler) HandleTabShopping(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
stores := h.aggregateShoppingLists(ctx)
@@ -125,7 +125,7 @@ func (h *Handler) HandleShoppingModeComplete(w http.ResponseWriter, r *http.Requ
JSONError(w, http.StatusInternalServerError, "Failed to delete item", err)
return
}
- case "trello", "plantoeat":
+ case "plantoeat":
// Mark as checked (will be filtered out of view)
if err := h.store.SetShoppingItemChecked(source, id, true); err != nil {
JSONError(w, http.StatusInternalServerError, "Failed to complete item", err)
@@ -160,81 +160,34 @@ func (h *Handler) HandleShoppingModeComplete(w http.ResponseWriter, r *http.Requ
}{storeName, items})
}
-// HandleGetShoppingLists returns the lists from the Shopping board for quick-add
-func (h *Handler) HandleGetShoppingLists(w http.ResponseWriter, r *http.Request) {
- boards, err := h.store.GetBoards()
- if err != nil {
- JSONError(w, http.StatusInternalServerError, "Failed to get boards", err)
- return
- }
-
- var shoppingBoardID string
- for _, b := range boards {
- if strings.EqualFold(b.Name, "Shopping") {
- shoppingBoardID = b.ID
- break
- }
- }
-
- if shoppingBoardID == "" {
- JSONError(w, http.StatusNotFound, "Shopping board not found", nil)
- return
- }
-
- lists, err := h.trelloClient.GetLists(r.Context(), shoppingBoardID)
- if err != nil {
- JSONError(w, http.StatusInternalServerError, "Failed to get lists", err)
- return
- }
+// HandleGetShoppingStores returns the current store names as <option> elements
+// for the quick-action modal's store picker.
+//
+// This replaces the Trello-lists endpoint the modal used to call. Note the
+// store names come from the items themselves — there is no separate store
+// registry yet, so a store with nothing in it does not appear here.
+func (h *Handler) HandleGetShoppingStores(w http.ResponseWriter, r *http.Request) {
+ stores := h.aggregateShoppingLists(r.Context())
w.Header().Set("Content-Type", "text/html")
- for _, list := range lists {
+ for _, s := range stores {
_, _ = fmt.Fprintf(w, `<option value="%s">%s</option>`,
- template.HTMLEscapeString(list.ID),
- template.HTMLEscapeString(list.Name))
+ template.HTMLEscapeString(s.Name),
+ template.HTMLEscapeString(s.Name))
}
}
-// aggregateShoppingLists combines Trello, PlanToEat, and user shopping items by store
+// aggregateShoppingLists combines PlanToEat and user shopping items by store
func (h *Handler) aggregateShoppingLists(ctx context.Context) []models.ShoppingStore {
storeMap := make(map[string]map[string][]models.UnifiedShoppingItem)
- // Fetch locally stored checked states for external sources
- trelloChecks, _ := h.store.GetShoppingItemChecks("trello")
+ // Fetch locally stored checked states for the remaining external source.
+ // Trello is no longer a shopping source: its items were read-only here and
+ // its list names were doubling as an accidental store registry. See
+ // migration 032 for the one-time import that preceded removing it.
plantoeatChecks, _ := h.store.GetShoppingItemChecks("plantoeat")
- // 1. Fetch Trello "Shopping" board cards
- boards, err := h.store.GetBoards()
- if err != nil {
- log.Printf("ERROR [Shopping/Trello]: %v", err)
- } else {
- for _, board := range boards {
- if strings.EqualFold(board.Name, "Shopping") {
- log.Printf("DEBUG [Shopping]: Found Shopping board with %d cards", len(board.Cards))
- for _, card := range board.Cards {
- storeName := card.ListName
- if storeName == "" {
- storeName = "Uncategorized"
- }
-
- if storeMap[storeName] == nil {
- storeMap[storeName] = make(map[string][]models.UnifiedShoppingItem)
- }
-
- item := models.UnifiedShoppingItem{
- ID: card.ID,
- Name: card.Name,
- Store: storeName,
- Source: "trello",
- Checked: trelloChecks[card.ID],
- }
- storeMap[storeName][""] = append(storeMap[storeName][""], item)
- }
- }
- }
- }
-
- // 2. Fetch PlanToEat shopping list
+ // 1. Fetch PlanToEat shopping list
if h.planToEatClient != nil {
items, err := h.planToEatClient.GetShoppingList(ctx)
if err != nil {
@@ -272,7 +225,7 @@ func (h *Handler) aggregateShoppingLists(ctx context.Context) []models.ShoppingS
log.Printf("DEBUG [Shopping/PlanToEat]: Client not configured")
}
- // 3. Fetch user-added shopping items
+ // 2. Fetch user-added shopping items
userItems, err := h.store.GetUserShoppingItems()
if err != nil {
log.Printf("ERROR [Shopping/User]: %v", err)
@@ -298,7 +251,7 @@ func (h *Handler) aggregateShoppingLists(ctx context.Context) []models.ShoppingS
}
}
- // 4. Convert map to sorted slice
+ // 3. Convert map to sorted slice
var stores []models.ShoppingStore
for storeName, categories := range storeMap {
store := models.ShoppingStore{Name: storeName}
diff --git a/internal/handlers/shopping_sources_test.go b/internal/handlers/shopping_sources_test.go
new file mode 100644
index 0000000..517f4b4
--- /dev/null
+++ b/internal/handlers/shopping_sources_test.go
@@ -0,0 +1,159 @@
+package handlers
+
+import (
+ "context"
+ "net/http"
+ "net/http/httptest"
+ "net/url"
+ "strings"
+ "testing"
+
+ "task-dashboard/internal/models"
+)
+
+// The Trello "Shopping" board is no longer a source for the shopping list. It
+// had become a dumping ground, its items were read-only in doot (no rename, no
+// move, no delete — only hide), and its list names were doubling as an
+// accidental store registry. The two groups worth keeping were imported into
+// user items by migration 032; the rest simply stop being displayed. The cards
+// themselves are untouched in Trello.
+func TestAggregateShoppingLists_IgnoresTrelloShoppingBoard(t *testing.T) {
+ h, cleanup := setupTestHandler(t)
+ defer cleanup()
+
+ if err := h.store.SaveBoards([]models.Board{{
+ ID: "shop-board",
+ Name: "Shopping",
+ Cards: []models.Card{
+ {ID: "c1", Name: "Broccoli", ListName: ""},
+ {ID: "c2", Name: "Wasp traps", ListName: "Hardware Store"},
+ {ID: "c3", Name: "Pearl Waffles", ListName: "Costco"},
+ },
+ }}); err != nil {
+ t.Fatalf("seeding boards: %v", err)
+ }
+
+ stores := h.aggregateShoppingLists(context.Background())
+
+ for _, st := range stores {
+ for _, cat := range st.Categories {
+ for _, it := range cat.Items {
+ if it.Source == "trello" {
+ t.Errorf("trello item %q leaked into the shopping list (store %q)", it.Name, st.Name)
+ }
+ }
+ }
+ }
+}
+
+// User-added items are still aggregated — this is the source that remains, so
+// a regression here would empty the list entirely.
+func TestAggregateShoppingLists_IncludesUserItems(t *testing.T) {
+ h, cleanup := setupTestHandler(t)
+ defer cleanup()
+
+ if err := h.store.SaveUserShoppingItem("Milk", "Costco"); err != nil {
+ t.Fatalf("saving user item: %v", err)
+ }
+
+ stores := h.aggregateShoppingLists(context.Background())
+
+ var found bool
+ for _, st := range stores {
+ for _, cat := range st.Categories {
+ for _, it := range cat.Items {
+ if it.Name == "Milk" && it.Source == "user" && st.Name == "Costco" {
+ found = true
+ }
+ }
+ }
+ }
+ if !found {
+ t.Errorf("user item not found in aggregated list; got %+v", stores)
+ }
+}
+
+// A Shopping board with cards must not conjure stores into existence. Store
+// names used to come partly from Trello list names, which is why removing the
+// source changes which stores exist at all.
+func TestAggregateShoppingLists_TrelloListsDoNotCreateStores(t *testing.T) {
+ h, cleanup := setupTestHandler(t)
+ defer cleanup()
+
+ if err := h.store.SaveBoards([]models.Board{{
+ ID: "shop-board",
+ Name: "Shopping",
+ Cards: []models.Card{
+ {ID: "c1", Name: "Gas valve", ListName: "Hardware Store"},
+ },
+ }}); err != nil {
+ t.Fatalf("seeding boards: %v", err)
+ }
+
+ for _, st := range h.aggregateShoppingLists(context.Background()) {
+ if st.Name == "Hardware Store" {
+ t.Error(`"Hardware Store" store exists only because of a Trello list name`)
+ }
+ }
+}
+
+// The quick-action modal's Shopping tab posts source=shopping. It used to post
+// source=trello with a list_id, which after the Trello removal would have
+// created a card nobody could see.
+func TestUnifiedAdd_ShoppingSourceCreatesUserItem(t *testing.T) {
+ h, cleanup := setupTestHandler(t)
+ defer cleanup()
+
+ form := url.Values{"title": {"Sponges"}, "source": {"shopping"}, "store": {"Costco"}}
+ req := httptest.NewRequest(http.MethodPost, "/unified-add", strings.NewReader(form.Encode()))
+ req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+ rec := httptest.NewRecorder()
+
+ h.HandleUnifiedAdd(rec, req)
+
+ if rec.Code != http.StatusOK {
+ t.Fatalf("got status %d, want 200; body=%s", rec.Code, rec.Body.String())
+ }
+ items, err := h.store.GetUserShoppingItems()
+ if err != nil {
+ t.Fatalf("reading items: %v", err)
+ }
+ if len(items) != 1 || items[0].Name != "Sponges" || items[0].Store != "Costco" {
+ t.Errorf("got %+v, want one Sponges/Costco item", items)
+ }
+}
+
+func TestUnifiedAdd_ShoppingRequiresAStore(t *testing.T) {
+ h, cleanup := setupTestHandler(t)
+ defer cleanup()
+
+ form := url.Values{"title": {"Sponges"}, "source": {"shopping"}}
+ req := httptest.NewRequest(http.MethodPost, "/unified-add", strings.NewReader(form.Encode()))
+ req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+ rec := httptest.NewRecorder()
+
+ h.HandleUnifiedAdd(rec, req)
+
+ if rec.Code != http.StatusBadRequest {
+ t.Errorf("got status %d, want 400 when no store is given", rec.Code)
+ }
+}
+
+// The store picker must offer the stores that actually exist.
+func TestHandleGetShoppingStores_ReturnsOptions(t *testing.T) {
+ h, cleanup := setupTestHandler(t)
+ defer cleanup()
+
+ _ = h.store.SaveUserShoppingItem("Milk", "Costco")
+ _ = h.store.SaveUserShoppingItem("Nails", "Hardware Store")
+
+ rec := httptest.NewRecorder()
+ h.HandleGetShoppingStores(rec, httptest.NewRequest(http.MethodGet, "/partials/shopping-stores", nil))
+
+ body := rec.Body.String()
+ for _, want := range []string{`<option value="Costco">Costco</option>`, `<option value="Hardware Store">Hardware Store</option>`} {
+ if !strings.Contains(body, want) {
+ t.Errorf("missing %q in %q", want, body)
+ }
+ }
+}
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-15 13:10:20 +0000