improve: update sample app UI (SDKCF-6856)

rakutentech · Feb 7, 2024 · c771a68 · c771a68
1 parent 021e0d0
commit c771a68
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 12 deletions.
diff --git a/Sample/EventLogger/EventListView.swift b/Sample/EventLogger/EventListView.swift
@@ -9,6 +9,9 @@ struct EventListView: View {
     }
 
     var body: some View {
+        VStack(alignment: .leading) {
+            Text("Total number of Unique Count: \(eventList.count)")
+        }
         List(eventList, id: \.self) { item in
             Text(item)
         }

diff --git a/Sample/EventLogger/EventLoggerInteractor.swift b/Sample/EventLogger/EventLoggerInteractor.swift
@@ -8,7 +8,7 @@ enum Constant {
 struct EventLoggerInteractor: EventLogging {
     func logEvent(_ event: EventModel, completionHandler: @escaping ((Bool) -> Void)) {
         let info = convertToJson(event.info)
-        for value in 1...event.count {
+        for _ in 1...event.count {
             DispatchQueue.main.async {
                 if event.isCritical {
                     REventLogger.shared.sendCriticalEvent(sourceName: event.sdkName,
@@ -41,7 +41,9 @@ struct EventLoggerInteractor: EventLogging {
               let json = try? JSONSerialization.jsonObject(with: data, options: .mutableContainers) as? [String: Any] else {
             return []
         }
-        return json.values.compactMap({ convertToString($0) })
+        let sortedValues = json.values.compactMap({$0 as? [String: Any]})
+            .sorted(by: { $0["firstOccurrenceOn"] as! Double > $1["firstOccurrenceOn"] as! Double })
+        return sortedValues.compactMap({ convertToString($0) })
     }
 
     func getConfiguration() -> (apiKey: String, apiEndpoint: String) {
@@ -50,9 +52,8 @@ struct EventLoggerInteractor: EventLogging {
         return (apiKey, apiEndpoint)
     }
 
-    private func convertToString(_ value: Any) -> String? {
-        guard let dictionary = value as? [String: Any],
-              let data = try? JSONSerialization.data(withJSONObject: dictionary, options: .prettyPrinted),
+    private func convertToString(_ value: [String: Any]) -> String? {
+        guard let data = try? JSONSerialization.data(withJSONObject: value, options: [.sortedKeys, .prettyPrinted]),
               let jsonString = String(data: data, encoding: .utf8) else {
             return nil
         }

diff --git a/Sample/EventLogger/EventLoggerView.swift b/Sample/EventLogger/EventLoggerView.swift
@@ -126,14 +126,25 @@ struct EventLoggerView: View {
                         updatedFocusFiled()
                     }
 
-                    Button(action: {
-                        isLoggingInprogress = true
-                        hideKeyboard()
-                        sendEvent()
-                    }) {
-                        Text(isCritical ? "Log Critical Event" : "Log Warning Event")
+                    Section {
+                        Button(action: {
+                            isLoggingInprogress = true
+                            hideKeyboard()
+                            sendEvent()
+                        }) {
+                            Text(isCritical ? "Log Critical Event" : "Log Warning Event")
+                        }
+                        .disabled(disableLogEvent())
+
+                        Button(action: {
+                            isLoggingInprogress = true
+                            hideKeyboard()
+                            sendUniqueEvent()
+                        }) {
+                            Text("Log Unique Event")
+                        }
+                        .disabled(disableLogEvent())
                     }
-                    .disabled(disableLogEvent())
 
                     Section {
                         NavigationLink(destination: EventListView(interactor: interactor)
@@ -192,6 +203,22 @@ struct EventLoggerView: View {
         }
         return customInfo.isEmpty ? true : false
     }
+
+    private func sendUniqueEvent() {
+        for value in 0..<eventCount {
+            let eMessage = errorMessage + String(Date().timeIntervalSince1970)
+            let event = EventModel(sdkName: sdkName,
+                                   sdkVersion: sdkVersion,
+                                   errorCode: errorCode,
+                                   errorMessage: eMessage,
+                                   count: 1,
+                                   isCritical: isCritical,
+                                   info: customInfo)
+            interactor.logEvent(event) { isFinished in
+                isLoggingInprogress = (eventCount == value)
+            }
+        }
+    }
 }
 
 #if canImport(UIKit)