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

feat: core schema redesign — dishes, structured recipes, cuisines, tags (iteration 7)

Browse Source 
Replaces the flat JSONB-based recipe schema with a normalized relational model:

Schema (migrations consolidated to 001_initial_schema + 002_seed_data):
- New: dishes, dish_translations, dish_tags — canonical dish catalog
- New: cuisines, tags, dish_categories with _translations tables + full seed data
- New: recipe_ingredients, recipe_steps with _translations (replaces JSONB blobs)
- New: user_saved_recipes thin bookmark (drops saved_recipes + saved_recipe_translations)
- New: product_ingredients M2M table
- recipes: now a cooking variant of a dish (dish_id FK, no title/JSONB columns)
- recipe_translations: repurposed to per-language notes only
- products: mapping_id → primary_ingredient_id
- menu_items: recipe_id FK → recipes; adds dish_id
- meal_diary: adds dish_id, recipe_id → recipes, portion_g

Backend (Go):
- New packages: internal/cuisine, internal/tag, internal/dish (registry + handler + repo)
- New GET /cuisines, GET /tags (public), GET /dishes, GET /dishes/{id}, GET /recipes/{id}
- recipe, savedrecipe, menu, diary, product, ingredient packages updated for new schema

Flutter:
- New models: Cuisine, Tag; new providers: cuisineNamesProvider, tagNamesProvider
- recipe.dart: RecipeIngredient gains unit_code + effectiveUnit getter
- saved_recipe.dart: thin model, manual fromJson, computed nutrition getter
- diary_entry.dart: adds dishId, recipeId, portionG
- recipe_detail_screen.dart: localized cuisine/tag names via providers

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
dbastrikin
2026-03-15 18:01:24 +02:00
parent 55d01400b0
commit 61feb91bba
52 changed files with 2479 additions and 1492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/lib/shared/models/cuisine.dart Normal file
View File

@@ -0,0 +1,13 @@
class Cuisine {
final String slug;
final String name;
const Cuisine({required this.slug, required this.name});
factory Cuisine.fromJson(Map<String, dynamic> json) {
return Cuisine(
slug: json['slug'] as String? ?? '',
name: json['name'] as String? ?? '',
);
}
}

6
client/lib/shared/models/diary_entry.dart
View File

@@ -9,7 +9,9 @@ class DiaryEntry {
final double? fatG;
final double? carbsG;
final String source;
final String? dishId;
final String? recipeId;
final double? portionG;
const DiaryEntry({
required this.id,
@@ -22,7 +24,9 @@ class DiaryEntry {
this.fatG,
this.carbsG,
required this.source,
this.dishId,
this.recipeId,
this.portionG,
});
factory DiaryEntry.fromJson(Map<String, dynamic> json) {
@@ -37,7 +41,9 @@ class DiaryEntry {
fatG: (json['fat_g'] as num?)?.toDouble(),
carbsG: (json['carbs_g'] as num?)?.toDouble(),
source: json['source'] as String? ?? 'manual',
dishId: json['dish_id'] as String?,
recipeId: json['recipe_id'] as String?,
portionG: (json['portion_g'] as num?)?.toDouble(),
);
}

13
client/lib/shared/models/recipe.dart
View File

@@ -59,14 +59,25 @@ class Recipe {
class RecipeIngredient {
final String name;
final double amount;
/// Unit from Gemini recommendations (free-form string).
@JsonKey(defaultValue: '')
final String unit;
/// Unit code from the DB-backed saved recipes endpoint.
@JsonKey(name: 'unit_code')
final String? unitCode;
const RecipeIngredient({
required this.name,
required this.amount,
required this.unit,
this.unit = '',
this.unitCode,
});
/// Returns the best available unit identifier for display / lookup.
String get effectiveUnit => unitCode ?? unit;
factory RecipeIngredient.fromJson(Map<String, dynamic> json) =>
_$RecipeIngredientFromJson(json);
Map<String, dynamic> toJson() => _$RecipeIngredientToJson(this);

4
client/lib/shared/models/recipe.g.dart
View File

@@ -55,7 +55,8 @@ RecipeIngredient _$RecipeIngredientFromJson(Map<String, dynamic> json) =>
RecipeIngredient(
name: json['name'] as String,
amount: (json['amount'] as num).toDouble(),
unit: json['unit'] as String,
unit: json['unit'] as String? ?? '',
unitCode: json['unit_code'] as String?,
);
Map<String, dynamic> _$RecipeIngredientToJson(RecipeIngredient instance) =>
@@ -63,6 +64,7 @@ Map<String, dynamic> _$RecipeIngredientToJson(RecipeIngredient instance) =>
'name': instance.name,
'amount': instance.amount,
'unit': instance.unit,
'unit_code': instance.unitCode,
};
RecipeStep _$RecipeStepFromJson(Map<String, dynamic> json) => RecipeStep(

118
client/lib/shared/models/saved_recipe.dart
View File

@@ -1,47 +1,36 @@
import 'package:json_annotation/json_annotation.dart';
import 'recipe.dart';
part 'saved_recipe.g.dart';
@JsonSerializable(explicitToJson: true)
/// A user's bookmarked recipe. Display fields are joined from dishes + recipes.
class SavedRecipe {
final String id;
final String recipeId;
final String title;
final String? description;
/// Mapped from cuisine_slug in the API response.
final String? cuisine;
final String? difficulty;
@JsonKey(name: 'prep_time_min')
final int? prepTimeMin;
@JsonKey(name: 'cook_time_min')
final int? cookTimeMin;
final int? servings;
@JsonKey(name: 'image_url')
final String? imageUrl;
@JsonKey(defaultValue: [])
final List<RecipeIngredient> ingredients;
@JsonKey(defaultValue: [])
final List<RecipeStep> steps;
@JsonKey(defaultValue: [])
final List<String> tags;
@JsonKey(name: 'nutrition_per_serving')
final NutritionInfo? nutrition;
final String source;
@JsonKey(name: 'saved_at')
final DateTime savedAt;
// Individual nutrition columns (nullable).
final double? caloriesPerServing;
final double? proteinPerServing;
final double? fatPerServing;
final double? carbsPerServing;
const SavedRecipe({
required this.id,
required this.recipeId,
required this.title,
this.description,
this.cuisine,
@@ -53,12 +42,81 @@ class SavedRecipe {
this.ingredients = const [],
this.steps = const [],
this.tags = const [],
this.nutrition,
required this.source,
required this.savedAt,
this.caloriesPerServing,
this.proteinPerServing,
this.fatPerServing,
this.carbsPerServing,
});
factory SavedRecipe.fromJson(Map<String, dynamic> json) =>
_$SavedRecipeFromJson(json);
Map<String, dynamic> toJson() => _$SavedRecipeToJson(this);
/// Builds a [NutritionInfo] from the individual per-serving columns,
/// or null when no calorie data is available.
NutritionInfo? get nutrition {
if (caloriesPerServing == null) return null;
return NutritionInfo(
calories: caloriesPerServing!,
proteinG: proteinPerServing ?? 0,
fatG: fatPerServing ?? 0,
carbsG: carbsPerServing ?? 0,
approximate: false,
);
}
factory SavedRecipe.fromJson(Map<String, dynamic> json) {
return SavedRecipe(
id: json['id'] as String? ?? '',
recipeId: json['recipe_id'] as String? ?? '',
title: json['title'] as String? ?? '',
description: json['description'] as String?,
cuisine: json['cuisine_slug'] as String?,
difficulty: json['difficulty'] as String?,
prepTimeMin: (json['prep_time_min'] as num?)?.toInt(),
cookTimeMin: (json['cook_time_min'] as num?)?.toInt(),
servings: (json['servings'] as num?)?.toInt(),
imageUrl: json['image_url'] as String?,
ingredients: (json['ingredients'] as List<dynamic>?)
?.map((e) =>
RecipeIngredient.fromJson(e as Map<String, dynamic>))
.toList() ??
[],
steps: (json['steps'] as List<dynamic>?)
?.map(
(e) => RecipeStep.fromJson(e as Map<String, dynamic>))
.toList() ??
[],
tags: (json['tags'] as List<dynamic>?)
?.map((e) => e as String)
.toList() ??
[],
savedAt: DateTime.tryParse(json['saved_at'] as String? ?? '') ??
DateTime.now(),
caloriesPerServing:
(json['calories_per_serving'] as num?)?.toDouble(),
proteinPerServing:
(json['protein_per_serving'] as num?)?.toDouble(),
fatPerServing: (json['fat_per_serving'] as num?)?.toDouble(),
carbsPerServing: (json['carbs_per_serving'] as num?)?.toDouble(),
);
}
Map<String, dynamic> toJson() => {
'id': id,
'recipe_id': recipeId,
'title': title,
'description': description,
'cuisine_slug': cuisine,
'difficulty': difficulty,
'prep_time_min': prepTimeMin,
'cook_time_min': cookTimeMin,
'servings': servings,
'image_url': imageUrl,
'ingredients': ingredients.map((e) => e.toJson()).toList(),
'steps': steps.map((e) => e.toJson()).toList(),
'tags': tags,
'saved_at': savedAt.toIso8601String(),
'calories_per_serving': caloriesPerServing,
'protein_per_serving': proteinPerServing,
'fat_per_serving': fatPerServing,
'carbs_per_serving': carbsPerServing,
};
}

58
client/lib/shared/models/saved_recipe.g.dart
View File

@@ -1,57 +1,3 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'saved_recipe.dart';
// **************************************************************************
// JsonSerializableGenerator
// **************************************************************************
SavedRecipe _$SavedRecipeFromJson(Map<String, dynamic> json) => SavedRecipe(
id: json['id'] as String,
title: json['title'] as String,
description: json['description'] as String?,
cuisine: json['cuisine'] as String?,
difficulty: json['difficulty'] as String?,
prepTimeMin: (json['prep_time_min'] as num?)?.toInt(),
cookTimeMin: (json['cook_time_min'] as num?)?.toInt(),
servings: (json['servings'] as num?)?.toInt(),
imageUrl: json['image_url'] as String?,
ingredients:
(json['ingredients'] as List<dynamic>?)
?.map((e) => RecipeIngredient.fromJson(e as Map<String, dynamic>))
.toList() ??
[],
steps:
(json['steps'] as List<dynamic>?)
?.map((e) => RecipeStep.fromJson(e as Map<String, dynamic>))
.toList() ??
[],
tags:
(json['tags'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
nutrition: json['nutrition_per_serving'] == null
? null
: NutritionInfo.fromJson(
json['nutrition_per_serving'] as Map<String, dynamic>,
),
source: json['source'] as String,
savedAt: DateTime.parse(json['saved_at'] as String),
);
Map<String, dynamic> _$SavedRecipeToJson(SavedRecipe instance) =>
<String, dynamic>{
'id': instance.id,
'title': instance.title,
'description': instance.description,
'cuisine': instance.cuisine,
'difficulty': instance.difficulty,
'prep_time_min': instance.prepTimeMin,
'cook_time_min': instance.cookTimeMin,
'servings': instance.servings,
'image_url': instance.imageUrl,
'ingredients': instance.ingredients.map((e) => e.toJson()).toList(),
'steps': instance.steps.map((e) => e.toJson()).toList(),
'tags': instance.tags,
'nutrition_per_serving': instance.nutrition?.toJson(),
'source': instance.source,
'saved_at': instance.savedAt.toIso8601String(),
};
// This file is intentionally empty.
// saved_recipe.dart now uses a manually written fromJson/toJson.

13
client/lib/shared/models/tag.dart Normal file
View File

@@ -0,0 +1,13 @@
class Tag {
final String slug;
final String name;
const Tag({required this.slug, required this.name});
factory Tag.fromJson(Map<String, dynamic> json) {
return Tag(
slug: json['slug'] as String? ?? '',
name: json['name'] as String? ?? '',
);
}
}