WIP

temba/channels/android/views.py

@@ -141,7 +141,7 @@ def sync(request, channel_id):
                 if phone and text:
                     try:
                         msg_id = mailroom.get_client().android_message(
-                            channel.org_id, channel.id, phone, text, received_on=date
+                            channel.org, channel, phone, text, received_on=date
                         )
                         extra = dict(msg_id=msg_id)
                     except mailroom.URNValidationException:
@@ -162,8 +162,8 @@ def sync(request, channel_id):
                 if phone and call_tuple not in unique_calls and ChannelEvent.is_valid_type(cmd["type"]):
                     try:
                         mailroom.get_client().android_event(
-                            channel.org_id,
-                            channel.id,
+                            channel.org,
+                            channel,
                             phone,
                             cmd["type"],
                             extra={"duration": duration},

temba/mailroom/client/client.py

@@ -47,28 +47,30 @@ def __init__(self, base_url, auth_token):
     def version(self):
         return self._request("", post=False).get("version")
 
-    def android_event(self, org_id: int, channel_id: int, phone: str, event_type: str, extra: dict, occurred_on):
-        payload = {
-            "org_id": org_id,
-            "channel_id": channel_id,
-            "phone": phone,
-            "event_type": event_type,
-            "extra": extra,
-            "occurred_on": occurred_on.isoformat(),
-        }
-
-        return self._request("android/event", payload)
-
-    def android_message(self, org_id: int, channel_id: int, phone: str, text: str, received_on):
-        payload = {
-            "org_id": org_id,
-            "channel_id": channel_id,
-            "phone": phone,
-            "text": text,
-            "received_on": received_on.isoformat(),
-        }
+    def android_event(self, org, channel, phone: str, event_type: str, extra: dict, occurred_on):
+        return self._request(
+            "android/event",
+            {
+                "org_id": org.id,
+                "channel_id": channel.id,
+                "phone": phone,
+                "event_type": event_type,
+                "extra": extra,
+                "occurred_on": occurred_on.isoformat(),
+            },
+        )
 
-        return self._request("android/message", payload)
+    def android_message(self, org, channel, phone: str, text: str, received_on):
+        return self._request(
+            "android/message",
+            {
+                "org_id": org.id,
+                "channel_id": channel.id,
+                "phone": phone,
+                "text": text,
+                "received_on": received_on.isoformat(),
+            },
+        )
 
     def contact_create(self, org_id: int, user_id: int, contact: ContactSpec):
         payload = {"org_id": org_id, "user_id": user_id, "contact": asdict(contact)}

temba/mailroom/client/tests.py

@@ -37,8 +37,8 @@ def test_version(self):
     def test_android_event(self, mock_post):
         mock_post.return_value = MockJsonResponse(200, {"id": 12345})
         response = self.client.android_event(
-            org_id=self.org.id,
-            channel_id=12,
+            org=self.org,
+            channel=self.channel,
             phone="+1234567890",
             event_type="mo_miss",
             extra={"duration": 45},
@@ -52,7 +52,7 @@ def test_android_event(self, mock_post):
             headers={"User-Agent": "Temba", "Authorization": "Token sesame"},
             json={
                 "org_id": self.org.id,
-                "channel_id": 12,
+                "channel_id": self.channel.id,
                 "phone": "+1234567890",
                 "event_type": "mo_miss",
                 "extra": {"duration": 45},
@@ -64,8 +64,8 @@ def test_android_event(self, mock_post):
     def test_android_message(self, mock_post):
         mock_post.return_value = MockJsonResponse(200, {"id": 12345})
         response = self.client.android_message(
-            org_id=self.org.id,
-            channel_id=12,
+            org=self.org,
+            channel=self.channel,
             phone="+1234567890",
             text="hello",
             received_on=datetime(2024, 4, 1, 16, 28, 30, 0, tzone.utc),
@@ -78,7 +78,7 @@ def test_android_message(self, mock_post):
             headers={"User-Agent": "Temba", "Authorization": "Token sesame"},
             json={
                 "org_id": self.org.id,
-                "channel_id": 12,
+                "channel_id": self.channel.id,
                 "phone": "+1234567890",
                 "text": "hello",
                 "received_on": "2024-04-01T16:28:30+00:00",

temba/tests/mailroom.py

@@ -14,7 +14,7 @@
 
 from temba import mailroom
 from temba.campaigns.models import CampaignEvent, EventFire
-from temba.channels.models import Channel, ChannelEvent
+from temba.channels.models import ChannelEvent
 from temba.contacts.models import URN, Contact, ContactField, ContactGroup, ContactURN
 from temba.flows.models import FlowRun, FlowSession
 from temba.locations.models import AdminBoundary
@@ -137,9 +137,7 @@ def __init__(self, mocks: Mocks):
 
         super().__init__(settings.MAILROOM_URL, settings.MAILROOM_AUTH_TOKEN)
 
-    def android_event(self, org_id: int, channel_id: int, phone: str, event_type: str, extra: dict, occurred_on):
-        org = Org.objects.get(id=org_id)
-        channel = Channel.objects.get(id=channel_id)
+    def android_event(self, org, channel, phone: str, event_type: str, extra: dict, occurred_on):
         contact, contact_urn = contact_resolve(org, phone)
 
         event = ChannelEvent.objects.create(
@@ -153,9 +151,7 @@ def android_event(self, org_id: int, channel_id: int, phone: str, event_type: st
         )
         return {"id": event.id}
 
-    def android_message(self, org_id: int, channel_id: int, phone: str, text: str, received_on):
-        org = Org.objects.get(id=org_id)
-        channel = Channel.objects.get(id=channel_id)
+    def android_message(self, org, channel, phone: str, text: str, received_on):
         contact, contact_urn = contact_resolve(org, phone)
         text = text[: Msg.MAX_TEXT_LEN]