Skip to content

Commit 1d21cd2

Browse files
committed
fix: many code improvements
1 parent 00450c3 commit 1d21cd2

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

app/internal/locations.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ def return_zip_to_location(session: Session) -> Optional[str]:
3232
Returns:
3333
A zip number for the user location.
3434
"""
35-
response = requests.get("http://ipinfo.io/json").json()
35+
response = requests.get("http://ipinfo.io/json")
3636
if not response.ok:
3737
return None
38+
location_by_ip = response.json()
3839
for location in session.query(Location).all():
39-
if (location.city == response["city"]
40-
and location.country == response["country"]):
40+
if (location.city == location_by_ip["city"]
41+
and location.country == location_by_ip["country"]):
4142
return location.zip_number
4243

4344

app/routers/dayview.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,15 @@ async def dayview(
212212
current_time_with_attrs = CurrentTimeAttributes(date=day)
213213
inter_day = international_days.get_international_day_per_day(session, day)
214214
location_and_shabbat = locations.get_user_location(session)
215-
location = location_and_shabbat["location"]["title"]
216-
shabbat_obj = shabbat.get_shabbat_if_date_friday(
217-
location_and_shabbat,
218-
day.date(),
219-
)
215+
if location_and_shabbat:
216+
location = location_and_shabbat["location"]["title"]
217+
shabbat_obj = shabbat.get_shabbat_if_date_friday(
218+
location_and_shabbat,
219+
day.date(),
220+
)
221+
else:
222+
location = None
223+
shabbat_obj = None
220224
month = day.strftime("%B").upper()
221225
return templates.TemplateResponse(
222226
"calendar_day_view.html",

0 commit comments

Comments
 (0)