Skip to content
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

Jump to bottom

Change Dining names to more intuitive labels #100

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+38 −47
Open

Change Dining names to more intuitive labels #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d189fa
change label names to more intuitive labels
esqu1 Feb 17, 2018
cc3ed02
fix tests for dining
esqu1 Feb 24, 2018
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
73 changes: 32 additions & 41 deletions penn/dining.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@

def normalize_weekly(data):
"""Normalization for dining menu data"""
if "tblMenu" not in data["result_data"]["Document"]:
data["result_data"]["Document"]["tblMenu"] = []
if isinstance(data["result_data"]["Document"]["tblMenu"], dict):
data["result_data"]["Document"]["tblMenu"] = [data["result_data"]["Document"]["tblMenu"]]
for day in data["result_data"]["Document"]["tblMenu"]:
if "tblDayPart" not in day:
if "menus" not in data["result_data"]["weekly_menu"]:
data["result_data"]["weekly_menu"]["menus"] = []
if isinstance(data["result_data"]["weekly_menu"]["menus"], dict):
data["result_data"]["weekly_menu"]["menus"] = [data["result_data"]["weekly_menu"]["menus"]]
for day in data["result_data"]["weekly_menu"]["menus"]:
if "meals" not in day:
continue
if isinstance(day["tblDayPart"], dict):
day["tblDayPart"] = [day["tblDayPart"]]
for meal in day["tblDayPart"]:
if isinstance(meal["tblStation"], dict):
meal["tblStation"] = [meal["tblStation"]]
for station in meal["tblStation"]:
if isinstance(station["tblItem"], dict):
station["tblItem"] = [station["tblItem"]]
if isinstance(day["meals"], dict):
day["meals"] = [day["meals"]]
for meal in day["meals"]:
if isinstance(meal["stations"], dict):
meal["stations"] = [meal["stations"]]
for station in meal["stations"]:
if isinstance(station["station_items"], dict):
station["station_items"] = [station["station_items"]]
return data


Expand All @@ -57,28 +57,19 @@ def get_meals(v2_response, building_id):
items = []
for item_id in station["items"]:
item = result_data["items"][item_id]
print item
new_item = {}
new_item["txtTitle"] = item["label"]
new_item["txtPrice"] = ""
new_item["txtNutritionInfo"] = ""
new_item["txtDescription"] = item["description"]
new_item["tblSide"] = ""
new_item["tblFarmToFork"] = ""
attrs = [{"description": item["cor_icon"][attr]} for attr in item["cor_icon"]]
if len(attrs) == 1:
new_item["tblAttributes"] = {"txtAttribute": attrs[0]}
elif len(attrs) > 1:
new_item["tblAttributes"] = {"txtAttribute": attrs}
else:
new_item["tblAttributes"] = ""
new_item["dish_title"] = item["label"]
new_item["dish_description"] = item["description"]
attrs = [item["cor_icon"][attr] for attr in item["cor_icon"]]
new_item["item_attrs"] = attrs
if isinstance(item["options"], list):
item["options"] = {}
if "values" in item["options"]:
for side in item["options"]["values"]:
new_item["tblSide"] = {"txtSideName": side["label"]}
new_item["side_items"] = [side["label"] for side in item["options"]["values"]]
items.append(new_item)
stations.append({"tblItem": items, "txtStationDescription": station["label"]})
meals.append({"tblStation": stations, "txtDayPartDescription": meal["label"]})
stations.append({"station_items": items, "station_description": station["label"]})
meals.append({"stations": stations, "meal_name": meal["label"]})
return meals


Expand Down Expand Up @@ -184,13 +175,13 @@ def menu_daily(self, building_id):
"""
today = str(datetime.date.today())
v2_response = DiningV2(self.bearer, self.token).menu(building_id, today)
response = {'result_data': {'Document': {}}}
response["result_data"]["Document"]["menudate"] = datetime.datetime.strptime(today, '%Y-%m-%d').strftime('%-m/%d/%Y')
response = {'result_data': {'weekly_menu': {}}}
response["result_data"]["weekly_menu"]["menudate"] = datetime.datetime.strptime(today, '%Y-%m-%d').strftime('%-m/%d/%Y')
if building_id in VENUE_NAMES:
response["result_data"]["Document"]["location"] = VENUE_NAMES[building_id]
response["result_data"]["weekly_menu"]["location"] = VENUE_NAMES[building_id]
else:
response["result_data"]["Document"]["location"] = v2_response["result_data"]["days"][0]["cafes"][building_id]["name"]
response["result_data"]["Document"]["tblMenu"] = {"tblDayPart": get_meals(v2_response, building_id)}
response["result_data"]["weekly_menu"]["location"] = v2_response["result_data"]["days"][0]["cafes"][building_id]["name"]
response["result_data"]["weekly_menu"]["menus"] = {"meals": get_meals(v2_response, building_id)}
return response

def menu_weekly(self, building_id):
Expand All @@ -203,16 +194,16 @@ def menu_weekly(self, building_id):
>>> commons_week = din.menu_weekly("593")
"""
din = DiningV2(self.bearer, self.token)
response = {'result_data': {'Document': {}}}
response = {'result_data': {'weekly_menu': {}}}
days = []
for i in range(7):
date = str(datetime.date.today() + datetime.timedelta(days=i))
v2_response = din.menu(building_id, date)
if building_id in VENUE_NAMES:
response["result_data"]["Document"]["location"] = VENUE_NAMES[building_id]
response["result_data"]["weekly_menu"]["location"] = VENUE_NAMES[building_id]
else:
response["result_data"]["Document"]["location"] = v2_response["result_data"]["days"][0]["cafes"][building_id]["name"]
response["result_data"]["weekly_menu"]["location"] = v2_response["result_data"]["days"][0]["cafes"][building_id]["name"]
formatted_date = datetime.datetime.strptime(date, '%Y-%m-%d').strftime('%-m/%d/%Y')
days.append({"tblDayPart": get_meals(v2_response, building_id), "menudate": formatted_date})
response["result_data"]["Document"]["tblMenu"] = days
days.append({"meals": get_meals(v2_response, building_id), "menudate": formatted_date})
response["result_data"]["weekly_menu"]["menus"] = days
return normalize_weekly(response)
12 changes: 6 additions & 6 deletions tests/dining_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def test_dining(self):
def test_dining_normalization(self):
data = self.din.menu_daily("593")
self.assertTrue(isinstance(
data["result_data"]["Document"]["tblMenu"]["tblDayPart"], list))
data["result_data"]["weekly_menu"]["menus"]["meals"], list))

def test_dining_venue_normalization(self):
data = self.din.venues()
Expand All @@ -37,21 +37,21 @@ def test_weekly_normalization_unit(self):
data = json.loads(json_data)

self.assertTrue(isinstance(
data["result_data"]["Document"]["tblMenu"][0]["tblDayPart"]["tblStation"][6]["tblItem"], dict))
data["result_data"]["weekly_menu"]["menus"][0]["meals"]["stations"][6]["station_items"], dict))

self.assertTrue(isinstance(
data["result_data"]["Document"]["tblMenu"][5]["tblDayPart"][2]["tblStation"], dict))
data["result_data"]["weekly_menu"]["menus"][5]["meals"][2]["stations"], dict))

new_data = dining.normalize_weekly(data)

self.assertTrue(isinstance(
new_data["result_data"]["Document"]["tblMenu"][0]["tblDayPart"][0]["tblStation"][6]["tblItem"], list))
new_data["result_data"]["weekly_menu"]["menus"][0]["meals"][0]["stations"][6]["station_items"], list))

self.assertTrue(isinstance(
new_data["result_data"]["Document"]["tblMenu"][5]["tblDayPart"][2]["tblStation"], list))
new_data["result_data"]["weekly_menu"]["menus"][5]["meals"][2]["stations"], list))

self.assertTrue(isinstance(
new_data["result_data"]["Document"]["tblMenu"][0]["tblDayPart"], list))
new_data["result_data"]["weekly_menu"]["menus"][0]["meals"], list))


class TestDiningV2(unittest.TestCase):
Expand Down