61feb91bba
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>
63 lines
1.6 KiB
Dart
63 lines
1.6 KiB
Dart
class DiaryEntry {
|
|
final String id;
|
|
final String date;
|
|
final String mealType;
|
|
final String name;
|
|
final double portions;
|
|
final double? calories;
|
|
final double? proteinG;
|
|
final double? fatG;
|
|
final double? carbsG;
|
|
final String source;
|
|
final String? dishId;
|
|
final String? recipeId;
|
|
final double? portionG;
|
|
|
|
const DiaryEntry({
|
|
required this.id,
|
|
required this.date,
|
|
required this.mealType,
|
|
required this.name,
|
|
required this.portions,
|
|
this.calories,
|
|
this.proteinG,
|
|
this.fatG,
|
|
this.carbsG,
|
|
required this.source,
|
|
this.dishId,
|
|
this.recipeId,
|
|
this.portionG,
|
|
});
|
|
|
|
factory DiaryEntry.fromJson(Map<String, dynamic> json) {
|
|
return DiaryEntry(
|
|
id: json['id'] as String? ?? '',
|
|
date: json['date'] as String? ?? '',
|
|
mealType: json['meal_type'] as String? ?? '',
|
|
name: json['name'] as String? ?? '',
|
|
portions: (json['portions'] as num?)?.toDouble() ?? 1,
|
|
calories: (json['calories'] as num?)?.toDouble(),
|
|
proteinG: (json['protein_g'] as num?)?.toDouble(),
|
|
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(),
|
|
);
|
|
}
|
|
|
|
String get mealLabel {
|
|
switch (mealType) {
|
|
case 'breakfast':
|
|
return 'Завтрак';
|
|
case 'lunch':
|
|
return 'Обед';
|
|
case 'dinner':
|
|
return 'Ужин';
|
|
default:
|
|
return mealType;
|
|
}
|
|
}
|
|
}
|