Fixed backend query to properly grab repeating meal events Feedback f…

…rom Saayeh 5th December 2024 #30
avichaljadeja2002 · Dec 11, 2024 · cf3bb47 · cf3bb47
1 parent 53e74c7
commit cf3bb47
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/backend/.idea/dataSources.local.xml b/backend/.idea/dataSources.local.xml
diff --git a/backend/omniplanner.db b/backend/omniplanner.db
diff --git a/backend/omniplanner/src/main/java/com/main/omniplanner/meals/MealEventsRepository.java b/backend/omniplanner/src/main/java/com/main/omniplanner/meals/MealEventsRepository.java
@@ -11,6 +11,6 @@
 @Repository
 public interface MealEventsRepository extends JpaRepository<MealEvents, Integer> {
     List<MealEvents> findByUserId(int userId);
-    @Query("SELECT f FROM MealEvents f WHERE f.userId = :userId AND f.event_date >= :currentTimeMillis ORDER BY f.event_date ASC")
+    @Query("SELECT f FROM MealEvents f WHERE f.userId = :userId AND (f.repeating = true OR f.event_date >= :currentTimeMillis) ORDER BY f.event_date ASC")
     List<MealEvents> findUpcomingByUserId(@Param("userId") int userId, @Param("currentTimeMillis") Long currentTimeMillis);
 }