Merge pull request #65 from mayorJAY/fix-open-issues

Fix bugs in Response signatures

src/main/kotlin/api/SubscribersApi.kt

@@ -77,7 +77,7 @@ interface SubscribersApi {
     suspend fun markSubscriberMessageFeedAs(
         @Path("subscriberId") subscriberId: String,
         @Body request: MarkSubscriberFeedAsRequest
-    ): Response<ResponseWrapper<SubscriberNotificationResponse>>
+    ): Response<ResponseWrapper<List<SubscriberNotificationResponse>>>
 
     @POST("$ENDPOINT/{subscriberId}/messages/{messageId}/actions/{type}")
     suspend fun markMessageActionAsSeen(

src/main/kotlin/dto/ApiKeys.kt

@@ -1,6 +1,9 @@
 package co.novu.dto
 
+import com.google.gson.annotations.SerializedName
+
 data class ApiKeys(
     var key: String? = null,
-    var _userId: String? = null
+    @SerializedName("_userId")
+    var userId: String? = null
 )

src/main/kotlin/dto/Channel.kt

@@ -1,7 +1,10 @@
 package co.novu.dto
 
+import com.google.gson.annotations.SerializedName
+
 data class Channel(
     val credentials: ChannelCredentials? = null,
     val providerId: String? = null,
-    val _integrationId: String? = null
+    @SerializedName("_integrationId")
+    val integrationId: String? = null
 )

src/main/kotlin/dto/ExecutionDetails.kt

@@ -1,14 +1,24 @@
 package co.novu.dto
 
+import com.google.gson.annotations.SerializedName
+
 data class ExecutionDetails(
-    val _id: String? = null,
-    val _jobId: String? = null,
-    val _organizationId: String? = null,
-    val _environmentId: String? = null,
-    val _notificationId: String? = null,
-    val _subscriberId: String? = null,
-    val _notificationTemplateId: String? = null,
-    val _messageId: String? = null,
+    @SerializedName("_id")
+    val id: String? = null,
+    @SerializedName("_jobId")
+    val jobId: String? = null,
+    @SerializedName("_organizationId")
+    val organizationId: String? = null,
+    @SerializedName("_environmentId")
+    val environmentId: String? = null,
+    @SerializedName("_notificationId")
+    val notificationId: String? = null,
+    @SerializedName("_subscriberId")
+    val subscriberId: String? = null,
+    @SerializedName("_notificationTemplateId")
+    val notificationTemplateId: String? = null,
+    @SerializedName("_messageId")
+    val messageId: String? = null,
     val transactionId: String? = null,
     val providerId: Any? = null,
     val status: String? = null,

src/main/kotlin/dto/Job.kt

@@ -1,12 +1,16 @@
 package co.novu.dto
 
+import com.google.gson.annotations.SerializedName
+
 data class Job(
-    var _id: String? = null,
+    @SerializedName("_id")
+    var id: String? = null,
     var digest: Any? = null,
     var status: String? = null,
     var payload: Any? = null,
     var step: Step? = null,
-    var _notificationId: String? = null,
+    @SerializedName("_notificationId")
+    var notificationId: String? = null,
     var type: String? = null,
     var createdAt: String? = null,
     var updatedAt: String? = null,

src/main/kotlin/dto/Notification.kt

@@ -1,11 +1,18 @@
 package co.novu.dto
 
+import com.google.gson.annotations.SerializedName
+
 data class Notification(
-    val _id: String? = null,
-    val _templateId: String? = null,
-    val _environmentId: String? = null,
-    val _organizationId: String? = null,
-    val _subscriberId: String? = null,
+    @SerializedName("_id")
+    val id: String? = null,
+    @SerializedName("_templateId")
+    val templateId: String? = null,
+    @SerializedName("_environmentId")
+    val environmentId: String? = null,
+    @SerializedName("_organizationId")
+    val organizationId: String? = null,
+    @SerializedName("_subscriberId")
+    val subscriberId: String? = null,
     val transactionId: String? = null,
     val channels: List<String>? = null,
     val to: Subscriber? = null,

src/main/kotlin/dto/NotificationGroup.kt

@@ -1,12 +1,19 @@
 package co.novu.dto
 
+import com.google.gson.annotations.SerializedName
+
 data class NotificationGroup(
-    val _id: String? = null,
+    @SerializedName("_id")
+    val id: String? = null,
     val name: String? = null,
-    val _organizationId: String? = null,
-    val _environmentId: String? = null,
-    val _parentId: String? = null,
+    @SerializedName("_organizationId")
+    val organizationId: String? = null,
+    @SerializedName("_environmentId")
+    val environmentId: String? = null,
+    @SerializedName("_parentId")
+    val parentId: String? = null,
     val createdAt: String? = null,
     val updatedAt: String? = null,
-    val __v: String? = null
+    @SerializedName("__v")
+    val version: String? = null
 )

src/main/kotlin/dto/Step.kt

@@ -1,15 +1,20 @@
 package co.novu.dto
 
+import com.google.gson.annotations.SerializedName
+
 data class Step(
-    val _id: String? = null,
-    val _templateId: String? = null,
+    @SerializedName("_id")
+    val id: String? = null,
+    @SerializedName("_templateId")
+    val templateId: String? = null,
     val uuid: String? = null,
     val name: String? = null,
     val active: Boolean? = null,
     val shouldStopOnFail: Boolean? = null,
     val template: Any? = null,
     val filters: List<Filters>? = null,
-    val _parentId: String? = null,
+    @SerializedName("_parentId")
+    val parentId: String? = null,
     val metadata: Metadata? = null,
     val replyCallback: Any? = null
 )

src/main/kotlin/dto/Subscriber.kt

@@ -1,6 +1,9 @@
 package co.novu.dto
 
+import com.google.gson.annotations.SerializedName
+
 open class Subscriber(
+    @SerializedName("_id")
     var id: String? = null,
     var subscriberId: String? = null,
     var firstName: String? = null,

src/main/kotlin/dto/Template.kt

@@ -1,7 +1,10 @@
 package co.novu.dto
 
+import com.google.gson.annotations.SerializedName
+
 data class Template(
-    var _id: String? = null,
+    @SerializedName("_id")
+    var id: String? = null,
     var name: String? = null,
     var critical: Boolean? = null,
     var triggers: List<Trigger>? = null

src/main/kotlin/dto/Tenant.kt

@@ -1,8 +1,12 @@
 package co.novu.dto
 
+import com.google.gson.annotations.SerializedName
+
 data class Tenant(
-    private var _environmentId: String? = null,
-    private var _id: String? = null,
+    @SerializedName("_environmentId")
+    private var environmentId: String? = null,
+    @SerializedName("_id")
+    private var id: String? = null,
     private var createdAt: String? = null,
     private var data: Any? = null,
     private var identifier: String? = null,

src/main/kotlin/dto/Token.kt

@@ -1,7 +1,10 @@
 package co.novu.dto
 
+import com.google.gson.annotations.SerializedName
+
 data class Token(
-    var _id: String? = null,
+    @SerializedName("_id")
+    var id: String? = null,
     var providerId: String? = null,
     var provider: String? = null,
     var accessToken: String? = null,

src/main/kotlin/dto/Trigger.kt

@@ -1,8 +1,11 @@
 package co.novu.dto
 
+import com.google.gson.annotations.SerializedName
+
 data class Trigger(
     val type: String? = null,
-    val _id: String? = null,
+    @SerializedName("_id")
+    val id: String? = null,
     val identifier: String? = null,
     val variables: List<Variables>? = null,
     val subscriberVariables: List<Variables>? = null,

src/main/kotlin/dto/User.kt

@@ -1,9 +1,11 @@
 package co.novu.dto
 
+import com.google.gson.annotations.SerializedName
 import java.math.BigDecimal
 
 data class User(
-    var _id: String? = null,
+    @SerializedName("_id")
+    var id: String? = null,
     var firstName: String? = null,
     var lastName: String? = null,
     var email: String? = null,
@@ -12,6 +14,7 @@ data class User(
     var token: List<Token>,
     var createdAt: String? = null,
     var updatedAt: String? = null,
-    var __v: BigDecimal? = null
+    @SerializedName("__v")
+    var version: BigDecimal? = null
 
 )

src/main/kotlin/dto/Variables.kt

@@ -1,6 +1,9 @@
 package co.novu.dto
 
+import com.google.gson.annotations.SerializedName
+
 data class Variables(
     var name: String? = null,
-    var _id: String? = null
+    @SerializedName("_id")
+    var id: String? = null
 )

src/main/kotlin/dto/blueprints/Blueprint.kt

@@ -3,28 +3,36 @@ package co.novu.dto.blueprints
 import co.novu.dto.NotificationGroup
 import co.novu.dto.PreferenceSettings
 import co.novu.dto.Trigger
+import com.google.gson.annotations.SerializedName
 
 data class Blueprint(
-    private var _id: String? = null,
+    @SerializedName("_id")
+    private var id: String? = null,
     private var name: String? = null,
     private var description: String? = null,
     private var active: Boolean? = null,
     private var draft: Boolean? = null,
     private var critical: Boolean? = null,
     private var isBlueprint: Boolean? = null,
-    private var _notificationGroupId: String? = null,
+    @SerializedName("_notificationGroupId")
+    private var notificationGroupId: String? = null,
     private var blueprintId: String? = null,
     private var tags: List<String>? = null,
     private var triggers: List<Trigger>? = null,
     private var steps: List<Step>? = null,
     private var preferenceSettings: PreferenceSettings? = null,
-    private var _environmentId: String? = null,
-    private var _organizationId: String? = null,
-    private var _creatorId: String? = null,
-    private var _parentId: String? = null,
+    @SerializedName("_environmentId")
+    private var environmentId: String? = null,
+    @SerializedName("_organizationId")
+    private var organizationId: String? = null,
+    @SerializedName("_creatorId")
+    private var creatorId: String? = null,
+    @SerializedName("_parentId")
+    private var parentId: String? = null,
     private var deleted: Boolean? = null,
     private var createdAt: String? = null,
     private var updatedAt: String? = null,
-    private var __v: Long? = null,
+    @SerializedName("__v")
+    private var version: Long? = null,
     private var notificationGroup: NotificationGroup? = null
 )

src/main/kotlin/dto/blueprints/Step.kt

@@ -1,15 +1,20 @@
 package co.novu.dto.blueprints
 
+import com.google.gson.annotations.SerializedName
+
 data class Step(
-    val _id: String? = null,
-    val _templateId: String? = null,
+    @SerializedName("_id")
+    val id: String? = null,
+    @SerializedName("_templateId")
+    val templateId: String? = null,
     val uuid: String? = null,
     val name: String? = null,
     val active: Boolean? = null,
     val shouldStopOnFail: Boolean? = null,
     val template: Any? = null,
     val filters: Any? = null,
-    val _parentId: String? = null,
+    @SerializedName("_parentId")
+    val parentId: String? = null,
     val metadata: Any? = null,
     val replyCallback: Any? = null
 )

src/main/kotlin/dto/request/BaseEventRequest.kt

@@ -9,18 +9,24 @@ abstract class BaseEventRequest {
     // Optional fields
     private var overrides: Map<String, Any>? = null
     private var transactionId: String? = null
+    private var actor: String? = null
+    private var tenant: String? = null
 
     protected fun init(
-        _name: String,
-        _payload: Map<String, Any>,
-        _overrides: Map<String, Any>? = null,
-        _transactionId: String? = null
+        name: String,
+        payload: Map<String, Any>,
+        overrides: Map<String, Any>? = null,
+        transactionId: String? = null,
+        actor: String? = null,
+        tenant: String? = null
     ): BaseEventRequest {
         return this.apply {
-            this.name = _name
-            this.payload = _payload
-            this.overrides = _overrides
-            this.transactionId = _transactionId
+            this.name = name
+            this.payload = payload
+            this.overrides = overrides
+            this.transactionId = transactionId
+            this.actor = actor
+            this.tenant = tenant
         }
     }
 }