one table approach - API for 360 return contacts. still missing shifts/donations/adoptions

Author: urirot

src/server/api/common_api.py

@@ -11,7 +11,7 @@ def get_contacts(search_text):
 
         names = search_text.split(" ")
         if len(names) == 2:
-            query = text("select * from pdp_contacts \
+            query = text("select * from pdp_contacts where archived_date is null AND\
                 where lower(first_name) like lower(:name1) and lower(last_name) like lower(:name2) \
                 OR lower(first_name) like lower(:name2) and lower(last_name) like lower(:name1)")
             query_result = connection.execute(query, name1='{}%'.format(names[0]), name2='{}%'.format(names[1]))
@@ -28,61 +28,33 @@ def get_contacts(search_text):
         return results
 
 
-@common_api.route('/api/360/<master_id>', methods=['GET'])
-def get_360(master_id):
+@common_api.route('/api/360/<matching_id>', methods=['GET'])
+def get_360(matching_id):
     result = {}
 
     with engine.connect() as connection:
-        #Master Table
-        query = text("select * from master where _id = :master_id")
-        query_result = connection.execute(query, master_id=master_id)
-        #todo: this shouldn't loop so eliminate the for
-        master_row = query_result.fetchone()
-
-        if master_row:
-            #Salesforce
-            salesforcecontacts_id = master_row['salesforcecontacts_id']
-
-            if salesforcecontacts_id:
-                query = text("select * from salesforcecontacts where contact_id = :salesforcecontacts_id")
-                query_result = connection.execute(query, salesforcecontacts_id=salesforcecontacts_id)
-                salesforce_results = [dict(row) for row in query_result]
-
-                if salesforce_results:
-                    result['salesforcecontacts'] = salesforce_results[0]
-
-                query = text("select * from salesforcedonations where contact_id = :salesforcecontacts_id")
-                query_result = connection.execute(query, salesforcecontacts_id=salesforcecontacts_id)
-                salesforcedonations_results = [dict(row) for row in query_result]
-
-                if salesforcedonations_results:
-                    result['salesforcedonations'] = salesforcedonations_results
+        query = text("select * from pdp_contacts where matching_id = :matching_id and archived_date is null")
+        query_result = connection.execute(query, matching_id=matching_id)
 
-            #Shelterluv
-            shelterluvpeople_id = master_row['shelterluvpeople_id']
-
-            if shelterluvpeople_id:
-                query = text("select * from shelterluvpeople where id = :shelterluvpeople_id")
-                query_result = connection.execute(query, shelterluvpeople_id=shelterluvpeople_id)
-                shelterluvpeople_results = [dict(row) for row in query_result]
-
-                if shelterluvpeople_results:
-                    result['shelterluvpeople'] = shelterluvpeople_results
-
-            #Volgistics
-            volgistics_id = master_row['volgistics_id']
-
-            if volgistics_id:
-                query = text("select * from volgistics where number = :volgistics_id")
-                query_result = connection.execute(query, volgistics_id=volgistics_id)
-                volgistics_results = [dict(row) for row in query_result]
+        result["contact_details"] = [dict(row) for row in query_result]
+        result["shifts"] = []
+        result["donations"] = []
+        result["adoptions"] = []
 
+        # todo: complete retrieving details for response
+        for row in query_result:
+            if row["source_type"] == "volgistics":
                 query = text("select * from volgisticsshifts where number = :volgistics_id")
-                query_result = connection.execute(query, volgistics_id=volgistics_id)
-                volgistics_shifts_results = [dict(row) for row in query_result]
+                query_result = connection.execute(query, volgistics_id=row["source_id"])
+                result["shifts"] += [dict(row) for row in query_result]
+
+        '''
+        query = text("select * from salesforcedonations where contact_id = :salesforcecontacts_id")
+        query_result = connection.execute(query, salesforcecontacts_id=salesforcecontacts_id)
+        salesforcedonations_results = [dict(row) for row in query_result]
 
-                if volgistics_results:
-                    result['volgistics'] = volgistics_results[0]
-                    result['volgistics_shifts_results'] = volgistics_shifts_results
+        if salesforcedonations_results:
+            result['salesforcedonations'] = salesforcedonations_results
+        '''
 
-            return jsonify(result)
+        return jsonify({'result': result})