Pre production fixes and clean up

android/build.gradle.kts

@@ -6,15 +6,15 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 buildscript {
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
         classpath(Deps.kotlin_coveralls_plugin)
         classpath("com.android.tools.build:gradle:8.2.2")
         classpath(Deps.dokka_plugin)
     }
 }
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.9.22"
+    id("org.jetbrains.kotlin.jvm") version "1.9.24"
     id("com.github.kt3k.coveralls") version "2.12.2"
     id("org.jetbrains.kotlin.plugin.serialization") version "1.8.10"
     id("com.google.dagger.hilt.android") version Deps.versions.hiltVersion apply false

android/buildSrc/src/main/kotlin/Deps.kt

@@ -23,7 +23,7 @@ object Deps {
         const val atsl_runner = "1.5.2"
         const val caffeine = "2.9.0"
         const val constraint_layout = "1.1.3"
-        const val coroutines = "1.7.3"
+        const val coroutines = "1.8.1"
         const val core = "1.7.0"
         const val cql_engine = "1.3.14-SNAPSHOT"
         const val desugar = "2.0.4"
@@ -32,7 +32,7 @@ object Deps {
         const val guava = "28.2-android"
         const val hapi_r4 = "5.3.0"
         const val junit5_api = "5.9.3"
-        const val kotlin = "1.8.22"
+        const val kotlin = "1.9.24"
         const val lifecycle = "2.2.0"
         const val material = "1.5.0"
         const val okhttp_logging_interceptor = "4.0.0"

android/dataclerk/build.gradle.kts

@@ -115,7 +115,7 @@ android {
     buildConfig = true
   }
 
-  composeOptions { kotlinCompilerExtensionVersion = "1.5.9" }
+  composeOptions { kotlinCompilerExtensionVersion = "1.5.14" }
 
   testOptions {
     execution = "ANDROIDX_TEST_ORCHESTRATOR"
@@ -139,15 +139,15 @@ android {
       dimension = "apps"
       applicationIdSuffix = ".exposedInfant"
       versionNameSuffix = "-exposedInfant"
-      versionCode = 1
-      versionName = "0.0.1"
+      versionCode = 3
+      versionName = "0.0.3"
     }
     create("artClient") {
       dimension = "apps"
       applicationIdSuffix = ".artClient"
       versionNameSuffix = "-artClient"
-      versionCode = 1
-      versionName = "0.0.1"
+      versionCode = 3
+      versionName = "0.0.3"
     }
     create("exposedInfantDev") {
       dimension = "apps"
@@ -190,19 +190,19 @@ dependencies {
   coreLibraryDesugaring(Deps.desugar)
   implementation(project(":engine"))
 
-  implementation("androidx.core:core-ktx:1.12.0")
+  implementation("androidx.core:core-ktx:1.13.1")
   implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.20"))
-  implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
-  implementation("androidx.activity:activity-compose:1.8.2")
+  implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.1")
+  implementation("androidx.activity:activity-compose:1.9.0")
 
   implementation(Deps.accompanist.swiperefresh)
 
-  implementation(platform("androidx.compose:compose-bom:2024.02.01"))
+  implementation(platform("androidx.compose:compose-bom:2024.05.00"))
   implementation("androidx.compose.ui:ui")
   implementation("androidx.compose.ui:ui-graphics")
   implementation("androidx.compose.ui:ui-tooling-preview")
   implementation("androidx.compose.material3:material3")
-  implementation("androidx.paging:paging-compose:3.2.1")
+  implementation("androidx.paging:paging-compose:3.3.0")
 
   implementation("com.github.anrwatchdog:anrwatchdog:1.4.0")
 

android/dataclerk/src/main/java/org/dtree/fhircore/dataclerk/ui/home/HomeScreen.kt

@@ -25,7 +25,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.BugReport
 import androidx.compose.material.icons.filled.Refresh
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.Settings

android/dataclerk/src/main/java/org/dtree/fhircore/dataclerk/ui/main/AppDataStore.kt

@@ -19,8 +19,8 @@ package org.dtree.fhircore.dataclerk.ui.main
 import ca.uhn.fhir.rest.gclient.DateClientParam
 import ca.uhn.fhir.rest.gclient.TokenClientParam
 import com.google.android.fhir.FhirEngine
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.get
-import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.Operation
 import com.google.android.fhir.search.Order
 import com.google.android.fhir.search.Search

android/dataclerk/src/main/java/org/dtree/fhircore/dataclerk/ui/patient/PatientScreen.kt

@@ -84,7 +84,7 @@ fun PatientScreen(
     topBar = {
       TopAppBar(
         navigationIcon = {
-          IconButton(onClick = { navController.popBackStack() }) {
+          IconButton(onClick = { navController.navigateUp() }) {
             Icon(Icons.Filled.ArrowBack, contentDescription = "")
           }
         },

android/engine/build.gradle.kts

@@ -41,7 +41,7 @@ android {
     dataBinding = true
     buildConfig = true
   }
-  composeOptions { kotlinCompilerExtensionVersion = "1.5.9" }
+  composeOptions { kotlinCompilerExtensionVersion = "1.5.14" }
 
   packaging {
     resources {
@@ -96,22 +96,22 @@ dependencies {
   implementation("androidx.preference:preference-ktx:1.2.1")
   coreLibraryDesugaring(Deps.desugar)
 
-  api("androidx.core:core-ktx:1.12.0")
-  api("androidx.appcompat:appcompat:1.6.1")
-  api("com.google.android.material:material:1.11.0")
+  api("androidx.core:core-ktx:1.13.1")
+  api("androidx.appcompat:appcompat:1.7.0")
+  api("com.google.android.material:material:1.12.0")
   implementation("androidx.constraintlayout:constraintlayout:2.1.4")
   implementation("androidx.constraintlayout:constraintlayout-compose:1.0.1")
-  implementation("androidx.fragment:fragment-ktx:1.6.2")
+  implementation("androidx.fragment:fragment-ktx:1.7.1")
   api("io.jsonwebtoken:jjwt:0.9.1")
   implementation("androidx.security:security-crypto:1.1.0-alpha06")
   api("org.smartregister:fhir-common-utils:0.0.8-SNAPSHOT") {
     exclude(group = "org.slf4j", module = "jcl-over-slf4j")
   }
-  implementation("com.squareup.okhttp3:logging-interceptor:4.11.0")
+  implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
   implementation("com.squareup.okhttp3:okhttp:4.12.0")
   implementation("androidx.cardview:cardview:1.0.0")
   implementation("joda-time:joda-time:2.10.14")
-  implementation("androidx.paging:paging-runtime-ktx:3.2.1")
+  implementation("androidx.paging:paging-runtime-ktx:3.3.0")
   implementation("com.github.bumptech.glide:glide:4.16.0")
   implementation("id.zelory:compressor:3.0.1")
 
@@ -151,13 +151,13 @@ dependencies {
   api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")
 
   // Jetpack - DataStore
-  implementation("androidx.datastore:datastore-preferences:1.0.0")
+  implementation("androidx.datastore:datastore-preferences:1.1.1")
 
   // P2P dependency
   api("org.smartregister:p2p-lib:0.3.0-SNAPSHOT")
 
   // Configure Jetpack Compose
-  api(platform("androidx.compose:compose-bom:2024.02.02"))
+  api(platform("androidx.compose:compose-bom:2024.05.00"))
   api("androidx.compose.ui:ui")
   api("androidx.compose.ui:ui-tooling")
   api("androidx.compose.foundation:foundation")
@@ -169,13 +169,13 @@ dependencies {
   api("androidx.navigation:navigation-compose:2.7.7")
   api("androidx.hilt:hilt-navigation-compose:1.2.0")
   api("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
-  api("androidx.paging:paging-compose:3.2.1")
-  api("androidx.activity:activity-compose:1.8.2")
+  api("androidx.paging:paging-compose:3.3.0")
+  api("androidx.activity:activity-compose:1.9.0")
   api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
   api("androidx.work:work-runtime-ktx:2.9.0")
   testApi("androidx.work:work-testing:2.9.0")
 
-  val coroutineVersion = "1.7.3"
+  val coroutineVersion = "1.8.1"
   api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
   api("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutineVersion")
   api("org.smartregister:contrib-barcode:0.1.0-beta3-preview7-SNAPSHOT") {
@@ -195,7 +195,9 @@ dependencies {
 
   api("org.smartregister:common:0.1.0-alpha05-preview3-SNAPSHOT") { isTransitive = true }
 
-  api("org.smartregister:engine:1.0.0-preview7.1-SNAPSHOT") {
+  //  api("org.smartregister:engine:1.0.0-preview7.1-SNAPSHOT") {
+  api("org.smartregister:engine:1.0.0-preview8-PERF-TEST-SNAPSHOT") {
+    //    api("org.smartregister:engine:1.0.0-preview7.1-PERF-TEST5-SNAPSHOT") {
     isTransitive = true
     exclude(group = "com.google.android.fhir", module = "common")
     exclude(group = "com.github.ben-manes.caffeine")

android/engine/src/main/java/org/smartregister/fhircore/engine/appointment/MissedFHIRAppointmentsWorker.kt

@@ -38,7 +38,7 @@ constructor(
   val dispatcherProvider: DispatcherProvider,
 ) : CoroutineWorker(appContext, workerParameters) {
   override suspend fun doWork(): Result {
-    return withContext(dispatcherProvider.io()) {
+    return withContext(dispatcherProvider.singleThread()) {
       fhirResourceUtil.handleMissedAppointment()
       Result.success()
     }

android/engine/src/main/java/org/smartregister/fhircore/engine/appointment/ProposedWelcomeServiceAppointmentsWorker.kt

@@ -36,7 +36,7 @@ constructor(
   val dispatcherProvider: DispatcherProvider,
 ) : CoroutineWorker(appContext, workerParameters) {
   override suspend fun doWork(): Result {
-    return withContext(dispatcherProvider.io()) {
+    return withContext(dispatcherProvider.singleThread()) {
       fhirResourceUtil.handleWelcomeServiceAppointmentWorker()
       Result.success()
     }

android/engine/src/main/java/org/smartregister/fhircore/engine/auditEvent/AuditEventRepository.kt

@@ -23,26 +23,28 @@ import javax.inject.Singleton
 import org.hl7.fhir.r4.model.AuditEvent
 import org.hl7.fhir.r4.model.Coding
 import org.hl7.fhir.r4.model.Practitioner
+import org.hl7.fhir.r4.model.ResourceType
 import org.smartregister.fhircore.engine.R
 import org.smartregister.fhircore.engine.data.local.DefaultRepository
 import org.smartregister.fhircore.engine.util.SharedPreferenceKey
 import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
 import org.smartregister.fhircore.engine.util.extension.asReference
+import org.smartregister.fhircore.engine.util.extension.extractLogicalIdUuid
 
 @Singleton
 class AuditEventRepository
 @Inject
 constructor(
   val defaultRepository: DefaultRepository,
-  val sharedPreferences: SharedPreferencesHelper,
+  private val sharedPreferences: SharedPreferencesHelper,
 ) : IAuditEventRepository {
   override suspend fun createAuditEvent() {
     // Get Practitioner Resource
     val practitionerID =
-      sharedPreferences.read(key = SharedPreferenceKey.PRACTITIONER_ID.name, defaultValue = null)
+      sharedPreferences.read(SharedPreferenceKey.PRACTITIONER_ID.name, null)?.extractLogicalIdUuid()
         ?: return
 
-    val practitioner = defaultRepository.loadResource<Practitioner>(practitionerID!!)
+    val practitioner = practitionerID.asReference(ResourceType.Practitioner)
 
     val context = sharedPreferences.context
 
@@ -70,12 +72,11 @@ constructor(
         agent =
           listOf(
             AuditEvent.AuditEventAgentComponent().apply {
-              who = practitioner?.asReference()
+              who = practitioner
               requestor = true
             },
           )
-        source =
-          AuditEvent.AuditEventSourceComponent().apply { observer = practitioner?.asReference() }
+        source = AuditEvent.AuditEventSourceComponent().apply { observer = practitioner }
       }
 
     // Save AuditEvent Resource

android/engine/src/main/java/org/smartregister/fhircore/engine/auditEvent/AuditEventWorker.kt

@@ -22,6 +22,8 @@ import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
+import kotlinx.coroutines.withContext
+import org.smartregister.fhircore.engine.util.DispatcherProvider
 import timber.log.Timber
 
 @HiltWorker
@@ -31,12 +33,15 @@ constructor(
   @Assisted val appContext: Context,
   @Assisted workerParameters: WorkerParameters,
   private val auditEventRepository: AuditEventRepository,
+  val dispatcherProvider: DispatcherProvider,
 ) : CoroutineWorker(appContext, workerParameters) {
 
   override suspend fun doWork(): Result {
-    Timber.e("AuditEventWorker is running")
-    auditEventRepository.createAuditEvent()
-    return Result.success()
+    return withContext(dispatcherProvider.singleThread()) {
+      Timber.e("AuditEventWorker is running")
+      auditEventRepository.createAuditEvent()
+      Result.success()
+    }
   }
 
   companion object {

android/engine/src/main/java/org/smartregister/fhircore/engine/data/domain/PhoneContact.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2021 Ona Systems, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.smartregister.fhircore.engine.data.domain
+
+data class PhoneContact(val number: String, val owner: String)

android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt

@@ -19,11 +19,11 @@ package org.smartregister.fhircore.engine.data.local
 import ca.uhn.fhir.rest.gclient.ReferenceClientParam
 import ca.uhn.fhir.rest.gclient.TokenClientParam
 import com.google.android.fhir.FhirEngine
+import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.db.ResourceNotFoundException
 import com.google.android.fhir.delete
 import com.google.android.fhir.get
 import com.google.android.fhir.getLocalizedText
-import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.search
 import javax.inject.Inject
 import javax.inject.Singleton