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:
@@ -6,7 +6,6 @@ import (
|
||||
"github.com/food-ai/backend/internal/domain/diary"
|
||||
"github.com/food-ai/backend/internal/domain/dish"
|
||||
"github.com/food-ai/backend/internal/domain/home"
|
||||
"github.com/food-ai/backend/internal/domain/ingredient"
|
||||
"github.com/food-ai/backend/internal/domain/menu"
|
||||
"github.com/food-ai/backend/internal/domain/product"
|
||||
"github.com/food-ai/backend/internal/domain/recipe"
|
||||
@@ -14,6 +13,7 @@ import (
|
||||
"github.com/food-ai/backend/internal/domain/recommendation"
|
||||
"github.com/food-ai/backend/internal/domain/savedrecipe"
|
||||
"github.com/food-ai/backend/internal/domain/user"
|
||||
"github.com/food-ai/backend/internal/domain/userproduct"
|
||||
"github.com/food-ai/backend/internal/infra/config"
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
)
|
||||
@@ -37,14 +37,15 @@ func initApp(appConfig *config.Config, pool *pgxpool.Pool) (*App, error) {
|
||||
openaiClient := newOpenAIClient(mainGeminiAPIKey)
|
||||
mainPexelsAPIKey := newPexelsAPIKey(appConfig)
|
||||
pexelsClient := newPexelsClient(mainPexelsAPIKey)
|
||||
productRepository := product.NewRepository(pool)
|
||||
recommendationHandler := recommendation.NewHandler(openaiClient, pexelsClient, userRepository, productRepository)
|
||||
userProductRepository := userproduct.NewRepository(pool)
|
||||
recommendationHandler := recommendation.NewHandler(openaiClient, pexelsClient, userRepository, userProductRepository)
|
||||
dishRepository := dish.NewRepository(pool)
|
||||
savedrecipeRepository := savedrecipe.NewRepository(pool, dishRepository)
|
||||
savedrecipeHandler := savedrecipe.NewHandler(savedrecipeRepository)
|
||||
ingredientRepository := ingredient.NewRepository(pool)
|
||||
ingredientHandler := ingredient.NewHandler(ingredientRepository)
|
||||
productHandler := product.NewHandler(productRepository)
|
||||
productRepository := product.NewRepository(pool)
|
||||
openFoodFactsClient := product.NewOpenFoodFacts()
|
||||
productHandler := product.NewHandler(productRepository, openFoodFactsClient)
|
||||
userProductHandler := userproduct.NewHandler(userProductRepository)
|
||||
|
||||
// Kafka producer
|
||||
kafkaProducer, kafkaProducerError := newKafkaProducer(appConfig)
|
||||
@@ -55,10 +56,10 @@ func initApp(appConfig *config.Config, pool *pgxpool.Pool) (*App, error) {
|
||||
// Recognition pipeline
|
||||
jobRepository := recognition.NewJobRepository(pool)
|
||||
sseBroker := recognition.NewSSEBroker(pool, jobRepository)
|
||||
recognitionHandler := recognition.NewHandler(openaiClient, ingredientRepository, jobRepository, kafkaProducer, sseBroker)
|
||||
recognitionHandler := recognition.NewHandler(openaiClient, productRepository, jobRepository, kafkaProducer, sseBroker)
|
||||
|
||||
menuRepository := menu.NewRepository(pool)
|
||||
menuHandler := menu.NewHandler(menuRepository, openaiClient, pexelsClient, userRepository, productRepository, dishRepository)
|
||||
menuHandler := menu.NewHandler(menuRepository, openaiClient, pexelsClient, userRepository, userProductRepository, dishRepository)
|
||||
diaryRepository := diary.NewRepository(pool)
|
||||
diaryHandler := diary.NewHandler(diaryRepository, dishRepository, dishRepository)
|
||||
homeHandler := home.NewHandler(pool)
|
||||
@@ -77,8 +78,8 @@ func initApp(appConfig *config.Config, pool *pgxpool.Pool) (*App, error) {
|
||||
userHandler,
|
||||
recommendationHandler,
|
||||
savedrecipeHandler,
|
||||
ingredientHandler,
|
||||
productHandler,
|
||||
userProductHandler,
|
||||
recognitionHandler,
|
||||
menuHandler,
|
||||
diaryHandler,
|
||||
|
||||
@@ -11,7 +11,6 @@ import (
|
||||
"github.com/food-ai/backend/internal/adapters/kafka"
|
||||
"github.com/food-ai/backend/internal/adapters/openai"
|
||||
"github.com/food-ai/backend/internal/domain/home"
|
||||
"github.com/food-ai/backend/internal/domain/ingredient"
|
||||
"github.com/food-ai/backend/internal/domain/menu"
|
||||
"github.com/food-ai/backend/internal/infra/middleware"
|
||||
"github.com/food-ai/backend/internal/adapters/pexels"
|
||||
@@ -25,6 +24,7 @@ import (
|
||||
"github.com/food-ai/backend/internal/domain/tag"
|
||||
"github.com/food-ai/backend/internal/domain/units"
|
||||
"github.com/food-ai/backend/internal/domain/user"
|
||||
"github.com/food-ai/backend/internal/domain/userproduct"
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
)
|
||||
|
||||
@@ -125,8 +125,8 @@ func newRouter(
|
||||
userHandler *user.Handler,
|
||||
recommendationHandler *recommendation.Handler,
|
||||
savedRecipeHandler *savedrecipe.Handler,
|
||||
ingredientHandler *ingredient.Handler,
|
||||
productHandler *product.Handler,
|
||||
userProductHandler *userproduct.Handler,
|
||||
recognitionHandler *recognition.Handler,
|
||||
menuHandler *menu.Handler,
|
||||
diaryHandler *diary.Handler,
|
||||
@@ -145,8 +145,8 @@ func newRouter(
|
||||
userHandler,
|
||||
recommendationHandler,
|
||||
savedRecipeHandler,
|
||||
ingredientHandler,
|
||||
productHandler,
|
||||
userProductHandler,
|
||||
recognitionHandler,
|
||||
menuHandler,
|
||||
diaryHandler,
|
||||
@@ -204,12 +204,12 @@ func newKafkaProducer(appConfig *config.Config) (*kafka.Producer, error) {
|
||||
var _ middleware.AccessTokenValidator = (*jwtAdapter)(nil)
|
||||
var _ menu.PhotoSearcher = (*pexels.Client)(nil)
|
||||
var _ menu.UserLoader = (*user.Repository)(nil)
|
||||
var _ menu.ProductLister = (*product.Repository)(nil)
|
||||
var _ menu.ProductLister = (*userproduct.Repository)(nil)
|
||||
var _ menu.RecipeSaver = (*dish.Repository)(nil)
|
||||
var _ recommendation.PhotoSearcher = (*pexels.Client)(nil)
|
||||
var _ recommendation.UserLoader = (*user.Repository)(nil)
|
||||
var _ recommendation.ProductLister = (*product.Repository)(nil)
|
||||
var _ recognition.IngredientRepository = (*ingredient.Repository)(nil)
|
||||
var _ recommendation.ProductLister = (*userproduct.Repository)(nil)
|
||||
var _ recognition.ProductRepository = (*product.Repository)(nil)
|
||||
var _ recognition.KafkaPublisher = (*kafka.Producer)(nil)
|
||||
var _ recognition.JobRepository = (*recognition.PostgresJobRepository)(nil)
|
||||
var _ user.UserRepository = (*user.Repository)(nil)
|
||||
|
||||
Reference in New Issue
Block a user