diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/ApiModes.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/ApiModes.kt deleted file mode 100644 index 15e1f1e5f4..0000000000 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/ApiModes.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.simprints.infra.eventsync.event.remote - -import androidx.annotation.Keep -import com.simprints.core.domain.modality.Modes - - -@Keep -internal enum class ApiModes { - FINGERPRINT, - FACE; -} - -internal fun Modes.fromDomainToApi(): ApiModes = - when (this) { - Modes.FINGERPRINT -> ApiModes.FINGERPRINT - Modes.FACE -> ApiModes.FACE - } diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/ApiRemoteEventQuery.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/ApiRemoteEventQuery.kt index c2abe9f7cf..5a3049292d 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/ApiRemoteEventQuery.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/ApiRemoteEventQuery.kt @@ -7,5 +7,4 @@ internal data class ApiRemoteEventQuery( val moduleId: String? = null, val subjectId: String? = null, val lastEventId: String? = null, - val modes: List, ) diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSource.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSource.kt index a497519a71..177490e36f 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSource.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSource.kt @@ -37,7 +37,6 @@ internal class EventRemoteDataSource @Inject constructor( moduleId = query.moduleId, attendantId = query.userId, subjectId = query.subjectId, - modes = query.modes, lastEventId = query.lastEventId ) } @@ -125,7 +124,6 @@ internal class EventRemoteDataSource @Inject constructor( moduleId = query.moduleId, attendantId = query.userId, subjectId = query.subjectId, - modes = query.modes, lastEventId = query.lastEventId ) } diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/EventRemoteInterface.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/EventRemoteInterface.kt index b5b3f90393..739cccea3d 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/EventRemoteInterface.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/EventRemoteInterface.kt @@ -23,7 +23,6 @@ internal interface EventRemoteInterface : SimRemoteInterface { @Query("l_moduleId") moduleId: String?, @Query("l_attendantId") attendantId: String?, @Query("l_subjectId") subjectId: String?, - @Query("l_mode") modes: List, @Query("lastEventId") lastEventId: String?, ): Response @@ -44,7 +43,6 @@ internal interface EventRemoteInterface : SimRemoteInterface { @Query("l_moduleId") moduleId: String?, @Query("l_attendantId") attendantId: String?, @Query("l_subjectId") subjectId: String?, - @Query("l_mode") modes: List, @Query("lastEventId") lastEventId: String?, ): Response diff --git a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/status/down/domain/RemoteEventQuery.kt b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/status/down/domain/RemoteEventQuery.kt index af4b692ea4..6ec2e5c624 100644 --- a/infra/event-sync/src/main/java/com/simprints/infra/eventsync/status/down/domain/RemoteEventQuery.kt +++ b/infra/event-sync/src/main/java/com/simprints/infra/eventsync/status/down/domain/RemoteEventQuery.kt @@ -3,7 +3,6 @@ package com.simprints.infra.eventsync.status.down.domain import androidx.annotation.Keep import com.simprints.core.domain.modality.Modes import com.simprints.infra.eventsync.event.remote.ApiRemoteEventQuery -import com.simprints.infra.eventsync.event.remote.fromDomainToApi @Keep @@ -22,7 +21,6 @@ internal data class RemoteEventQuery( moduleId = moduleId, subjectId = subjectId, lastEventId = lastEventId, - modes = modes.map { it.fromDomainToApi() }, ) } diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSourceTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSourceTest.kt index 9e64a8a321..f9e5c28906 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSourceTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSourceTest.kt @@ -61,7 +61,6 @@ class EventRemoteDataSourceTest { moduleId = DEFAULT_MODULE_ID.value, subjectId = GUID1, lastEventId = GUID2, - modes = listOf(ApiModes.FACE, ApiModes.FINGERPRINT), ) @Before @@ -87,7 +86,7 @@ class EventRemoteDataSourceTest { @Test fun count_shouldMakeANetworkRequest() = runTest { coEvery { - eventRemoteInterface.countEvents(any(), any(), any(), any(), any(), any()) + eventRemoteInterface.countEvents(any(), any(), any(), any(), any()) } returns Response.success( null, mapOf("x-event-count" to "6", "x-event-count-is-lower-bound" to "true").toHeaders() @@ -102,7 +101,6 @@ class EventRemoteDataSourceTest { moduleId = DEFAULT_MODULE_ID.value, attendantId = DEFAULT_USER_ID.value, subjectId = GUID1, - modes = listOf(ApiModes.FACE, ApiModes.FINGERPRINT), lastEventId = GUID2 ) } @@ -117,7 +115,6 @@ class EventRemoteDataSourceTest { any(), any(), any(), - any() ) } throws Throwable("Request issue") @@ -177,7 +174,6 @@ class EventRemoteDataSourceTest { any(), any(), any(), - any() ) } throws exception @@ -206,7 +202,6 @@ class EventRemoteDataSourceTest { any(), any(), any(), - any() ) } throws exception @@ -226,7 +221,6 @@ class EventRemoteDataSourceTest { any(), any(), any(), - any() ) } returns Response.success("".toResponseBody()) @@ -237,7 +231,7 @@ class EventRemoteDataSourceTest { with(query) { coVerify { eventRemoteInterface.downloadEvents( - GUID1, projectId, moduleId, userId, subjectId, modes, lastEventId + GUID1, projectId, moduleId, userId, subjectId, lastEventId ) } } @@ -246,7 +240,7 @@ class EventRemoteDataSourceTest { @Test fun getEvents_shouldReturnCorrectTotalHeader() = runTest { coEvery { - eventRemoteInterface.downloadEvents(any(), any(), any(), any(), any(), any(), any()) + eventRemoteInterface.downloadEvents(any(), any(), any(), any(), any(), any()) } returns Response.success( "".toResponseBody(), mapOf("x-event-count" to "22").toHeaders() @@ -263,7 +257,7 @@ class EventRemoteDataSourceTest { @Test fun getEvents_shouldReturnCorrectStatus() = runTest { coEvery { - eventRemoteInterface.downloadEvents(any(), any(), any(), any(), any(), any(), any()) + eventRemoteInterface.downloadEvents(any(), any(), any(), any(), any(), any()) } returns Response.success(205, "".toResponseBody()) val mockedScope: CoroutineScope = mockk() @@ -275,7 +269,7 @@ class EventRemoteDataSourceTest { @Test fun getEvents_shouldNotReturnTotalHeaderWhenLowerBound() = runTest { coEvery { - eventRemoteInterface.downloadEvents(any(), any(), any(), any(), any(), any(), any()) + eventRemoteInterface.downloadEvents(any(), any(), any(), any(), any(), any()) } returns Response.success( "".toResponseBody(), mapOf("x-event-count" to "22", "x-event-count-is-lower-bound" to "true").toHeaders() diff --git a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/status/down/domain/RemoteEventQueryTest.kt b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/status/down/domain/RemoteEventQueryTest.kt index c85297b8fd..5aa87b415e 100644 --- a/infra/event-sync/src/test/java/com/simprints/infra/eventsync/status/down/domain/RemoteEventQueryTest.kt +++ b/infra/event-sync/src/test/java/com/simprints/infra/eventsync/status/down/domain/RemoteEventQueryTest.kt @@ -7,7 +7,6 @@ import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_PROJECT_ID import com.simprints.infra.events.sampledata.SampleDefaults.DEFAULT_USER_ID import com.simprints.infra.events.sampledata.SampleDefaults.GUID1 import com.simprints.infra.events.sampledata.SampleDefaults.GUID2 -import com.simprints.infra.eventsync.event.remote.fromDomainToApi import org.junit.Test class RemoteEventQueryTest { @@ -29,7 +28,6 @@ class RemoteEventQueryTest { assertThat(moduleId).isEqualTo(DEFAULT_MODULE_ID.value) assertThat(subjectId).isEqualTo(GUID1) assertThat(lastEventId).isEqualTo(GUID2) - assertThat(modes).isEqualTo(DEFAULT_MODES.map { it.fromDomainToApi() }) } } }