Skip to content

Commit

Permalink
linter
Browse files Browse the repository at this point in the history
  • Loading branch information
phamkelly17 committed Nov 19, 2023
1 parent bb278a7 commit 96158c8
Showing 1 changed file with 26 additions and 17 deletions.
43 changes: 26 additions & 17 deletions backend/app/services/implementations/residents_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,34 +127,43 @@ def get_residents(
date_joined = None

if filters.get("date_range") is not None:
date_joined, date_left = filters.get("date_range")
if date_joined is not None:
date_joined = datetime.strptime(date_joined, "%Y-%m-%d").replace(
hour=0, minute=0
)
date_joined, date_left = filters.get("date_range")
if date_joined is not None:
date_joined = datetime.strptime(
date_joined, "%Y-%m-%d"
).replace(hour=0, minute=0)
if date_left is not None:
date_left = datetime.strptime(date_left, "%Y-%m-%d").replace(
hour=0, minute=0
)

residents_results = (
Residents.query.join(
Buildings, Buildings.id == Residents.building_id
)
.with_entities(Residents, Buildings.name.label("building"))
)
residents_results = Residents.query.join(
Buildings, Buildings.id == Residents.building_id
).with_entities(Residents, Buildings.name.label("building"))

if building_id is not None:
residents_results = residents_results.filter(Residents.building_id.in_(building_id))
residents_results = residents_results.filter(
Residents.building_id.in_(building_id)
)
if resident_id is not None:
residents_results = residents_results.filter(Residents.resident_id.in_(resident_id))
residents_results = residents_results.filter(
Residents.resident_id.in_(resident_id)
)
if date_joined is not None and date_left is not None:
residents_results = residents_results.filter(Residents.date_joined >= date_joined)
residents_results = residents_results.filter(Residents.date_left <= date_left)
residents_results = residents_results.filter(
Residents.date_joined >= date_joined
)
residents_results = residents_results.filter(
Residents.date_left <= date_left
)
elif date_joined is not None:
residents_results = residents_results.filter(Residents.date_joined >= date_joined)
residents_results = residents_results.filter(
Residents.date_joined >= date_joined
)
elif date_left is not None:
residents_results = residents_results.filter(Residents.date_left <= date_left)
residents_results = residents_results.filter(
Residents.date_left <= date_left
)
else:
residents_results = (
Residents.query.join(
Expand Down

0 comments on commit 96158c8

Please sign in to comment.