fix: latestAction -> action renaming + test

ably · Dec 6, 2024 · 7627409 · 7627409
1 parent cb58c0b
commit 7627409
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 13 deletions.
diff --git a/chat-android/src/main/java/com/ably/chat/ChatApi.kt b/chat-android/src/main/java/com/ably/chat/ChatApi.kt
@@ -35,7 +35,7 @@ internal class ChatApi(
             method = "GET",
             params = params,
         ) {
-            val latestActionName = it.requireJsonObject().get("latestAction")?.asString
+            val latestActionName = it.requireJsonObject().get("action")?.asString
             val latestAction = latestActionName?.let { name -> messageActionNameToAction[name] }
 
             latestAction?.let { action ->
@@ -47,7 +47,7 @@ internal class ChatApi(
                     createdAt = it.requireLong("createdAt"),
                     metadata = it.asJsonObject.get("metadata"),
                     headers = it.asJsonObject.get("headers")?.toMap() ?: mapOf(),
-                    latestAction = action,
+                    action = action,
                 )
             }
         }
@@ -87,7 +87,7 @@ internal class ChatApi(
                 createdAt = it.requireLong("createdAt"),
                 metadata = params.metadata,
                 headers = params.headers ?: mapOf(),
-                latestAction = MessageAction.MESSAGE_CREATE,
+                action = MessageAction.MESSAGE_CREATE,
             )
         } ?: throw AblyException.fromErrorInfo(ErrorInfo("Send message endpoint returned empty value", HttpStatusCode.InternalServerError))
     }

diff --git a/chat-android/src/main/java/com/ably/chat/Message.kt b/chat-android/src/main/java/com/ably/chat/Message.kt
@@ -73,5 +73,5 @@ data class Message(
     /**
      * The latest action of the message. This can be used to determine if the message was created, updated, or deleted.
      */
-    val latestAction: MessageAction,
+    val action: MessageAction,
 )
diff --git a/chat-android/src/main/java/com/ably/chat/Messages.kt b/chat-android/src/main/java/com/ably/chat/Messages.kt
@@ -290,7 +290,7 @@ internal class DefaultMessages(
                 text = data.text,
                 metadata = data.metadata,
                 headers = pubSubMessage.extras.asJsonObject().get("headers")?.toMap() ?: mapOf(),
-                latestAction = MessageAction.MESSAGE_CREATE,
+                action = MessageAction.MESSAGE_CREATE,
             )
             listener.onEvent(MessageEvent(type = MessageEventType.Created, message = chatMessage))
         }

diff --git a/chat-android/src/test/java/com/ably/chat/ChatApiTest.kt b/chat-android/src/test/java/com/ably/chat/ChatApiTest.kt
@@ -32,7 +32,7 @@ class ChatApiTest {
                     addProperty("clientId", "clientId")
                     addProperty("text", "hello")
                     addProperty("createdAt", 1_000_000)
-                    addProperty("latestAction", "message.create")
+                    addProperty("action", "message.create")
                 },
             ),
         )
@@ -49,7 +49,7 @@ class ChatApiTest {
                     createdAt = 1_000_000L,
                     metadata = null,
                     headers = mapOf(),
-                    latestAction = MessageAction.MESSAGE_CREATE,
+                    action = MessageAction.MESSAGE_CREATE,
                 ),
             ),
             messages.items,
@@ -66,7 +66,7 @@ class ChatApiTest {
             listOf(
                 JsonObject().apply {
                     addProperty("foo", "bar")
-                    addProperty("latestAction", "message.create")
+                    addProperty("action", "message.create")
                 },
             ),
         )
@@ -103,7 +103,7 @@ class ChatApiTest {
                 createdAt = 1_000_000L,
                 headers = mapOf(),
                 metadata = null,
-                latestAction = MessageAction.MESSAGE_CREATE,
+                action = MessageAction.MESSAGE_CREATE,
             ),
             message,
         )

diff --git a/chat-android/src/test/java/com/ably/chat/MessagesTest.kt b/chat-android/src/test/java/com/ably/chat/MessagesTest.kt
@@ -75,7 +75,7 @@ class MessagesTest {
                 createdAt = 1_000_000,
                 metadata = JsonObject().apply { addProperty("meta", "data") },
                 headers = mapOf("foo" to "bar"),
-                latestAction = MessageAction.MESSAGE_CREATE,
+                action = MessageAction.MESSAGE_CREATE,
             ),
             sentMessage,
         )
@@ -135,7 +135,7 @@ class MessagesTest {
                 text = "some text",
                 metadata = null,
                 headers = mapOf("foo" to "bar"),
-                latestAction = MessageAction.MESSAGE_CREATE,
+                action = MessageAction.MESSAGE_CREATE,
             ),
             messageEvent.message,
         )

diff --git a/chat-android/src/test/java/com/ably/chat/SandboxTest.kt b/chat-android/src/test/java/com/ably/chat/SandboxTest.kt
@@ -128,6 +128,29 @@ class SandboxTest {
         )
     }
 
+    @Test
+    fun `should be able to send and retrieve messages from history`() = runTest {
+        val chatClient = sandbox.createSandboxChatClient()
+        val roomId = UUID.randomUUID().toString()
+
+        val room = chatClient.rooms.get(roomId)
+
+        room.attach()
+
+        room.messages.send("hello")
+
+        lateinit var messages: List<Message>
+
+        assertWaiter {
+            messages = room.messages.get().items
+            messages.isNotEmpty()
+        }
+
+        assertEquals(1, messages.size)
+        assertEquals("hello", messages.first().text)
+        assertEquals("sandbox-client", messages.first().clientId)
+    }
+
     companion object {
 
         private lateinit var sandbox: Sandbox

diff --git a/chat-android/src/test/java/com/ably/chat/TestUtils.kt b/chat-android/src/test/java/com/ably/chat/TestUtils.kt
@@ -69,7 +69,7 @@ fun Occupancy.subscribeOnce(listener: Occupancy.Listener) {
     }
 }
 
-suspend fun assertWaiter(timeoutInMs: Long = 10_000, block: () -> Boolean) {
+suspend fun assertWaiter(timeoutInMs: Long = 10_000, block: suspend () -> Boolean) {
     withContext(Dispatchers.Default) {
         withTimeout(timeoutInMs) {
             do {

diff --git a/example/src/main/java/com/ably/chat/example/MainActivity.kt b/example/src/main/java/com/ably/chat/example/MainActivity.kt
@@ -320,7 +320,7 @@ fun MessageBubblePreview() {
                 createdAt = System.currentTimeMillis(),
                 metadata = null,
                 headers = mapOf(),
-                latestAction = MessageAction.MESSAGE_CREATE,
+                action = MessageAction.MESSAGE_CREATE,
             ),
         )
     }