acrius/food-ai
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: rename ingredients→products, products→user_products; add barcode/OFF import

Browse Source 
- 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
2026-03-21 12:45:48 +02:00
parent 6861e5e754
commit 205edbdade
72 changed files with 2588 additions and 1444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
backend/tests/ingredient/handler_test.go
View File

@@ -1,25 +1,44 @@
package ingredient_test
package product_catalog_test
import (
"bytes"
"context"
"encoding/json"
"errors"
"net/http"
"net/http/httptest"
"testing"
"github.com/food-ai/backend/internal/domain/ingredient"
"github.com/food-ai/backend/internal/domain/product"
"github.com/food-ai/backend/internal/infra/middleware"
"github.com/go-chi/chi/v5"
)
// mockIngredientSearcher is an inline mock for ingredient.IngredientSearcher.
type mockIngredientSearcher struct {
searchFn func(ctx context.Context, query string, limit int) ([]*ingredient.IngredientMapping, error)
// mockProductSearcher is an inline mock for product.ProductSearcher (catalog search only).
type mockProductSearcher struct {
searchFn func(ctx context.Context, query string, limit int) ([]*product.Product, error)
}
func (m *mockIngredientSearcher) Search(ctx context.Context, query string, limit int) ([]*ingredient.IngredientMapping, error) {
return m.searchFn(ctx, query, limit)
func (m *mockProductSearcher) Search(ctx context.Context, query string, limit int) ([]*product.Product, error) {
if m.searchFn != nil {
return m.searchFn(ctx, query, limit)
}
return []*product.Product{}, nil
}
func (m *mockProductSearcher) GetByBarcode(_ context.Context, _ string) (*product.Product, error) {
return nil, errors.New("not implemented")
}
func (m *mockProductSearcher) UpsertByBarcode(_ context.Context, catalogProduct *product.Product) (*product.Product, error) {
return catalogProduct, nil
}
// mockOpenFoodFacts is an inline mock for product.OpenFoodFactsClient (unused in search tests).
type mockOpenFoodFacts struct{}
func (m *mockOpenFoodFacts) Fetch(_ context.Context, _ string) (*product.Product, error) {
return nil, errors.New("not implemented")
}
type alwaysAuthValidator struct{ userID string }
@@ -28,10 +47,10 @@ func (v *alwaysAuthValidator) ValidateAccessToken(_ string) (*middleware.TokenCl
return &middleware.TokenClaims{UserID: v.userID}, nil
}
func buildRouter(handler *ingredient.Handler) *chi.Mux {
func buildRouter(handler *product.Handler) *chi.Mux {
router := chi.NewRouter()
router.Use(middleware.Auth(&alwaysAuthValidator{userID: "user-1"}))
router.Get("/ingredients/search", handler.Search)
router.Get("/products/search", handler.Search)
return router
}
@@ -43,11 +62,11 @@ func authorizedRequest(target string) *http.Request {
func TestSearch_EmptyQuery_ReturnsEmptyArray(t *testing.T) {
// When q is empty, the handler returns [] without calling the repository.
handler := ingredient.NewHandler(&mockIngredientSearcher{})
handler := product.NewHandler(&mockProductSearcher{}, &mockOpenFoodFacts{})
router := buildRouter(handler)
recorder := httptest.NewRecorder()
router.ServeHTTP(recorder, authorizedRequest("/ingredients/search"))
router.ServeHTTP(recorder, authorizedRequest("/products/search"))
if recorder.Code != http.StatusOK {
t.Errorf("expected 200, got %d", recorder.Code)
@@ -60,17 +79,17 @@ func TestSearch_EmptyQuery_ReturnsEmptyArray(t *testing.T) {
func TestSearch_LimitTooLarge_UsesDefault(t *testing.T) {
// When limit > 50, the handler ignores it and uses default 10.
calledLimit := 0
mockRepo := &mockIngredientSearcher{
searchFn: func(ctx context.Context, query string, limit int) ([]*ingredient.IngredientMapping, error) {
mockRepo := &mockProductSearcher{
searchFn: func(ctx context.Context, query string, limit int) ([]*product.Product, error) {
calledLimit = limit
return []*ingredient.IngredientMapping{}, nil
return []*product.Product{}, nil
},
}
handler := ingredient.NewHandler(mockRepo)
handler := product.NewHandler(mockRepo, &mockOpenFoodFacts{})
router := buildRouter(handler)
recorder := httptest.NewRecorder()
router.ServeHTTP(recorder, authorizedRequest("/ingredients/search?q=apple&limit=100"))
router.ServeHTTP(recorder, authorizedRequest("/products/search?q=apple&limit=100"))
if recorder.Code != http.StatusOK {
t.Errorf("expected 200, got %d", recorder.Code)
@@ -83,17 +102,17 @@ func TestSearch_LimitTooLarge_UsesDefault(t *testing.T) {
func TestSearch_DefaultLimit(t *testing.T) {
// When no limit is supplied, the handler uses default 10.
calledLimit := 0
mockRepo := &mockIngredientSearcher{
searchFn: func(ctx context.Context, query string, limit int) ([]*ingredient.IngredientMapping, error) {
mockRepo := &mockProductSearcher{
searchFn: func(ctx context.Context, query string, limit int) ([]*product.Product, error) {
calledLimit = limit
return []*ingredient.IngredientMapping{}, nil
return []*product.Product{}, nil
},
}
handler := ingredient.NewHandler(mockRepo)
handler := product.NewHandler(mockRepo, &mockOpenFoodFacts{})
router := buildRouter(handler)
recorder := httptest.NewRecorder()
router.ServeHTTP(recorder, authorizedRequest("/ingredients/search?q=apple"))
router.ServeHTTP(recorder, authorizedRequest("/products/search?q=apple"))
if recorder.Code != http.StatusOK {
t.Errorf("expected 200, got %d", recorder.Code)
@@ -106,17 +125,17 @@ func TestSearch_DefaultLimit(t *testing.T) {
func TestSearch_ValidLimit(t *testing.T) {
// limit=25 is within range and should be forwarded as-is.
calledLimit := 0
mockRepo := &mockIngredientSearcher{
searchFn: func(ctx context.Context, query string, limit int) ([]*ingredient.IngredientMapping, error) {
mockRepo := &mockProductSearcher{
searchFn: func(ctx context.Context, query string, limit int) ([]*product.Product, error) {
calledLimit = limit
return []*ingredient.IngredientMapping{}, nil
return []*product.Product{}, nil
},
}
handler := ingredient.NewHandler(mockRepo)
handler := product.NewHandler(mockRepo, &mockOpenFoodFacts{})
router := buildRouter(handler)
recorder := httptest.NewRecorder()
router.ServeHTTP(recorder, authorizedRequest("/ingredients/search?q=apple&limit=25"))
router.ServeHTTP(recorder, authorizedRequest("/products/search?q=apple&limit=25"))
if recorder.Code != http.StatusOK {
t.Errorf("expected 200, got %d", recorder.Code)
@@ -127,31 +146,31 @@ func TestSearch_ValidLimit(t *testing.T) {
}
func TestSearch_Success(t *testing.T) {
mockRepo := &mockIngredientSearcher{
searchFn: func(ctx context.Context, query string, limit int) ([]*ingredient.IngredientMapping, error) {
return []*ingredient.IngredientMapping{
{ID: "ing-1", CanonicalName: "apple"},
mockRepo := &mockProductSearcher{
searchFn: func(ctx context.Context, query string, limit int) ([]*product.Product, error) {
return []*product.Product{
{ID: "prod-1", CanonicalName: "apple"},
}, nil
},
}
handler := ingredient.NewHandler(mockRepo)
handler := product.NewHandler(mockRepo, &mockOpenFoodFacts{})
router := buildRouter(handler)
recorder := httptest.NewRecorder()
router.ServeHTTP(recorder, authorizedRequest("/ingredients/search?q=apple"))
router.ServeHTTP(recorder, authorizedRequest("/products/search?q=apple"))
if recorder.Code != http.StatusOK {
t.Errorf("expected 200, got %d", recorder.Code)
}
var mappings []ingredient.IngredientMapping
if decodeError := json.NewDecoder(recorder.Body).Decode(&mappings); decodeError != nil {
var products []product.Product
if decodeError := json.NewDecoder(recorder.Body).Decode(&products); decodeError != nil {
t.Fatalf("decode response: %v", decodeError)
}
if len(mappings) != 1 {
t.Errorf("expected 1 result, got %d", len(mappings))
if len(products) != 1 {
t.Errorf("expected 1 result, got %d", len(products))
}
if mappings[0].CanonicalName != "apple" {
t.Errorf("expected canonical_name=apple, got %q", mappings[0].CanonicalName)
if products[0].CanonicalName != "apple" {
t.Errorf("expected canonical_name=apple, got %q", products[0].CanonicalName)
}
}