Merge pull request #679 from Iterable/evan/MOB-7219-impressions-tracking-rework

[MOB-7219] impressions tracking rework

Author: evantk91

swift-sdk/Constants.swift

@@ -44,7 +44,7 @@ enum Const {
         static let embeddedMessageClick = "embedded-messaging/events/click"
         static let embeddedMessageDismiss = "embedded-messaging/events/dismiss"
         static let embeddedMessageImpression = "embedded-messaging/events/impression"
-        static let trackEmbeddedSession = "embedded-messaging/events/impression"
+        static let trackEmbeddedSession = "embedded-messaging/events/session"
     }
 
     public enum UserDefault {

swift-sdk/Internal/EmbeddedSessionManager.swift

@@ -62,7 +62,7 @@ public class EmbeddedSessionManager {
         }
     }
 
-    public func startImpression(messageId: String) {
+    public func startImpression(messageId: String, placementId: Double) {
         if let trackingImpression = currentlyTrackingImpressions[messageId], trackingImpression.tracking {
             return
         }
@@ -71,7 +71,7 @@ public class EmbeddedSessionManager {
                 session?.impressions[index].displayCount += 1
             }
         } else {
-            let newImpression = IterableEmbeddedImpression(messageId: messageId, displayCount: 1, displayDuration: 0)
+            let newImpression = IterableEmbeddedImpression(messageId: messageId, placementId: placementId, displayCount: 1, displayDuration: 0)
             session?.impressions.append(newImpression)
             currentlyTrackingImpressions[messageId] = (totalDisplayDuration: 0, startTime: Date(), tracking: true)
         }

swift-sdk/Internal/MiscEmbeddedClasses.swift

@@ -12,16 +12,21 @@ public class IterableEmbeddedImpression: NSObject, Codable {
     /// The message ID of message
     public let messageId: String
 
+    /// The placement ID of message
+    public let placementId: Double
+    
     /// How many times this message was displayed
     public var displayCount: Int
 
     /// Total duration this message was displayed
     public var displayDuration: TimeInterval
 
     public init(messageId: String,
+                placementId: Double,
                 displayCount: Int,
                 displayDuration: TimeInterval) {
         self.messageId = messageId
+        self.placementId = placementId
         self.displayCount = displayCount
         self.displayDuration = displayDuration
     }
@@ -32,9 +37,6 @@ final public class IterableEmbeddedSession: NSObject, Codable {
     /// UUID of the session
     public let embeddedSessionId: String
 
-    /// Placement ID, optional
-    public let placementId: String?
-    
     /// Start time of the session
     public let embeddedSessionStart: Date?
 
@@ -47,13 +49,11 @@ final public class IterableEmbeddedSession: NSObject, Codable {
     public var isActive: Bool
 
     public init(embeddedSessionId: String = UUID().uuidString,
-                placementId: String? = nil,
                 embeddedSessionStart: Date,
                 embeddedSessionEnd: Date? = nil,
                 impressions: [IterableEmbeddedImpression],
                 isActive: Bool = false) {
         self.embeddedSessionId = embeddedSessionId
-        self.placementId = placementId
         self.embeddedSessionStart = embeddedSessionStart
         self.embeddedSessionEnd = embeddedSessionEnd
         self.impressions = impressions