Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(datastore): Return nested data for belongsTo associations in datastore #1390

Merged
merged 5 commits into from
Jul 8, 2021
Merged

feat(datastore): Return nested data for belongsTo associations in datastore #1390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0cb99c1
recursively create SerializedModel
Jordan-Nelson Jun 25, 2021
b7c4b17
update test queryModelsInSerializedForm
Jordan-Nelson Jun 29, 2021
596f478
Merge branch 'main' of github.com:aws-amplify/amplify-android into fe…
Jordan-Nelson Jun 29, 2021
b4c6d4e
fix style issues
Jordan-Nelson Jul 6, 2021
059c6eb
Merge branch 'main' of github.com:aws-amplify/amplify-android into fe…
Jordan-Nelson Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...src/androidTest/java/com/amplifyframework/datastore/HybridOfflineInstrumentationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ public void queryModelsInSerializedForm() throws DataStoreException {
serializedBlogData.put("id", blog.getId());
serializedBlogData.put("name", blog.getName());
serializedBlogData.put("owner", SerializedModel.builder()
.serializedData(Collections.singletonMap("id", blogOwner.getId()))
.modelSchema(null)
.serializedData(serializedBlogOwnerData)
.modelSchema(blogOwnerSchema)
.build()
);
assertEquals(
Expand Down
56 changes: 35 additions & 21 deletions ...ore/src/main/java/com/amplifyframework/datastore/storage/sqlite/SQLiteStorageAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.amplifyframework.core.Consumer;
import com.amplifyframework.core.async.Cancelable;
import com.amplifyframework.core.model.Model;
import com.amplifyframework.core.model.ModelAssociation;
import com.amplifyframework.core.model.ModelField;
import com.amplifyframework.core.model.ModelProvider;
import com.amplifyframework.core.model.ModelSchema;
Expand Down Expand Up @@ -416,7 +417,6 @@ public <T extends Model> void query(
/**
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
@Override
public void query(
@NonNull String modelName,
Expand Down Expand Up @@ -447,26 +447,8 @@ public void query(

if (cursor.moveToFirst()) {
do {
final Map<String, Object> serializedData = new HashMap<>();
for (Map.Entry<String, Object> entry : converter.buildMapForModel(cursor).entrySet()) {
ModelField field = modelSchema.getFields().get(entry.getKey());
if (field == null || entry.getValue() == null) {
// Skip it
} else if (field.isModel()) {
String id = (String) ((Map<String, Object>) entry.getValue()).get("id");
serializedData.put(entry.getKey(), SerializedModel.builder()
.serializedData(Collections.singletonMap("id", id))
.modelSchema(null)
.build()
);
} else {
serializedData.put(entry.getKey(), entry.getValue());
}
}
SerializedModel model = SerializedModel.builder()
.serializedData(serializedData)
.modelSchema(modelSchema)
.build();
final Map<String, Object> data = converter.buildMapForModel(cursor);
final SerializedModel model = createSerializedModel(modelSchema, data);
models.add(model);
} while (cursor.moveToNext());
}
Expand Down Expand Up @@ -831,4 +813,36 @@ private Completable updateModels() {
return PersistentModelVersion.saveToLocalStorage(this, persistentModelVersion);
}).ignoreElement();
}

/**
* recursively creates nested SerializedModels from raw data.
*/
private SerializedModel createSerializedModel(ModelSchema modelSchema, Map<String, Object> data) {
final Map<String, Object> serializedData = new HashMap<>();
for (Map.Entry<String, Object> entry : data.entrySet()) {
ModelField field = modelSchema.getFields().get(entry.getKey());
if (field != null && entry.getValue() != null) {
if (field.isModel()) {
ModelAssociation association = modelSchema.getAssociations().get(entry.getKey());
if (association != null) {
String associatedType = association.getAssociatedType();
final ModelSchema nestedModelSchema = modelSchemaRegistry.getModelSchemaForModelClass(
associatedType
);
@SuppressWarnings("unchecked")
SerializedModel model = createSerializedModel(
nestedModelSchema, (Map<String, Object>) entry.getValue()
);
serializedData.put(entry.getKey(), model);
}
} else {
serializedData.put(entry.getKey(), entry.getValue());
}
}
}
return SerializedModel.builder()
.serializedData(serializedData)
.modelSchema(modelSchema)
.build();
}
}