Add view for recipe type

src/humulus/designs/recipes.json

@@ -10,6 +10,9 @@
     },
     "by-volume": {
       "map": "function (doc) {\n  if (doc.$type == \"recipe\" && doc.volume && doc.name) {\n    emit(doc.volume, doc.name)\n  }\n}"
+    },
+    "by-type": {
+      "map": "function (doc) {\n  if (doc.$type == \"recipe\" && doc.type && doc.name) {\n    emit(doc.type, doc.name)\n  }\n}"
     }
   },
   "lists": {},

src/humulus/recipes.py

@@ -262,12 +262,7 @@ def index():
         ['true', 'yes']
     )
     sort_by = request.args.get('sort_by', default='name', type=str)
-    if sort_by == 'date':
+    view = get_view('_design/recipes', 'by-{}'.format(sort_by))
-        view = get_view('_design/recipes', 'by-date')
-    elif sort_by == 'volume':
-        view = get_view('_design/recipes', 'by-volume')
-    else:
-        view = get_view('_design/recipes', 'by-name')
 
     return render_template(
         'recipes/index.html',

src/humulus/templates/recipes/index.html

@@ -49,6 +49,15 @@
         <a class="text-dark" href="{{ url_for('recipes.index', descending='false', sort_by='volume') }}">Batch Size</a>
         {% endif %}
       </th>
+      <th>
+        {% if sort_by == 'type' and descending %}
+        <a class="text-dark" href="{{ url_for('recipes.index', descending='false', sort_by='type') }}">Type &darr;</a>
+        {% elif sort_by == 'type' %}
+        <a class="text-dark" href="{{ url_for('recipes.index', descending='true', sort_by='type') }}">Type &uarr;</a>
+        {% else %}
+        <a class="text-dark" href="{{ url_for('recipes.index', descending='false', sort_by='type') }}">Type</a>
+        {% endif %}
+      </th>
       <th>
         {% if sort_by == 'date' and descending %}
         <a class="text-dark" href="{{ url_for('recipes.index', descending='false', sort_by='date') }}">Created On &darr;</a>
@@ -64,6 +73,7 @@
   <tr>
     <td><a href="{{ url_for('recipes.info', id=row.id) }}">{{ row.doc.name }}</a></td>
     <td>{{ row.doc.volume }} gal.</td>
+    <td>{{ row.doc.type }}</td>
     <td>{{ moment(row.doc.created) }}</td>
   </tr>
   {% endfor %}

tests/test_recipes.py

@@ -93,6 +93,27 @@ def test_index(client):
         response.data
     )
 
+    # Test sort by type ascending
+    response = client.get('/recipes/?descending=false&sort_by=type')
+    assert (
+        b'"/recipes/?descending=false&sort_by=name">Name' in
+        response.data
+    )
+    assert (
+        b'"/recipes/?descending=true&sort_by=type">Type ↑' in
+        response.data
+    )
+
+    # Test sort by type descending
+    response = client.get('/recipes/?descending=true&sort_by=type')
+    assert (
+        b'"/recipes/?descending=false&sort_by=name">Name' in
+        response.data
+    )
+    assert (
+        b'"/recipes/?descending=false&sort_by=type">Type ↓' in
+        response.data
+    )
 
 def test_create(client, app, auth):
     """Test success in creating a recipe document."""