MS-760 Project configuration ID

build-logic/build_properties.gradle.kts

@@ -14,8 +14,9 @@ extra.apply {
      * https://simprints.atlassian.net/wiki/spaces/KB/pages/1761378305/Releasing+Simprints+ID
      *
      * Dev version >= 2024.2.1 is required for receiving biometric sdk age restrictions
+     * Dev version >= 2024.3.0 is required to receive configuration ID
      */
-    set("VERSION_NAME", "2024.2.1")
+    set("VERSION_NAME", "2024.3.0")
 
     /**
      * Build type. The version code describes which build type was used for the build.

feature/login-check/src/test/java/com/simprints/feature/logincheck/usecases/UpdateSessionScopePayloadUseCaseTest.kt

@@ -74,6 +74,7 @@ internal class UpdateSessionScopePayloadUseCaseTest {
             device = Device("deviceId", "deviceModel", "deviceManufacturer"),
             databaseInfo = DatabaseInfo(0, 0),
             projectConfigurationUpdatedAt = "",
+            projectConfigurationId = "",
             location = null,
         ),
     )

infra/auth-logic/src/test/java/com/simprints/infra/authlogic/authenticator/ProjectAuthenticatorTest.kt

@@ -158,6 +158,7 @@ class ProjectAuthenticatorTest {
         } returns Token("", "", "", "")
 
         coEvery { configManager.getProjectConfiguration() } returns ProjectConfiguration(
+            "id",
             PROJECT_ID,
             "",
             general = GeneralConfiguration(

infra/auth-logic/src/test/java/com/simprints/infra/authlogic/authenticator/SignerManagerTest.kt

@@ -231,7 +231,7 @@ internal class SignerManagerTest {
                             tokenizationKeys = emptyMap()
                         ),
                         ProjectConfiguration(
-                            DEFAULT_PROJECT_ID, "", mockk(), mockk(), mockk(), mockk(), mockk(), mockk()
+                            "id", DEFAULT_PROJECT_ID, "", mockk(), mockk(), mockk(), mockk(), mockk(), mockk()
                         )
                     )
                 )

infra/config-store/src/main/java/com/simprints/infra/config/store/local/ConfigLocalDataSourceImpl.kt

@@ -126,6 +126,7 @@ internal class ConfigLocalDataSourceImpl @Inject constructor(
 
         val defaultProjectConfiguration: ProtoProjectConfiguration =
             ProjectConfiguration(
+                id = "",
                 projectId = "",
                 updatedAt = "",
                 general = GeneralConfiguration(

infra/config-store/src/main/java/com/simprints/infra/config/store/local/migrations/models/OldProjectConfig.kt

@@ -64,6 +64,7 @@ internal data class OldProjectConfig(
 ) {
     fun toDomain(projectId: String): ProjectConfiguration =
         ProjectConfiguration(
+            id = "",
             projectId = projectId,
             updatedAt = "",
             general = generalConfiguration(),

infra/config-store/src/main/java/com/simprints/infra/config/store/local/models/ProjectConfiguration.kt

@@ -4,6 +4,7 @@ import com.simprints.infra.config.store.models.ProjectConfiguration
 
 internal fun ProjectConfiguration.toProto(): ProtoProjectConfiguration =
     ProtoProjectConfiguration.newBuilder()
+        .setId(id)
         .setProjectId(projectId)
         .setUpdatedAt(updatedAt)
         .setConsent(consent.toProto())
@@ -18,6 +19,7 @@ internal fun ProjectConfiguration.toProto(): ProtoProjectConfiguration =
 
 internal fun ProtoProjectConfiguration.toDomain(): ProjectConfiguration =
     ProjectConfiguration(
+        id,
         projectId,
         updatedAt,
         general.toDomain(),

infra/config-store/src/main/java/com/simprints/infra/config/store/models/ProjectConfiguration.kt

@@ -1,6 +1,7 @@
 package com.simprints.infra.config.store.models
 
 data class ProjectConfiguration(
+    val id: String,
     val projectId: String,
     val updatedAt: String,
     val general: GeneralConfiguration,

infra/config-store/src/main/java/com/simprints/infra/config/store/remote/models/ApiProjectConfiguration.kt

@@ -5,6 +5,7 @@ import com.simprints.infra.config.store.models.ProjectConfiguration
 
 @Keep
 internal data class ApiProjectConfiguration(
+    val id: String,
     val projectId: String,
     val updatedAt: String,
     val general: ApiGeneralConfiguration,
@@ -16,6 +17,7 @@ internal data class ApiProjectConfiguration(
 ) {
 
     fun toDomain(): ProjectConfiguration = ProjectConfiguration(
+        id,
         projectId,
         updatedAt,
         general.toDomain(),

infra/config-store/src/main/proto/project_config.proto

@@ -12,6 +12,7 @@ message ProtoProjectConfiguration {
     ProtoIdentificationConfiguration identification = 6;
     ProtoSynchronizationConfiguration synchronization = 7;
     string updated_at = 8;
+    string id = 10;
 }
 
 message ProtoGeneralConfiguration {

infra/config-store/src/test/java/com/simprints/infra/config/store/local/ConfigLocalDataSourceImplTest.kt

@@ -163,6 +163,7 @@ class ConfigLocalDataSourceImplTest {
     fun `should save the project configuration and update the device configuration correctly with an empty list of fingersToCollect if fingerprint config is missing`() =
         runTest(UnconfinedTestDispatcher()) {
             val projectConfigurationToSave = ProjectConfiguration(
+                "id",
                 "projectId",
                 "updatedAt",
                 generalConfiguration,

infra/config-store/src/test/java/com/simprints/infra/config/store/remote/models/ApiProjectConfigurationTest.kt

@@ -15,6 +15,7 @@ class ApiProjectConfigurationTest {
     @Test
     fun `should map correctly the model when both fingerprint and face are missing`() {
         val apiProjectConfiguration = ApiProjectConfiguration(
+            "id",
             "projectId",
             "updatedAt",
             apiGeneralConfiguration,
@@ -25,6 +26,7 @@ class ApiProjectConfigurationTest {
             apiSynchronizationConfiguration
         )
         val projectConfiguration = ProjectConfiguration(
+            "id",
             "projectId",
             "updatedAt",
             generalConfiguration,

infra/config-store/src/test/java/com/simprints/infra/config/store/testtools/Models.kt

@@ -348,6 +348,7 @@ internal val protoSynchronizationConfiguration = ProtoSynchronizationConfigurati
     .build()
 
 internal val apiProjectConfiguration = ApiProjectConfiguration(
+    "id",
     "projectId",
     "updatedAt",
     apiGeneralConfiguration,
@@ -359,6 +360,7 @@ internal val apiProjectConfiguration = ApiProjectConfiguration(
 )
 
 internal val projectConfiguration = ProjectConfiguration(
+    "id",
     "projectId",
     "updatedAt",
     generalConfiguration,
@@ -370,6 +372,7 @@ internal val projectConfiguration = ProjectConfiguration(
 )
 
 internal val protoProjectConfiguration = ProtoProjectConfiguration.newBuilder()
+    .setId("id")
     .setProjectId("projectId")
     .setUpdatedAt("updatedAt")
     .setGeneral(protoGeneralConfiguration)

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

@@ -26,6 +26,7 @@ internal data class ApiEventScope(
     val location: ApiLocation?,
     @JsonInclude(Include.NON_EMPTY)
     val projectConfigurationUpdatedAt: String,
+    val projectConfigurationId: String,
     val events: List<ApiEvent>,
 ) {
 
@@ -48,6 +49,7 @@ internal data class ApiEventScope(
             databaseInfo = scope.payload.databaseInfo.fromDomainToApi(),
             location = scope.payload.location?.fromDomainToApi(),
             projectConfigurationUpdatedAt = scope.payload.projectConfigurationUpdatedAt,
+            projectConfigurationId = scope.payload.projectConfigurationId.orEmpty(),
             events = events.map { it.fromDomainToApi() }
         )
     }

infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/models/session/ApiEventScopeTest.kt

@@ -24,6 +24,7 @@ class ApiEventScopeTest {
             databaseInfo = ApiDatabaseInfo(0, 0),
             location = null,
             projectConfigurationUpdatedAt = "",
+            projectConfigurationId = "",
             events = emptyList()
         )
 
@@ -51,6 +52,7 @@ class ApiEventScopeTest {
             databaseInfo = ApiDatabaseInfo(0, 0),
             location = null,
             projectConfigurationUpdatedAt = "123",
+            projectConfigurationId = "",
             events = emptyList()
         )
 
@@ -60,4 +62,4 @@ class ApiEventScopeTest {
         // Assert
         Truth.assertThat(json).contains("projectConfigurationUpdatedAt")
     }
-}
+}

infra/events/src/debug/java/com/simprints/infra/events/sampledata/EventFactoryUtils.kt

@@ -122,7 +122,8 @@ fun createSessionScope(
             device = deviceArg,
             databaseInfo = databaseInfoArg,
             location = locationArg,
-            projectConfigurationUpdatedAt = "projectConfigurationUpdatedAt"
+            projectConfigurationUpdatedAt = "projectConfigurationUpdatedAt",
+            projectConfigurationId = "projectConfigurationId",
         )
     )
 }

infra/events/src/main/java/com/simprints/infra/events/EventRepositoryImpl.kt

@@ -74,6 +74,7 @@ internal open class EventRepositoryImpl @Inject constructor(
                     ),
                     databaseInfo = DatabaseInfo(sessionCount),
                     projectConfigurationUpdatedAt = projectConfiguration.updatedAt,
+                    projectConfigurationId = projectConfiguration.id,
                 )
             )
         }

infra/events/src/main/java/com/simprints/infra/events/event/domain/models/scope/EventScopePayload.kt

@@ -11,6 +11,7 @@ data class EventScopePayload(
     val libSimprintsVersion: String,
     val language: String,
     val projectConfigurationUpdatedAt: String,
+    val projectConfigurationId: String? = null,
 
     val modalities: List<GeneralConfiguration.Modality>,
     val device: Device,

infra/sync/src/test/java/com/simprints/infra/sync/config/testtools/Models.kt

@@ -116,6 +116,7 @@ internal val identificationConfiguration =
     IdentificationConfiguration(4, IdentificationConfiguration.PoolType.PROJECT)
 
 internal val projectConfiguration = ProjectConfiguration(
+    "id",
     "projectId",
     "updatedAt",
     generalConfiguration,