refactor: prepare for merchant active/disable state

services.py

@@ -371,25 +371,13 @@ async def _handle_incoming_dms(
     else:
         await increment_customer_unread_messages(merchant.id, event.pubkey)
 
-    dm_reply = await _handle_dirrect_message(
+    dm_type, json_data = PartialDirectMessage.parse_message(clear_text_msg)
-        merchant.id,
+    new_dm = await _persist_dm(merchant.id, dm_type.value, event.pubkey, event.id, event.created_at, clear_text_msg)
-        merchant.public_key,
+
-        event.pubkey,
+    if json_data:
-        event.id,
+        dm_reply = await _handle_incoming_structured_dm(merchant, new_dm, json_data)
-        event.created_at,
+        if dm_reply:
-        clear_text_msg,
+            await _reply_to_structured_dm(merchant, event, dm_reply)
-    )
-    if dm_reply:
-        dm_event = merchant.build_dm_event(dm_reply, event.pubkey)
-        dm = PartialDirectMessage(
-            event_id=dm_event.id,
-            event_created_at=dm_event.created_at,
-            message=dm_reply,
-            public_key=event.pubkey,
-            type=DirectMessageType.PAYMENT_REQUEST.value,
-        )
-        await create_direct_message(merchant.id, dm)
-        await nostr_client.publish_nostr_event(dm_event)
 
 
 async def _handle_outgoing_dms(
@@ -408,37 +396,15 @@ async def _handle_outgoing_dms(
         await create_direct_message(merchant.id, dm)
 
 
-async def _handle_dirrect_message(
+async def _handle_incoming_structured_dm(merchant: Merchant, dm: DirectMessage, json_data) -> Optional[str]:
-    merchant_id: str,
-    merchant_public_key: str,
-    from_pubkey: str,
-    event_id: str,
-    event_created_at: int,
-    msg: str,
-) -> Optional[str]:
-    type, order = PartialDirectMessage.parse_message(msg)
     try:
-        dm = PartialDirectMessage(
+        if dm.type == DirectMessageType.CUSTOMER_ORDER.value:
-            event_id=event_id,
+        # and merchant.config.active:
-            event_created_at=event_created_at,
+            json_data["public_key"] = dm.public_key
-            message=msg,
+            json_data["merchant_public_key"] = merchant.public_key
-            public_key=from_pubkey,
+            json_data["event_id"] = dm.event_id
-            incoming=True,
+            json_data["event_created_at"] = dm.event_created_at
-            type=type.value,
+            return await _handle_new_order(PartialOrder(**json_data))
-        )
-        new_dm = await create_direct_message(merchant_id, dm)
-        # todo: do the same for new order
-        await websocketUpdater(
-            merchant_id,
-            json.dumps({"type": "new-direct-message", "customerPubkey": from_pubkey, "data": new_dm.dict()}),
-        )
-
-        if type == DirectMessageType.CUSTOMER_ORDER:
-            order["public_key"] = from_pubkey
-            order["merchant_public_key"] = merchant_public_key
-            order["event_id"] = event_id
-            order["event_created_at"] = event_created_at
-            return await _handle_new_order(PartialOrder(**order))
 
         return None
     except Exception as ex:
@@ -446,6 +412,37 @@ async def _handle_dirrect_message(
         return None
 
 
+async def _persist_dm(merchant_id: str, dm_type: str, from_pubkey:str, event_id:str, event_created_at: int, msg: str) -> DirectMessage:
+    dm = PartialDirectMessage(
+            event_id=event_id,
+            event_created_at=event_created_at,
+            message=msg,
+            public_key=from_pubkey,
+            incoming=True,
+            type=dm_type,
+        )
+    new_dm = await create_direct_message(merchant_id, dm)
+
+    await websocketUpdater(
+        merchant_id,
+        json.dumps({"type": "new-direct-message", "customerPubkey": from_pubkey, "data": new_dm.dict()}),
+    )
+    return new_dm
+
+async def _reply_to_structured_dm(merchant: Merchant, event: NostrEvent,  dm_reply: str):
+    dm_event = merchant.build_dm_event(dm_reply, event.pubkey)
+    dm = PartialDirectMessage(
+            event_id=dm_event.id,
+            event_created_at=dm_event.created_at,
+            message=dm_reply,
+            public_key=event.pubkey,
+            type=DirectMessageType.PAYMENT_REQUEST.value,
+        )
+    await create_direct_message(merchant.id, dm)
+    await nostr_client.publish_nostr_event(dm_event)
+
+
+
 async def _handle_new_order(order: PartialOrder) -> Optional[str]:
     order.validate_order()