ISSUE #1617: Streaks widget not displaying streaks correctly

Author: robiningelbrecht

config/reference.php

@@ -1098,6 +1098,17 @@
  *     doctrine?: DoctrineConfig,
  *     doctrine_migrations?: DoctrineMigrationsConfig,
  *     twig?: TwigConfig,
+ *     "when@dev"?: array{
+ *         imports?: ImportsConfig,
+ *         parameters?: ParametersConfig,
+ *         services?: ServicesConfig,
+ *         framework?: FrameworkConfig,
+ *         flysystem?: FlysystemConfig,
+ *         monolog?: MonologConfig,
+ *         doctrine?: DoctrineConfig,
+ *         doctrine_migrations?: DoctrineMigrationsConfig,
+ *         twig?: TwigConfig,
+ *     },
  *     "when@prod"?: array{
  *         imports?: ImportsConfig,
  *         parameters?: ParametersConfig,
@@ -1200,6 +1211,7 @@ public static function config(array $config): array
  *     deprecated?: array{package:string, version:string, message?:string},
  * }
  * @psalm-type RoutesConfig = array{
+ *     "when@dev"?: array<string, RouteConfig|ImportConfig|AliasConfig>,
  *     "when@prod"?: array<string, RouteConfig|ImportConfig|AliasConfig>,
  *     "when@test"?: array<string, RouteConfig|ImportConfig|AliasConfig>,
  *     ...<string, RouteConfig|ImportConfig|AliasConfig>

src/Domain/Rewind/FindStreaks/FindStreaksQueryHandler.php

@@ -84,13 +84,16 @@ private function computeStreaks(array $days): FindStreaksResponse
         $longestMonthStreak = $runningMonthStreak = 1;
 
         $previousDay = array_first($days);
-        $keepTrackOfCurrentDayStreak = $previousDay->format('Ymd') === $today->format('Ymd');
+       $keepTrackOfCurrentDayStreak = $today->diff($previousDay)->days < 2;
         $currentDayStreak = $keepTrackOfCurrentDayStreak ? 1 : 0;
 
-        $keepTrackOfCurrentWeekStreak = $previousDay->modify(self::FIRST_DAY_OF_THE_WEEK)->format('Ymd') === $today->modify(self::FIRST_DAY_OF_THE_WEEK)->format('Ymd');
+        $keepTrackOfCurrentWeekStreak = $today->diff($previousDay)->days < 7;
         $currentWeekStreak = $keepTrackOfCurrentWeekStreak ? 1 : 0;
 
-        $keepTrackOfCurrentMonthStreak = $previousDay->modify(self::FIRST_DAY_OF_THE_MONTH)->format('Ymd') === $today->modify(self::FIRST_DAY_OF_THE_MONTH)->format('Ymd');
+        $monthDiff =
+            (($today->getYear() - $previousDay->getYear()) * 12)
+            + ($today->getMonthWithoutLeadingZero() - $previousDay->getMonthWithoutLeadingZero());
+       $keepTrackOfCurrentMonthStreak = $monthDiff <= 1;
         $currentMonthStreak = $keepTrackOfCurrentMonthStreak ? 1 : 0;
 
         for ($i = 1; $i < count($days); ++$i) {