progress reading data, using ivm tables

Author: Dieterbe

lib/models/nutrition/log.dart

@@ -107,24 +107,14 @@ class Log {
     return ingredient.nutritionalValues / (100 / weight);
   }
 
+  static Future<List<Log>> readByMealId(int mealId) async {
+    final results = await db.getAll('SELECT * FROM $tableLogItems WHERE meal_id = ?', [mealId]);
+    return results.map((r) => Log.fromRow(r)).toList();
+  }
+
   static Future<List<Log>> readByPlanId(int planId) async {
     final results = await db.getAll('SELECT * FROM $tableLogItems WHERE plan_id = ?', [planId]);
-    return results.map((r) {
-      final log = Log.fromRow(r);
-      // TODO:
-      // need to find a way to set ingredients. since we don't use powersync for it, we need to fetch
-      // but this needs a context, therofere this needs a context, and all callers do, so we should probably 
-      // move all that stuff into the nutritionprovider, so we keep context out of the models
-      // however, still unsolved:
-      // mealItem stuff then?
-      // nutrition image
-      // nutrition_ingredientcategory
-  //     nutrition_ingredientweightunit
-  // nutrition_weightunit;
-  // nutrition_mealitem
-      log.ingredient = Provider.of<NutritionPlansProvider>(context, listen: false).fetchIngredient(id),
-      return log;
-    }).toList();
+    return results.map((r) => Log.fromRow(r)).toList();
   }
 
 /*

lib/models/nutrition/meal.dart

@@ -93,7 +93,7 @@ class Meal {
   factory Meal.fromRow(sqlite.Row row) {
     return Meal(
       id: int.parse(row['id']),
-      plan: row['plan'],
+      plan: row['plan_id'],
       time: stringToTime(row['time']),
       name: row['name'],
     );
@@ -103,22 +103,30 @@ class Meal {
 
   Meal copyWith({
     int? id,
-    int? planId,
+    int? plan,
     TimeOfDay? time,
     String? name,
     List<MealItem>? mealItems,
     List<Log>? diaryEntries,
   }) {
     return Meal(
       id: id ?? this.id,
-      plan: planId ?? this.planId,
+      plan: plan ?? planId,
       time: time ?? this.time,
       name: name ?? this.name,
       mealItems: mealItems ?? this.mealItems,
       diaryEntries: diaryEntries ?? this.diaryEntries,
     );
   }
 
+  Future<Meal> loadChildren() async {
+    print('loadChildren called. plan is $planId');
+    return copyWith(
+      mealItems: await MealItem.readByMealId(id!),
+      diaryEntries: await Log.readByMealId(id!),
+    );
+  }
+
   static Future<Meal> read(int id) async {
     final results = await db.get('SELECT * FROM $tableMeals WHERE id = ?', [id]);
     return Meal.fromRow(results);
@@ -128,6 +136,6 @@ class Meal {
     print('Meal.readByPlanId: SELECT * FROM $tableMeals WHERE plan_id = $planId');
     final results = await db.getAll('SELECT * FROM $tableMeals WHERE plan_id = ?', [planId]);
     print(results.rows.length);
-    return results.map((r) => Meal.fromRow(r)).toList();
+    return Future.wait(results.map((r) => Meal.fromRow(r).loadChildren()));
   }
 }

lib/models/nutrition/meal_item.dart

@@ -17,10 +17,14 @@
  */
 
 import 'package:json_annotation/json_annotation.dart';
+import 'package:powersync/sqlite3.dart' as sqlite;
+
 import 'package:wger/helpers/json.dart';
 import 'package:wger/models/nutrition/ingredient.dart';
 import 'package:wger/models/nutrition/ingredient_weight_unit.dart';
 import 'package:wger/models/nutrition/nutritional_values.dart';
+import 'package:wger/models/schema.dart';
+import 'package:wger/powersync.dart';
 
 part 'meal_item.g.dart';
 
@@ -71,6 +75,15 @@ class MealItem {
 
   Map<String, dynamic> toJson() => _$MealItemToJson(this);
 
+  factory MealItem.fromRow(sqlite.Row row) {
+    return MealItem(
+      amount: row['amount'],
+      weightUnitId: row['weight_unit_id'],
+      mealId: row['meal_id'],
+      ingredientId: row['ingredient_id'],
+    );
+  }
+
   /// Calculations
   /// TODO why does this not consider weightUnitObj ? should we do the same as Log.nutritionalValues here?
   NutritionalValues get nutritionalValues {
@@ -112,4 +125,9 @@ class MealItem {
     m.weightUnitObj = weightUnitObj ?? this.weightUnitObj;
     return m;
   }
+
+  static Future<List<MealItem>> readByMealId(int mealId) async {
+    final results = await db.getAll('SELECT * FROM $tableMealItems WHERE meal_id = ?', [mealId]);
+    return results.map((r) => MealItem.fromRow(r)).toList();
+  }
 }

lib/models/nutrition/nutritional_plan.dart

@@ -327,10 +327,10 @@ class NutritionalPlan {
     });
   }
 
-  static Stream<NutritionalPlan> watchNutritionPlan(int id) {
+  static Stream<NutritionalPlan?> watchNutritionPlan(int id) {
     return db.onChange([tableNutritionPlans, tableLogItems, tableMeals]).asyncMap((event) async {
-      final row = await db.get('SELECT * FROM $tableNutritionPlans WHERE id = ?', [id]);
-      return NutritionalPlan.fromRow(row).loadChildren();
+      final row = await db.getOptional('SELECT * FROM $tableNutritionPlans WHERE id = ?', [id]);
+      return row == null ? null : NutritionalPlan.fromRow(row).loadChildren();
     });
   }
 

lib/models/schema.dart

@@ -16,10 +16,10 @@ assumptions: nutrition_ingredientcategory, nutrition_weightunit, nutrition_ingre
 
 // User,NutritionPlan,Meal,LogItem,MealItem,Ingredient
 const tableMuscles = 'exercises_muscle';
-const tableLogItems = 'nutrition_logitem';
+const tableLogItems = 'ivm_nutrition_logitem';
 const tableNutritionPlans = 'nutrition_nutritionplan';
-const tableMeals = 'nutrition_meal';
-const tableMealItems = 'nutrition_mealitem';
+const tableMeals = 'ivm_nutrition_meal';
+const tableMealItems = 'ivm_nutrition_mealitem';
 
 Schema schema = const Schema([
   Table(

lib/providers/nutrition.dart

@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'dart:async';
 import 'dart:convert';
 import 'dart:developer';
 
@@ -91,6 +92,66 @@ class NutritionPlansProvider with ChangeNotifier {
     return null;
   }
 
+  Future<NutritionalPlan> _enrichPlan(NutritionalPlan plan) async {
+    // TODO: set up ingredient images
+
+    final List<Log> diaryEntries = [];
+    for (final diaryEntry in plan.diaryEntries) {
+      diaryEntry.ingredient = await fetchIngredient(diaryEntry.ingredientId);
+      diaryEntries.add(diaryEntry);
+    }
+
+    final List<Meal> meals = [];
+    for (final meal in plan.meals) {
+      final List<MealItem> mealItems = [];
+      for (final mealItem in meal.mealItems) {
+        mealItem.ingredient = await fetchIngredient(mealItem.ingredientId);
+        mealItems.add(mealItem);
+      }
+      meal.mealItems = mealItems;
+      meal.diaryEntries = diaryEntries.where((d) => d.mealId == meal.id).toList();
+      meals.add(meal);
+    }
+
+    plan.meals = meals;
+    plan.diaryEntries = diaryEntries;
+
+    return plan;
+  }
+
+  Stream<NutritionalPlan?> watchNutritionPlan(int id) {
+    return NutritionalPlan.watchNutritionPlan(id).transform(
+      StreamTransformer.fromHandlers(
+        handleData: (plan, sink) async {
+          if (plan == null) {
+            sink.add(plan);
+            return;
+          }
+          sink.add(await _enrichPlan(plan));
+        },
+      ),
+    );
+  }
+
+  Stream<NutritionalPlan> watchNutritionPlanLast() {
+    return NutritionalPlan.watchNutritionPlanLast().transform(
+      StreamTransformer.fromHandlers(
+        handleData: (plan, sink) async {
+          sink.add(await _enrichPlan(plan));
+        },
+      ),
+    );
+  }
+
+  Stream<List<NutritionalPlan>> watchNutritionPlans() {
+    return NutritionalPlan.watchNutritionPlans().transform(
+      StreamTransformer.fromHandlers(
+        handleData: (plans, sink) async {
+          sink.add(await Future.wait(plans.map((plan) => _enrichPlan(plan))));
+        },
+      ),
+    );
+  }
 /*
 TODO implement:
           ingredient.image = image;

lib/screens/dashboard.dart

@@ -42,7 +42,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
         padding: EdgeInsets.all(10),
         child: Column(
           children: [
-            DashboardMuscleWidget(),
             DashboardWorkoutWidget(),
             DashboardNutritionWidget(),
             DashboardWeightWidget(),

lib/screens/nutritional_diary_screen.dart

@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
@@ -26,31 +28,58 @@ import 'package:wger/widgets/nutrition/nutritional_diary_detail.dart';
 /// Arguments passed to the form screen
 class NutritionalDiaryArguments {
   /// Nutritional plan
-  final NutritionalPlan plan;
+  final int plan;
 
   /// Date to show data for
   final DateTime date;
 
   const NutritionalDiaryArguments(this.plan, this.date);
 }
 
-class NutritionalDiaryScreen extends StatelessWidget {
+class NutritionalDiaryScreen extends StatefulWidget {
   const NutritionalDiaryScreen();
   static const routeName = '/nutritional-diary';
 
   @override
-  Widget build(BuildContext context) {
+  State<NutritionalDiaryScreen> createState() => _NutritionalDiaryScreenState();
+}
+
+class _NutritionalDiaryScreenState extends State<NutritionalDiaryScreen> {
+  NutritionalPlan? _plan;
+  late DateTime date;
+  StreamSubscription? _subscription;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
     final args = ModalRoute.of(context)!.settings.arguments as NutritionalDiaryArguments;
+    date = args.date;
+
+    final stream =
+        Provider.of<NutritionPlansProvider>(context, listen: false).watchNutritionPlan(args.plan);
+    _subscription = stream.listen((plan) {
+      if (!context.mounted) {
+        return;
+      }
+      setState(() {
+        _plan = plan;
+      });
+    });
+  }
 
+  @override
+  Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(DateFormat.yMd(Localizations.localeOf(context).languageCode).format(args.date)),
+        title: Text(DateFormat.yMd(Localizations.localeOf(context).languageCode).format(date)),
       ),
       body: Consumer<NutritionPlansProvider>(
         builder: (context, nutritionProvider, child) => SingleChildScrollView(
           child: Padding(
             padding: const EdgeInsets.all(8.0),
-            child: NutritionalDiaryDetailWidget(args.plan, args.date),
+            child: _plan == null
+                ? const Text('plan not found')
+                : NutritionalDiaryDetailWidget(_plan!, date),
           ),
         ),
       ),