Skip to content

TT-69 Overlap Hours #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 14, 2020
Merged

TT-69 Overlap Hours #244

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b41145
TT-69 fix: adding or editing an entry must not overlap the date of an…
Dec 11, 2020
30b7e00
Merge branch 'master' into TT-69_OverlapHours
josepato87 Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion commons/git_hooks/enforce_semantic_commit_msg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

SUCCESS_MSG = "Commit succeed!. Semantic commit message is correct."

COMMIT_MSG_REGEX = r'(build|ci|docs|feat|fix|perf|refactor|style|test|chore|revert)(\([\w\-]+\))?:\s.*'
COMMIT_MSG_REGEX = r'(TT-)[0-9].*(build|ci|docs|feat|fix|perf|refactor|style|test|chore|revert)(\([\w\-]+\))?:\s.*'

# Get the commit message file
commit_msg_file = open(sys.argv[1]) # The first argument is the file
Expand Down
6 changes: 6 additions & 0 deletions tests/time_tracker_api/time_entries/time_entries_model_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ def create_time_entry(
"2020-10-01T02:00:00.000Z",
"2020-10-01T12:00:00.000Z",
),
(
"2020-10-01T05:00:00.000Z",
"2020-10-01T10:00:00.000Z",
"2020-10-01T06:00:00.000Z",
"2020-10-01T07:00:00.000Z",
),
],
)
def test_find_interception_with_date_range_should_find(
Expand Down
4 changes: 3 additions & 1 deletion time_tracker_api/time_entries/time_entries_repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,10 @@ def find_interception_with_date_range(
result = self.container.query_items(
query="""
SELECT * FROM c
WHERE ((c.start_date BETWEEN @start_date AND @end_date)
WHERE (((c.start_date BETWEEN @start_date AND @end_date)
OR (c.end_date BETWEEN @start_date AND @end_date))
OR ((@start_date BETWEEN c.start_date AND c.end_date)
OR (@end_date BETWEEN c.start_date AND c.end_date)))
AND c.start_date!= @end_date
AND c.end_date!= @start_date
{conditions_clause}
Expand Down