Skip to content

fix: TT-238 adds condition to control when there are no time entries … #290

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
May 11, 2021
Merged

fix: TT-238 adds condition to control when there are no time entries … #290

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7442788
fix: TT-238 adds condition to control when there are no time entries …
May 10, 2021
a505cc5
fix: TT-238 change code according sonar suggestion
May 11, 2021
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
11 changes: 8 additions & 3 deletions 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 @@ -142,7 +142,9 @@ def count(

return result.next()

def add_complementary_info(self, time_entries=None, max_count=None):
def add_complementary_info(
self, time_entries=None, max_count=None, exist_conditions=False
):
if time_entries:
custom_conditions = create_in_condition(time_entries, "project_id")
custom_conditions_activity = create_in_condition(
Expand All @@ -168,7 +170,7 @@ def add_complementary_info(self, time_entries=None, max_count=None):

users = AzureConnection().users()
add_user_email_to_time_entries(time_entries, users)
elif not time_entries and len(conditions) > 1:
elif not time_entries and exist_conditions:
abort(HTTPStatus.NOT_FOUND, "Time entry not found")
return time_entries

Expand Down Expand Up @@ -230,8 +232,11 @@ def find_all(

function_mapper = self.get_mapper_or_dict(mapper)
time_entries = list(map(function_mapper, result))
exist_conditions = len(conditions) > 1

return self.add_complementary_info(time_entries, max_count)
return self.add_complementary_info(
time_entries, max_count, exist_conditions
)

def create_sql_test_users_exclusion_condition(self, test_user_ids):
if test_user_ids != None:
Expand Down