fix: add sentAt field to each event (#438)

rudderlabs · Jun 10, 2024 · 6781895 · 6781895
1 parent 0a3fc95
commit 6781895
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 17 deletions.
diff --git a/core/src/main/java/com/rudderstack/core/internal/DataUploadServiceImpl.kt b/core/src/main/java/com/rudderstack/core/internal/DataUploadServiceImpl.kt
@@ -81,13 +81,7 @@ internal class DataUploadServiceImpl @JvmOverloads constructor(
 
         currentConfiguration?.apply {
             if (networkExecutor.isShutdown || networkExecutor.isTerminated) return
-            val batchBody = mapOf<String, Any>(
-                "sentAt" to RudderUtils.timeStamp, "batch" to data
-            ).let {
-                if (extraInfo.isNullOrEmpty()) it else it + extraInfo //adding extra info data
-            }.let {
-                jsonAdapter.writeToJson(it, object : RudderTypeAdapter<Map<String, Any>>() {})
-            }
+            val batchBody = createBatchBody(data, extraInfo)
             webService.get()?.post(
                 mapOf(
                     "Content-Type" to "application/json",
@@ -99,20 +93,14 @@ internal class DataUploadServiceImpl @JvmOverloads constructor(
         }
     }
 
+
+
     override fun uploadSync(
         data: List<Message>, extraInfo: Map<String, String>?
     ): HttpResponse<out Any>? {
         if (_isPaused.get()) return null
         return currentConfiguration?.let { config ->
-            val batchBody = mapOf<String, Any>(
-                "sentAt" to RudderUtils.timeStamp, "batch" to data
-            ).let {
-                if (extraInfo.isNullOrEmpty()) it else it + extraInfo //adding extra info data
-            }.let {
-                config.jsonAdapter.writeToJson(
-                    it,
-                    object : RudderTypeAdapter<Map<String, Any>>() {})
-            }
+            val batchBody = config.createBatchBody(data, extraInfo)
             webService.get()?.post(
                 mapOf(
                     "Content-Type" to "application/json",
@@ -122,7 +110,22 @@ internal class DataUploadServiceImpl @JvmOverloads constructor(
             )?.get()
         }
     }
-
+    private fun Configuration.createBatchBody(
+        data: List<Message>,
+        extraInfo: Map<String, String>?
+    ) : String?{
+        val sentAt = RudderUtils.timeStamp
+        return mapOf<String, Any>(
+            "sentAt" to sentAt, "batch" to data.map {
+                it.sentAt = sentAt
+                it
+            }
+        ).let {
+            if (extraInfo.isNullOrEmpty()) it else it + extraInfo //adding extra info data
+        }.let {
+            jsonAdapter.writeToJson(it, object : RudderTypeAdapter<Map<String, Any>>() {})
+        }
+    }
     override fun setup(analytics: Analytics) {
         // No-op
     }

diff --git a/models/src/main/java/com/rudderstack/models/Message.kt b/models/src/main/java/com/rudderstack/models/Message.kt
@@ -110,6 +110,15 @@ sealed class Message(
     @Json(name = "integrations")
     var integrations: MessageIntegrations? = null
 
+    /**
+     * For internal usage. This variable will return null when called.
+     * Setting this variable will make no difference as this value will be overridden while
+     * syncing the data with server.
+     */
+    @SerializedName("sentAt")
+    @JsonProperty("sentAt")
+    @Json(name = "sentAt")
+    var sentAt: String?= null
     open fun copy(
         context: MessageContext? = this.context,
         anonymousId: String? = this.anonymousId,