Merge branch 'master' into loup/fix_login_page

MTES-MCT · Dec 5, 2024 · cf5bc66 · cf5bc66
2 parents 9808b4a + 80d1c0b
commit cf5bc66
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/.../monitorfish/infrastructure/database/repositories/interfaces/DBLogbookReportRepository.kt b/.../monitorfish/infrastructure/database/repositories/interfaces/DBLogbookReportRepository.kt
@@ -343,6 +343,8 @@ interface DBLogbookReportRepository :
             SELECT *
             FROM logbook_reports
             WHERE referenced_report_id IN (select report_id FROM dat_cor)
+            AND operation_datetime_utc >= cast(:startDate AS TIMESTAMP) - INTERVAL '1 day'
+            AND operation_datetime_utc <= cast(:endDate AS TIMESTAMP) + INTERVAL '1 day'
             AND operation_type = 'RET'
             AND NOT is_test_message
         )
@@ -380,8 +382,8 @@ interface DBLogbookReportRepository :
            FROM logbook_reports
            WHERE
                referenced_report_id IN (select report_id FROM dat_cor) AND
-               operation_datetime_utc + INTERVAL '1 day' >= cast(?2 AS timestamp) AND
-               operation_datetime_utc - INTERVAL '1 day' < cast(?3 AS timestamp) AND
+               operation_datetime_utc >= cast(?2 AS timestamp) - INTERVAL '1 day' AND
+               operation_datetime_utc < cast(?3 AS timestamp) + INTERVAL '1 day' AND
                operation_type = 'RET'
                AND NOT is_test_message
            ORDER BY operation_datetime_utc DESC
@@ -392,7 +394,7 @@ interface DBLogbookReportRepository :
            WHERE
                referenced_report_id IN (select report_id FROM dat_cor) AND
                operation_datetime_utc >= cast(?2 AS timestamp) AND
-               operation_datetime_utc - INTERVAL '1 week' < cast(?3 AS timestamp) AND
+               operation_datetime_utc < cast(?3 AS timestamp) + INTERVAL '1 week' AND
                operation_type = 'DEL'
                AND NOT is_test_message
            ORDER BY operation_datetime_utc desc