From 028a854422a5dc38b05cc29dcc5e928b8e720edb Mon Sep 17 00:00:00 2001
From: Jason Owen <jason.a.owen@gmail.com>
Date: Tue, 21 Feb 2017 17:55:40 -0500
Subject: [PATCH] Add "my batch" filter

Issue #3 add filters
---
 faces.py               | 25 +++++++++++++++++++++++++
 src/components/next.js |  1 +
 2 files changed, 26 insertions(+)

diff --git a/faces.py b/faces.py
index fe44d5c..f51819a 100644
--- a/faces.py
+++ b/faces.py
@@ -129,6 +129,29 @@ def get_random_overlapping(cursor, current_user):
                    [current_user])
     return cursor.fetchone()
 
+def get_random_in_batch(cursor, current_user):
+    """Find a random person from the database that is in (one of) the current
+    user's batch(es)."""
+    cursor.execute("""WITH user_batch AS (
+                        SELECT batch_id
+                        FROM stints
+                        WHERE person_id = %s
+                      )
+                      SELECT people.person_id,
+                             people.first_name,
+                             people.middle_name,
+                             people.last_name,
+                             people.image_url
+                      FROM people
+                        INNER JOIN stints
+                          ON people.person_id = stints.person_id
+                        INNER JOIN user_batch
+                          ON stints.batch_id = user_batch.batch_id
+                      ORDER BY random()
+                      LIMIT 1""",
+                   [current_user])
+    return cursor.fetchone()
+
 @app.route('/api/people/random')
 @needs_authorization
 def get_random_person():
@@ -145,6 +168,8 @@ def get_random_person():
         random_person = get_random_person_from_all_batches(cursor, current_user)
     elif random_person_filter == 'overlapping':
         random_person = get_random_overlapping(cursor, current_user)
+    elif random_person_filter == 'my_batch':
+        random_person = get_random_in_batch(cursor, current_user)
     else:
         return (jsonify({
             'message': 'Unrecognized filter',
diff --git a/src/components/next.js b/src/components/next.js
index 655fbd4..352ca1e 100644
--- a/src/components/next.js
+++ b/src/components/next.js
@@ -19,6 +19,7 @@ class Next extends Component {
         <select name="filter" ref={input => this._selection = input}>
           <option value="all">Everyone</option>
           <option value="overlapping">At RC with me</option>
+          <option value="my_batch">My batch</option>
         </select>
         <input type="submit" value="Next!" label="Next!" />
       </form>