Merge pull request #45 from capcom6/issue/44-invalid-state-transition

Fix message state with multiple recipients

.github/workflows/build-apk.yml

@@ -50,6 +50,9 @@ jobs:
           sed -i "s/versionName.*/versionName \"${VERSION_NAME#v}\"/" app/build.gradle
           sed -i "s/versionCode.*/versionCode $(( ($(date +%s) - $(date -d "2022-06-15" +%s)) / 86400 ))/" app/build.gradle
 
+      - name: Test
+        run: ./gradlew test
+
       #1
       - name: Decode Keystore
         env:

app/src/main/java/me/capcom/smsgateway/data/entities/MessageWithRecipients.kt

@@ -13,10 +13,11 @@ data class MessageWithRecipients(
 ) {
     val state: Message.State
         get() = when {
+            recipients.any { it.state == Message.State.Pending } -> Message.State.Pending
+            recipients.any { it.state == Message.State.Processed } -> Message.State.Processed
+
             recipients.all { it.state == Message.State.Failed } -> Message.State.Failed
             recipients.all { it.state == Message.State.Delivered } -> Message.State.Delivered
-            recipients.all { it.state == Message.State.Sent } -> Message.State.Sent
-            recipients.any { it.state == Message.State.Pending } -> Message.State.Pending
-            else -> Message.State.Processed
+            else -> Message.State.Sent
         }
 }

app/src/test/java/me/capcom/smsgateway/data/entities/MessageWithRecipientsTest.kt

@@ -0,0 +1,75 @@
+package me.capcom.smsgateway.data.entities
+
+import me.capcom.smsgateway.modules.messages.data.MessageSource
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class MessageWithRecipientsTest {
+    @Test
+    fun testStatePending() {
+        val message = Message(
+            id = "1",
+            text = "Test message",
+            withDeliveryReport = true,
+            simNumber = 1,
+            validUntil = null,
+            isEncrypted = false,
+            source = MessageSource.Local,
+            state = Message.State.Pending,
+            createdAt = System.currentTimeMillis()
+        )
+        val recipients = listOf(
+            MessageRecipient("1", "1234567890", Message.State.Pending, null),
+            MessageRecipient("1", "9876543210", Message.State.Processed, null)
+        )
+        val messageWithRecipients = MessageWithRecipients(message, recipients)
+
+        assertEquals(Message.State.Pending, messageWithRecipients.state)
+    }
+
+    @Test
+    fun testStateSent() {
+        val message = Message(
+            id = "1",
+            text = "Test message",
+            withDeliveryReport = true,
+            simNumber = 1,
+            validUntil = null,
+            isEncrypted = false,
+            source = MessageSource.Local,
+            state = Message.State.Pending,
+            createdAt = System.currentTimeMillis()
+        )
+        val recipients = listOf(
+            MessageRecipient("1", "1234567890", Message.State.Delivered, null),
+            MessageRecipient("1", "9876543210", Message.State.Sent, null)
+        )
+        val messageWithRecipients = MessageWithRecipients(message, recipients)
+
+        assertEquals(Message.State.Sent, messageWithRecipients.state)
+    }
+
+    @Test
+    fun testStateDelivered() {
+        val message = Message(
+            id = "2",
+            text = "Test message",
+            withDeliveryReport = true,
+            simNumber = 1,
+            validUntil = null,
+            isEncrypted = false,
+            source = MessageSource.Local,
+            state = Message.State.Pending,
+            createdAt = System.currentTimeMillis()
+        )
+        val recipients = listOf(
+            MessageRecipient("2", "1234567890", Message.State.Delivered, null),
+            MessageRecipient("2", "9876543210", Message.State.Delivered, null)
+        )
+        val messageWithRecipients = MessageWithRecipients(message, recipients)
+
+        assertEquals(Message.State.Delivered, messageWithRecipients.state)
+    }
+
+    // Add more test cases for other states
+}