(fix): Event batch fix (#204)

* fix a bug found while looking at jae PR

* fix resetting event batch size

Author: thomaszurkan-optimizely

OptimizelySDK/Customization/DefaultEventDispatcher.swift

@@ -118,7 +118,7 @@ open class DefaultEventDispatcher : BackgroundingCallbacks, OPTEventDispatcher {
                     // if the bacth size is not equal to the actual event size,
                     // then setup the batchSizeHolder to be the size of the event.
                     if actualEventsSize != self.batchSize {
-                        batchSizeHolder = actualEventsSize
+                        batchSizeHolder = self.batchSize
                         self.batchSize = actualEventsSize
                         sendCount = actualEventsSize - 1
                     }
@@ -170,7 +170,7 @@ open class DefaultEventDispatcher : BackgroundingCallbacks, OPTEventDispatcher {
                         if batchSizeHolder != 0 {
                             sendCount += 1
                             // have we sent all the events in this batch?
-                            if sendCount == batchSizeHolder {
+                            if sendCount == self.batchSize {
                                 resetBatch()
                             }
                         }

OptimizelySDK/OptimizelyTests/OptimizelyTests-Common/EventDispatcherTests_Batch.swift

@@ -110,6 +110,8 @@ extension EventDispatcherTests_Batch {
         // this tests timer-based dispatch, available for iOS 10+
         guard #available(iOS 10.0, tvOS 10.0, *) else { return }
 
+        XCTAssert(eventDispatcher.batchSize == 10)
+        
         eventDispatcher.dispatchEvent(event: makeEventForDispatch(url: kUrlA, event: batchEventA), completionHandler: nil)
         eventDispatcher.dispatchEvent(event: makeEventForDispatch(url: kUrlA, event: batchEventB), completionHandler: nil)
         eventDispatcher.dispatchEvent(event: makeEventForDispatch(url: kUrlA, event: batchEventA), completionHandler: nil)
@@ -133,12 +135,19 @@ extension EventDispatcherTests_Batch {
         XCTAssertEqual(batchedEvents.visitors[2], visitorA)
         XCTAssertEqual(batchedEvents.visitors.count, 3)
         XCTAssertEqual(eventDispatcher.dataStore.count, 0)
+        
+        XCTAssert(eventDispatcher.batchSize == 10)
+        
+
     }
 
     func testFlushEventsWhenBatchFails() {
         // this tests timer-based dispatch, available for iOS 10+
         guard #available(iOS 10.0, tvOS 10.0, *) else { return }
 
+        XCTAssert(eventDispatcher.batchSize == 10)
+        
+
         eventDispatcher.dispatchEvent(event: makeEventForDispatch(url: kUrlA, event: batchEventA), completionHandler: nil)
         eventDispatcher.dispatchEvent(event: makeEventForDispatch(url: kUrlA, event: batchEventA), completionHandler: nil)
         eventDispatcher.dispatchEvent(event: makeEventForDispatch(url: kUrlB, event: batchEventB), completionHandler: nil)
@@ -191,6 +200,8 @@ extension EventDispatcherTests_Batch {
         XCTAssertEqual(batchedEvents.visitors.count, 1)
 
         XCTAssertEqual(eventDispatcher.dataStore.count, 0)
+        
+        XCTAssert(eventDispatcher.batchSize == 10)        
     }
 
     func testFlushEventsWhenSendEventFails() {