From b8633d802d056c728390f393d33000a287bbf2cb Mon Sep 17 00:00:00 2001
From: Kaushal Kapasi <kaushal.kapasi@taplytics.com>
Date: Tue, 30 Apr 2024 10:05:25 -0400
Subject: [PATCH] fix: revert event batching

---
 DevCycle/Networking/DevCycleService.swift     | 43 +++++--------
 .../Networking/DevCycleServiceTests.swift     | 61 ++++++++-----------
 2 files changed, 39 insertions(+), 65 deletions(-)

diff --git a/DevCycle/Networking/DevCycleService.swift b/DevCycle/Networking/DevCycleService.swift
index ad98e86..e5882c2 100644
--- a/DevCycle/Networking/DevCycleService.swift
+++ b/DevCycle/Networking/DevCycleService.swift
@@ -105,7 +105,7 @@ class DevCycleService: DevCycleServiceProtocol {
             return completion((nil, nil, ClientError.InvalidUser))
         }
 
-        self.batchEventsPayload(events: eventPayload, user: userBody, completion: completion)
+        self.sendEventsPayload(events: eventPayload, user: userBody, completion: completion)
     }
     
     func saveEntity(user: DevCycleUser, completion: @escaping SaveEntityCompletionHandler) {
@@ -293,41 +293,28 @@ class DevCycleService: DevCycleServiceProtocol {
         return eventsJSON
     }
 
-    private func batchEventsPayload(events: [[String:Any]], user: Any, completion: @escaping PublishEventsCompletionHandler) {
+    private func sendEventsPayload(events: [[String:Any]], user: Any, completion: @escaping PublishEventsCompletionHandler) {
         var eventsRequest = createEventsRequest()
         eventsRequest.httpMethod = "POST"
         eventsRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         eventsRequest.addValue("application/json", forHTTPHeaderField: "Accept")
         eventsRequest.addValue(self.config.sdkKey, forHTTPHeaderField: "Authorization")
-        
-        let totalEventsCount = events.count
-        var startIndex = 0
-        var endIndex = min(self.maxBatchSize, totalEventsCount)
-        
-        while startIndex < totalEventsCount {
-            let batchEvents = Array(events[startIndex..<endIndex])
-            
-            let requestBody: [String: Any] = [
-                "events": batchEvents,
-                "user": user
-            ]
 
-            let jsonBody = try? JSONSerialization.data(withJSONObject: requestBody, options: .prettyPrinted)
-            Log.debug("Post Events Payload: \(String(data: jsonBody!, encoding: .utf8) ?? "")")
-            eventsRequest.httpBody = jsonBody
-            
-            self.makeRequest(request: eventsRequest) { data, response, error in
-                if error != nil || data == nil {
-                    return completion((data, response, error))
-                }
-                // Continue with next batch
-                startIndex = endIndex
-                endIndex = min(endIndex + self.maxBatchSize, totalEventsCount)
+        let requestBody: [String: Any] = [
+            "events": events,
+            "user": user
+        ]
 
-                if startIndex >= totalEventsCount {
-                    return completion((data, response, nil))
-                }
+        let jsonBody = try? JSONSerialization.data(withJSONObject: requestBody, options: .prettyPrinted)
+        Log.debug("Post Events Payload: \(String(data: jsonBody!, encoding: .utf8) ?? "")")
+        eventsRequest.httpBody = jsonBody
+        
+        self.makeRequest(request: eventsRequest) { data, response, error in
+            if error != nil || data == nil {
+                return completion((data, response, error))
             }
+
+            return completion((data, response, nil))
         }
     }
 }
diff --git a/DevCycleTests/Networking/DevCycleServiceTests.swift b/DevCycleTests/Networking/DevCycleServiceTests.swift
index c2a26c9..571b0e6 100644
--- a/DevCycleTests/Networking/DevCycleServiceTests.swift
+++ b/DevCycleTests/Networking/DevCycleServiceTests.swift
@@ -81,7 +81,7 @@ class DevCycleServiceTests: XCTestCase {
         let service = MockDevCycleService()
         let eventQueue = EventQueue()
         let user = try! DevCycleUser.builder().userId("user1").build()
-        let expectation = XCTestExpectation(description: "Events are flushed in a single batch")
+        let expectation = XCTestExpectation(description: "10 Events are flushed in a single batch")
         
         // Generate 205 custom events and add them to the queue
         for i in 0..<10 {
@@ -98,11 +98,11 @@ class DevCycleServiceTests: XCTestCase {
         XCTAssertEqual(service.makeRequestCallCount, 1, "makeRequest should have been called 1 time")
     }
     
-    func testFlushingEventsInBatches() {
+    func testFlushingLargeNumberOfEvents() {
         let service = MockDevCycleService()
         let eventQueue = EventQueue()
         let user = try! DevCycleUser.builder().userId("user1").build()
-        let expectation = XCTestExpectation(description: "Events are serially queued and flushed in multiple batches")
+        let expectation = XCTestExpectation(description: "205 Events are flushed in a single batch")
         
         // Generate 205 custom events and add them to the queue
         for i in 0..<205 {
@@ -116,7 +116,7 @@ class DevCycleServiceTests: XCTestCase {
         }
         wait(for: [expectation], timeout: 3.0)
         XCTAssertTrue(service.publishEventsCalled)
-        XCTAssertEqual(service.makeRequestCallCount, 3, "makeRequest should have been called 3 times")
+        XCTAssertEqual(service.makeRequestCallCount, 1, "makeRequest should have been called 1 times")
     }
 }
 
@@ -223,43 +223,30 @@ extension DevCycleServiceTests {
         }
 
         private func batchEventsPayload(events: [[String:Any]], user: Any, completion: @escaping PublishEventsCompletionHandler) {
-                let url = URL(string: "http://test.com/v1/events")!
-                var eventsRequest = URLRequest(url: url)
-                eventsRequest.httpMethod = "POST"
-                eventsRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
-                eventsRequest.addValue("application/json", forHTTPHeaderField: "Accept")
-                eventsRequest.addValue(self.sdkKey, forHTTPHeaderField: "Authorization")
-                
-                let totalEventsCount = events.count
-                var startIndex = 0
-                var endIndex = min(self.testMaxBatchSize, totalEventsCount)
-                
-                while startIndex < totalEventsCount {
-                    let batchEvents = Array(events[startIndex..<endIndex])
-                    
-                    let requestBody: [String: Any] = [
-                        "events": batchEvents,
-                        "user": user
-                    ]
+            let url = URL(string: "http://test.com/v1/events")!
+            var eventsRequest = URLRequest(url: url)
+            eventsRequest.httpMethod = "POST"
+            eventsRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+            eventsRequest.addValue("application/json", forHTTPHeaderField: "Accept")
+            eventsRequest.addValue(self.sdkKey, forHTTPHeaderField: "Authorization")
+
+            let requestBody: [String: Any] = [
+                "events": events,
+                "user": user
+            ]
 
-                    let jsonBody = try? JSONSerialization.data(withJSONObject: requestBody, options: .prettyPrinted)
-                    Log.debug("Post Events Payload: \(String(data: jsonBody!, encoding: .utf8) ?? "")")
-                    eventsRequest.httpBody = jsonBody
-                    
-                    self.makeRequest(request: eventsRequest) { data, response, error in
-                        if error != nil || data == nil {
-                            return completion((data, response, error))
-                        }
-                        // Continue with next batch
-                        startIndex = endIndex
-                        endIndex = min(endIndex + self.testMaxBatchSize, totalEventsCount)
+            let jsonBody = try? JSONSerialization.data(withJSONObject: requestBody, options: .prettyPrinted)
+            Log.debug("Post Events Payload: \(String(data: jsonBody!, encoding: .utf8) ?? "")")
+            eventsRequest.httpBody = jsonBody
 
-                        if startIndex >= totalEventsCount {
-                            return completion((data, response, nil))
-                        }
-                    }
+            self.makeRequest(request: eventsRequest) { data, response, error in
+                if error != nil || data == nil {
+                    return completion((data, response, error))
                 }
+
+                return completion((data, response, nil))
             }
+        }
     }