Merge branch 'master' of https://github.com/cseg-tech/nyc-housingautomation

Author: raghavmecheri

app/__init__.py

@@ -9,7 +9,7 @@
 # Imported packages
 from sendgrid.helpers.mail import Mail
 from pymongo import MongoClient
-from apscheduler.schedulers.blocking import BlockingScheduler
+from apscheduler.schedulers.background import BackgroundScheduler
 from sendgrid import SendGridAPIClient
 
 # Custom modules
@@ -37,21 +37,16 @@
 #get sendgrid key
 key = Credential.get_sg_key()
 
-'''
+
 sg_key = Credential.get_sg_key()
 
 def cron_job():
 	# Query each user, find out if anyone else has lodged complaints for thier BBL - if so, email them.
-	emailNeeded = True
-	if(emailNeeded):
-		print("sending...")
-		to = "[email protected]"
-		content = "Hi"	
-		send_mail(sg_key, to, content)
-
-scheduler = BlockingScheduler()
+	MongoHelper.iterate_all_users(db, col)
+
+scheduler = BackgroundScheduler()
 scheduler.add_job(cron_job, 'interval', hours=24)
-scheduler.start()'''
+scheduler.start()
 #Ref: https://stackoverflow.com/questions/22715086/scheduling-python-script-to-run-every-hour-accurately
 
 
@@ -192,3 +187,4 @@ def getURL():
 	myKey = Credential.get_places_key()
 	apiString = "https://maps.googleapis.com/maps/api/js?v=3.exp&key={keyVal}&sensor=false&libraries=places".format(keyVal=myKey)
 	return apiString
+

app/modules/MongoHelper.py

@@ -36,6 +36,28 @@ def init_Mongo():
 #get sendgrid key
 key = Credential.get_sg_key()
 
+def iterate_all_users(db, col):
+    
+    returnData = {}
+
+    for x in col.find():
+
+        complaints = getUIDNewComplaints(db, col, x)
+        if complaints:
+            open_complaints = complaints[0]
+            closed_complaints = complaints[1]
+            number = complaints[2]
+
+            emaillist = list(x['email'])
+
+            returnData["open_complaints"] = open_complaints
+            returnData["closed_complaints"] = closed_complaints
+            returnData["number"] = number
+
+        if returnData:
+            Communications.send_email(key, emaillist, '311 Notification – New Complaint(s) Filed', returnData)
+
+
 #remove user from database (only for unit testing purposes)
 def DB_remove_user(col, email):
     cursor = col.find({'email': email})
@@ -110,17 +132,18 @@ def getUIDComplaints(db, col, user_id):
     return "No Complaints Found"
 
 #get complaints for a given user based on the current date 
-def getUIDNewComplaints(db, col, user_id):
-    cursor = col.find({'id' : user_id})
+def getUIDNewComplaints(db, col, doc):
     start_date = datetime.datetime.now()
     end_date = datetime.datetime.now() + datetime.timedelta(1)
-    start_date = start_date.strftime("%m/%d/%Y")
-    end_date = end_date.strftime("%m/%d/%Y")
-    for x in cursor:
-        bbl = x['bbl']
-        result = NYCDBWrapper.findNewComplaints(bbl, start_date, end_date)
-        return result
-    return "No Complaints Found"
+    #start_date = start_date.strftime("%m/%d/%Y")
+    #end_date = end_date.strftime("%m/%d/%Y")
+    
+    bbl = str(doc['bbl'])
+    print(bbl)
+    result = NYCDBWrapper.findDailyComplaints(bbl)
+    return result
+
+    #return "No Complaints Found"
 
 #get address for a given user ID
 def getAddress(db, col, UID):

app/modules/NYCDBWrapper.py

@@ -44,11 +44,13 @@ def findDailyComplaints(bbl):
 	findNewComplaints(bbl, start_date, end_date)
 
 def findNewComplaints(bbl, start_date, end_date):
-    token = Credential.get_nycdb_token()
-    url = "https://data.cityofnewyork.us/resource/erm2-nwe9.json?$$app_token={}&&$where=created_date%20between%20%27{}%27%20and%20%27{}%27&&bbl={}".format(token,start_date, end_date, bbl)
-    with urllib.request.urlopen(url) as r:
-    	data = json.loads(r.read().decode(r.info().get_param('charset') or 'utf-8'))
-    return cleanComplaints(data)
+	token = Credential.get_nycdb_token()
+	url = "https://data.cityofnewyork.us/resource/erm2-nwe9.json?$$app_token={}&&$where=created_date%20between%20%27{}%27%20and%20%27{}%27&&bbl={}".format(token,start_date, end_date, bbl)
+	print(url)
+	with urllib.request.urlopen(url) as r:
+		data = json.loads(r.read().decode(r.info().get_param('charset') or 'utf-8'))
+
+	return cleanComplaints(data)
 
 def getBBL(building, street, borough):
 	appID = Credential.get_nyc_appID()