mesh-2433 remove duplicate code

Author: james-bradley-nhs

src/mesh_sandbox/common/constants.py

@@ -45,6 +45,8 @@ class Headers:
     Mex_AddressType = "mex-AddressType"
 
 
+MESSAGE_IN_INBOX_EXPIRY_IN_DAYS = 5
+
 # Error codes
 ERROR_INVALID_FROM_ADDRESS: Final = "Invalid From Address"
 ERROR_MISSING_TO_ADDRESS: Final = "TO_DTS missing"

src/mesh_sandbox/common/exceptions.py

@@ -1,10 +1,8 @@
 from typing import Any, Optional, Union
-from uuid import uuid4
 
-from mesh_sandbox.models.mailbox import Mailbox
 from mesh_sandbox.views.admin import CreateReportRequest
 
-from ..models.message import Message, MessageEvent, MessageMetadata, MessageParty, MessageStatus, MessageType
+from ..models.message import MessageEvent, MessageMetadata, MessageStatus
 from . import constants
 
 
@@ -52,7 +50,7 @@ def try_parse_error(detail: Union[str, dict, None] = None, message_id: Optional[
 
 
 def get_ndr_error() -> dict:
-    expiry_period = 5
+    expiry_period = constants.MESSAGE_IN_INBOX_EXPIRY_IN_DAYS
     error_description = parse_error(
         detail=constants.ERROR_UNDELIVERED_MESSAGE,
         format_params=(expiry_period,),
@@ -61,55 +59,26 @@ def get_ndr_error() -> dict:
     return error_description
 
 
-def create_ndr(request: CreateReportRequest, recipient: Mailbox) -> Message:
+def create_ndr_event(request: CreateReportRequest) -> MessageEvent:
     error_description = get_ndr_error()
-    report = create_error_report(request, error_description, recipient)
-    return report
-
-
-def create_error_report(request: CreateReportRequest, error_description: dict, recipient: Mailbox) -> Message:
 
     error_code = error_description.get("errorCode")
     error_event = error_description.get("errorEvent")
     error_message = error_description.get("errorDescription")
 
+    return MessageEvent(
+        status=MessageStatus.ERROR,
+        code=error_code,
+        event=error_event,
+        description=error_message,
+        linked_message_id=request.linked_message_id,
+    )
+
+
+def create_ndr_metadata(request: CreateReportRequest) -> MessageMetadata:
     subject = "NDR" if not request.subject else f"NDR: {request.subject}"
 
-    metadata = MessageMetadata(
+    return MessageMetadata(
         subject=subject,
         local_id=request.local_id,
     )
-
-    return Message(
-        events=[
-            MessageEvent(status=MessageStatus.ACCEPTED),
-            MessageEvent(
-                status=MessageStatus.ERROR,
-                code=error_code,
-                event=error_event,
-                description=error_message,
-                linked_message_id=request.linked_message_id,
-            ),
-        ],
-        message_id=uuid4().hex.upper(),
-        sender=MessageParty(
-            mailbox_id="",
-            mailbox_name="Central System Mailbox",
-            ods_code="X26",
-            org_code="X26",
-            org_name="NHS England",
-            billing_entity="England",
-        ),
-        recipient=MessageParty(
-            mailbox_id=recipient.mailbox_id,
-            mailbox_name=recipient.mailbox_name,
-            ods_code=recipient.ods_code,
-            org_code=recipient.org_code,
-            org_name=recipient.org_name,
-            billing_entity=recipient.billing_entity,
-        ),
-        total_chunks=0,
-        message_type=MessageType.REPORT,
-        workflow_id=request.workflow_id,
-        metadata=metadata,
-    )

src/mesh_sandbox/handlers/admin.py

@@ -3,7 +3,7 @@
 
 from fastapi import BackgroundTasks, Depends, HTTPException, status
 
-from mesh_sandbox.common.exceptions import create_ndr
+from mesh_sandbox.common.exceptions import create_ndr_event, create_ndr_metadata
 
 from ..common.messaging import Messaging
 from ..dependencies import get_messaging
@@ -53,45 +53,49 @@ async def create_report(self, request: CreateReportRequest, background_tasks: Ba
         assert request.status in (MessageStatus.UNDELIVERABLE, MessageStatus.ERROR)
 
         if request.status == MessageStatus.UNDELIVERABLE:
-            message = create_ndr(request, recipient)
+            message_event = create_ndr_event(request)
+            message_metadata = create_ndr_metadata(request)
         else:
-            message = Message(
-                events=[
-                    MessageEvent(status=MessageStatus.ACCEPTED),
-                    MessageEvent(
-                        status=request.status,
-                        event="TRANSFER",
-                        code=request.code,
-                        description=request.description,
-                        linked_message_id=request.linked_message_id,
-                    ),
-                ],
-                message_id=uuid4().hex.upper(),
-                sender=MessageParty(
-                    mailbox_id="",
-                    mailbox_name="Central System Mailbox",
-                    ods_code="X26",
-                    org_code="X26",
-                    org_name="NHS England",
-                    billing_entity="England",
-                ),
-                recipient=MessageParty(
-                    mailbox_id=recipient.mailbox_id,
-                    mailbox_name=recipient.mailbox_name,
-                    ods_code=recipient.ods_code,
-                    org_code=recipient.org_code,
-                    org_name=recipient.org_name,
-                    billing_entity=recipient.billing_entity,
-                ),
-                total_chunks=0,
-                message_type=MessageType.REPORT,
-                workflow_id=request.workflow_id,
-                metadata=MessageMetadata(
-                    subject=request.subject,
-                    local_id=request.local_id,
-                    file_name=request.file_name,
-                ),
+            message_event = MessageEvent(
+                status=request.status,
+                event="TRANSFER",
+                code=request.code,
+                description=request.description,
+                linked_message_id=request.linked_message_id,
             )
+            message_metadata = MessageMetadata(
+                subject=request.subject,
+                local_id=request.local_id,
+                file_name=request.file_name,
+            )
+
+        message = Message(
+            events=[
+                MessageEvent(status=MessageStatus.ACCEPTED),
+                message_event,
+            ],
+            message_id=uuid4().hex.upper(),
+            sender=MessageParty(
+                mailbox_id="",
+                mailbox_name="Central System Mailbox",
+                ods_code="X26",
+                org_code="X26",
+                org_name="NHS England",
+                billing_entity="England",
+            ),
+            recipient=MessageParty(
+                mailbox_id=recipient.mailbox_id,
+                mailbox_name=recipient.mailbox_name,
+                ods_code=recipient.ods_code,
+                org_code=recipient.org_code,
+                org_name=recipient.org_name,
+                billing_entity=recipient.billing_entity,
+            ),
+            total_chunks=0,
+            message_type=MessageType.REPORT,
+            workflow_id=request.workflow_id,
+            metadata=message_metadata,
+        )
 
         await self.messaging.send_message(message=message, body=b"", background_tasks=background_tasks)