Merge pull request #16 from bellisk/feat/add-contact-point-to-delete-email

feat: add object_id to dict so that we can retrieve information about…

Author: stefina

ckanext/subscribe/notification.py

@@ -380,7 +380,8 @@ def send_emails(notifications_by_email, deletions_by_email):
             code, email, notifications, "notification"
         )
     for email, notifications in deletions_by_email.items():
-        code = email_auth.create_code(email)
-        notification_email.send_notification_email(
-            code, email, notifications, "deletion"
-        )
+        for notification in notifications:
+            code = email_auth.create_code(email)
+            notification_email.send_notification_email(
+                code, email, [notification], "deletion"
+            )

ckanext/subscribe/notification_email.py

@@ -56,6 +56,7 @@ def get_notification_email_vars(code, email, notifications):
                     timestamp=p.toolkit.h.date_str_to_datetime(activity["timestamp"]),
                     dataset_link=dataset_link_from_activity(activity),
                     dataset_href=dataset_href_from_activity(activity),
+                    dataset_id=activity["object_id"],
                 )
             )
         # get the package/group's name & title

ckanext/subscribe/tests/test_notification_email.py

@@ -144,6 +144,7 @@ def test_basic(self):
                     "activities": [
                         {
                             "activity_type": u"new dataset",
+                            "dataset_id": dataset["id"],
                             "dataset_href": "http://test.ckan.net/dataset/{}".format(
                                 dataset["name"]
                             ),
@@ -187,6 +188,7 @@ def test_group(self):
                     "activities": [
                         {
                             "activity_type": u"new group",
+                            "dataset_id": group["id"],
                             "dataset_href": u"",
                             "dataset_link": u"",
                             "timestamp": activity.timestamp,
@@ -224,6 +226,7 @@ def test_org(self):
                     "activities": [
                         {
                             "activity_type": u"new organization",
+                            "dataset_id": org["id"],
                             "dataset_href": u"",
                             "dataset_link": u"",
                             "timestamp": activity.timestamp,