Complaint sorting implemented

Author: RamiMatar

app/__init__.py

@@ -117,12 +117,22 @@ def getBBLDetails():
 	open_complaints = complaints[0]
 	closed_complaints = complaints[1]
 	number = complaints[2]
-
+ 
+	keywords = [['Administrative'],['Environmental'],['Safety']]
+ 
 	returnData = {}
 	returnData["address"] = address
 	returnData["open_complaints"] = open_complaints
 	returnData["closed_complaints"] = closed_complaints
 	returnData["number"] = number
+ 
+	allComplaints = open_complaints
+	allComplaints.extend(closed_complaints)
+	sortedComplaints = NYCDBWrapper.sortComplaints(allComplaints, keywords)
+	returnData["Administrative"] = sortedComplaints[0]
+	returnData["Environmental"] = sortedComplaints[1]
+	returnData["Safety"] = sortedComplaints[2]
+	
 
 	return returnData
 

app/modules/NYCDBWrapper.py

@@ -61,5 +61,16 @@ def getBBL(building, street, borough):
 	return (data['address']['bbl'])
 
 
+def sortComplaints(complaints, keywords):
+    # complaints is a list of all the complaints, open_complaints and closed_complaints from cleanComplaints()
+    # keywords is a list of 3 lists, keywords[0] is the list of Administrative keywords, 1- Environmental, 2- Safety.
+    toReturn = [[],[],[]]
+    for complaint in complaints:
+        for i, category in enumerate(keywords):
+            for keyword in category:
+                if keyword in complaint['Description']:
+                    toReturn[i].append(complaint)
+    return toReturn 
+    
 def getSameComplaints(user_id):
     return None

app/static/js/components/Dashboard.js

@@ -81,13 +81,13 @@ export default class Dashboard extends React.Component {
             <div className="lowerPortion">
               <Row>
                   <Col>
-                    <ComplaintCard header={"Administrative"} data={open_complaints} />
+                    <ComplaintCard header={"Administrative"} data={Administrative} />
                   </Col>
                   <Col>
-                    <ComplaintCard header={"Environmental"} data={closed_complaints} />
+                    <ComplaintCard header={"Environmental"} data={Environmental} />
                   </Col>
                   <Col>
-                  <ComplaintCard header={"Safety"} data={closed_complaints} />
+                  <ComplaintCard header={"Safety"} data={Safety} />
                   </Col>
               </Row>
             </div>

tests.py

@@ -74,6 +74,15 @@ def test_find_all_complaints(self):
         self.assertIsNotNone(complaints[1])
         # Check if closed and open complaints are both not null
 
+    def test_complaint_sort(self):
+        testBBL = 1019610057
+        complaints = NYCDBWrapper.findAllComplaints(testBBL)
+        complaints[0].extend(complaints[1])
+        print(complaints[0])
+        keywords = [['Administrative'],['Environmental'],['Safety']]
+        sorted_complaints = NYCDBWrapper.sortComplaints(complaints[0],keywords)
+        self.assertIsNotNone(sorted_complaints)
+        
     def test_find_new_complaints(self):
         testBBL = 1019610057
         start_date = "2010-01-22T16:04:13"