Skip to content

Commit 8ef5e2c

Browse files
author
Guido Quezada
committed
Revert "Revert "TT-69 fix: adding or editing an entry must not overlap the date of any other entry""
This reverts commit 26ddb20.
1 parent c545fff commit 8ef5e2c

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

tests/time_tracker_api/time_entries/time_entries_model_test.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ def create_time_entry(
6161
"2020-10-01T02:00:00.000Z",
6262
"2020-10-01T12:00:00.000Z",
6363
),
64+
(
65+
"2020-10-01T05:00:00.000Z",
66+
"2020-10-01T10:00:00.000Z",
67+
"2020-10-01T06:00:00.000Z",
68+
"2020-10-01T07:00:00.000Z",
69+
),
6470
],
6571
)
6672
def test_find_interception_with_date_range_should_find(

time_tracker_api/time_entries/time_entries_repository.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,10 @@ def find_interception_with_date_range(
207207
result = self.container.query_items(
208208
query="""
209209
SELECT * FROM c
210-
WHERE ((c.start_date BETWEEN @start_date AND @end_date)
210+
WHERE (((c.start_date BETWEEN @start_date AND @end_date)
211211
OR (c.end_date BETWEEN @start_date AND @end_date))
212+
OR ((@start_date BETWEEN c.start_date AND c.end_date)
213+
OR (@end_date BETWEEN c.start_date AND c.end_date)))
212214
AND c.start_date!= @end_date
213215
AND c.end_date!= @start_date
214216
{conditions_clause}

0 commit comments

Comments
 (0)