Remove shopping list draft/publish workflow — lists are always live
Shopping lists no longer go through a draft → published lifecycle. They are immediately usable upon generation from a week plan. Removed: status/published_at columns (V021 migration), publish endpoint, PublishResponse DTO, delete-item guard, and 4 related tests. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -32,12 +32,6 @@ public class ShoppingListController {
|
||||
return shoppingService.getShoppingList(householdId, id);
|
||||
}
|
||||
|
||||
@PostMapping("/v1/shopping-lists/{id}/publish")
|
||||
public PublishResponse publish(@PathVariable UUID id, Principal principal) {
|
||||
UUID householdId = householdResolver.resolve(principal.getName());
|
||||
return shoppingService.publish(householdId, id);
|
||||
}
|
||||
|
||||
@PatchMapping("/v1/shopping-lists/{listId}/items/{itemId}")
|
||||
public ShoppingListItemResponse checkItem(@PathVariable UUID listId,
|
||||
@PathVariable UUID itemId,
|
||||
|
||||
@@ -1,21 +1,246 @@
|
||||
package com.recipeapp.shopping;
|
||||
|
||||
import com.recipeapp.auth.UserAccountRepository;
|
||||
import com.recipeapp.auth.entity.UserAccount;
|
||||
import com.recipeapp.common.ResourceNotFoundException;
|
||||
import com.recipeapp.household.HouseholdRepository;
|
||||
import com.recipeapp.planning.WeekPlanRepository;
|
||||
import com.recipeapp.planning.entity.WeekPlan;
|
||||
import com.recipeapp.recipe.IngredientRepository;
|
||||
import com.recipeapp.recipe.entity.Ingredient;
|
||||
import com.recipeapp.recipe.entity.RecipeIngredient;
|
||||
import com.recipeapp.shopping.dto.*;
|
||||
import com.recipeapp.shopping.entity.ShoppingList;
|
||||
import com.recipeapp.shopping.entity.ShoppingListItem;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.UUID;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public interface ShoppingService {
|
||||
@Service
|
||||
@Transactional
|
||||
public class ShoppingService {
|
||||
|
||||
ShoppingListResponse generateFromPlan(UUID householdId, UUID weekPlanId);
|
||||
private final ShoppingListRepository shoppingListRepository;
|
||||
private final ShoppingListItemRepository shoppingListItemRepository;
|
||||
private final WeekPlanRepository weekPlanRepository;
|
||||
private final HouseholdRepository householdRepository;
|
||||
private final IngredientRepository ingredientRepository;
|
||||
private final UserAccountRepository userAccountRepository;
|
||||
|
||||
ShoppingListResponse getShoppingList(UUID householdId, UUID shoppingListId);
|
||||
public ShoppingService(ShoppingListRepository shoppingListRepository,
|
||||
ShoppingListItemRepository shoppingListItemRepository,
|
||||
WeekPlanRepository weekPlanRepository,
|
||||
HouseholdRepository householdRepository,
|
||||
IngredientRepository ingredientRepository,
|
||||
UserAccountRepository userAccountRepository) {
|
||||
this.shoppingListRepository = shoppingListRepository;
|
||||
this.shoppingListItemRepository = shoppingListItemRepository;
|
||||
this.weekPlanRepository = weekPlanRepository;
|
||||
this.householdRepository = householdRepository;
|
||||
this.ingredientRepository = ingredientRepository;
|
||||
this.userAccountRepository = userAccountRepository;
|
||||
}
|
||||
|
||||
PublishResponse publish(UUID householdId, UUID shoppingListId);
|
||||
|
||||
ShoppingListItemResponse checkItem(UUID householdId, UUID listId, UUID itemId,
|
||||
CheckItemRequest request, UUID userId);
|
||||
public ShoppingListResponse generateFromPlan(UUID householdId, UUID weekPlanId) {
|
||||
WeekPlan weekPlan = weekPlanRepository.findById(weekPlanId)
|
||||
.orElseThrow(() -> new ResourceNotFoundException("Week plan not found"));
|
||||
|
||||
ShoppingListItemResponse addItem(UUID householdId, UUID shoppingListId, AddItemRequest request);
|
||||
if (!weekPlan.getHousehold().getId().equals(householdId)) {
|
||||
throw new ResourceNotFoundException("Week plan not found");
|
||||
}
|
||||
|
||||
void deleteItem(UUID householdId, UUID listId, UUID itemId);
|
||||
var household = weekPlan.getHousehold();
|
||||
|
||||
ShoppingList shoppingList = new ShoppingList(household, weekPlan);
|
||||
shoppingList = shoppingListRepository.save(shoppingList);
|
||||
|
||||
// Aggregate ingredients across all slots/recipes
|
||||
// Key: ingredientId + unit -> merged data
|
||||
Map<String, MergedIngredient> merged = new LinkedHashMap<>();
|
||||
|
||||
for (var slot : weekPlan.getSlots()) {
|
||||
var recipe = slot.getRecipe();
|
||||
for (RecipeIngredient ri : recipe.getIngredients()) {
|
||||
Ingredient ingredient = ri.getIngredient();
|
||||
|
||||
// Filter out staples
|
||||
if (ingredient.isStaple()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
String key = ingredient.getId().toString() + "|" + ri.getUnit();
|
||||
merged.computeIfAbsent(key, k -> new MergedIngredient(ingredient, ri.getUnit()))
|
||||
.addQuantity(ri.getQuantity())
|
||||
.addRecipeId(recipe.getId());
|
||||
}
|
||||
}
|
||||
|
||||
// Create shopping list items
|
||||
for (MergedIngredient mi : merged.values()) {
|
||||
ShoppingListItem item = new ShoppingListItem(
|
||||
shoppingList,
|
||||
mi.ingredient,
|
||||
null,
|
||||
mi.totalQuantity,
|
||||
mi.unit,
|
||||
mi.recipeIds.stream().distinct().toArray(UUID[]::new)
|
||||
);
|
||||
shoppingList.getItems().add(item);
|
||||
}
|
||||
|
||||
shoppingListRepository.save(shoppingList);
|
||||
|
||||
return toResponse(shoppingList);
|
||||
}
|
||||
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public ShoppingListResponse getShoppingList(UUID householdId, UUID shoppingListId) {
|
||||
ShoppingList list = findList(householdId, shoppingListId);
|
||||
return toResponse(list);
|
||||
}
|
||||
|
||||
|
||||
public ShoppingListItemResponse checkItem(UUID householdId, UUID listId, UUID itemId,
|
||||
CheckItemRequest request, UUID userId) {
|
||||
ShoppingList list = findList(householdId, listId);
|
||||
ShoppingListItem item = findItem(list, itemId);
|
||||
|
||||
item.setChecked(request.isChecked());
|
||||
|
||||
if (request.isChecked()) {
|
||||
UserAccount user = userAccountRepository.findById(userId)
|
||||
.orElseThrow(() -> new ResourceNotFoundException("User not found"));
|
||||
item.setCheckedBy(user);
|
||||
} else {
|
||||
item.setCheckedBy(null);
|
||||
}
|
||||
|
||||
shoppingListItemRepository.save(item);
|
||||
return toItemResponse(item);
|
||||
}
|
||||
|
||||
|
||||
public ShoppingListItemResponse addItem(UUID householdId, UUID shoppingListId, AddItemRequest request) {
|
||||
ShoppingList list = findList(householdId, shoppingListId);
|
||||
|
||||
Ingredient ingredient = null;
|
||||
if (request.ingredientId() != null) {
|
||||
ingredient = ingredientRepository.findById(request.ingredientId())
|
||||
.orElseThrow(() -> new ResourceNotFoundException("Ingredient not found"));
|
||||
}
|
||||
|
||||
ShoppingListItem item = new ShoppingListItem(
|
||||
list,
|
||||
ingredient,
|
||||
request.customName(),
|
||||
request.quantity(),
|
||||
request.unit(),
|
||||
new UUID[0]
|
||||
);
|
||||
|
||||
item = shoppingListItemRepository.save(item);
|
||||
list.getItems().add(item);
|
||||
|
||||
return toItemResponse(item);
|
||||
}
|
||||
|
||||
|
||||
public void deleteItem(UUID householdId, UUID listId, UUID itemId) {
|
||||
ShoppingList list = findList(householdId, listId);
|
||||
ShoppingListItem item = findItem(list, itemId);
|
||||
list.getItems().remove(item);
|
||||
shoppingListItemRepository.delete(item);
|
||||
}
|
||||
|
||||
// ── Helpers ──
|
||||
|
||||
private ShoppingList findList(UUID householdId, UUID shoppingListId) {
|
||||
ShoppingList list = shoppingListRepository.findById(shoppingListId)
|
||||
.orElseThrow(() -> new ResourceNotFoundException("Shopping list not found"));
|
||||
|
||||
if (!list.getHousehold().getId().equals(householdId)) {
|
||||
throw new ResourceNotFoundException("Shopping list not found");
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
private ShoppingListItem findItem(ShoppingList list, UUID itemId) {
|
||||
return list.getItems().stream()
|
||||
.filter(i -> i.getId().equals(itemId))
|
||||
.findFirst()
|
||||
.orElseThrow(() -> new ResourceNotFoundException("Shopping list item not found"));
|
||||
}
|
||||
|
||||
private ShoppingListResponse toResponse(ShoppingList list) {
|
||||
List<ShoppingListItemResponse> items = list.getItems().stream()
|
||||
.map(this::toItemResponse)
|
||||
.toList();
|
||||
|
||||
return new ShoppingListResponse(
|
||||
list.getId(),
|
||||
list.getWeekPlan().getId(),
|
||||
items
|
||||
);
|
||||
}
|
||||
|
||||
private ShoppingListItemResponse toItemResponse(ShoppingListItem item) {
|
||||
String name;
|
||||
ShoppingListItemResponse.CategoryRef categoryRef = null;
|
||||
UUID ingredientId = null;
|
||||
|
||||
if (item.getIngredient() != null) {
|
||||
ingredientId = item.getIngredient().getId();
|
||||
name = item.getIngredient().getName();
|
||||
if (item.getIngredient().getCategory() != null) {
|
||||
categoryRef = new ShoppingListItemResponse.CategoryRef(
|
||||
item.getIngredient().getCategory().getId(),
|
||||
item.getIngredient().getCategory().getName()
|
||||
);
|
||||
}
|
||||
} else {
|
||||
name = item.getCustomName();
|
||||
}
|
||||
|
||||
return new ShoppingListItemResponse(
|
||||
item.getId(),
|
||||
ingredientId,
|
||||
name,
|
||||
categoryRef,
|
||||
item.getQuantity(),
|
||||
item.getUnit(),
|
||||
item.isChecked(),
|
||||
item.getCheckedBy() != null ? item.getCheckedBy().getId() : null,
|
||||
item.getSourceRecipes() != null ? Arrays.asList(item.getSourceRecipes()) : List.of()
|
||||
);
|
||||
}
|
||||
|
||||
private static class MergedIngredient {
|
||||
final Ingredient ingredient;
|
||||
final String unit;
|
||||
BigDecimal totalQuantity = BigDecimal.ZERO;
|
||||
final List<UUID> recipeIds = new ArrayList<>();
|
||||
|
||||
MergedIngredient(Ingredient ingredient, String unit) {
|
||||
this.ingredient = ingredient;
|
||||
this.unit = unit;
|
||||
}
|
||||
|
||||
MergedIngredient addQuantity(BigDecimal qty) {
|
||||
if (qty != null) {
|
||||
this.totalQuantity = this.totalQuantity.add(qty);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
MergedIngredient addRecipeId(UUID recipeId) {
|
||||
this.recipeIds.add(recipeId);
|
||||
return this;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
package com.recipeapp.shopping.dto;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.UUID;
|
||||
|
||||
public record PublishResponse(UUID id, String status, Instant publishedAt) {}
|
||||
@@ -1,13 +1,10 @@
|
||||
package com.recipeapp.shopping.dto;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public record ShoppingListResponse(
|
||||
UUID id,
|
||||
UUID weekPlanId,
|
||||
String status,
|
||||
Instant publishedAt,
|
||||
List<ShoppingListItemResponse> items
|
||||
) {}
|
||||
|
||||
@@ -3,7 +3,6 @@ package com.recipeapp.shopping.entity;
|
||||
import com.recipeapp.household.entity.Household;
|
||||
import com.recipeapp.planning.entity.WeekPlan;
|
||||
import jakarta.persistence.*;
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
@@ -24,12 +23,6 @@ public class ShoppingList {
|
||||
@JoinColumn(name = "week_plan_id", nullable = false)
|
||||
private WeekPlan weekPlan;
|
||||
|
||||
@Column(nullable = false, length = 10)
|
||||
private String status = "draft";
|
||||
|
||||
@Column(name = "published_at")
|
||||
private Instant publishedAt;
|
||||
|
||||
@OneToMany(mappedBy = "shoppingList", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||
private List<ShoppingListItem> items = new ArrayList<>();
|
||||
|
||||
@@ -43,9 +36,5 @@ public class ShoppingList {
|
||||
public UUID getId() { return id; }
|
||||
public Household getHousehold() { return household; }
|
||||
public WeekPlan getWeekPlan() { return weekPlan; }
|
||||
public String getStatus() { return status; }
|
||||
public void setStatus(String status) { this.status = status; }
|
||||
public Instant getPublishedAt() { return publishedAt; }
|
||||
public void setPublishedAt(Instant publishedAt) { this.publishedAt = publishedAt; }
|
||||
public List<ShoppingListItem> getItems() { return items; }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user