Switch to SQLite implementation of EntitiesRepository

collect_app/src/main/java/org/odk/collect/android/database/AltDatabasePathContext.kt → androidshared/src/main/java/org/odk/collect/androidshared/sqlite/AltDatabasePathContext.kt

@@ -1,4 +1,4 @@
-package org.odk.collect.android.database
+package org.odk.collect.androidshared.sqlite
 
 import android.content.Context
 import android.content.ContextWrapper

androidshared/src/main/java/org/odk/collect/androidshared/sqlite/CursorExt.kt

@@ -0,0 +1,68 @@
+package org.odk.collect.androidshared.sqlite
+
+import android.database.Cursor
+import androidx.core.database.getIntOrNull
+import androidx.core.database.getStringOrNull
+
+object CursorExt {
+    fun <T> Cursor.foldAndClose(initial: T, operation: (T, Cursor) -> T): T {
+        return this.use {
+            it.moveToPosition(-1)
+
+            var accumulator = initial
+            while (it.moveToNext()) {
+                accumulator = operation(accumulator, it)
+            }
+
+            accumulator
+        }
+    }
+
+    fun <T> Cursor.foldAndClose(operation: (Cursor) -> T): List<T> {
+        return this.use {
+            it.moveToPosition(-1)
+
+            val accumulator = ArrayList<T>(it.count)
+            while (it.moveToNext()) {
+                accumulator.add(operation(it))
+            }
+
+            accumulator
+        }
+    }
+
+    fun <T> Cursor.first(map: (Cursor) -> T): T? {
+        return this.use {
+            if (it.moveToFirst()) {
+                map(it)
+            } else {
+                return null
+            }
+        }
+    }
+
+    fun Cursor.getString(column: String): String {
+        val columnIndex = this.getColumnIndex(column)
+        return this.getString(columnIndex)
+    }
+
+    fun Cursor.getStringOrNull(column: String): String? {
+        val columnIndex = this.getColumnIndex(column)
+        return this.getStringOrNull(columnIndex)
+    }
+
+    fun Cursor.getLong(column: String): Long {
+        val columnIndex = this.getColumnIndex(column)
+        return this.getLong(columnIndex)
+    }
+
+    fun Cursor.getInt(column: String): Int {
+        val columnIndex = this.getColumnIndex(column)
+        return this.getInt(columnIndex)
+    }
+
+    fun Cursor.getIntOrNull(column: String): Int? {
+        val columnIndex = this.getColumnIndex(column)
+        return this.getIntOrNull(columnIndex)
+    }
+}

collect_app/src/main/java/org/odk/collect/android/utilities/CustomSQLiteQueryBuilder.java → androidshared/src/main/java/org/odk/collect/androidshared/sqlite/CustomSQLiteQueryBuilder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.odk.collect.android.utilities;
+package org.odk.collect.androidshared.sqlite;
 
 import org.odk.collect.shared.strings.StringUtils;
 

collect_app/src/main/java/org/odk/collect/android/utilities/CustomSQLiteQueryExecutor.java → androidshared/src/main/java/org/odk/collect/androidshared/sqlite/CustomSQLiteQueryExecutor.java

@@ -1,4 +1,4 @@
-package org.odk.collect.android.utilities;
+package org.odk.collect.androidshared.sqlite;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;

collect_app/src/main/java/org/odk/collect/android/database/DatabaseConnection.kt → androidshared/src/main/java/org/odk/collect/androidshared/sqlite/DatabaseConnection.kt

@@ -1,4 +1,4 @@
-package org.odk.collect.android.database
+package org.odk.collect.androidshared.sqlite
 
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase

collect_app/src/main/java/org/odk/collect/android/database/DatabaseMigrator.java → androidshared/src/main/java/org/odk/collect/androidshared/sqlite/DatabaseMigrator.java

@@ -1,4 +1,4 @@
-package org.odk.collect.android.database;
+package org.odk.collect.androidshared.sqlite;
 
 import android.database.sqlite.SQLiteDatabase;
 
@@ -8,4 +8,4 @@ public interface DatabaseMigrator {
     void onUpgrade(SQLiteDatabase db, int oldVersion);
 
     void onDowngrade(SQLiteDatabase db);
-}
+}

androidshared/src/main/java/org/odk/collect/androidshared/sqlite/SQLiteColumns.kt

@@ -0,0 +1,5 @@
+package org.odk.collect.androidshared.sqlite
+
+object SQLiteColumns {
+    const val ROW_ID = "rowid"
+}

androidshared/src/main/java/org/odk/collect/androidshared/sqlite/SQLiteDatabaseExt.kt

@@ -0,0 +1,23 @@
+package org.odk.collect.androidshared.sqlite
+
+import android.database.Cursor
+import android.database.sqlite.SQLiteDatabase
+import android.database.sqlite.SQLiteQueryBuilder
+
+object SQLiteDatabaseExt {
+    fun SQLiteDatabase.query(
+        table: String,
+        selection: String? = null,
+        selectionArgs: Array<String?>? = null
+    ): Cursor {
+        val qb = SQLiteQueryBuilder().apply {
+            tables = table
+        }
+
+        return qb.query(this, null, selection, selectionArgs, null, null, null)
+    }
+
+    fun SQLiteDatabase.delete(table: String) {
+        this.delete(table, null, null)
+    }
+}

collect_app/src/main/java/org/odk/collect/android/utilities/SQLiteUtils.java → androidshared/src/main/java/org/odk/collect/androidshared/sqlite/SQLiteUtils.java

@@ -1,4 +1,4 @@
-package org.odk.collect.android.utilities;
+package org.odk.collect.androidshared.sqlite;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;

collect_app/src/test/java/org/odk/collect/android/utilities/CustomSQLiteQueryBuilderTest.java → androidshared/src/test/java/org/odk/collect/androidshared/sqlite/CustomSQLiteQueryBuilderTest.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.odk.collect.android.utilities;
+package org.odk.collect.androidshared.sqlite;
+
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-
 public class CustomSQLiteQueryBuilderTest {
 
     private final String[] columns = {"_id", "col1", "col2", "col3"};

collect_app/src/test/java/org/odk/collect/android/utilities/SQLiteUtilsTest.java → androidshared/src/test/java/org/odk/collect/androidshared/sqlite/SQLiteUtilsTest.java

@@ -1,28 +1,28 @@
-package org.odk.collect.android.utilities;
+package org.odk.collect.androidshared.sqlite;
+
+import static android.content.Context.MODE_PRIVATE;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
 
 import android.database.sqlite.SQLiteDatabase;
 
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.odk.collect.android.application.Collect;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static android.content.Context.MODE_PRIVATE;
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertTrue;
-
 @RunWith(AndroidJUnit4.class)
 public class SQLiteUtilsTest {
 
     @Test
     public void doesColumnExistTest() {
         String tableName = "testTable";
 
-        SQLiteDatabase db = Collect.getInstance().openOrCreateDatabase("testDatabase", MODE_PRIVATE, null);
+        SQLiteDatabase db = ApplicationProvider.getApplicationContext().openOrCreateDatabase("testDatabase", MODE_PRIVATE, null);
         db.execSQL("CREATE TABLE " + tableName + " (id integer, column1 text);");
 
         assertTrue(SQLiteUtils.doesColumnExist(db, tableName, "id"));
@@ -36,7 +36,7 @@ public void doesTableExistTest() {
         final String tableName = "testTable";
         final String columnName = CustomSQLiteQueryBuilder.quoteIdentifier("col");
 
-        SQLiteDatabase db = Collect.getInstance().openOrCreateDatabase("testDatabase", MODE_PRIVATE, null);
+        SQLiteDatabase db = ApplicationProvider.getApplicationContext().openOrCreateDatabase("testDatabase", MODE_PRIVATE, null);
 
         assertFalse(SQLiteUtils.doesTableExist(db, tableName));
 

collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/EntityFormTest.kt

@@ -6,7 +6,6 @@ import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
 import org.odk.collect.android.support.StubOpenRosaServer.EntityListItem
-import org.odk.collect.android.support.StubOpenRosaServer.MediaFileItem
 import org.odk.collect.android.support.TestDependencies
 import org.odk.collect.android.support.pages.FormEntryPage
 import org.odk.collect.android.support.pages.MainMenuPage
@@ -23,26 +22,6 @@ class EntityFormTest {
     val ruleChain: RuleChain = TestRuleChain.chain(testDependencies)
         .around(rule)
 
-    @Test
-    fun fillingEntityRegistrationForm_doesNotShowEntitiesInNonEntityListForm() {
-        testDependencies.server.addForm("one-question-entity-registration.xml")
-        testDependencies.server.addForm(
-            "one-question-entity-update.xml",
-            listOf(MediaFileItem("people.csv"))
-        )
-
-        rule.withMatchExactlyProject(testDependencies.server.url)
-            .enableLocalEntitiesInForms()
-
-            .startBlankForm("One Question Entity Registration")
-            .fillOutAndFinalize(FormEntryPage.QuestionAndAnswer("Name", "Logan Roy"))
-
-            .startBlankForm("One Question Entity Update")
-            .assertQuestion("Select person")
-            .assertText("Roman Roy")
-            .assertTextDoesNotExist("Logan Roy")
-    }
-
     @Test
     fun fillingEntityRegistrationForm_createsEntityForFollowUpForms() {
         testDependencies.server.addForm("one-question-entity-registration.xml")
@@ -52,8 +31,6 @@ class EntityFormTest {
         )
 
         rule.withMatchExactlyProject(testDependencies.server.url)
-            .enableLocalEntitiesInForms()
-
             .startBlankForm("One Question Entity Registration")
             .fillOutAndFinalize(FormEntryPage.QuestionAndAnswer("Name", "Logan Roy"))
 
@@ -72,8 +49,6 @@ class EntityFormTest {
         )
 
         rule.withMatchExactlyProject(testDependencies.server.url)
-            .enableLocalEntitiesInForms()
-
             .startBlankForm("One Question Entity Update") // Open to create cached form def
             .pressBackAndDiscardForm()
 
@@ -94,8 +69,6 @@ class EntityFormTest {
         )
 
         rule.withMatchExactlyProject(testDependencies.server.url)
-            .enableLocalEntitiesInForms()
-
             .startBlankForm("One Question Entity Update")
             .assertQuestion("Select person")
             .clickOnText("Roman Roy")
@@ -118,8 +91,6 @@ class EntityFormTest {
         )
 
         rule.withMatchExactlyProject(testDependencies.server.url)
-            .enableLocalEntitiesInForms()
-
             .startBlankForm("One Question Entity Registration")
             .fillOutAndFinalize(FormEntryPage.QuestionAndAnswer("Name", "Logan Roy"))
 
@@ -137,8 +108,6 @@ class EntityFormTest {
         )
 
         rule.withMatchExactlyProject(testDependencies.server.url)
-            .enableLocalEntitiesInForms()
-
             .startBlankForm("One Question Entity Update")
             .assertQuestion("Select person")
             .clickOnText("Roman Roy")
@@ -167,8 +136,6 @@ class EntityFormTest {
         }
 
         rule.withProject(testDependencies.server)
-            .enableLocalEntitiesInForms()
-
             .clickGetBlankForm()
             .clickClearAll()
             .clickForm("One Question Entity Update")
@@ -185,4 +152,24 @@ class EntityFormTest {
             .assertText("Ro-Ro Roy")
             .assertTextDoesNotExist("Roman Roy")
     }
+
+    @Test
+    fun disablingLocalEntities_stopsThemFromBeingShownInFollowUpForms() {
+        testDependencies.server.addForm("one-question-entity-registration.xml")
+        testDependencies.server.addForm(
+            "one-question-entity-update.xml",
+            listOf(EntityListItem("people.csv"))
+        )
+
+        rule.withMatchExactlyProject(testDependencies.server.url)
+            .startBlankForm("One Question Entity Registration")
+            .fillOutAndFinalize(FormEntryPage.QuestionAndAnswer("Name", "Logan Roy"))
+
+            .disableLocalEntitiesInForms()
+
+            .startBlankForm("One Question Entity Update")
+            .assertQuestion("Select person")
+            .assertText("Roman Roy")
+            .assertTextDoesNotExist("Logan Roy")
+    }
 }