correctly process immediate; also clear cache when updating goals

lalomartins · Jul 7, 2020 · 8fdebcf · 8fdebcf
1 parent 7d69983
commit 8fdebcf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/db.dart b/lib/db.dart
@@ -177,11 +177,10 @@ class WeeklyGoalsDatabase extends _$WeeklyGoalsDatabase {
           .watch();
 
   Future<void> refreshGoals() async {
-    final newGoals = await Goal.goalsAsOf(db: this);
+    final newGoals = await Goal.goalsAsOf(db: this, clearCache: true);
     await delete(cachedGoals).go();
     for (final goal in newGoals) {
       into(cachedGoals).insert(goal);
     }
-    print('cached goals updated');
   }
 }
diff --git a/lib/model/goal.dart b/lib/model/goal.dart
@@ -3,6 +3,7 @@ import 'package:flutter/foundation.dart';
 import 'package:yaml/yaml.dart';
 
 import '../config.dart';
+import '../date_util.dart';
 import '../db.dart';
 
 final _memCache = ExpireCache<DateTime, List<Goal>>(expireDuration: Duration(minutes: 15), sizeLimit: 52);
@@ -64,15 +65,17 @@ class Goal extends CachedGoal {
     return map;
   }
 
-  static Future<List<Goal>> goalsAsOf({DateTime when, @required WeeklyGoalsDatabase db}) async {
-    if (_memCache.containsKey(when)) return _memCache.get(when);
+  static Future<List<Goal>> goalsAsOf({DateTime when, @required WeeklyGoalsDatabase db, clearCache: false}) async {
+    if (clearCache) _memCache.clear();
+    else if (_memCache.containsKey(when)) return _memCache.get(when);
 
     final events = await db.getEvents(type: 'set goal', until: when);
     final map = Map<String, Map<String, Goal>>();
     final goals = List<Goal>();
+    final effectDate = when ?? startOfWeek(weeksAgo: -1, midnight: true);
     for (final event in events) {
       final YamlMap data = loadYaml(event.additional);
-      if (when != null && data['immediate'] == false && event.timestamp.add(Duration(days: 7)).isAfter(when)) continue;
+      if (data['immediate'] == false && event.timestamp.add(Duration(days: 7)).isAfter(effectDate)) continue;
       final goal = map.putIfAbsent(data['category'], () => Map()).putIfAbsent(data['name'], () {
         final goal = Goal(
           category: data['category'],