Filter out non-courtdoc messages from eventbus less aggressively

nationalarchives · Oct 9, 2023 · 4d6d5c9 · 4d6d5c9
1 parent c27376b
commit 4d6d5c9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/aws_examples/sns/parsed-judgment-v2.json b/aws_examples/sns/parsed-judgment-v2.json
@@ -1,6 +1,6 @@
 {
   "properties": {
-    "messageType": "uk.gov.nationalarchives.tre.messages.courtdocumentpackage.available.CourtDocumentPackageAvailable",
+    "messageType": "uk.gov.nationalarchives.da.messages.courtdocumentpackage.available.CourtDocumentPackageAvailable",
     "timestamp": "2023-06-28T09:09:25.670688Z",
     "function": "staging-tre-court-document-pack-lambda",
     "producer": "TRE",

diff --git a/ds-caselaw-ingester/lambda_function.py b/ds-caselaw-ingester/lambda_function.py
@@ -95,6 +95,9 @@ def save_s3_response(self, sqs_client, s3_client):
 
         return filename
 
+    def is_valid_ingester_message(self):
+        return True
+
 
 class V2Message(Message):
     def is_v1(self):
@@ -120,13 +123,25 @@ def save_s3_response(self, sqs_client, s3_client):
         print(f"tar.gz saved locally as {filename}")
         return filename
 
+    def is_valid_ingester_message(self):
+        message_type = self.message["properties"]["messageType"]
+        print(f"Message type: {message_type}")
+        return (
+            message_type
+            == "uk.gov.nationalarchives.da.messages.courtdocumentpackage.available.CourtDocumentPackageAvailable"
+        )
+
 
 class ReportableException(Exception):
     def __init__(self, *args, **kwargs):
         rollbar.report_message("Something happened!", "warning", str(self))
         super().__init__(*args, **kwargs)
 
 
+class WrongMessageTypeError(ReportableException):
+    pass
+
+
 class S3HTTPError(ReportableException):
     pass
 
@@ -413,6 +428,10 @@ def unpublish_updated_judgment(uri):
 def handler(event, context):
     message = Message.from_event(event)
 
+    if message.is_valid_ingester_message():
+        print("Message type is not valid for ingestion. Skipping.")
+        return
+
     consignment_reference = message.get_consignment_reference()
     print(f"Ingester Start: Consignment reference {consignment_reference}")
     print(f"Received Message: {message.message}")

diff --git a/ds-caselaw-ingester/tests.py b/ds-caselaw-ingester/tests.py
@@ -26,7 +26,7 @@
     {
         "properties": {
             "messageType":
-                "uk.gov.nationalarchives.tre.messages.judgmentpackage.available.JudgmentPackageAvailable",
+                "uk.gov.nationalarchives.da.messages.courtdocumentpackage.available.CourtDocumentPackageAvailable",
             "timestamp": "2023-05-15T09:14:53.791409Z",
             "function": "staging-tre-judgment-packer-lambda",
             "producer": "TRE",