updates

Author: biozal

src/app/src/androidTest/java/com/couchbase/learningpath/DatabaseIntegrationTests.kt

@@ -9,18 +9,11 @@ import com.couchbase.learningpath.data.audits.AuditRepositoryDb
 import com.couchbase.learningpath.data.project.ProjectRepositoryDb
 import com.couchbase.learningpath.data.stockItem.StockItemRepositoryDb
 import com.couchbase.learningpath.data.userprofile.UserProfileRepository
-import com.couchbase.learningpath.data.warehouse.WarehouseRepository
 import com.couchbase.learningpath.data.warehouse.WarehouseRepositoryDb
 import com.couchbase.learningpath.models.*
 import com.couchbase.learningpath.services.MockAuthenticationService
 import com.couchbase.lite.CouchbaseLiteException
-import com.couchbase.lite.Dictionary
-import junit.framework.Assert.assertNull
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.runTest
 import org.junit.*
 import org.junit.Assert.*
@@ -371,7 +364,7 @@ class DatabaseIntegrationTests {
                 assertEquals(it.auditId, testAudit.auditId)
                 assertEquals(it.stockItem, testAudit.stockItem)
                 assertEquals(it.notes, testAudit.notes)
-                assertEquals(it.count, testAudit.count)
+                assertEquals(it.auditCount, testAudit.auditCount)
                 assertEquals(it.team, testAudit.team)
             }
         }

src/app/src/main/java/com/couchbase/learningpath/data/project/ProjectRepositoryDb.kt

@@ -3,7 +3,6 @@ package com.couchbase.learningpath.data.project
 import android.content.Context
 import android.util.Log
 import com.couchbase.lite.*
-import com.couchbase.lite.Function
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
@@ -197,7 +196,7 @@ class ProjectRepositoryDb(
                 db?.let { database ->
                     val query = QueryBuilder  // 1
                         .select(
-                            SelectResult.expression(Function.count(Expression.string("*")))
+                            SelectResult.expression(com.couchbase.lite.Function.count(Expression.string("*")))
                                 .`as`("count")
                         ) // 2
                         .from(DataSource.database(database)) //3
@@ -261,7 +260,7 @@ class ProjectRepositoryDb(
                                     val auditDocument = Audit(
                                         auditId = UUID.randomUUID().toString(),
                                         projectId = projectId,
-                                        count = (1..100000).random(),
+                                        auditCount = (1..100000).random(),
                                         stockItem =  stockItem,
                                         documentType = auditDocumentType,
                                         notes = "Found item ${stockItem.name} - ${stockItem.description} in warehouse",

src/app/src/main/java/com/couchbase/learningpath/models/Audit.kt

@@ -20,7 +20,7 @@ data class Audit (
     var auditId: String = "",
     var projectId: String = "",
     var stockItem: StockItem? = null,
-    var count: Int = 0,
+    var auditCount: Int = 0,
     var documentType: String = "",
     var notes: String = "",
     //security tracking

src/app/src/main/java/com/couchbase/learningpath/services/AuditEditorStateService.kt

@@ -129,7 +129,7 @@ fun AuditCard(
 
                 Text(
                     modifier = Modifier.padding(start = 6.dp),
-                    text = audit.count.toString(),
+                    text = audit.auditCount.toString(),
                     style = MaterialTheme.typography.caption,
                     color = MaterialTheme.colors.onSurface
                 )
@@ -166,7 +166,7 @@ fun AuditCardPreview() {
         auditId = "",
         projectId = "",
         stockItem = StockItem("000-000-0000", name = "Test Item", description = "Test Item Description", price = 0.0F, documentType="item"),
-        count = 100,
+        auditCount = 100,
         notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
         team = "Test Team",
         documentType = "Test Type",

src/app/src/main/java/com/couchbase/learningpath/ui/audit/AuditCard.kt

@@ -39,7 +39,7 @@ class AuditEditorViewModel(
                 //as the uuid is assigned by the repository
                 auditId.value = audit.auditId
                 auditState.value?.let {
-                    count.value = it.count.toString()
+                    count.value = it.auditCount.toString()
                     if (it.stockItem != null) {
                         it.stockItem?.let { stockItem ->
                             stockItemSelectionState.value = stockItem.name
@@ -74,7 +74,7 @@ class AuditEditorViewModel(
     val onCountChanged: (String) -> Unit = { newValue ->
         if (newValue != "") {
             try {
-                auditState.value?.count = newValue.toInt()
+                auditState.value?.auditCount = newValue.toInt()
                 count.value = newValue
             } catch (nfe: NumberFormatException) {
                 Log.e("Error", nfe.message.toString())
@@ -121,7 +121,7 @@ class AuditEditorViewModel(
         viewModelScope.launch {
             if (projectId.value != "") {
                 auditState.value?.let {
-                    if (it.count <= 0) {
+                    if (it.auditCount <= 0) {
                         errorMessageState.value = "Error: Count must be greater than zero"
                     } else if (it.stockItem == null) {
                         errorMessageState.value = "Error: Must select stock item before saving"

src/app/src/main/java/com/couchbase/learningpath/ui/audit/AuditEditorViewModel.kt

@@ -107,7 +107,7 @@ fun AuditListPreview() {
         auditId = "",
         projectId = "",
         stockItem = StockItem("000-000-0000", name = "Test Item", description = "Test Item Description", price = 0.0F, documentType="item"),
-        count = 100,
+        auditCount = 100,
         notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
         team = "Test Team",
         documentType = "Test Type",

src/app/src/main/java/com/couchbase/learningpath/ui/audit/AuditListView.kt

@@ -15,7 +15,7 @@ buildscript {
         coroutines_tests_version = '1.6.3'
 
         //couchbase
-        couchbase_lite_version = '3.0.0'
+        couchbase_lite_version = '3.0.2'
     }
 
     repositories {