WIP: use new string id's for nutrition stuff so we can use powersync

Author: Dieterbe

lib/helpers/consts.dart

@@ -109,7 +109,7 @@ enum EXERCISE_IMAGE_ART_STYLE {
 }
 
 /// Dummy ID for pseudo meals
-const PSEUDO_MEAL_ID = -1;
+const PSEUDO_MEAL_ID = 'deadbeef';
 
 /// Colors used for muscles
 const COLOR_MAIN_MUSCLES = Colors.red;

lib/models/nutrition/log.dart

@@ -17,6 +17,7 @@
  */
 
 import 'package:json_annotation/json_annotation.dart';
+import 'package:powersync/powersync.dart';
 import 'package:powersync/sqlite3.dart' as sqlite;
 import 'package:wger/helpers/json.dart';
 import 'package:wger/models/nutrition/ingredient.dart';
@@ -25,20 +26,19 @@ import 'package:wger/models/nutrition/meal_item.dart';
 import 'package:wger/models/nutrition/nutritional_values.dart';
 import 'package:wger/models/schema.dart';
 import 'package:wger/powersync.dart';
-import 'package:wger/providers/nutrition.dart';
 
 part 'log.g.dart';
 
 @JsonSerializable()
 class Log {
   @JsonKey(required: true)
-  int? id;
+  String? id;
 
   @JsonKey(required: false, name: 'meal')
-  int? mealId;
+  String? mealId;
 
   @JsonKey(required: true, name: 'plan')
-  int planId;
+  String planId;
 
   @JsonKey(required: true)
   late DateTime datetime;
@@ -81,7 +81,7 @@ class Log {
 
   factory Log.fromRow(sqlite.Row row) {
     return Log(
-      id: int.parse(row['id']),
+      id: row['id'],
       mealId: row['meal_id'],
       ingredientId: row['ingredient_id'],
       weightUnitId: row['weight_unit_id'],
@@ -107,12 +107,12 @@ class Log {
     return ingredient.nutritionalValues / (100 / weight);
   }
 
-  static Future<List<Log>> readByMealId(int mealId) async {
+  static Future<List<Log>> readByMealId(String 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 {
+  static Future<List<Log>> readByPlanId(String planId) async {
     final results = await db.getAll('SELECT * FROM $tableLogItems WHERE plan_id = ?', [planId]);
     return results.map((r) => Log.fromRow(r)).toList();
   }
@@ -121,10 +121,23 @@ class Log {
   Future<void> delete() async {
     await db.execute('DELETE FROM $logItemsTable WHERE id = ?', [id]);
   }
+  */
 
-  static Future<void> addPhoto(String photoId, String id) async {
-    await db.execute('UPDATE $logItemsTable SET photo_id = ? WHERE id = ?', [photoId, id]);
+  Future<void> log() async {
+    print('DIETER Log.log called id=$id, planId=$planId');
+    await db.execute(
+      'INSERT INTO $tableLogItems (id, meal_id, ingredient_id, weight_unit_id, amount, plan_id, datetime, comment) VALUES (?, ?, ?, ?, ?, ?, ?, ?)',
+      [
+        // generate an id using uuid
+        uuid.v4(),
+        mealId,
+        ingredientId,
+        weightUnitId,
+        amount,
+        planId,
+        datetime.toIso8601String(),
+        comment,
+      ],
+    );
   }
-}
-  */
 }

lib/models/nutrition/log.g.dart

@@ -33,10 +33,10 @@ part 'meal.g.dart';
 @JsonSerializable()
 class Meal {
   @JsonKey(required: false)
-  late int? id;
+  late String? id;
 
   @JsonKey(name: 'plan')
-  late int planId;
+  late String planId;
 
   @JsonKey(toJson: timeToString, fromJson: stringToTime)
   TimeOfDay? time;
@@ -55,7 +55,7 @@ class Meal {
 
   Meal({
     this.id,
-    int? plan,
+    String? plan,
     this.time,
     String? name,
     List<MealItem>? mealItems,
@@ -92,7 +92,7 @@ class Meal {
 
   factory Meal.fromRow(sqlite.Row row) {
     return Meal(
-      id: int.parse(row['id']),
+      id: row['id'],
       plan: row['plan_id'],
       time: stringToTime(row['time']),
       name: row['name'],
@@ -102,8 +102,8 @@ class Meal {
   Map<String, dynamic> toJson() => _$MealToJson(this);
 
   Meal copyWith({
-    int? id,
-    int? plan,
+    String? id,
+    String? plan,
     TimeOfDay? time,
     String? name,
     List<MealItem>? mealItems,
@@ -127,12 +127,12 @@ class Meal {
     );
   }
 
-  static Future<Meal> read(int id) async {
+  static Future<Meal> read(String id) async {
     final results = await db.get('SELECT * FROM $tableMeals WHERE id = ?', [id]);
     return Meal.fromRow(results);
   }
 
-  static Future<List<Meal>> readByPlanId(int planId) async {
+  static Future<List<Meal>> readByPlanId(String planId) async {
     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);

lib/models/nutrition/meal.dart

@@ -34,7 +34,7 @@ class MealItem {
   int? id;
 
   @JsonKey(required: false, name: 'meal')
-  late int mealId;
+  late String mealId;
 
   @JsonKey(required: false, name: 'ingredient')
   late int ingredientId;
@@ -53,7 +53,7 @@ class MealItem {
 
   MealItem({
     this.id,
-    int? mealId,
+    String? mealId,
     required this.ingredientId,
     this.weightUnitId,
     required this.amount,
@@ -107,7 +107,7 @@ class MealItem {
 
   MealItem copyWith({
     int? id,
-    int? mealId,
+    String? mealId,
     int? ingredientId,
     int? weightUnitId,
     num? amount,
@@ -126,7 +126,7 @@ class MealItem {
     return m;
   }
 
-  static Future<List<MealItem>> readByMealId(int mealId) async {
+  static Future<List<MealItem>> readByMealId(String 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/meal.g.dart

@@ -35,8 +35,8 @@ part 'nutritional_plan.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class NutritionalPlan {
-  @JsonKey(required: true)
-  int? id;
+  @JsonKey(required: false)
+  String? id;
 
   @JsonKey(required: true)
   late String description;
@@ -87,7 +87,7 @@ class NutritionalPlan {
 
   factory NutritionalPlan.fromRow(sqlite.Row row) {
     return NutritionalPlan(
-      id: int.parse(row['id']),
+      id: row['id'],
       description: row['description'],
       creationDate: DateTime.parse(row['creation_date']),
       onlyLogging: row['only_logging'] == 1,
@@ -100,7 +100,7 @@ class NutritionalPlan {
   }
 
   NutritionalPlan copyWith({
-    int? id,
+    String? id,
     String? description,
     DateTime? creationDate,
     bool? onlyLogging,
@@ -299,7 +299,7 @@ class NutritionalPlan {
     );
   }
 
-  static Future<NutritionalPlan> read(int id) async {
+  static Future<NutritionalPlan> read(String id) async {
     final row = await db.get('SELECT * FROM $tableNutritionPlans WHERE id = ?', [id]);
     return NutritionalPlan.fromRow(row).loadChildren();
   }
@@ -327,18 +327,21 @@ class NutritionalPlan {
     });
   }
 
-  static Stream<NutritionalPlan?> watchNutritionPlan(int id) {
+  static Stream<NutritionalPlan?> watchNutritionPlan(String id) {
     return db.onChange([tableNutritionPlans, tableLogItems, tableMeals]).asyncMap((event) async {
       final row = await db.getOptional('SELECT * FROM $tableNutritionPlans WHERE id = ?', [id]);
       return row == null ? null : NutritionalPlan.fromRow(row).loadChildren();
     });
   }
 
-  static Stream<NutritionalPlan> watchNutritionPlanLast() {
+  static Stream<NutritionalPlan?> watchNutritionPlanLast() {
     return db.onChange([tableNutritionPlans, tableLogItems, tableMeals]).asyncMap((event) async {
-      final row =
-          await db.get('SELECT * FROM $tableNutritionPlans ORDER BY creation_date DESC LIMIT 1');
-      return NutritionalPlan.fromRow(row).loadChildren();
+      final res =
+          await db.getAll('SELECT * FROM $tableNutritionPlans ORDER BY creation_date DESC LIMIT 1');
+      if (res.isEmpty) {
+        return null;
+      }
+      return NutritionalPlan.fromRow(res.first).loadChildren();
     });
   }
 /*

lib/models/nutrition/meal_item.dart

@@ -33,6 +33,7 @@ Schema schema = const Schema([
       Column.text('description'),
       Column.integer('has_goal_calories'),
       Column.integer('user_id'),
+      Column.integer('remote_id'),
       Column.integer('only_logging'),
       Column.integer('goal_carbohydrates'),
       Column.integer('goal_energy'),
@@ -47,10 +48,11 @@ Schema schema = const Schema([
       Column.text('datetime'),
       Column.text('comment'),
       Column.integer('amount'),
+      Column.integer('remote_id'),
       Column.integer('ingredient_id'),
-      Column.integer('plan_id'),
+      Column.text('plan_id'),
       Column.integer('weight_unit_id'),
-      Column.integer('meal_id'), // optional
+      Column.text('meal_id'), // optional
     ],
     indexes: [
       // Index('plan', [IndexedColumn('plan_id')])
@@ -60,8 +62,9 @@ Schema schema = const Schema([
     tableMeals,
     [
       Column.integer('order'),
+      Column.integer('remote_id'),
       Column.text('time'),
-      Column.integer('plan_id'),
+      Column.text('plan_id'),
       Column.text('name'),
     ],
   ),
@@ -71,7 +74,8 @@ Schema schema = const Schema([
       Column.integer('order'),
       Column.integer('amount'),
       Column.integer('ingredient_id'),
-      Column.integer('meal_id'),
+      Column.text('meal_id'),
+      Column.integer('remote_id'),
       Column.integer('weight_unit_id'),
     ],
   ),