From c5691aca55c0248b1445e09483a5de3ae6a6f756 Mon Sep 17 00:00:00 2001 From: Ansh Tyagi Date: Tue, 13 Feb 2024 13:43:02 +0530 Subject: [PATCH 1/4] fix: bulk api response type Bulk Trigger returns list of trigger response --- src/main/kotlin/extensions/EventsExtensions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/extensions/EventsExtensions.kt b/src/main/kotlin/extensions/EventsExtensions.kt index 81ccdda..2586fec 100644 --- a/src/main/kotlin/extensions/EventsExtensions.kt +++ b/src/main/kotlin/extensions/EventsExtensions.kt @@ -16,7 +16,7 @@ suspend fun Novu.trigger(body: TriggerEventRequest): ResponseWrapper? { +suspend fun Novu.bulkTrigger(body: BulkTriggerEventRequest): ResponseWrapper>? { val response = eventsApi.bulkTriggerEvent(body) return response.extractResponse(logger) } From bf8331a116c244739d934adb87c489302b6ca076 Mon Sep 17 00:00:00 2001 From: Ansh Tyagi Date: Tue, 13 Feb 2024 13:45:45 +0530 Subject: [PATCH 2/4] chore: fix api response --- src/main/kotlin/api/EventsApi.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/api/EventsApi.kt b/src/main/kotlin/api/EventsApi.kt index 731b726..4c48d07 100644 --- a/src/main/kotlin/api/EventsApi.kt +++ b/src/main/kotlin/api/EventsApi.kt @@ -21,7 +21,7 @@ interface EventsApi { suspend fun triggerEvent(@Body body: TriggerEventRequest): Response> @POST("$ENDPOINT/trigger/bulk") - suspend fun bulkTriggerEvent(@Body body: BulkTriggerEventRequest): Response> + suspend fun bulkTriggerEvent(@Body body: BulkTriggerEventRequest): Response>> @POST("$ENDPOINT/trigger/broadcast") suspend fun broadcastEvent(@Body body: BroadcastEventRequest): Response> From 9a216697eb1fc688934e487a1e7c1ddc1c27045f Mon Sep 17 00:00:00 2001 From: therealansh Date: Wed, 14 Feb 2024 00:12:38 +0530 Subject: [PATCH 3/4] fix: ut for bulk trigger --- src/test/kotlin/EventsApiTest.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/kotlin/EventsApiTest.kt b/src/test/kotlin/EventsApiTest.kt index bcdf20e..ce06ead 100644 --- a/src/test/kotlin/EventsApiTest.kt +++ b/src/test/kotlin/EventsApiTest.kt @@ -97,11 +97,13 @@ class EventsApiTest { @Test fun testBulkTriggerEvent() = runTest { val responseBody = ResponseWrapper( - TriggerResponse( + listOf( + TriggerResponse( acknowledged = true, status = "status", transactionId = "transactionId", error = listOf("error") + ) ) ) mockWebServer.enqueue( From 744b8992c24ef2bf9a6c9fe61b2288ed2041f4b3 Mon Sep 17 00:00:00 2001 From: therealansh Date: Thu, 15 Feb 2024 00:06:46 +0530 Subject: [PATCH 4/4] chore: ktlint --- src/test/kotlin/EventsApiTest.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/kotlin/EventsApiTest.kt b/src/test/kotlin/EventsApiTest.kt index ce06ead..3000e10 100644 --- a/src/test/kotlin/EventsApiTest.kt +++ b/src/test/kotlin/EventsApiTest.kt @@ -99,10 +99,10 @@ class EventsApiTest { val responseBody = ResponseWrapper( listOf( TriggerResponse( - acknowledged = true, - status = "status", - transactionId = "transactionId", - error = listOf("error") + acknowledged = true, + status = "status", + transactionId = "transactionId", + error = listOf("error") ) ) )