Merge pull request #118 from open-zaak/revert-101-Issue/Add-Notificat…

…ion-uuid-header-to-outgoing-requests

Revert "Issue/add notification UUID header to outgoing requests"

src/nrc/api/serializers.py

@@ -1,6 +1,5 @@
 import logging
 from typing import Optional
-from uuid import UUID, uuid4
 
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
@@ -176,12 +175,7 @@ def validate(self, attrs):
         # ensure we're still camelCasing
         return camelize(validated_attrs)
 
-    def _send_to_subs(
-        self,
-        msg: dict,
-        notificatie_uuid: UUID,
-        notificatie: Optional[Notificatie] = None,
-    ):
+    def _send_to_subs(self, msg: dict, notificatie: Optional[Notificatie] = None):
         # define subs
         msg_filters = msg["kenmerken"]
         subs = set()
@@ -196,11 +190,7 @@ def _send_to_subs(
         if not notificatie and settings.LOG_NOTIFICATIONS_IN_DB:
             # creation of the notification
             kanaal = Kanaal.objects.get(naam=msg["kanaal"])
-            notificatie = Notificatie.objects.create(
-                uuid=notificatie_uuid, forwarded_msg=msg, kanaal=kanaal
-            )
-
-        msg["uuid"] = str(notificatie_uuid)
+            notificatie = Notificatie.objects.create(forwarded_msg=msg, kanaal=kanaal)
 
         if notificatie:
             task_kwargs.update(
@@ -218,13 +208,9 @@ def create(self, validated_data: dict) -> dict:
         logger.info("Handling notification %r", validated_data)
 
         notificatie = validated_data.pop("notificatie", None)
-        if notificatie:
-            notificatie_uuid = notificatie.uuid
-        else:
-            notificatie_uuid = uuid4()
 
         # send to subs
-        self._send_to_subs(validated_data, notificatie_uuid, notificatie=notificatie)
+        self._send_to_subs(validated_data, notificatie=notificatie)
         return validated_data
 
     @classmethod

src/nrc/api/tests/test_notificatie.py

@@ -62,15 +62,10 @@ def test_notificatie_send_success(self, mock_task):
 
         response = self.client.post(notificatie_url, msg)
 
-        saved_notificatie = Notificatie.objects.get()
-
         self.assertEqual(response.status_code, status.HTTP_201_CREATED, response.data)
         self.assertEqual(Notificatie.objects.count(), 1)
         mock_task.assert_called_once_with(
-            abon.id,
-            {**msg, **{"uuid": str(saved_notificatie.uuid)}},
-            notificatie_id=saved_notificatie.id,
-            attempt=1,
+            abon.id, msg, notificatie_id=Notificatie.objects.get().id, attempt=1
         )
 
     def test_notificatie_send_inconsistent_kenmerken(self, mock_task):
@@ -142,13 +137,9 @@ def test_notificatie_send_empty_kenmerk_value(self, mock_task):
         }
 
         response = self.client.post(notificatie_url, msg)
-        saved_notificatie = Notificatie.objects.get()
 
         self.assertEqual(response.status_code, status.HTTP_201_CREATED, response.data)
         self.assertEqual(Notificatie.objects.count(), 1)
         mock_task.assert_called_once_with(
-            abon.id,
-            {**msg, **{"uuid": str(saved_notificatie.uuid)}},
-            notificatie_id=saved_notificatie.id,
-            attempt=1,
+            abon.id, msg, notificatie_id=Notificatie.objects.get().id, attempt=1
         )

src/nrc/datamodel/admin.py

@@ -102,7 +102,6 @@ def resend_notifications(modeladmin, request, queryset):
 @admin.register(Notificatie)
 class NotificatieAdmin(admin.ModelAdmin):
     list_display = (
-        "uuid",
         "kanaal",
         "action",
         "resource",

src/nrc/datamodel/models.py

@@ -138,11 +138,6 @@ class Meta:
 
 
 class Notificatie(models.Model):
-    uuid = models.UUIDField(
-        unique=True,
-        default=_uuid.uuid4,
-        help_text=_("Unique resource identifier (UUID4)"),
-    )
     forwarded_msg = models.JSONField(encoder=DjangoJSONEncoder)
     kanaal = models.ForeignKey(Kanaal, on_delete=models.CASCADE)
 

src/nrc/tests/admin/test_notifications.py

@@ -63,7 +63,7 @@ def test_create_notification(self, mock_deliver_message):
         # Notification should be sent
         mock_deliver_message.assert_called_once_with(
             self.abonnement.id,
-            {**self.forwarded_msg, **{"uuid": str(Notificatie.objects.get().uuid)}},
+            self.forwarded_msg,
             notificatie_id=Notificatie.objects.get().id,
             attempt=1,
         )
@@ -92,7 +92,7 @@ def test_resend_notification(self, mock_deliver_message):
         # Notification should be scheduled
         mock_deliver_message.assert_called_once_with(
             self.abonnement.id,
-            {**self.forwarded_msg, **{"uuid": str(Notificatie.objects.get().uuid)}},
+            self.forwarded_msg,
             notificatie_id=notificatie.id,
             attempt=2,
         )