diff --git a/backend/.idea/dataSources.local.xml b/backend/.idea/dataSources.local.xml index e1e2d3f..e6efc0e 100644 --- a/backend/.idea/dataSources.local.xml +++ b/backend/.idea/dataSources.local.xml @@ -1,6 +1,6 @@ - + no-auth diff --git a/backend/omniplanner.db b/backend/omniplanner.db index 54a8b6d..e112c2f 100644 Binary files a/backend/omniplanner.db and b/backend/omniplanner.db differ 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 index 04423b7..d1febce 100644 --- 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 { List 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 findUpcomingByUserId(@Param("userId") int userId, @Param("currentTimeMillis") Long currentTimeMillis); }