recover var to let for BatchEvent fields

Author: jaeopt

OptimizelySDK/Data Model/DispatchEvents/BatchEvent.swift

@@ -9,14 +9,14 @@
 import Foundation
 
 struct BatchEvent: Codable, Equatable {
-    var revision: String
-    var accountID: String
-    var clientVersion: String
-    var visitors: [Visitor]
-    var projectID: String
-    var clientName: String
-    var anonymizeIP: Bool
-    var enrichDecisions: Bool
+    let revision: String
+    let accountID: String
+    let clientVersion: String
+    let visitors: [Visitor]
+    let projectID: String
+    let clientName: String
+    let anonymizeIP: Bool
+    let enrichDecisions: Bool
 
     enum CodingKeys: String, CodingKey {
         case revision
@@ -41,9 +41,9 @@ struct BatchEvent: Codable, Equatable {
 }
 
 struct Visitor: Codable, Equatable {
-    var attributes: [EventAttribute]
-    var snapshots: [Snapshot]
-    var visitorID: String
+    let attributes: [EventAttribute]
+    let snapshots: [Snapshot]
+    let visitorID: String
 
     enum CodingKeys: String, CodingKey {
         case attributes
@@ -53,10 +53,10 @@ struct Visitor: Codable, Equatable {
 }
 
 struct EventAttribute: Codable, Equatable {
-    var value: AttributeValue
-    var key: String
-    var type: String
-    var entityID: String
+    let value: AttributeValue
+    let key: String
+    let type: String
+    let entityID: String
 
     enum CodingKeys: String, CodingKey {
         case value
@@ -67,12 +67,14 @@ struct EventAttribute: Codable, Equatable {
 }
 
 struct Snapshot: Codable, Equatable {
-    var decisions: [Decision]?
-    var events: [DispatchEvent]
+    let decisions: [Decision]?
+    let events: [DispatchEvent]
 }
 
 struct Decision: Codable, Equatable {
-    var variationID, campaignID, experimentID: String
+    let variationID: String
+    let campaignID: String
+    let experimentID: String
 
     enum CodingKeys: String, CodingKey {
         case variationID = "variation_id"
@@ -87,10 +89,10 @@ struct DispatchEvent: Codable, Equatable {
     static let activateEventKey = "campaign_activated"
 
     // entityID is the layer id for impression events.
-    var entityID: String
-    var key: String
-    var timestamp: Int64
-    var uuid: String
+    let entityID: String
+    let key: String
+    let timestamp: Int64
+    let uuid: String
     var tags: [String: AttributeValue]?
     var revenue: AttributeValue?
     var value: AttributeValue?

OptimizelySDK/OptimizelyTests/OptimizelyTests-Common/EventDispatcherTests_Batch.swift

@@ -81,9 +81,8 @@ extension EventDispatcherTests_Batch {
     }
 
     func testBatchingEventsWhenProjectIdsNotEqual() {
-        let be1 = batchEventA
-        var be2 = batchEventA
-        be2.projectID = "99999"
+        let be1 = makeTestBatchEvent(projectId: nil, visitor: visitorA)
+        let be2 = makeTestBatchEvent(projectId: "99999", visitor: visitorA)
 
         let events: [EventForDispatch] = [
             makeEventForDispatch(url: kUrlA, event: be1),
@@ -494,33 +493,30 @@ extension EventDispatcherTests_Batch {
         return EventForDispatch(url: URL(string: url), body: data)
     }
 
-    var emptyBatchEvent: BatchEvent {
+    func makeTestBatchEvent(projectId: String?=nil, visitor: Visitor?=nil) -> BatchEvent {
+        let testProjectId = projectId ?? kProjectId
+        let testVisitor = visitor ?? visitorA
+        
         return BatchEvent(revision: kRevision,
                           accountID: kAccountId,
                           clientVersion: kClientVersion,
-                          visitors: [],
-                          projectID: kProjectId,
+                          visitors: [testVisitor],
+                          projectID: testProjectId,
                           clientName: kClientName,
                           anonymizeIP: kAnonymizeIP,
                           enrichDecisions: kEnrichDecision)
     }
 
     var batchEventA: BatchEvent {
-        var event = emptyBatchEvent
-        event.visitors = [visitorA]
-        return event
+        return makeTestBatchEvent(visitor: visitorA)
     }
 
     var batchEventB: BatchEvent {
-        var event = emptyBatchEvent
-        event.visitors = [visitorB]
-        return event
+        return makeTestBatchEvent(visitor: visitorB)
     }
 
     var batchEventC: BatchEvent {
-        var event = emptyBatchEvent
-        event.visitors = [visitorC]
-        return event
+        return makeTestBatchEvent(visitor: visitorC)
     }
 
     var visitorA: Visitor {