fix(datastore): dont use where.id() function (#1130)

Author: raphkim

aws-datastore/src/androidTest/java/com/amplifyframework/datastore/storage/sqlite/SQLiteStorageAdapterSaveTest.java

@@ -35,6 +35,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -322,4 +323,33 @@ public void patchItemOnlyHasChangedFields() throws AmplifyException, Interrupted
         observer.assertValueCount(1);
         observer.assertValueAt(0, storageItemChange -> storageItemChange.patchItem().equals(expectedItem));
     }
+
+    /**
+     * Test save with predicate. Confirms that conditionally updating a nested model also works.
+     * @throws DataStoreException On unexpected failure manipulating items in/out of DataStore
+     */
+    @Test
+    public void saveModelWithPredicateUpdatesForNestedModels() throws DataStoreException {
+        // Save a model
+        final BlogOwner mark = BlogOwner.builder()
+                .name("Mark")
+                .build();
+        adapter.save(mark);
+
+        // Save a model that belongs to another model
+        final Blog marksBlog = Blog.builder()
+                .name("Mark's very first blog.")
+                .owner(mark)
+                .build();
+        adapter.save(marksBlog);
+
+        // Update a model that belongs to another model
+        final Blog marksBlogEdit = marksBlog.copyOfBuilder()
+                .name("Mark's edited blog.")
+                .build();
+        adapter.save(marksBlogEdit);
+
+        // Assert that update went through successfully
+        assertEquals(Collections.singletonList(marksBlogEdit), adapter.query(Blog.class));
+    }
 }

aws-datastore/src/main/java/com/amplifyframework/datastore/storage/sqlite/SQLiteStorageAdapter.java

@@ -852,11 +852,17 @@ private boolean modelExists(Model model, QueryPredicate predicate) throws DataSt
      * @return the Model instance from SQLite, if it exists, otherwise null.
      */
     private Model query(Model model) {
+        final String modelName = getModelName(model);
+        final ModelSchema schema = modelSchemaRegistry.getModelSchemaForModelClass(modelName);
+        final SQLiteTable table = SQLiteTable.fromSchema(schema);
+        final String primaryKeyName = table.getPrimaryKeyColumnName();
+        final QueryPredicate matchId = QueryField.field(primaryKeyName).eq(model.getId());
+
         Iterator<? extends Model> result = Single.<Iterator<? extends Model>>create(emitter -> {
             if (model instanceof SerializedModel) {
-                query(getModelName(model), Where.id(model.getId()), emitter::onSuccess, emitter::onError);
+                query(modelName, Where.matches(matchId), emitter::onSuccess, emitter::onError);
             } else {
-                query(model.getClass(), Where.id(model.getId()), emitter::onSuccess, emitter::onError);
+                query(model.getClass(), Where.matches(matchId), emitter::onSuccess, emitter::onError);
             }
         }).blockingGet();
         return result.hasNext() ? result.next() : null;