feat: enable to pass the event options for all track call (#36)

amplitude · Jun 1, 2022 · 8dd1ab6 · 8dd1ab6
1 parent d84a84e
commit 8dd1ab6
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/core/src/main/java/com/amplitude/core/Amplitude.kt b/core/src/main/java/com/amplitude/core/Amplitude.kt
@@ -86,10 +86,14 @@ open class Amplitude internal constructor(
      *
      * @param event the event
      * @param callback the optional event callback
+     * @param options optional event options
      * @return the Amplitude instance
      */
     @JvmOverloads
-    fun track(event: BaseEvent, callback: EventCallBack? = null): Amplitude {
+    fun track(event: BaseEvent, options: EventOptions? = null, callback: EventCallBack? = null): Amplitude {
+        options ?. let {
+            event.mergeEventOptions(it)
+        }
         callback ?. let {
             event.callback = it
         }

diff --git a/core/src/test/kotlin/com/amplitude/core/AmplitudeTest.kt b/core/src/test/kotlin/com/amplitude/core/AmplitudeTest.kt
@@ -64,6 +64,30 @@ internal class AmplitudeTest {
                 assertEquals("test", it.plan?.source)
             }
         }
+
+        @Test
+        fun `test track with event object and event options`() {
+            val mockPlugin = spyk(StubPlugin())
+            amplitude.add(mockPlugin)
+            amplitude.setUserId("user_id")
+            amplitude.setDeviceId("device_id")
+            val eventOptions = EventOptions()
+            eventOptions.city = "SF"
+            val event = BaseEvent()
+            event.eventType = "test event"
+            event.region = "CA"
+            amplitude.track(event, eventOptions)
+            val track = slot<BaseEvent>()
+            verify { mockPlugin.track(capture(track)) }
+            track.captured.let {
+                assertEquals("user_id", it.userId)
+                assertEquals("device_id", it.deviceId)
+                assertEquals("${Constants.SDK_LIBRARY}/${Constants.SDK_VERSION}", it.library)
+                assertEquals("CA", it.region)
+                assertEquals("SF", it.city)
+                assertEquals("test", it.plan?.source)
+            }
+        }
     }
 
     @Nested