Skip to content

Fix for #347 (include in LiveList) #348

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

Merged
merged 5 commits into from
Apr 4, 2020
Merged

Fix for #347 (include in LiveList) #348

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd837d1
LiveList: reload included objects
fischerscode Apr 2, 2020
a30de87
Key was wrong on order change
fischerscode Apr 2, 2020
8d4a4af
include sub-includes
fischerscode Apr 2, 2020
f4860d2
reuse loaded pointers
fischerscode Apr 4, 2020
31a498b
Deleted stuff
fischerscode Apr 4, 2020
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
139 changes: 125 additions & 14 deletions lib/src/utils/parse_live_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,24 @@ class ParseLiveList<T extends ParseObject> {
return _list.length;
}

List<String> get includes =>
_query.limiters['include']?.toString()?.split(',') ?? <String>[];

Map<String, dynamic> get _includePaths {
final Map<String, dynamic> includesMap = <String, dynamic>{};

for (String includeString in includes) {
final List<String> pathParts = includeString.split('.');
Map<String, dynamic> root = includesMap;
for (String pathPart in pathParts) {
root.putIfAbsent(pathPart, () => <String, dynamic>{});
root = root[pathPart];
}
}

return includesMap;
}

Stream<ParseLiveListEvent<T>> get stream => _eventStreamController.stream;
Subscription<T> _liveQuerySubscription;
StreamSubscription<LiveQueryClientEvent> _liveQueryClientEventSubscription;
Expand All @@ -92,9 +110,9 @@ class ParseLiveList<T extends ParseObject> {
if (query.limiters.containsKey('order')) {
query.keysToReturn(
query.limiters['order'].toString().split(',').map((String string) {
if (string.startsWith('-')) {
return string.substring(1);
}
if (string.startsWith('-')) {
return string.substring(1);
}
return string;
}).toList());
} else {
Expand Down Expand Up @@ -180,7 +198,92 @@ class ParseLiveList<T extends ParseObject> {
});
}

void _objectAdded(T object, {bool loaded = true}) {
Future<void> _loadIncludes(ParseObject object,
{ParseObject oldObject, Map<String, dynamic> paths}) async {
paths ??= _includePaths;
if (object == null || paths.isEmpty) return;

final List<Future<void>> loadingNodes = <Future<void>>[];

for (String key in paths.keys) {
if (object.containsKey(key)) {
ParseObject includedObject = object.get<ParseObject>(key);
//If the object is not fetched
if (!includedObject.containsKey(keyVarUpdatedAt)) {
//See if oldObject contains key
if (oldObject != null && oldObject.containsKey(key)) {
includedObject = oldObject.get<ParseObject>(key);
//If the object is not fetched || the ids don't match / the pointer changed
if (!includedObject.containsKey(keyVarUpdatedAt) ||
includedObject.objectId !=
object.get<ParseObject>(key).objectId) {
//fetch from web including sub objects
//same as down there
final QueryBuilder<ParseObject> queryBuilder = QueryBuilder<
ParseObject>(ParseObject(includedObject.parseClassName))
..whereEqualTo(keyVarObjectId, includedObject.objectId)
..includeObject(_toIncludeStringList(paths[key]));
loadingNodes.add(queryBuilder
.query()
.then<void>((ParseResponse parseResponse) {
if (parseResponse.success &&
parseResponse.results.length == 1) {
object.getObjectData()[key] = parseResponse.results[0];
}
}));
continue;
} else {
object.getObjectData()[key] = includedObject;
//recursion
loadingNodes
.add(_loadIncludes(includedObject, paths: paths[key]));
continue;
}
} else {
//fetch from web including sub objects
//same as up there
final QueryBuilder<ParseObject> queryBuilder = QueryBuilder<
ParseObject>(ParseObject(includedObject.parseClassName))
..whereEqualTo(keyVarObjectId, includedObject.objectId)
..includeObject(_toIncludeStringList(paths[key]));
loadingNodes.add(
queryBuilder.query().then<void>((ParseResponse parseResponse) {
if (parseResponse.success && parseResponse.results.length == 1) {
object.getObjectData()[key] = parseResponse.results[0];
}
}));
continue;
}
} else {
//recursion
loadingNodes.add(_loadIncludes(includedObject,
oldObject: oldObject?.get(key), paths: paths[key]));
continue;
}
} else {
//All fine for this key
continue;
}
}
await Future.wait(loadingNodes);
}

List<String> _toIncludeStringList(Map<String, dynamic> includes) {
final List<String> includeList = <String>[];
for (String key in includes.keys) {
includeList.add(key);
// ignore: avoid_as
if ((includes[key] as Map<String, dynamic>).isNotEmpty) {
includeList
.addAll(_toIncludeStringList(includes[key]).map((e) => '$key.$e'));
}
}
return includeList;
}

Future<void> _objectAdded(T object,
{bool loaded = true, bool fetchedIncludes = false}) async {
if (!fetchedIncludes) await _loadIncludes(object);
for (int i = 0; i < _list.length; i++) {
if (after(object, _list[i].object) != true) {
_list.insert(i, ParseLiveListElement<T>(object, loaded: loaded));
Expand All @@ -194,20 +297,19 @@ class ParseLiveList<T extends ParseObject> {
_list.length - 1, object?.clone(object?.toJson(full: true))));
}

void _objectUpdated(T object) {
Future<void> _objectUpdated(T object) async {
for (int i = 0; i < _list.length; i++) {
if (_list[i].object.get<String>(keyVarObjectId) ==
object.get<String>(keyVarObjectId)) {
await _loadIncludes(object, oldObject: _list[i].object);
if (after(_list[i].object, object) == null) {
_list[i].object = object;
_list[i].object = object?.clone(object?.toJson(full: true));
} else {
_list.removeAt(i).dispose();
_eventStreamController.sink.add(ParseLiveListDeleteEvent<T>(
// ignore: invalid_use_of_protected_member
i,
object?.clone(object?.toJson(full: true))));
// ignore: invalid_use_of_protected_member
_objectAdded(object?.clone(object?.toJson(full: true)));
i, object?.clone(object?.toJson(full: true))));
_objectAdded(object?.clone(object?.toJson(full: true)),
fetchedIncludes: true);
}
break;
}
Expand Down Expand Up @@ -255,6 +357,15 @@ class ParseLiveList<T extends ParseObject> {
return 'NotFound';
}

String getIdentifier(int index) {
if (index < _list.length) {
return _list[index].object.get<String>(keyVarObjectId) +
_list[index].object.get<DateTime>(keyVarUpdatedAt)?.toString() ??
'';
}
return 'NotFound';
}

T getLoadedAt(int index) {
if (index < _list.length && _list[index].loaded) {
return _list[index].object;
Expand Down Expand Up @@ -308,7 +419,7 @@ class ParseLiveListElement<T extends ParseObject> {
}

abstract class ParseLiveListEvent<T extends ParseObject> {
ParseLiveListEvent(this._index, this._object); //, this._object);
ParseLiveListEvent(this._index, this._object);

final int _index;
final T _object;
Expand Down Expand Up @@ -459,7 +570,8 @@ class _ParseLiveListWidgetState<T extends ParseObject>
itemBuilder:
(BuildContext context, int index, Animation<double> animation) {
return ParseLiveListElementWidget<T>(
key: ValueKey<String>(_liveList?.idOf(index) ?? '_NotFound'),
key: ValueKey<String>(
_liveList?.getIdentifier(index) ?? '_NotFound'),
stream: () => _liveList?.getAt(index),
loadedData: () => _liveList?.getLoadedAt(index),
sizeFactor: animation,
Expand Down Expand Up @@ -505,7 +617,6 @@ class _ParseLiveListElementWidgetState<T extends ParseObject>
with SingleTickerProviderStateMixin {
_ParseLiveListElementWidgetState(
DataGetter<T> loadedDataGetter, StreamGetter<T> stream) {
// loadedData = loadedDataGetter();
_snapshot = ParseLiveListElementSnapshot<T>(loadedData: loadedDataGetter());
if (stream != null) {
_streamSubscription = stream().listen(
Expand Down