Merge pull request #508 from Iterable/tapash/mob-3241-in-app-delivery

[MOB-3241] - Do not count server read messages as delivered.

Author: tapashmajumder

swift-sdk/Internal/InAppManager+Functions.swift

@@ -138,9 +138,11 @@ struct MessagesObtainedHandler {
             }
         }
 
+        let deliveredMessages = addedMessages.filter { $0.read != true }
+        
         return MergeMessagesResult(inboxChanged: removedInboxCount + addedInboxCount + messagesOverwritten > 0,
                                    messagesMap: newMessagesMap,
-                                   deliveredMessages: addedMessages)
+                                   deliveredMessages: deliveredMessages)
     }
 
     private let messagesMap: OrderedDictionary<String, IterableInAppMessage>

tests/unit-tests/InAppMessageProcessorTests.swift

@@ -24,6 +24,21 @@ class InAppMessageProcessorTests: XCTestCase {
         XCTAssertTrue(result.inboxChanged)
     }
 
+    func testDoNotCountNewReadMessageAsDelivered() throws {
+        let localMessage = Self.makeEmptyInboxMessage("msg-1")
+        let serverMessage1 = Self.makeEmptyInboxMessage("msg-2")
+        serverMessage1.read = true
+        let serverMessage2 = Self.makeEmptyInboxMessage("msg-3")
+        serverMessage2.read = false
+
+        let messagesMap: OrderedDictionary<String, IterableInAppMessage> = ["msg-1": localMessage]
+        let newMessages = [serverMessage1, serverMessage2]
+        
+        let result = MessagesObtainedHandler(messagesMap: messagesMap,
+                                             messages: newMessages).handle()
+        XCTAssertEqual(result.deliveredMessages.count, 1)
+    }
+    
     private static let emptyInAppContent = IterableHtmlInAppContent(edgeInsets: .zero, html: "")
 
     private static func makeEmptyMessage() -> IterableInAppMessage {