Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
feat: TT-243 Add function and testing to time entries query builder
  • Loading branch information
jcalarcon98 committed Jun 9, 2021
commit 91d13b2e041d4d5876e79866ff8958aa9815ceac
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,47 @@ def test_build_with_add_sql_date_range_condition():
assert remove_white_spaces(query) == remove_white_spaces(expected_query)
assert len(time_entry_query_builder.where_conditions) == 1
assert len(time_entry_query_builder.get_parameters()) == 2


def test_add_sql_interception_with_date_range_condition():
start_date = "2021-03-19T05:07:00.000Z"
end_date = "2021-03-25T10:00:00.000Z"

time_entry_query_builder = (
TimeEntryQueryBuilder().add_sql_interception_with_date_range_condition(
start_date, end_date
)
)

expected_params = [
{"name": "@start_date", "value": start_date},
{"name": "@end_date", "value": end_date},
]

assert len(time_entry_query_builder.where_conditions) == 1
assert len(time_entry_query_builder.parameters) == len(expected_params)
assert time_entry_query_builder.parameters == expected_params


def test_build_with_add_sql_interception_with_date_range_condition():
start_date = "2021-03-19T05:07:00.000Z"
end_date = "2021-03-25T10:00:00.000Z"
time_entry_query_builder = (
TimeEntryQueryBuilder()
.add_sql_interception_with_date_range_condition(start_date, end_date)
.build()
)

expected_query = """
SELECT * FROM c
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)))
"""

builder_query = time_entry_query_builder.get_query()

assert remove_white_spaces(builder_query) == remove_white_spaces(
expected_query
)
18 changes: 18 additions & 0 deletions time_tracker_api/time_entries/time_entries_query_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,21 @@ def add_sql_date_range_condition(self, date_range: tuple = None):
]
)
return self

def add_sql_interception_with_date_range_condition(
self, start_date, end_date
):
condition = """
(((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)))
"""
self.where_conditions.append(condition)
self.parameters.extend(
[
{'name': '@start_date', 'value': start_date},
{'name': '@end_date', 'value': end_date},
]
)
return self