Merge branch 'master' of gitlab.com:uncel_dolan/similar-beer

1 files changed, 16 insertions, 14 deletions

diff --git a/app.py b/app.py
index 21c487b..122e8c0 100644
--- a/app.py
+++ b/app.py
@@ -78,35 +78,37 @@ def get_beer_details(brewery_id, beer_id):
         item_result, item_brewer = beer_lookup(item)
         similar_beer_objects.append(BeerInfo(item, item_brewer, item_result))
 
-    if request.method == 'POST':
+    kwargs = {
+            "beer_data": beerinfo,
+            "attrs": ATTRS,
+            "similar_beers": similar_beer_objects,
+            "style_preds": similar_beers,
+            "style_map": style_map
+            }
 
+    if request.method == 'POST':
         attr = request.form.get('attr')
         direction = request.form.get('direction')
         style = request.form.get('style')
         if attr != None and direction != None:
+            kwargs['attrs'] = attrs
+            kwargs['direction'] = direction
             attr_beers = translate_to_attr(full_id, attr, int(direction))
             attr_beer_objects = []
             for item in attr_beers:
                 item_result, item_brewer = beer_lookup(item[0])
                 attr_beer_objects.append(BeerInfo(item[0], item_brewer, item_result))
-            return render_template('beerpage.jinja2', beer_data=beerinfo,
-                    attrs=ATTRS, similar_beers=similar_beer_objects, attr=attr,
-                    direction=direction, attr_beers=attr_beer_objects, style_preds=similar_beers,
-                    style_map=style_map)
-        if style != None:
+            kwargs['attr_beers'] = attr_beer_objects
+        elif style != None:
+            kwargs['style'] = style
             style_beers = translate_to_style(full_id, style)
             style_beer_objects = []
             for item in style_beers:
                 item_result, item_brewer = beer_lookup(item[0])
                 style_beer_objects.append(BeerInfo(item[0], item_brewer, item_result))
-            return render_template('beerpage.jinja2', beer_data=beerinfo,
-                    attrs=ATTRS, similar_beers=similar_beer_objects,
-                    style=style, style_beers=style_beer_objects, style_preds=similar_beers,
-                    style_map=style_map)
-
-    return render_template('beerpage.jinja2', beer_data=beerinfo, attrs=ATTRS,
-                           similar_beers=similar_beer_objects, style_preds=similar_beers,
-                           style_map=style_map)
+            kwargs['style_beers'] = style_beer_objects
+
+    return render_template('beerpage.jinja2', **kwargs)
 
 
 def beer_lookup(brewery_id, beer_id=None):