From ff1afd7c32f1a26d1bb4ac4c7bbf705c3364f936 Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Sun, 14 Jun 2020 16:11:13 +0200 Subject: [PATCH] Don't show future entries on /today endpoint --- .../java/de/hft/geotime/repositories/RecordRepository.java | 6 +++++- backend/src/main/resources/data.sql | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/de/hft/geotime/repositories/RecordRepository.java b/backend/src/main/java/de/hft/geotime/repositories/RecordRepository.java index fb715ff..04cb836 100644 --- a/backend/src/main/java/de/hft/geotime/repositories/RecordRepository.java +++ b/backend/src/main/java/de/hft/geotime/repositories/RecordRepository.java @@ -45,7 +45,11 @@ public interface RecordRepository extends PagingAndSortingRepository current_date") + @Query("SELECT record from TimeRecord record " + + "where record.account.user.username = :#{principal} " + + "AND record.enddate > current_date " + + "AND record.enddate < current_date+1" + ) Page today(Pageable pageable); @RestResource(rel = "openEntries", path = "openEntries") diff --git a/backend/src/main/resources/data.sql b/backend/src/main/resources/data.sql index 7fb7b97..bfb9c6d 100644 --- a/backend/src/main/resources/data.sql +++ b/backend/src/main/resources/data.sql @@ -34,6 +34,8 @@ INSERT INTO time_record (id, enddate, startdate, `type`, account_id) VALUES (6, '2020-05-30 23:00:00', '2020-05-30 22:00:00', 1, 1), (7, '2020-05-31 01:00:00', '2020-05-31 00:00:00', 1, 1), (8, '2020-05-31 04:00:00', '2020-05-31 02:00:00', 1, 1), - (9, '2020-05-31 16:00:00', '2020-05-31 12:00:00', 1, 1); + (9, '2020-05-31 16:00:00', '2020-05-31 12:00:00', 1, 1), + (10, '2020-06-14 16:00:00', '2020-06-14 12:00:00', 1, 1), + (11, '2020-06-15 16:00:00', '2020-06-15 12:00:00', 1, 1); SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file