feat: rename ingredients→products, products→user_products; add barcode/OFF import
- Rename catalog: ingredient/* → product/* (canonical_name, barcode, nutrition per 100g)
- Rename pantry: product/* → userproduct/* (user-owned items with expiry)
- Squash migrations into single 001_initial_schema.sql (clean-db baseline)
- product_categories: add English canonical name column; fix COALESCE in queries
- Remove product_translations: product names are stored in their original language
- Add default_unit_name to product API responses via unit_translations JOIN
- Add cmd/importoff: bulk import from OpenFoodFacts JSONL dump (COPY + ON CONFLICT)
- Diary: support product_id entries alongside dish_id (CHECK num_nonnulls = 1)
- Home: getLoggedCalories joins both recipes and catalog products
- Flutter: rename models/providers/services to match backend rename
- Flutter: add barcode scan flow for diary (mobile_scanner, product_portion_sheet)
- Flutter: localise 6 new keys across 12 languages (barcode scan, portion weight)
- Routes: GET /products/search, GET /products/barcode/{barcode}, /user-products
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
dbastrikin
@@ -1,41 +1,29 @@
|
||||
package product
|
||||
|
||||
import "time"
|
||||
import (
|
||||
"encoding/json"
|
||||
"time"
|
||||
)
|
||||
|
||||
// Product is a user's food item in their pantry.
|
||||
// Product is a catalog entry representing a food ingredient or packaged product.
|
||||
// CanonicalName holds the English name; localized names are resolved at query time.
|
||||
type Product struct {
|
||||
ID string `json:"id"`
|
||||
UserID string `json:"user_id"`
|
||||
PrimaryIngredientID *string `json:"primary_ingredient_id"`
|
||||
Name string `json:"name"`
|
||||
Quantity float64 `json:"quantity"`
|
||||
Unit string `json:"unit"`
|
||||
Category *string `json:"category"`
|
||||
StorageDays int `json:"storage_days"`
|
||||
AddedAt time.Time `json:"added_at"`
|
||||
ExpiresAt time.Time `json:"expires_at"`
|
||||
DaysLeft int `json:"days_left"`
|
||||
ExpiringSoon bool `json:"expiring_soon"`
|
||||
}
|
||||
ID string `json:"id"`
|
||||
CanonicalName string `json:"canonical_name"`
|
||||
Aliases json.RawMessage `json:"aliases"` // []string, populated by read queries
|
||||
Category *string `json:"category"`
|
||||
CategoryName *string `json:"category_name"` // localized category display name
|
||||
DefaultUnit *string `json:"default_unit"`
|
||||
DefaultUnitName *string `json:"default_unit_name,omitempty"`
|
||||
Barcode *string `json:"barcode,omitempty"`
|
||||
|
||||
// CreateRequest is the body for POST /products.
|
||||
type CreateRequest struct {
|
||||
PrimaryIngredientID *string `json:"primary_ingredient_id"`
|
||||
// Accept both "primary_ingredient_id" (new) and "mapping_id" (legacy client) fields.
|
||||
MappingID *string `json:"mapping_id"`
|
||||
Name string `json:"name"`
|
||||
Quantity float64 `json:"quantity"`
|
||||
Unit string `json:"unit"`
|
||||
Category *string `json:"category"`
|
||||
StorageDays int `json:"storage_days"`
|
||||
}
|
||||
CaloriesPer100g *float64 `json:"calories_per_100g"`
|
||||
ProteinPer100g *float64 `json:"protein_per_100g"`
|
||||
FatPer100g *float64 `json:"fat_per_100g"`
|
||||
CarbsPer100g *float64 `json:"carbs_per_100g"`
|
||||
FiberPer100g *float64 `json:"fiber_per_100g"`
|
||||
|
||||
// UpdateRequest is the body for PUT /products/{id}.
|
||||
// All fields are optional (nil = keep existing value).
|
||||
type UpdateRequest struct {
|
||||
Name *string `json:"name"`
|
||||
Quantity *float64 `json:"quantity"`
|
||||
Unit *string `json:"unit"`
|
||||
Category *string `json:"category"`
|
||||
StorageDays *int `json:"storage_days"`
|
||||
StorageDays *int `json:"storage_days"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
UpdatedAt time.Time `json:"updated_at"`
|
||||
}
|
||||
|
||||
@@ -3,145 +3,121 @@ package product
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
"github.com/food-ai/backend/internal/infra/middleware"
|
||||
"github.com/go-chi/chi/v5"
|
||||
)
|
||||
|
||||
// ProductRepository is the data layer interface used by Handler.
|
||||
type ProductRepository interface {
|
||||
List(ctx context.Context, userID string) ([]*Product, error)
|
||||
Create(ctx context.Context, userID string, req CreateRequest) (*Product, error)
|
||||
BatchCreate(ctx context.Context, userID string, items []CreateRequest) ([]*Product, error)
|
||||
Update(ctx context.Context, id, userID string, req UpdateRequest) (*Product, error)
|
||||
Delete(ctx context.Context, id, userID string) error
|
||||
// ProductSearcher is the data layer interface used by Handler for search.
|
||||
type ProductSearcher interface {
|
||||
Search(ctx context.Context, query string, limit int) ([]*Product, error)
|
||||
GetByBarcode(ctx context.Context, barcode string) (*Product, error)
|
||||
UpsertByBarcode(ctx context.Context, catalogProduct *Product) (*Product, error)
|
||||
}
|
||||
|
||||
// Handler handles /products HTTP requests.
|
||||
// OpenFoodFactsClient fetches product data from Open Food Facts.
|
||||
type OpenFoodFactsClient interface {
|
||||
Fetch(requestContext context.Context, barcode string) (*Product, error)
|
||||
}
|
||||
|
||||
// Handler handles catalog product HTTP requests.
|
||||
type Handler struct {
|
||||
repo ProductRepository
|
||||
repo ProductSearcher
|
||||
openFoodFacts OpenFoodFactsClient
|
||||
}
|
||||
|
||||
// NewHandler creates a new Handler.
|
||||
func NewHandler(repo ProductRepository) *Handler {
|
||||
return &Handler{repo: repo}
|
||||
func NewHandler(repo ProductSearcher, openFoodFacts OpenFoodFactsClient) *Handler {
|
||||
return &Handler{repo: repo, openFoodFacts: openFoodFacts}
|
||||
}
|
||||
|
||||
// List handles GET /products.
|
||||
func (h *Handler) List(w http.ResponseWriter, r *http.Request) {
|
||||
userID := middleware.UserIDFromCtx(r.Context())
|
||||
products, err := h.repo.List(r.Context(), userID)
|
||||
if err != nil {
|
||||
slog.Error("list products", "user_id", userID, "err", err)
|
||||
writeErrorJSON(w, http.StatusInternalServerError, "failed to list products")
|
||||
// Search handles GET /products/search?q=&limit=10.
|
||||
func (handler *Handler) Search(responseWriter http.ResponseWriter, request *http.Request) {
|
||||
query := request.URL.Query().Get("q")
|
||||
if query == "" {
|
||||
responseWriter.Header().Set("Content-Type", "application/json")
|
||||
_, _ = responseWriter.Write([]byte("[]"))
|
||||
return
|
||||
}
|
||||
|
||||
limit := 10
|
||||
if limitStr := request.URL.Query().Get("limit"); limitStr != "" {
|
||||
if parsedLimit, parseError := strconv.Atoi(limitStr); parseError == nil && parsedLimit > 0 && parsedLimit <= 50 {
|
||||
limit = parsedLimit
|
||||
}
|
||||
}
|
||||
|
||||
products, searchError := handler.repo.Search(request.Context(), query, limit)
|
||||
if searchError != nil {
|
||||
slog.Error("search catalog products", "q", query, "err", searchError)
|
||||
responseWriter.Header().Set("Content-Type", "application/json")
|
||||
responseWriter.WriteHeader(http.StatusInternalServerError)
|
||||
_, _ = responseWriter.Write([]byte(`{"error":"search failed"}`))
|
||||
return
|
||||
}
|
||||
|
||||
if products == nil {
|
||||
products = []*Product{}
|
||||
}
|
||||
writeJSON(w, http.StatusOK, products)
|
||||
|
||||
responseWriter.Header().Set("Content-Type", "application/json")
|
||||
_ = json.NewEncoder(responseWriter).Encode(products)
|
||||
}
|
||||
|
||||
// Create handles POST /products.
|
||||
func (h *Handler) Create(w http.ResponseWriter, r *http.Request) {
|
||||
userID := middleware.UserIDFromCtx(r.Context())
|
||||
var req CreateRequest
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
writeErrorJSON(w, http.StatusBadRequest, "invalid request body")
|
||||
return
|
||||
}
|
||||
if req.Name == "" {
|
||||
writeErrorJSON(w, http.StatusBadRequest, "name is required")
|
||||
// GetByBarcode handles GET /products/barcode/{barcode}.
|
||||
// Checks the database first; on miss, fetches from Open Food Facts and caches the result.
|
||||
func (handler *Handler) GetByBarcode(responseWriter http.ResponseWriter, request *http.Request) {
|
||||
barcode := chi.URLParam(request, "barcode")
|
||||
if barcode == "" {
|
||||
writeErrorJSON(responseWriter, http.StatusBadRequest, "barcode is required")
|
||||
return
|
||||
}
|
||||
|
||||
p, err := h.repo.Create(r.Context(), userID, req)
|
||||
if err != nil {
|
||||
slog.Error("create product", "user_id", userID, "err", err)
|
||||
writeErrorJSON(w, http.StatusInternalServerError, "failed to create product")
|
||||
// Check the local catalog first.
|
||||
catalogProduct, lookupError := handler.repo.GetByBarcode(request.Context(), barcode)
|
||||
if lookupError != nil {
|
||||
slog.Error("lookup product by barcode", "barcode", barcode, "err", lookupError)
|
||||
writeErrorJSON(responseWriter, http.StatusInternalServerError, "lookup failed")
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusCreated, p)
|
||||
}
|
||||
|
||||
// BatchCreate handles POST /products/batch.
|
||||
func (h *Handler) BatchCreate(w http.ResponseWriter, r *http.Request) {
|
||||
userID := middleware.UserIDFromCtx(r.Context())
|
||||
var items []CreateRequest
|
||||
if err := json.NewDecoder(r.Body).Decode(&items); err != nil {
|
||||
writeErrorJSON(w, http.StatusBadRequest, "invalid request body")
|
||||
return
|
||||
}
|
||||
if len(items) == 0 {
|
||||
writeJSON(w, http.StatusCreated, []*Product{})
|
||||
if catalogProduct != nil {
|
||||
writeJSON(responseWriter, http.StatusOK, catalogProduct)
|
||||
return
|
||||
}
|
||||
|
||||
products, err := h.repo.BatchCreate(r.Context(), userID, items)
|
||||
if err != nil {
|
||||
slog.Error("batch create products", "user_id", userID, "err", err)
|
||||
writeErrorJSON(w, http.StatusInternalServerError, "failed to create products")
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusCreated, products)
|
||||
}
|
||||
|
||||
// Update handles PUT /products/{id}.
|
||||
func (h *Handler) Update(w http.ResponseWriter, r *http.Request) {
|
||||
userID := middleware.UserIDFromCtx(r.Context())
|
||||
id := chi.URLParam(r, "id")
|
||||
|
||||
var req UpdateRequest
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
writeErrorJSON(w, http.StatusBadRequest, "invalid request body")
|
||||
// Not in catalog — fetch from Open Food Facts.
|
||||
fetchedProduct, fetchError := handler.openFoodFacts.Fetch(request.Context(), barcode)
|
||||
if fetchError != nil {
|
||||
slog.Warn("open food facts fetch failed", "barcode", barcode, "err", fetchError)
|
||||
writeErrorJSON(responseWriter, http.StatusNotFound, "product not found")
|
||||
return
|
||||
}
|
||||
|
||||
p, err := h.repo.Update(r.Context(), id, userID, req)
|
||||
if errors.Is(err, ErrNotFound) {
|
||||
writeErrorJSON(w, http.StatusNotFound, "product not found")
|
||||
// Persist the fetched product so subsequent lookups are served from the DB.
|
||||
savedProduct, upsertError := handler.repo.UpsertByBarcode(request.Context(), fetchedProduct)
|
||||
if upsertError != nil {
|
||||
slog.Warn("upsert product from open food facts", "barcode", barcode, "err", upsertError)
|
||||
// Return the fetched data even if we could not cache it.
|
||||
writeJSON(responseWriter, http.StatusOK, fetchedProduct)
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
slog.Error("update product", "id", id, "err", err)
|
||||
writeErrorJSON(w, http.StatusInternalServerError, "failed to update product")
|
||||
return
|
||||
}
|
||||
writeJSON(w, http.StatusOK, p)
|
||||
}
|
||||
|
||||
// Delete handles DELETE /products/{id}.
|
||||
func (h *Handler) Delete(w http.ResponseWriter, r *http.Request) {
|
||||
userID := middleware.UserIDFromCtx(r.Context())
|
||||
id := chi.URLParam(r, "id")
|
||||
|
||||
if err := h.repo.Delete(r.Context(), id, userID); err != nil {
|
||||
if errors.Is(err, ErrNotFound) {
|
||||
writeErrorJSON(w, http.StatusNotFound, "product not found")
|
||||
return
|
||||
}
|
||||
slog.Error("delete product", "id", id, "err", err)
|
||||
writeErrorJSON(w, http.StatusInternalServerError, "failed to delete product")
|
||||
return
|
||||
}
|
||||
w.WriteHeader(http.StatusNoContent)
|
||||
writeJSON(responseWriter, http.StatusOK, savedProduct)
|
||||
}
|
||||
|
||||
type errorResponse struct {
|
||||
Error string `json:"error"`
|
||||
}
|
||||
|
||||
func writeErrorJSON(w http.ResponseWriter, status int, msg string) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
w.WriteHeader(status)
|
||||
_ = json.NewEncoder(w).Encode(errorResponse{Error: msg})
|
||||
func writeErrorJSON(responseWriter http.ResponseWriter, status int, msg string) {
|
||||
responseWriter.Header().Set("Content-Type", "application/json")
|
||||
responseWriter.WriteHeader(status)
|
||||
_ = json.NewEncoder(responseWriter).Encode(errorResponse{Error: msg})
|
||||
}
|
||||
|
||||
func writeJSON(w http.ResponseWriter, status int, v any) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
w.WriteHeader(status)
|
||||
_ = json.NewEncoder(w).Encode(v)
|
||||
func writeJSON(responseWriter http.ResponseWriter, status int, value any) {
|
||||
responseWriter.Header().Set("Content-Type", "application/json")
|
||||
responseWriter.WriteHeader(status)
|
||||
_ = json.NewEncoder(responseWriter).Encode(value)
|
||||
}
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
package mocks
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/food-ai/backend/internal/domain/product"
|
||||
)
|
||||
|
||||
// MockProductRepository is a test double implementing product.ProductRepository.
|
||||
type MockProductRepository struct {
|
||||
ListFn func(ctx context.Context, userID string) ([]*product.Product, error)
|
||||
CreateFn func(ctx context.Context, userID string, req product.CreateRequest) (*product.Product, error)
|
||||
BatchCreateFn func(ctx context.Context, userID string, items []product.CreateRequest) ([]*product.Product, error)
|
||||
UpdateFn func(ctx context.Context, id, userID string, req product.UpdateRequest) (*product.Product, error)
|
||||
DeleteFn func(ctx context.Context, id, userID string) error
|
||||
}
|
||||
|
||||
func (m *MockProductRepository) List(ctx context.Context, userID string) ([]*product.Product, error) {
|
||||
return m.ListFn(ctx, userID)
|
||||
}
|
||||
|
||||
func (m *MockProductRepository) Create(ctx context.Context, userID string, req product.CreateRequest) (*product.Product, error) {
|
||||
return m.CreateFn(ctx, userID, req)
|
||||
}
|
||||
|
||||
func (m *MockProductRepository) BatchCreate(ctx context.Context, userID string, items []product.CreateRequest) ([]*product.Product, error) {
|
||||
return m.BatchCreateFn(ctx, userID, items)
|
||||
}
|
||||
|
||||
func (m *MockProductRepository) Update(ctx context.Context, id, userID string, req product.UpdateRequest) (*product.Product, error) {
|
||||
return m.UpdateFn(ctx, id, userID, req)
|
||||
}
|
||||
|
||||
func (m *MockProductRepository) Delete(ctx context.Context, id, userID string) error {
|
||||
return m.DeleteFn(ctx, id, userID)
|
||||
}
|
||||
84
backend/internal/domain/product/openfoodfacts.go
Normal file
84
backend/internal/domain/product/openfoodfacts.go
Normal file
@@ -0,0 +1,84 @@
|
||||
package product
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
// OpenFoodFacts is the client for the Open Food Facts public API.
|
||||
type OpenFoodFacts struct {
|
||||
httpClient *http.Client
|
||||
}
|
||||
|
||||
// NewOpenFoodFacts creates a new OpenFoodFacts client with the default HTTP client.
|
||||
func NewOpenFoodFacts() *OpenFoodFacts {
|
||||
return &OpenFoodFacts{httpClient: &http.Client{}}
|
||||
}
|
||||
|
||||
// offProduct is the JSON shape returned by the Open Food Facts v2 API.
|
||||
type offProduct struct {
|
||||
ProductName string `json:"product_name"`
|
||||
Brands string `json:"brands"`
|
||||
Nutriments offNutriments `json:"nutriments"`
|
||||
}
|
||||
|
||||
type offNutriments struct {
|
||||
EnergyKcal100g *float64 `json:"energy-kcal_100g"`
|
||||
Proteins100g *float64 `json:"proteins_100g"`
|
||||
Fat100g *float64 `json:"fat_100g"`
|
||||
Carbohydrates100g *float64 `json:"carbohydrates_100g"`
|
||||
Fiber100g *float64 `json:"fiber_100g"`
|
||||
}
|
||||
|
||||
type offResponse struct {
|
||||
Status int `json:"status"`
|
||||
Product offProduct `json:"product"`
|
||||
}
|
||||
|
||||
// Fetch retrieves a product from Open Food Facts by barcode.
|
||||
// Returns an error if the product is not found or the API call fails.
|
||||
func (client *OpenFoodFacts) Fetch(requestContext context.Context, barcode string) (*Product, error) {
|
||||
url := fmt.Sprintf("https://world.openfoodfacts.org/api/v2/product/%s.json", barcode)
|
||||
httpRequest, requestError := http.NewRequestWithContext(requestContext, http.MethodGet, url, nil)
|
||||
if requestError != nil {
|
||||
return nil, fmt.Errorf("build open food facts request: %w", requestError)
|
||||
}
|
||||
httpRequest.Header.Set("User-Agent", "FoodAI/1.0")
|
||||
|
||||
httpResponse, fetchError := client.httpClient.Do(httpRequest)
|
||||
if fetchError != nil {
|
||||
return nil, fmt.Errorf("open food facts request: %w", fetchError)
|
||||
}
|
||||
defer httpResponse.Body.Close()
|
||||
|
||||
if httpResponse.StatusCode != http.StatusOK {
|
||||
return nil, fmt.Errorf("open food facts returned status %d for barcode %s", httpResponse.StatusCode, barcode)
|
||||
}
|
||||
|
||||
var offResp offResponse
|
||||
if decodeError := json.NewDecoder(httpResponse.Body).Decode(&offResp); decodeError != nil {
|
||||
return nil, fmt.Errorf("decode open food facts response: %w", decodeError)
|
||||
}
|
||||
if offResp.Status == 0 {
|
||||
return nil, fmt.Errorf("product %s not found in open food facts", barcode)
|
||||
}
|
||||
|
||||
canonicalName := offResp.Product.ProductName
|
||||
if canonicalName == "" {
|
||||
canonicalName = barcode // Fall back to barcode as canonical name
|
||||
}
|
||||
|
||||
barcodeValue := barcode
|
||||
catalogProduct := &Product{
|
||||
CanonicalName: canonicalName,
|
||||
Barcode: &barcodeValue,
|
||||
CaloriesPer100g: offResp.Product.Nutriments.EnergyKcal100g,
|
||||
ProteinPer100g: offResp.Product.Nutriments.Proteins100g,
|
||||
FatPer100g: offResp.Product.Nutriments.Fat100g,
|
||||
CarbsPer100g: offResp.Product.Nutriments.Carbohydrates100g,
|
||||
FiberPer100g: offResp.Product.Nutriments.Fiber100g,
|
||||
}
|
||||
return catalogProduct, nil
|
||||
}
|
||||
@@ -2,18 +2,16 @@ package product
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/food-ai/backend/internal/infra/locale"
|
||||
"github.com/jackc/pgx/v5"
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
)
|
||||
|
||||
// ErrNotFound is returned when a product is not found or does not belong to the user.
|
||||
var ErrNotFound = errors.New("product not found")
|
||||
|
||||
// Repository handles product persistence.
|
||||
// Repository handles persistence for catalog products and their translations.
|
||||
type Repository struct {
|
||||
pool *pgxpool.Pool
|
||||
}
|
||||
@@ -23,180 +21,314 @@ func NewRepository(pool *pgxpool.Pool) *Repository {
|
||||
return &Repository{pool: pool}
|
||||
}
|
||||
|
||||
// expires_at is computed in SQL because TIMESTAMPTZ + INTERVAL is STABLE (not IMMUTABLE),
|
||||
// which prevents it from being used as a stored generated column.
|
||||
const selectCols = `id, user_id, primary_ingredient_id, name, quantity, unit, category, storage_days, added_at,
|
||||
(added_at + storage_days * INTERVAL '1 day') AS expires_at`
|
||||
// Upsert inserts or updates a catalog product (English canonical content).
|
||||
// Conflict is resolved on canonical_name.
|
||||
func (r *Repository) Upsert(requestContext context.Context, catalogProduct *Product) (*Product, error) {
|
||||
query := `
|
||||
INSERT INTO products (
|
||||
canonical_name,
|
||||
category, default_unit,
|
||||
calories_per_100g, protein_per_100g, fat_per_100g, carbs_per_100g, fiber_per_100g,
|
||||
storage_days
|
||||
) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
|
||||
ON CONFLICT (canonical_name) DO UPDATE SET
|
||||
category = EXCLUDED.category,
|
||||
default_unit = EXCLUDED.default_unit,
|
||||
calories_per_100g = EXCLUDED.calories_per_100g,
|
||||
protein_per_100g = EXCLUDED.protein_per_100g,
|
||||
fat_per_100g = EXCLUDED.fat_per_100g,
|
||||
carbs_per_100g = EXCLUDED.carbs_per_100g,
|
||||
fiber_per_100g = EXCLUDED.fiber_per_100g,
|
||||
storage_days = EXCLUDED.storage_days,
|
||||
updated_at = now()
|
||||
RETURNING id, canonical_name, category, default_unit,
|
||||
calories_per_100g, protein_per_100g, fat_per_100g, carbs_per_100g, fiber_per_100g,
|
||||
storage_days, created_at, updated_at`
|
||||
|
||||
// List returns all products for a user, sorted by expires_at ASC.
|
||||
func (r *Repository) List(ctx context.Context, userID string) ([]*Product, error) {
|
||||
rows, err := r.pool.Query(ctx, `
|
||||
SELECT `+selectCols+`
|
||||
FROM products
|
||||
WHERE user_id = $1
|
||||
ORDER BY expires_at ASC`, userID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("list products: %w", err)
|
||||
row := r.pool.QueryRow(requestContext, query,
|
||||
catalogProduct.CanonicalName,
|
||||
catalogProduct.Category, catalogProduct.DefaultUnit,
|
||||
catalogProduct.CaloriesPer100g, catalogProduct.ProteinPer100g, catalogProduct.FatPer100g, catalogProduct.CarbsPer100g, catalogProduct.FiberPer100g,
|
||||
catalogProduct.StorageDays,
|
||||
)
|
||||
return scanProductWrite(row)
|
||||
}
|
||||
|
||||
// GetByID returns a catalog product by UUID.
|
||||
// CanonicalName and aliases are resolved for the language stored in requestContext.
|
||||
// Returns nil, nil if not found.
|
||||
func (r *Repository) GetByID(requestContext context.Context, id string) (*Product, error) {
|
||||
lang := locale.FromContext(requestContext)
|
||||
query := `
|
||||
SELECT p.id,
|
||||
p.canonical_name,
|
||||
p.category,
|
||||
COALESCE(pct.name, pc.name) AS category_name,
|
||||
p.default_unit,
|
||||
COALESCE(ut.name, p.default_unit) AS unit_name,
|
||||
p.calories_per_100g, p.protein_per_100g, p.fat_per_100g, p.carbs_per_100g, p.fiber_per_100g,
|
||||
p.storage_days, p.created_at, p.updated_at,
|
||||
COALESCE(al.aliases, '[]'::json) AS aliases
|
||||
FROM products p
|
||||
LEFT JOIN product_categories pc
|
||||
ON pc.slug = p.category
|
||||
LEFT JOIN product_category_translations pct
|
||||
ON pct.product_category_slug = p.category AND pct.lang = $2
|
||||
LEFT JOIN unit_translations ut
|
||||
ON ut.unit_code = p.default_unit AND ut.lang = $2
|
||||
LEFT JOIN LATERAL (
|
||||
SELECT json_agg(pa.alias ORDER BY pa.alias) AS aliases
|
||||
FROM product_aliases pa
|
||||
WHERE pa.product_id = p.id AND pa.lang = $2
|
||||
) al ON true
|
||||
WHERE p.id = $1`
|
||||
|
||||
row := r.pool.QueryRow(requestContext, query, id, lang)
|
||||
catalogProduct, queryError := scanProductRead(row)
|
||||
if errors.Is(queryError, pgx.ErrNoRows) {
|
||||
return nil, nil
|
||||
}
|
||||
return catalogProduct, queryError
|
||||
}
|
||||
|
||||
// GetByBarcode returns a catalog product by barcode value.
|
||||
// Returns nil, nil if not found.
|
||||
func (r *Repository) GetByBarcode(requestContext context.Context, barcode string) (*Product, error) {
|
||||
lang := locale.FromContext(requestContext)
|
||||
query := `
|
||||
SELECT p.id,
|
||||
p.canonical_name,
|
||||
p.category,
|
||||
COALESCE(pct.name, pc.name) AS category_name,
|
||||
p.default_unit,
|
||||
COALESCE(ut.name, p.default_unit) AS unit_name,
|
||||
p.calories_per_100g, p.protein_per_100g, p.fat_per_100g, p.carbs_per_100g, p.fiber_per_100g,
|
||||
p.storage_days, p.created_at, p.updated_at,
|
||||
COALESCE(al.aliases, '[]'::json) AS aliases
|
||||
FROM products p
|
||||
LEFT JOIN product_categories pc
|
||||
ON pc.slug = p.category
|
||||
LEFT JOIN product_category_translations pct
|
||||
ON pct.product_category_slug = p.category AND pct.lang = $2
|
||||
LEFT JOIN unit_translations ut
|
||||
ON ut.unit_code = p.default_unit AND ut.lang = $2
|
||||
LEFT JOIN LATERAL (
|
||||
SELECT json_agg(pa.alias ORDER BY pa.alias) AS aliases
|
||||
FROM product_aliases pa
|
||||
WHERE pa.product_id = p.id AND pa.lang = $2
|
||||
) al ON true
|
||||
WHERE p.barcode = $1`
|
||||
|
||||
row := r.pool.QueryRow(requestContext, query, barcode, lang)
|
||||
catalogProduct, queryError := scanProductRead(row)
|
||||
if errors.Is(queryError, pgx.ErrNoRows) {
|
||||
return nil, nil
|
||||
}
|
||||
return catalogProduct, queryError
|
||||
}
|
||||
|
||||
// UpsertByBarcode inserts or updates a catalog product including its barcode.
|
||||
func (r *Repository) UpsertByBarcode(requestContext context.Context, catalogProduct *Product) (*Product, error) {
|
||||
query := `
|
||||
INSERT INTO products (
|
||||
canonical_name, barcode,
|
||||
category, default_unit,
|
||||
calories_per_100g, protein_per_100g, fat_per_100g, carbs_per_100g, fiber_per_100g,
|
||||
storage_days
|
||||
) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
|
||||
ON CONFLICT (canonical_name) DO UPDATE SET
|
||||
barcode = EXCLUDED.barcode,
|
||||
category = EXCLUDED.category,
|
||||
default_unit = EXCLUDED.default_unit,
|
||||
calories_per_100g = EXCLUDED.calories_per_100g,
|
||||
protein_per_100g = EXCLUDED.protein_per_100g,
|
||||
fat_per_100g = EXCLUDED.fat_per_100g,
|
||||
carbs_per_100g = EXCLUDED.carbs_per_100g,
|
||||
fiber_per_100g = EXCLUDED.fiber_per_100g,
|
||||
storage_days = EXCLUDED.storage_days,
|
||||
updated_at = now()
|
||||
RETURNING id, canonical_name, category, default_unit,
|
||||
calories_per_100g, protein_per_100g, fat_per_100g, carbs_per_100g, fiber_per_100g,
|
||||
storage_days, created_at, updated_at`
|
||||
|
||||
row := r.pool.QueryRow(requestContext, query,
|
||||
catalogProduct.CanonicalName, catalogProduct.Barcode,
|
||||
catalogProduct.Category, catalogProduct.DefaultUnit,
|
||||
catalogProduct.CaloriesPer100g, catalogProduct.ProteinPer100g, catalogProduct.FatPer100g, catalogProduct.CarbsPer100g, catalogProduct.FiberPer100g,
|
||||
catalogProduct.StorageDays,
|
||||
)
|
||||
return scanProductWrite(row)
|
||||
}
|
||||
|
||||
// FuzzyMatch finds the single best matching catalog product for a given name.
|
||||
// Returns nil, nil when no match is found.
|
||||
func (r *Repository) FuzzyMatch(requestContext context.Context, name string) (*Product, error) {
|
||||
results, searchError := r.Search(requestContext, name, 1)
|
||||
if searchError != nil {
|
||||
return nil, searchError
|
||||
}
|
||||
if len(results) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
return results[0], nil
|
||||
}
|
||||
|
||||
// Search finds catalog products matching the query string.
|
||||
// Searches aliases table and translated names for the language in requestContext.
|
||||
func (r *Repository) Search(requestContext context.Context, query string, limit int) ([]*Product, error) {
|
||||
if limit <= 0 {
|
||||
limit = 10
|
||||
}
|
||||
lang := locale.FromContext(requestContext)
|
||||
searchQuery := `
|
||||
SELECT p.id,
|
||||
p.canonical_name,
|
||||
p.category,
|
||||
COALESCE(pct.name, pc.name) AS category_name,
|
||||
p.default_unit,
|
||||
COALESCE(ut.name, p.default_unit) AS unit_name,
|
||||
p.calories_per_100g, p.protein_per_100g, p.fat_per_100g, p.carbs_per_100g, p.fiber_per_100g,
|
||||
p.storage_days, p.created_at, p.updated_at,
|
||||
COALESCE(al.aliases, '[]'::json) AS aliases
|
||||
FROM products p
|
||||
LEFT JOIN product_categories pc
|
||||
ON pc.slug = p.category
|
||||
LEFT JOIN product_category_translations pct
|
||||
ON pct.product_category_slug = p.category AND pct.lang = $3
|
||||
LEFT JOIN unit_translations ut
|
||||
ON ut.unit_code = p.default_unit AND ut.lang = $3
|
||||
LEFT JOIN LATERAL (
|
||||
SELECT json_agg(pa.alias ORDER BY pa.alias) AS aliases
|
||||
FROM product_aliases pa
|
||||
WHERE pa.product_id = p.id AND pa.lang = $3
|
||||
) al ON true
|
||||
WHERE EXISTS (
|
||||
SELECT 1 FROM product_aliases pa
|
||||
WHERE pa.product_id = p.id
|
||||
AND (pa.lang = $3 OR pa.lang = 'en')
|
||||
AND pa.alias ILIKE '%' || $1 || '%'
|
||||
)
|
||||
OR p.canonical_name ILIKE '%' || $1 || '%'
|
||||
OR similarity(p.canonical_name, $1) > 0.3
|
||||
ORDER BY similarity(p.canonical_name, $1) DESC
|
||||
LIMIT $2`
|
||||
|
||||
rows, queryError := r.pool.Query(requestContext, searchQuery, query, limit, lang)
|
||||
if queryError != nil {
|
||||
return nil, fmt.Errorf("search products: %w", queryError)
|
||||
}
|
||||
defer rows.Close()
|
||||
return collectProducts(rows)
|
||||
return collectProductsRead(rows)
|
||||
}
|
||||
|
||||
// Create inserts a new product and returns the created record.
|
||||
func (r *Repository) Create(ctx context.Context, userID string, req CreateRequest) (*Product, error) {
|
||||
storageDays := req.StorageDays
|
||||
if storageDays <= 0 {
|
||||
storageDays = 7
|
||||
// Count returns the total number of catalog products.
|
||||
func (r *Repository) Count(requestContext context.Context) (int, error) {
|
||||
var count int
|
||||
if queryError := r.pool.QueryRow(requestContext, `SELECT count(*) FROM products`).Scan(&count); queryError != nil {
|
||||
return 0, fmt.Errorf("count products: %w", queryError)
|
||||
}
|
||||
unit := req.Unit
|
||||
if unit == "" {
|
||||
unit = "pcs"
|
||||
}
|
||||
qty := req.Quantity
|
||||
if qty <= 0 {
|
||||
qty = 1
|
||||
}
|
||||
|
||||
// Accept both new and legacy field names.
|
||||
primaryID := req.PrimaryIngredientID
|
||||
if primaryID == nil {
|
||||
primaryID = req.MappingID
|
||||
}
|
||||
|
||||
row := r.pool.QueryRow(ctx, `
|
||||
INSERT INTO products (user_id, primary_ingredient_id, name, quantity, unit, category, storage_days)
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7)
|
||||
RETURNING `+selectCols,
|
||||
userID, primaryID, req.Name, qty, unit, req.Category, storageDays,
|
||||
)
|
||||
return scanProduct(row)
|
||||
return count, nil
|
||||
}
|
||||
|
||||
// BatchCreate inserts multiple products sequentially and returns all created records.
|
||||
func (r *Repository) BatchCreate(ctx context.Context, userID string, items []CreateRequest) ([]*Product, error) {
|
||||
var result []*Product
|
||||
for _, req := range items {
|
||||
p, err := r.Create(ctx, userID, req)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("batch create product %q: %w", req.Name, err)
|
||||
// UpsertAliases inserts aliases for a given catalog product and language.
|
||||
func (r *Repository) UpsertAliases(requestContext context.Context, id, lang string, aliases []string) error {
|
||||
if len(aliases) == 0 {
|
||||
return nil
|
||||
}
|
||||
batch := &pgx.Batch{}
|
||||
for _, alias := range aliases {
|
||||
batch.Queue(
|
||||
`INSERT INTO product_aliases (product_id, lang, alias) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING`,
|
||||
id, lang, alias,
|
||||
)
|
||||
}
|
||||
results := r.pool.SendBatch(requestContext, batch)
|
||||
defer results.Close()
|
||||
for range aliases {
|
||||
if _, execError := results.Exec(); execError != nil {
|
||||
return fmt.Errorf("upsert product alias %s/%s: %w", id, lang, execError)
|
||||
}
|
||||
result = append(result, p)
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
// Update modifies an existing product. Only non-nil fields are changed.
|
||||
// Returns ErrNotFound if the product does not exist or belongs to a different user.
|
||||
func (r *Repository) Update(ctx context.Context, id, userID string, req UpdateRequest) (*Product, error) {
|
||||
row := r.pool.QueryRow(ctx, `
|
||||
UPDATE products SET
|
||||
name = COALESCE($3, name),
|
||||
quantity = COALESCE($4, quantity),
|
||||
unit = COALESCE($5, unit),
|
||||
category = COALESCE($6, category),
|
||||
storage_days = COALESCE($7, storage_days)
|
||||
WHERE id = $1 AND user_id = $2
|
||||
RETURNING `+selectCols,
|
||||
id, userID, req.Name, req.Quantity, req.Unit, req.Category, req.StorageDays,
|
||||
)
|
||||
p, err := scanProduct(row)
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return nil, ErrNotFound
|
||||
}
|
||||
return p, err
|
||||
}
|
||||
|
||||
// Delete removes a product. Returns ErrNotFound if it does not exist or belongs to a different user.
|
||||
func (r *Repository) Delete(ctx context.Context, id, userID string) error {
|
||||
tag, err := r.pool.Exec(ctx,
|
||||
`DELETE FROM products WHERE id = $1 AND user_id = $2`, id, userID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("delete product: %w", err)
|
||||
}
|
||||
if tag.RowsAffected() == 0 {
|
||||
return ErrNotFound
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// ListForPrompt returns a human-readable list of user's products for the AI prompt.
|
||||
// Expiring soon items are marked with ⚠.
|
||||
func (r *Repository) ListForPrompt(ctx context.Context, userID string) ([]string, error) {
|
||||
rows, err := r.pool.Query(ctx, `
|
||||
WITH p AS (
|
||||
SELECT name, quantity, unit,
|
||||
(added_at + storage_days * INTERVAL '1 day') AS expires_at
|
||||
FROM products
|
||||
WHERE user_id = $1
|
||||
)
|
||||
SELECT name, quantity, unit, expires_at
|
||||
FROM p
|
||||
ORDER BY expires_at ASC`, userID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("list products for prompt: %w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
// UpsertCategoryTranslation inserts or replaces a localized category name.
|
||||
func (r *Repository) UpsertCategoryTranslation(requestContext context.Context, slug, lang, name string) error {
|
||||
query := `
|
||||
INSERT INTO product_category_translations (product_category_slug, lang, name)
|
||||
VALUES ($1, $2, $3)
|
||||
ON CONFLICT (product_category_slug, lang) DO UPDATE SET name = EXCLUDED.name`
|
||||
|
||||
var lines []string
|
||||
now := time.Now()
|
||||
for rows.Next() {
|
||||
var name, unit string
|
||||
var qty float64
|
||||
var expiresAt time.Time
|
||||
if err := rows.Scan(&name, &qty, &unit, &expiresAt); err != nil {
|
||||
return nil, fmt.Errorf("scan product for prompt: %w", err)
|
||||
}
|
||||
daysLeft := int(expiresAt.Sub(now).Hours() / 24)
|
||||
line := fmt.Sprintf("- %s %.0f %s", name, qty, unit)
|
||||
switch {
|
||||
case daysLeft <= 0:
|
||||
line += " (expires today ⚠)"
|
||||
case daysLeft == 1:
|
||||
line += " (expires tomorrow ⚠)"
|
||||
case daysLeft <= 3:
|
||||
line += fmt.Sprintf(" (expires in %d days ⚠)", daysLeft)
|
||||
}
|
||||
lines = append(lines, line)
|
||||
if _, execError := r.pool.Exec(requestContext, query, slug, lang, name); execError != nil {
|
||||
return fmt.Errorf("upsert category translation %s/%s: %w", slug, lang, execError)
|
||||
}
|
||||
return lines, rows.Err()
|
||||
return nil
|
||||
}
|
||||
|
||||
// --- helpers ---
|
||||
// --- scan helpers ---
|
||||
|
||||
func scanProduct(row pgx.Row) (*Product, error) {
|
||||
var p Product
|
||||
err := row.Scan(
|
||||
&p.ID, &p.UserID, &p.PrimaryIngredientID, &p.Name, &p.Quantity, &p.Unit,
|
||||
&p.Category, &p.StorageDays, &p.AddedAt, &p.ExpiresAt,
|
||||
func scanProductWrite(row pgx.Row) (*Product, error) {
|
||||
var catalogProduct Product
|
||||
scanError := row.Scan(
|
||||
&catalogProduct.ID, &catalogProduct.CanonicalName, &catalogProduct.Category, &catalogProduct.DefaultUnit,
|
||||
&catalogProduct.CaloriesPer100g, &catalogProduct.ProteinPer100g, &catalogProduct.FatPer100g, &catalogProduct.CarbsPer100g, &catalogProduct.FiberPer100g,
|
||||
&catalogProduct.StorageDays, &catalogProduct.CreatedAt, &catalogProduct.UpdatedAt,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
if scanError != nil {
|
||||
return nil, scanError
|
||||
}
|
||||
computeDaysLeft(&p)
|
||||
return &p, nil
|
||||
catalogProduct.Aliases = json.RawMessage("[]")
|
||||
return &catalogProduct, nil
|
||||
}
|
||||
|
||||
func collectProducts(rows pgx.Rows) ([]*Product, error) {
|
||||
func scanProductRead(row pgx.Row) (*Product, error) {
|
||||
var catalogProduct Product
|
||||
var aliases []byte
|
||||
scanError := row.Scan(
|
||||
&catalogProduct.ID, &catalogProduct.CanonicalName, &catalogProduct.Category, &catalogProduct.CategoryName,
|
||||
&catalogProduct.DefaultUnit, &catalogProduct.DefaultUnitName,
|
||||
&catalogProduct.CaloriesPer100g, &catalogProduct.ProteinPer100g, &catalogProduct.FatPer100g, &catalogProduct.CarbsPer100g, &catalogProduct.FiberPer100g,
|
||||
&catalogProduct.StorageDays, &catalogProduct.CreatedAt, &catalogProduct.UpdatedAt, &aliases,
|
||||
)
|
||||
if scanError != nil {
|
||||
return nil, scanError
|
||||
}
|
||||
catalogProduct.Aliases = json.RawMessage(aliases)
|
||||
return &catalogProduct, nil
|
||||
}
|
||||
|
||||
func collectProductsWrite(rows pgx.Rows) ([]*Product, error) {
|
||||
var result []*Product
|
||||
for rows.Next() {
|
||||
var p Product
|
||||
if err := rows.Scan(
|
||||
&p.ID, &p.UserID, &p.PrimaryIngredientID, &p.Name, &p.Quantity, &p.Unit,
|
||||
&p.Category, &p.StorageDays, &p.AddedAt, &p.ExpiresAt,
|
||||
); err != nil {
|
||||
return nil, fmt.Errorf("scan product: %w", err)
|
||||
var catalogProduct Product
|
||||
if scanError := rows.Scan(
|
||||
&catalogProduct.ID, &catalogProduct.CanonicalName, &catalogProduct.Category, &catalogProduct.DefaultUnit,
|
||||
&catalogProduct.CaloriesPer100g, &catalogProduct.ProteinPer100g, &catalogProduct.FatPer100g, &catalogProduct.CarbsPer100g, &catalogProduct.FiberPer100g,
|
||||
&catalogProduct.StorageDays, &catalogProduct.CreatedAt, &catalogProduct.UpdatedAt,
|
||||
); scanError != nil {
|
||||
return nil, fmt.Errorf("scan product: %w", scanError)
|
||||
}
|
||||
computeDaysLeft(&p)
|
||||
result = append(result, &p)
|
||||
catalogProduct.Aliases = json.RawMessage("[]")
|
||||
result = append(result, &catalogProduct)
|
||||
}
|
||||
return result, rows.Err()
|
||||
}
|
||||
|
||||
func computeDaysLeft(p *Product) {
|
||||
d := int(time.Until(p.ExpiresAt).Hours() / 24)
|
||||
if d < 0 {
|
||||
d = 0
|
||||
func collectProductsRead(rows pgx.Rows) ([]*Product, error) {
|
||||
var result []*Product
|
||||
for rows.Next() {
|
||||
var catalogProduct Product
|
||||
var aliases []byte
|
||||
if scanError := rows.Scan(
|
||||
&catalogProduct.ID, &catalogProduct.CanonicalName, &catalogProduct.Category, &catalogProduct.CategoryName,
|
||||
&catalogProduct.DefaultUnit, &catalogProduct.DefaultUnitName,
|
||||
&catalogProduct.CaloriesPer100g, &catalogProduct.ProteinPer100g, &catalogProduct.FatPer100g, &catalogProduct.CarbsPer100g, &catalogProduct.FiberPer100g,
|
||||
&catalogProduct.StorageDays, &catalogProduct.CreatedAt, &catalogProduct.UpdatedAt, &aliases,
|
||||
); scanError != nil {
|
||||
return nil, fmt.Errorf("scan product: %w", scanError)
|
||||
}
|
||||
catalogProduct.Aliases = json.RawMessage(aliases)
|
||||
result = append(result, &catalogProduct)
|
||||
}
|
||||
p.DaysLeft = d
|
||||
p.ExpiringSoon = d <= 3
|
||||
return result, rows.Err()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user