Fixed issue with bcc'ing FOIL Officers on requests

CityOfNewYork · Jul 15, 2016 · 8bbf47f · 8bbf47f
1 parent a6fec4d
commit 8bbf47f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/public_records_portal/notifications.py b/public_records_portal/notifications.py
@@ -38,13 +38,17 @@
 def generate_prr_emails(
         request_id,
         notification_type,
-        notification_content
+        notification_content,
+        department_id = None
 ):
     # 'text=None' is used additional information.
     # 'text2=None' is used if there are more variable text passed into email such as with 'close this request' and being offered multiple reasons
     app.logger.info("def generate_prr_emails")
-    req = Request.query.filter_by(id=request_id).first();
-    dept_id = req.department_id
+    if request_id:
+        req = Request.query.filter_by(id=request_id).first();
+        dept_id = req.department_id
+    else:
+        dept_id = department_id
     user_id = Department.query.filter_by(id=dept_id).first().primary_contact_id
     foil_officer_email = User.query.filter_by(id=user_id).first().email
     bcc = [foil_officer_email]

diff --git a/public_records_portal/prr.py b/public_records_portal/prr.py
@@ -104,12 +104,14 @@ def nonportal_request(request_body):
     notification_content['contact_info'] = contact_info
     generate_prr_emails(request_id=None,
                         notification_type='non-portal-agency_agency',
-                        notification_content=notification_content)
+                        notification_content=notification_content,
+                        department_id=notification_content['department'].id)
 
     notification_content['recipient'] = request_body['request_email']
     generate_prr_emails(request_id=None,
                         notification_type='non-portal-agency_requester',
-                        notification_content=notification_content)
+                        notification_content=notification_content,
+                        department_id=notification_content['department'].id)
     return 1