From 3705adfeeb7ec9bf25275eab214c134ae289b7cc Mon Sep 17 00:00:00 2001 From: Ben Burwell Date: Sun, 28 Jul 2019 14:40:18 -0400 Subject: Add brewery_id, id to BeerInfo --- app.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'app.py') diff --git a/app.py b/app.py index aff30aa..aea7cff 100644 --- a/app.py +++ b/app.py @@ -35,8 +35,7 @@ def get_brewery_list(brewery_id): @app.route('/brewery//', methods=['GET', 'POST']) def get_beer_details(brewery_id, beer_id): - beer_result, brewery_name = beer_lookup(brewery_id, beer_id) - beerinfo = BeerInfo(beer_result, brewery_name, brewery_id + '-' +beer_id) + beerinfo = beer_lookup(brewery_id, beer_id) attrs = ['Burnt', 'Bready', 'Malty', 'Dark', 'Floral', 'Hoppy', 'Dank', 'Grassy', 'Boozy', 'Warming', 'Bitter', 'Wheaty', 'Sour', 'Barnyardy', 'Woody', 'Smoky', 'Roasty', 'Yeasty', 'Sweet', @@ -52,10 +51,11 @@ def get_beer_details(brewery_id, beer_id): def beer_lookup(brewery_id, beer_id): - item_id = brewery_id + "-" + beer_id try: + item_id = brewery_id + "-" + beer_id beer_result = beer[item_id] - return beer_result, brewery_names[brewery_id] + brewer = brewery_names[brewery_id] + return BeerInfo(beer_id, brewery_id, beer_result, brewer) except: return None @@ -68,15 +68,16 @@ def find_beers_from_brewery(brewery_id): class BeerInfo(object): - def __init__(self, item_json, brewery_name, beer_id): - self._id = beer_id + def __init__(self, beer_id, brewery_id, item_json, brewery_name): + self.id = beer_id + self.brewery_id = brewery_id self.parent_style = item_json[1][1] self.base_style = item_json[1][0] self.name = item_json[0] self.abv = item_json[2] self.brewer = brewery_name self.num_reviews = item_json[3] - self.drinks_like = get_drinks_like(self._id) + self.drinks_like = get_drinks_like(brewery_id + '-' + beer_id) class Brewery(object): -- cgit v1.2.3