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,33 +1,33 @@
|
||||
//go:build integration
|
||||
|
||||
package ingredient_test
|
||||
package product_catalog_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/food-ai/backend/internal/domain/ingredient"
|
||||
"github.com/food-ai/backend/internal/domain/product"
|
||||
"github.com/food-ai/backend/internal/infra/locale"
|
||||
"github.com/food-ai/backend/internal/testutil"
|
||||
)
|
||||
|
||||
func TestIngredientRepository_Upsert_Insert(t *testing.T) {
|
||||
func TestProductRepository_Upsert_Insert(t *testing.T) {
|
||||
pool := testutil.SetupTestDB(t)
|
||||
repo := ingredient.NewRepository(pool)
|
||||
repo := product.NewRepository(pool)
|
||||
ctx := context.Background()
|
||||
|
||||
cat := "produce"
|
||||
unit := "g"
|
||||
cal := 52.0
|
||||
|
||||
mapping := &ingredient.IngredientMapping{
|
||||
catalogProduct := &product.Product{
|
||||
CanonicalName: "apple",
|
||||
Category: &cat,
|
||||
DefaultUnit: &unit,
|
||||
CaloriesPer100g: &cal,
|
||||
}
|
||||
|
||||
got, upsertError := repo.Upsert(ctx, mapping)
|
||||
got, upsertError := repo.Upsert(ctx, catalogProduct)
|
||||
if upsertError != nil {
|
||||
t.Fatalf("upsert: %v", upsertError)
|
||||
}
|
||||
@@ -42,15 +42,15 @@ func TestIngredientRepository_Upsert_Insert(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestIngredientRepository_Upsert_ConflictUpdates(t *testing.T) {
|
||||
func TestProductRepository_Upsert_ConflictUpdates(t *testing.T) {
|
||||
pool := testutil.SetupTestDB(t)
|
||||
repo := ingredient.NewRepository(pool)
|
||||
repo := product.NewRepository(pool)
|
||||
ctx := context.Background()
|
||||
|
||||
cat := "produce"
|
||||
unit := "g"
|
||||
|
||||
first := &ingredient.IngredientMapping{
|
||||
first := &product.Product{
|
||||
CanonicalName: "banana",
|
||||
Category: &cat,
|
||||
DefaultUnit: &unit,
|
||||
@@ -61,7 +61,7 @@ func TestIngredientRepository_Upsert_ConflictUpdates(t *testing.T) {
|
||||
}
|
||||
|
||||
cal := 89.0
|
||||
second := &ingredient.IngredientMapping{
|
||||
second := &product.Product{
|
||||
CanonicalName: "banana",
|
||||
Category: &cat,
|
||||
DefaultUnit: &unit,
|
||||
@@ -83,15 +83,15 @@ func TestIngredientRepository_Upsert_ConflictUpdates(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestIngredientRepository_GetByID_Found(t *testing.T) {
|
||||
func TestProductRepository_GetByID_Found(t *testing.T) {
|
||||
pool := testutil.SetupTestDB(t)
|
||||
repo := ingredient.NewRepository(pool)
|
||||
repo := product.NewRepository(pool)
|
||||
ctx := context.Background()
|
||||
|
||||
cat := "dairy"
|
||||
unit := "g"
|
||||
|
||||
saved, upsertError := repo.Upsert(ctx, &ingredient.IngredientMapping{
|
||||
saved, upsertError := repo.Upsert(ctx, &product.Product{
|
||||
CanonicalName: "cheese",
|
||||
Category: &cat,
|
||||
DefaultUnit: &unit,
|
||||
@@ -112,9 +112,9 @@ func TestIngredientRepository_GetByID_Found(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestIngredientRepository_GetByID_NotFound(t *testing.T) {
|
||||
func TestProductRepository_GetByID_NotFound(t *testing.T) {
|
||||
pool := testutil.SetupTestDB(t)
|
||||
repo := ingredient.NewRepository(pool)
|
||||
repo := product.NewRepository(pool)
|
||||
ctx := context.Background()
|
||||
|
||||
got, getError := repo.GetByID(ctx, "00000000-0000-0000-0000-000000000000")
|
||||
@@ -126,105 +126,17 @@ func TestIngredientRepository_GetByID_NotFound(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestIngredientRepository_ListMissingTranslation(t *testing.T) {
|
||||
|
||||
|
||||
func TestProductRepository_UpsertAliases(t *testing.T) {
|
||||
pool := testutil.SetupTestDB(t)
|
||||
repo := ingredient.NewRepository(pool)
|
||||
repo := product.NewRepository(pool)
|
||||
ctx := context.Background()
|
||||
|
||||
cat := "produce"
|
||||
unit := "g"
|
||||
|
||||
// Insert 3 without any translation.
|
||||
for _, name := range []string{"carrot", "onion", "garlic"} {
|
||||
_, upsertError := repo.Upsert(ctx, &ingredient.IngredientMapping{
|
||||
CanonicalName: name,
|
||||
Category: &cat,
|
||||
DefaultUnit: &unit,
|
||||
})
|
||||
if upsertError != nil {
|
||||
t.Fatalf("upsert %s: %v", name, upsertError)
|
||||
}
|
||||
}
|
||||
|
||||
// Insert 1 and add a translation — should not appear in the result.
|
||||
saved, upsertError := repo.Upsert(ctx, &ingredient.IngredientMapping{
|
||||
CanonicalName: "tomato",
|
||||
Category: &cat,
|
||||
DefaultUnit: &unit,
|
||||
})
|
||||
if upsertError != nil {
|
||||
t.Fatalf("upsert tomato: %v", upsertError)
|
||||
}
|
||||
if translationError := repo.UpsertTranslation(ctx, saved.ID, "ru", "помидор"); translationError != nil {
|
||||
t.Fatalf("upsert translation: %v", translationError)
|
||||
}
|
||||
|
||||
missing, listError := repo.ListMissingTranslation(ctx, "ru", 10, 0)
|
||||
if listError != nil {
|
||||
t.Fatalf("list missing translation: %v", listError)
|
||||
}
|
||||
|
||||
for _, mapping := range missing {
|
||||
if mapping.CanonicalName == "tomato" {
|
||||
t.Error("translated ingredient should not appear in ListMissingTranslation")
|
||||
}
|
||||
}
|
||||
if len(missing) < 3 {
|
||||
t.Errorf("expected at least 3 untranslated, got %d", len(missing))
|
||||
}
|
||||
}
|
||||
|
||||
func TestIngredientRepository_UpsertTranslation(t *testing.T) {
|
||||
pool := testutil.SetupTestDB(t)
|
||||
repo := ingredient.NewRepository(pool)
|
||||
ctx := context.Background()
|
||||
|
||||
cat := "meat"
|
||||
unit := "g"
|
||||
|
||||
saved, upsertError := repo.Upsert(ctx, &ingredient.IngredientMapping{
|
||||
CanonicalName: "chicken_breast",
|
||||
Category: &cat,
|
||||
DefaultUnit: &unit,
|
||||
})
|
||||
if upsertError != nil {
|
||||
t.Fatalf("upsert: %v", upsertError)
|
||||
}
|
||||
|
||||
if translationError := repo.UpsertTranslation(ctx, saved.ID, "ru", "куриная грудка"); translationError != nil {
|
||||
t.Fatalf("upsert translation: %v", translationError)
|
||||
}
|
||||
|
||||
// Retrieve with Russian context — CanonicalName should be the Russian name.
|
||||
russianContext := locale.WithLang(ctx, "ru")
|
||||
got, getError := repo.GetByID(russianContext, saved.ID)
|
||||
if getError != nil {
|
||||
t.Fatalf("get by id: %v", getError)
|
||||
}
|
||||
if got.CanonicalName != "куриная грудка" {
|
||||
t.Errorf("expected CanonicalName='куриная грудка', got %q", got.CanonicalName)
|
||||
}
|
||||
|
||||
// Retrieve with English context (default) — CanonicalName should be the English name.
|
||||
englishContext := locale.WithLang(ctx, "en")
|
||||
gotEnglish, getEnglishError := repo.GetByID(englishContext, saved.ID)
|
||||
if getEnglishError != nil {
|
||||
t.Fatalf("get by id (en): %v", getEnglishError)
|
||||
}
|
||||
if gotEnglish.CanonicalName != "chicken_breast" {
|
||||
t.Errorf("expected English CanonicalName='chicken_breast', got %q", gotEnglish.CanonicalName)
|
||||
}
|
||||
}
|
||||
|
||||
func TestIngredientRepository_UpsertAliases(t *testing.T) {
|
||||
pool := testutil.SetupTestDB(t)
|
||||
repo := ingredient.NewRepository(pool)
|
||||
ctx := context.Background()
|
||||
|
||||
cat := "produce"
|
||||
unit := "g"
|
||||
|
||||
saved, upsertError := repo.Upsert(ctx, &ingredient.IngredientMapping{
|
||||
saved, upsertError := repo.Upsert(ctx, &product.Product{
|
||||
CanonicalName: "apple_test_aliases",
|
||||
Category: &cat,
|
||||
DefaultUnit: &unit,
|
||||
@@ -238,12 +150,10 @@ func TestIngredientRepository_UpsertAliases(t *testing.T) {
|
||||
t.Fatalf("upsert aliases: %v", aliasError)
|
||||
}
|
||||
|
||||
// Idempotent — second call should not fail.
|
||||
if aliasError := repo.UpsertAliases(ctx, saved.ID, "en", aliases); aliasError != nil {
|
||||
t.Fatalf("second upsert aliases: %v", aliasError)
|
||||
}
|
||||
|
||||
// Retrieve with English context — aliases should appear.
|
||||
englishContext := locale.WithLang(ctx, "en")
|
||||
got, getError := repo.GetByID(englishContext, saved.ID)
|
||||
if getError != nil {
|
||||
@@ -254,15 +164,14 @@ func TestIngredientRepository_UpsertAliases(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestIngredientRepository_UpsertCategoryTranslation(t *testing.T) {
|
||||
func TestProductRepository_UpsertCategoryTranslation(t *testing.T) {
|
||||
pool := testutil.SetupTestDB(t)
|
||||
repo := ingredient.NewRepository(pool)
|
||||
repo := product.NewRepository(pool)
|
||||
ctx := context.Background()
|
||||
|
||||
// Upsert an ingredient with a known category.
|
||||
cat := "dairy"
|
||||
unit := "g"
|
||||
saved, upsertError := repo.Upsert(ctx, &ingredient.IngredientMapping{
|
||||
saved, upsertError := repo.Upsert(ctx, &product.Product{
|
||||
CanonicalName: "milk_test_category",
|
||||
Category: &cat,
|
||||
DefaultUnit: &unit,
|
||||
@@ -271,8 +180,6 @@ func TestIngredientRepository_UpsertCategoryTranslation(t *testing.T) {
|
||||
t.Fatalf("upsert: %v", upsertError)
|
||||
}
|
||||
|
||||
// The migration already inserted Russian translations for known categories.
|
||||
// Retrieve with Russian context — CategoryName should be set.
|
||||
russianContext := locale.WithLang(ctx, "ru")
|
||||
got, getError := repo.GetByID(russianContext, saved.ID)
|
||||
if getError != nil {
|
||||
@@ -282,7 +189,6 @@ func TestIngredientRepository_UpsertCategoryTranslation(t *testing.T) {
|
||||
t.Error("expected non-empty CategoryName for 'dairy' in Russian")
|
||||
}
|
||||
|
||||
// Upsert a new translation and verify it is returned.
|
||||
if translationError := repo.UpsertCategoryTranslation(ctx, "dairy", "de", "Milchprodukte"); translationError != nil {
|
||||
t.Fatalf("upsert category translation: %v", translationError)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user