Merge pull request #335 from CodeForPhilly/312-sort-order

312 sort order

Author: c-simpson

src/client/src/pages/DataView360/Search/Search.js

@@ -18,7 +18,7 @@ import {
     CircularProgress
 } from '@material-ui/core';
 
-import _ from 'lodash';
+import _, { lowerCase } from 'lodash';
 import SearchBar from './components/SearchBar';
 import {formatPhoneNumber} from "../../../utils/utils";
 import Grid from "@material-ui/core/Grid";
@@ -104,14 +104,24 @@ class Search360 extends Component {
             })
     }
 
+    namesToLowerCase(participant) {
+        let first_name = participant.first_name
+        let last_name = participant.last_name
+
+        return {
+            ...participant, 
+            lower_first_name: lowerCase(first_name),
+            lower_last_name: lowerCase(last_name)
+        }
+    }
+
     renderParticipantsTable() {
         const {classes} = this.props;
         const tableRowColors = [classes.tableRowEven, classes.tableRowOdd]
 
-        let participantListGrouped = _.groupBy(this.state.participantList, "matching_id");
-        participantListGrouped = _.reverse(_.sortBy(participantListGrouped, matching_group => {
-            return _.size(matching_group);
-        }));
+        let participantListGrouped = _.map(this.state.participantList, this.namesToLowerCase)
+        participantListGrouped = _.groupBy(participantListGrouped, "matching_id");
+        participantListGrouped = _.orderBy(participantListGrouped, ['0.lower_last_name', '0.lower_first_name']);
 
         return (
             <Grid container direction={"column"} justify={"center"}>

src/server/api/common_api.py

@@ -48,12 +48,13 @@ def get_contacts(search_text):
         if len(names) == 2:
             query = text("select * from pdp_contacts where archived_date is null AND ( \
                 (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)) )")
+                OR (lower(first_name) like lower(:name2) and lower(last_name) like lower(:name1)) )\
+                    order by lower(last_name), lower(first_name)")
             query_result = connection.execute(query, name1='{}%'.format(names[0]), name2='{}%'.format(names[1]))
         elif len(names) == 1:
             query = text("select * from pdp_contacts \
                 WHERE lower(first_name) like lower(:search_text) \
-                OR lower(last_name) like lower(:search_text)")
+                OR lower(last_name) like lower(:search_text) order by lower(last_name), lower(first_name)")
             query_result = connection.execute(query, search_text='{}%'.format(search_text))
 
         query_result_json = [dict(row) for row in query_result]