Add event version to top-level in ApiEvent request body

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiAlertScreenPayload.kt

@@ -11,13 +11,11 @@ import com.simprints.infra.eventsync.event.remote.models.ApiAlertScreenPayload.A
 @Keep
 internal data class ApiAlertScreenPayload(
     override val startTime: ApiTimestamp,
-    override val version: Int,
     val alertType: ApiAlertScreenEventType,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload(startTime) {
 
     constructor(domainPayload: AlertScreenPayload) : this(
         domainPayload.createdAt.fromDomainToApi(),
-        domainPayload.eventVersion,
         domainPayload.alertType.fromDomainToApi(),
     )
 

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiAuthenticationPayload.kt

@@ -17,11 +17,10 @@ import com.simprints.infra.eventsync.event.remote.models.ApiAuthenticationPayloa
 @Keep
 internal data class ApiAuthenticationPayload(
     override val startTime: ApiTimestamp,
-    override val version: Int,
     val endTime: ApiTimestamp?,
     val userInfo: ApiUserInfo,
     val result: ApiResult,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload(startTime) {
 
     @Keep
     data class ApiUserInfo(val projectId: String, val userId: String) {
@@ -45,7 +44,6 @@ internal data class ApiAuthenticationPayload(
 
     constructor(domainPayload: AuthenticationPayload) : this(
         domainPayload.createdAt.fromDomainToApi(),
-        domainPayload.eventVersion,
         domainPayload.endedAt?.fromDomainToApi(),
         ApiUserInfo(domainPayload.userInfo),
         domainPayload.result.fromDomainToApi()

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiAuthorizationPayload.kt

@@ -15,10 +15,9 @@ import com.simprints.infra.eventsync.event.remote.models.ApiAuthorizationPayload
 @JsonInclude(Include.NON_NULL)
 internal data class ApiAuthorizationPayload(
     override val startTime: ApiTimestamp,
-    override val version: Int,
     val result: ApiResult,
     val userInfo: ApiUserInfo?,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload(startTime) {
 
     @Keep
     data class ApiUserInfo(val projectId: String, val userId: String) {
@@ -35,7 +34,6 @@ internal data class ApiAuthorizationPayload(
 
     constructor(domainPayload: AuthorizationPayload) : this(
         domainPayload.createdAt.fromDomainToApi(),
-        domainPayload.eventVersion,
         domainPayload.result.fromDomainToApi(),
         domainPayload.userInfo?.let { ApiUserInfo(it) }
     )

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCandidateReadPayload.kt

@@ -14,12 +14,11 @@ import com.simprints.infra.eventsync.event.remote.models.ApiCandidateReadPayload
 @JsonInclude(Include.NON_NULL)
 internal data class ApiCandidateReadPayload(
     override val startTime: ApiTimestamp,
-    override val version: Int,
     val endTime: ApiTimestamp?,
     val candidateId: String,
     val localResult: ApiLocalResult,
     val remoteResult: ApiRemoteResult?,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload(startTime) {
 
     @Keep
     enum class ApiLocalResult {
@@ -35,7 +34,6 @@ internal data class ApiCandidateReadPayload(
 
     constructor(domainPayload: CandidateReadPayload) : this(
         domainPayload.createdAt.fromDomainToApi(),
-        domainPayload.eventVersion,
         domainPayload.endedAt?.fromDomainToApi(),
         domainPayload.candidateId,
         domainPayload.localResult.fromDomainToApi(),

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiCompletionCheckPayload.kt

@@ -7,13 +7,11 @@ import com.simprints.infra.events.event.domain.models.CompletionCheckEvent.Compl
 @Keep
 internal data class ApiCompletionCheckPayload(
     override val startTime: ApiTimestamp,
-    override val version: Int,
     val completed: Boolean,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload(startTime) {
 
     constructor(domainPayload: CompletionCheckPayload) : this(
         domainPayload.createdAt.fromDomainToApi(),
-        domainPayload.eventVersion,
         domainPayload.completed,
     )
 

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiConnectivitySnapshotPayload.kt

@@ -9,9 +9,8 @@ import com.simprints.infra.events.event.domain.models.ConnectivitySnapshotEvent.
 @Keep
 internal data class ApiConnectivitySnapshotPayload(
     override val startTime: ApiTimestamp,
-    override val version: Int,
     val connections: List<ApiConnection>,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload(startTime) {
 
     @Keep
     class ApiConnection(val type: String, val state: String) {
@@ -22,7 +21,6 @@ internal data class ApiConnectivitySnapshotPayload(
 
     constructor(domainPayload: ConnectivitySnapshotPayload) : this(
         domainPayload.createdAt.fromDomainToApi(),
-        domainPayload.eventVersion,
         domainPayload.connections.map { ApiConnection(it) },
     )
 

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiConsentPayload.kt

@@ -14,11 +14,10 @@ import com.simprints.infra.eventsync.event.remote.models.ApiConsentPayload.ApiTy
 @Keep
 internal data class ApiConsentPayload(
     override val startTime: ApiTimestamp,
-    override val version: Int,
     var endTime: ApiTimestamp?,
     val consentType: ApiType,
     var result: ApiResult,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload(startTime) {
 
     @Keep
     enum class ApiType {
@@ -34,7 +33,6 @@ internal data class ApiConsentPayload(
 
     constructor(domainPayload: ConsentPayload) : this(
         domainPayload.createdAt.fromDomainToApi(),
-        domainPayload.eventVersion,
         domainPayload.endedAt?.fromDomainToApi(),
         domainPayload.consentType.fromDomainToApi(),
         domainPayload.result.fromDomainToApi()

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentPayloadV1.kt

@@ -7,13 +7,11 @@ import com.simprints.infra.events.event.domain.models.EnrolmentEventV1
 @Keep
 internal data class ApiEnrolmentPayloadV1(
     override val startTime: ApiTimestamp,
-    override val version: Int,
     val personId: String,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload(startTime) {
 
     constructor(domainPayload: EnrolmentEventV1.EnrolmentPayload) : this(
         domainPayload.createdAt.fromDomainToApi(),
-        domainPayload.eventVersion,
         domainPayload.personId
     )
 

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEnrolmentPayloadV2.kt

@@ -7,17 +7,15 @@ import com.simprints.infra.events.event.domain.models.EnrolmentEventV2
 @Keep
 internal data class ApiEnrolmentPayloadV2(
     override val startTime: ApiTimestamp,
-    override val version: Int,
     val subjectId: String,
     val projectId: String,
     val moduleId: String,
     val attendantId: String,
     val personCreationEventId: String,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload(startTime) {
 
     constructor(domainPayload: EnrolmentEventV2.EnrolmentPayload) : this(
         domainPayload.createdAt.fromDomainToApi(),
-        domainPayload.eventVersion,
         domainPayload.subjectId,
         domainPayload.projectId,
         domainPayload.moduleId.value,

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEvent.kt

@@ -9,20 +9,22 @@ import com.simprints.infra.events.event.domain.models.Event
 internal data class ApiEvent(
     val id: String,
     val type: ApiEventPayloadType,
+    val version: Int,
     val payload: ApiEventPayload,
     val tokenizedFields: List<String>,
 )
 
 internal fun Event.fromDomainToApi(): ApiEvent {
     val tokenizedKeyTypes =
         getTokenizedFields().filter { it.value is TokenizableString.Tokenized }.keys.toList()
-    val payload = payload.fromDomainToApi()
-    val tokenizedFields = tokenizedKeyTypes.mapNotNull(payload::getTokenizedFieldJsonPath)
+    val apiPayload = payload.fromDomainToApi()
+    val tokenizedFields = tokenizedKeyTypes.mapNotNull(apiPayload::getTokenizedFieldJsonPath)
 
     return ApiEvent(
         id = id,
         type = type.fromDomainToApi(),
-        payload = payload,
+        version = payload.eventVersion,
+        payload = apiPayload,
         tokenizedFields = tokenizedFields
     )
 }

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiEventPayload.kt

@@ -131,7 +131,6 @@ import com.simprints.infra.eventsync.event.remote.models.upsync.ApiEventUpSyncRe
 )
 @Keep
 internal abstract class ApiEventPayload(
-    open val version: Int,
     open val startTime: ApiTimestamp,
 ) {
 

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintCaptureBiometricsPayload.kt

@@ -7,11 +7,10 @@ import com.simprints.core.domain.fingerprint.IFingerIdentifier
 
 @Keep
 internal data class ApiFingerprintCaptureBiometricsPayload(
-    override val version: Int,
     override val startTime: ApiTimestamp,
     val fingerprint: Fingerprint,
     val id: String,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload(startTime) {
 
     @Keep
     data class Fingerprint(
@@ -30,7 +29,6 @@ internal data class ApiFingerprintCaptureBiometricsPayload(
     }
 
     constructor(domainPayload: FingerprintCaptureBiometricsEvent.FingerprintCaptureBiometricsPayload) : this(
-        domainPayload.eventVersion,
         domainPayload.createdAt.fromDomainToApi(),
         Fingerprint(domainPayload.fingerprint),
         domainPayload.id

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiFingerprintCapturePayload.kt

@@ -14,13 +14,12 @@ import com.simprints.core.domain.fingerprint.IFingerIdentifier
 internal data class ApiFingerprintCapturePayload(
     val id: String,
     override val startTime: ApiTimestamp,
-    override val version: Int,
     val endTime: ApiTimestamp?,
     val qualityThreshold: Int,
     val finger: IFingerIdentifier,
     val result: ApiResult,
     val fingerprint: ApiFingerprint?,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload(startTime) {
 
     @Keep
     data class ApiFingerprint(
@@ -36,15 +35,15 @@ internal data class ApiFingerprintCapturePayload(
         )
     }
 
-    constructor(domainPayload: FingerprintCapturePayload) :
-        this(domainPayload.id,
-            domainPayload.createdAt.fromDomainToApi(),
-            domainPayload.eventVersion,
-            domainPayload.endedAt?.fromDomainToApi(),
-            domainPayload.qualityThreshold,
-            domainPayload.finger,
-            domainPayload.result.fromDomainToApi(),
-            domainPayload.fingerprint?.let { ApiFingerprint(it) })
+    constructor(domainPayload: FingerprintCapturePayload) : this(
+        domainPayload.id,
+        domainPayload.createdAt.fromDomainToApi(),
+        domainPayload.endedAt?.fromDomainToApi(),
+        domainPayload.qualityThreshold,
+        domainPayload.finger,
+        domainPayload.result.fromDomainToApi(),
+        domainPayload.fingerprint?.let { ApiFingerprint(it) },
+    )
 
     @Keep
     enum class ApiResult {

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiGuidSelectionPayload.kt

@@ -7,13 +7,11 @@ import com.simprints.infra.events.event.domain.models.GuidSelectionEvent.GuidSel
 @Keep
 internal data class ApiGuidSelectionPayload(
     override val startTime: ApiTimestamp,
-    override val version: Int,
     val selectedId: String,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload(startTime) {
 
     constructor(domainPayload: GuidSelectionPayload) : this(
         domainPayload.createdAt.fromDomainToApi(),
-        domainPayload.eventVersion,
         domainPayload.selectedId,
     )
 

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiIntentParsingPayload.kt

@@ -12,13 +12,11 @@ import com.simprints.infra.eventsync.event.remote.models.ApiIntentParsingPayload
 @Keep
 internal data class ApiIntentParsingPayload(
     override val startTime: ApiTimestamp,
-    override val version: Int,
     val integration: ApiIntegrationInfo,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload(startTime) {
 
     constructor(domainPayload: IntentParsingPayload) : this(
         domainPayload.createdAt.fromDomainToApi(),
-        domainPayload.eventVersion,
         domainPayload.integration.fromDomainToApi(),
     )
 

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiInvalidIntentPayload.kt

@@ -10,14 +10,12 @@ import com.simprints.infra.events.event.domain.models.InvalidIntentEvent.Invalid
 @JsonInclude(Include.NON_NULL)
 internal data class ApiInvalidIntentPayload(
     override val startTime: ApiTimestamp,
-    override val version: Int,
     val action: String,
     val extras: Map<String, Any?>,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload(startTime) {
 
     constructor(domainPayload: InvalidIntentPayload) : this(
         domainPayload.createdAt.fromDomainToApi(),
-        domainPayload.eventVersion,
         domainPayload.action,
         domainPayload.extras,
     )

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiOneToManyMatchPayload.kt

@@ -8,12 +8,11 @@ import com.simprints.infra.events.event.domain.models.OneToManyMatchEvent.OneToM
 @Keep
 internal data class ApiOneToManyMatchPayload(
     override val startTime: ApiTimestamp,
-    override val version: Int,
     val endTime: ApiTimestamp?,
     val pool: ApiMatchPool,
     val matcher: String,
     val result: List<ApiMatchEntry>?,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload( startTime) {
 
     @Keep
     data class ApiMatchPool(val type: ApiMatchPoolType, val count: Int) {
@@ -32,7 +31,6 @@ internal data class ApiOneToManyMatchPayload(
 
     constructor(domainPayload: OneToManyMatchPayload) : this(
         domainPayload.createdAt.fromDomainToApi(),
-        domainPayload.eventVersion,
         domainPayload.endedAt?.fromDomainToApi(),
         ApiMatchPool(domainPayload.pool),
         domainPayload.matcher,

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiOneToOneMatchPayload.kt

@@ -10,17 +10,15 @@ import com.simprints.infra.events.event.domain.models.OneToOneMatchEvent.OneToOn
 @JsonInclude(Include.NON_NULL)
 internal data class ApiOneToOneMatchPayload(
     override val startTime: ApiTimestamp,
-    override val version: Int,
     val endTime: ApiTimestamp?,
     val candidateId: String,
     val matcher: String,
     val result: ApiMatchEntry?,
     val fingerComparisonStrategy: ApiFingerComparisonStrategy?,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload(startTime) {
 
     constructor(domainPayload: OneToOneMatchPayload) : this(
         domainPayload.createdAt.fromDomainToApi(),
-        domainPayload.eventVersion,
         domainPayload.endedAt?.fromDomainToApi(),
         domainPayload.candidateId,
         domainPayload.matcher,

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiPersonCreationPayload.kt

@@ -8,16 +8,14 @@ import com.simprints.infra.events.event.domain.models.PersonCreationEvent.Person
 @Keep
 internal data class ApiPersonCreationPayload(
     override val startTime: ApiTimestamp,
-    override val version: Int,
     val fingerprintCaptureIds: List<String>?,
     val fingerprintReferenceId: String?,
     val faceCaptureIds: List<String>?,
     val faceReferenceId: String?,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload(startTime) {
 
     constructor(domainPayload: PersonCreationPayload) : this(
         domainPayload.createdAt.fromDomainToApi(),
-        domainPayload.eventVersion,
         domainPayload.fingerprintCaptureIds,
         domainPayload.fingerprintReferenceId,
         domainPayload.faceCaptureIds,

infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/models/ApiRefusalPayload.kt

@@ -16,11 +16,10 @@ import com.simprints.infra.eventsync.event.remote.models.ApiRefusalPayload.ApiAn
 @Keep
 internal data class ApiRefusalPayload(
     override val startTime: ApiTimestamp,
-    override val version: Int,
     val endTime: ApiTimestamp?,
     val reason: ApiAnswer,
     val otherText: String,
-) : ApiEventPayload(version, startTime) {
+) : ApiEventPayload(startTime) {
 
     @Keep
     enum class ApiAnswer {
@@ -37,7 +36,6 @@ internal data class ApiRefusalPayload(
 
     constructor(domainPayload: RefusalPayload) : this(
         domainPayload.createdAt.fromDomainToApi(),
-        domainPayload.eventVersion,
         domainPayload.endedAt?.fromDomainToApi(),
         domainPayload.reason.toApiRefusalEventAnswer(),
         domainPayload.otherText,