Skip to content

Tt 220 remove custom sql conditions from find all #292

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 12 commits into from
May 26, 2021
Merged

Tt 220 remove custom sql conditions from find all #292

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
58de09b
fix: TT-220 refactoring for projects
May 10, 2021
6399ba6
fix: TT-238 activities find_all refactoring
May 11, 2021
7400b90
fix: TT-220 Correction in get_all function for projects_model
kevinjlope May 12, 2021
9e9fd0c
fix: TT-220 Remove custom_sql_params from methods and replace for new…
May 13, 2021
c95fc27
fix: TT-220 apply refactoring on some code
May 14, 2021
a77a420
fix: TT-220 Bugs corrections
kevinjlope May 14, 2021
d43d88b
fix: TT-220 Removes order conditions from activities
kevinjlope May 14, 2021
37df429
fix: TT-220 make adjustments in projects query for time-entries
May 14, 2021
9eb0e96
fix: TT-220 adjustments according sonar suggestions
May 19, 2021
d13c19d
fix: TT-220 adjustments according sonar suggestions in activities
May 19, 2021
8a2682a
fix: TT-220 adjustments according sonar code analysis
May 19, 2021
ede5c4c
fix: TT-220 adjustments according reviewers suggestions
May 20, 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
Prev Previous commit
Next Next commit
fix: TT-220 Correction in get_all function for projects_model
  • Loading branch information
@kevinjlope
kevinjlope authored and Pablo committed May 17, 2021
commit 7400b90de7588fa68ea39b25f10911bbe1380b85
12 changes: 8 additions & 4 deletions time_tracker_api/projects/projects_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,20 @@ def get_all(
for customer in customers
if customer.status == 'active'
]

conditions = conditions if conditions else {}
customers_ids = [v for k, v in conditions.items()]
customers_ids = (
customers_ids + customers_id if project_ids else customers_ids
customers_ids_conditions = [v for k, v in conditions.items()]

customers_ids_conditions = (
customers_ids_conditions + customers_id
if customers_id
else customers_id
)

projects = self.repository.find_all(
event_context=event_ctx,
project_ids=project_ids,
customer_ids=customers_ids,
customer_ids=customers_ids_conditions,
)

add_customer_name_to_projects(projects, customers)
Expand Down