diff --git a/lib/data/models/serializers.dart b/lib/data/models/serializers.dart index cb8c90a3a..d560e7b7c 100644 --- a/lib/data/models/serializers.dart +++ b/lib/data/models/serializers.dart @@ -171,7 +171,6 @@ part 'serializers.g.dart'; ImportRequest, ImportRequestMapping, UserTwoFactorResponse, - KanbanResponse, ]) final Serializers serializers = (_$serializers.toBuilder()..addPlugin(StandardJsonPlugin())).build(); diff --git a/lib/data/models/serializers.g.dart b/lib/data/models/serializers.g.dart index 60d54dd5e..b7a71b318 100644 --- a/lib/data/models/serializers.g.dart +++ b/lib/data/models/serializers.g.dart @@ -102,8 +102,6 @@ Serializers _$serializers = (new Serializers().toBuilder() ..add(InvoiceState.serializer) ..add(InvoiceStatusEntity.serializer) ..add(InvoiceUIState.serializer) - ..add(KanbanResponse.serializer) - ..add(KanbanResponseData.serializer) ..add(LanguageEntity.serializer) ..add(LanguageItemResponse.serializer) ..add(LanguageListResponse.serializer) diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart index 3f4f96fa4..617195c1a 100644 --- a/lib/data/models/task_model.dart +++ b/lib/data/models/task_model.dart @@ -47,44 +47,6 @@ abstract class TaskItemResponse _$taskItemResponseSerializer; } -abstract class KanbanResponse - implements Built { - factory KanbanResponse([void updates(KanbanResponseBuilder b)]) = - _$KanbanResponse; - - KanbanResponse._(); - - @override - @memoized - int get hashCode; - - KanbanResponseData get data; - - static Serializer get serializer => - _$kanbanResponseSerializer; -} - -abstract class KanbanResponseData - implements Built { - factory KanbanResponseData([void updates(KanbanResponseDataBuilder b)]) = - _$KanbanResponseData; - - KanbanResponseData._(); - - @override - @memoized - int get hashCode; - - @BuiltValueField(wireName: 'status_ids') - BuiltList get statusIds; - - @BuiltValueField(wireName: 'task_ids') - BuiltMap> get taskIds; - - static Serializer get serializer => - _$kanbanResponseDataSerializer; -} - class TaskFields { static const String number = 'number'; static const String rate = 'rate'; diff --git a/lib/data/models/task_model.g.dart b/lib/data/models/task_model.g.dart index 11a77a708..48685dcd1 100644 --- a/lib/data/models/task_model.g.dart +++ b/lib/data/models/task_model.g.dart @@ -10,10 +10,6 @@ Serializer _$taskListResponseSerializer = new _$TaskListResponseSerializer(); Serializer _$taskItemResponseSerializer = new _$TaskItemResponseSerializer(); -Serializer _$kanbanResponseSerializer = - new _$KanbanResponseSerializer(); -Serializer _$kanbanResponseDataSerializer = - new _$KanbanResponseDataSerializer(); Serializer _$taskTimeSerializer = new _$TaskTimeSerializer(); Serializer _$taskEntitySerializer = new _$TaskEntitySerializer(); @@ -104,107 +100,6 @@ class _$TaskItemResponseSerializer } } -class _$KanbanResponseSerializer - implements StructuredSerializer { - @override - final Iterable types = const [KanbanResponse, _$KanbanResponse]; - @override - final String wireName = 'KanbanResponse'; - - @override - Iterable serialize(Serializers serializers, KanbanResponse object, - {FullType specifiedType = FullType.unspecified}) { - final result = [ - 'data', - serializers.serialize(object.data, - specifiedType: const FullType(KanbanResponseData)), - ]; - - return result; - } - - @override - KanbanResponse deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - final result = new KanbanResponseBuilder(); - - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final dynamic value = iterator.current; - switch (key) { - case 'data': - result.data.replace(serializers.deserialize(value, - specifiedType: const FullType(KanbanResponseData)) - as KanbanResponseData); - break; - } - } - - return result.build(); - } -} - -class _$KanbanResponseDataSerializer - implements StructuredSerializer { - @override - final Iterable types = const [KanbanResponseData, _$KanbanResponseData]; - @override - final String wireName = 'KanbanResponseData'; - - @override - Iterable serialize(Serializers serializers, KanbanResponseData object, - {FullType specifiedType = FullType.unspecified}) { - final result = [ - 'status_ids', - serializers.serialize(object.statusIds, - specifiedType: - const FullType(BuiltList, const [const FullType(String)])), - 'task_ids', - serializers.serialize(object.taskIds, - specifiedType: const FullType(BuiltMap, const [ - const FullType(String), - const FullType(BuiltList, const [const FullType(String)]) - ])), - ]; - - return result; - } - - @override - KanbanResponseData deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - final result = new KanbanResponseDataBuilder(); - - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final dynamic value = iterator.current; - switch (key) { - case 'status_ids': - result.statusIds.replace(serializers.deserialize(value, - specifiedType: - const FullType(BuiltList, const [const FullType(String)])) - as BuiltList); - break; - case 'task_ids': - result.taskIds.replace(serializers.deserialize(value, - specifiedType: const FullType(BuiltMap, const [ - const FullType(String), - const FullType(BuiltList, const [const FullType(String)]) - ]))); - break; - } - } - - return result.build(); - } -} - class _$TaskTimeSerializer implements StructuredSerializer { @override final Iterable types = const [TaskTime, _$TaskTime]; @@ -662,215 +557,6 @@ class TaskItemResponseBuilder } } -class _$KanbanResponse extends KanbanResponse { - @override - final KanbanResponseData data; - - factory _$KanbanResponse([void Function(KanbanResponseBuilder) updates]) => - (new KanbanResponseBuilder()..update(updates)).build(); - - _$KanbanResponse._({this.data}) : super._() { - if (data == null) { - throw new BuiltValueNullFieldError('KanbanResponse', 'data'); - } - } - - @override - KanbanResponse rebuild(void Function(KanbanResponseBuilder) updates) => - (toBuilder()..update(updates)).build(); - - @override - KanbanResponseBuilder toBuilder() => - new KanbanResponseBuilder()..replace(this); - - @override - bool operator ==(Object other) { - if (identical(other, this)) return true; - return other is KanbanResponse && data == other.data; - } - - int __hashCode; - @override - int get hashCode { - return __hashCode ??= $jf($jc(0, data.hashCode)); - } - - @override - String toString() { - return (newBuiltValueToStringHelper('KanbanResponse')..add('data', data)) - .toString(); - } -} - -class KanbanResponseBuilder - implements Builder { - _$KanbanResponse _$v; - - KanbanResponseDataBuilder _data; - KanbanResponseDataBuilder get data => - _$this._data ??= new KanbanResponseDataBuilder(); - set data(KanbanResponseDataBuilder data) => _$this._data = data; - - KanbanResponseBuilder(); - - KanbanResponseBuilder get _$this { - if (_$v != null) { - _data = _$v.data?.toBuilder(); - _$v = null; - } - return this; - } - - @override - void replace(KanbanResponse other) { - if (other == null) { - throw new ArgumentError.notNull('other'); - } - _$v = other as _$KanbanResponse; - } - - @override - void update(void Function(KanbanResponseBuilder) updates) { - if (updates != null) updates(this); - } - - @override - _$KanbanResponse build() { - _$KanbanResponse _$result; - try { - _$result = _$v ?? new _$KanbanResponse._(data: data.build()); - } catch (_) { - String _$failedField; - try { - _$failedField = 'data'; - data.build(); - } catch (e) { - throw new BuiltValueNestedFieldError( - 'KanbanResponse', _$failedField, e.toString()); - } - rethrow; - } - replace(_$result); - return _$result; - } -} - -class _$KanbanResponseData extends KanbanResponseData { - @override - final BuiltList statusIds; - @override - final BuiltMap> taskIds; - - factory _$KanbanResponseData( - [void Function(KanbanResponseDataBuilder) updates]) => - (new KanbanResponseDataBuilder()..update(updates)).build(); - - _$KanbanResponseData._({this.statusIds, this.taskIds}) : super._() { - if (statusIds == null) { - throw new BuiltValueNullFieldError('KanbanResponseData', 'statusIds'); - } - if (taskIds == null) { - throw new BuiltValueNullFieldError('KanbanResponseData', 'taskIds'); - } - } - - @override - KanbanResponseData rebuild( - void Function(KanbanResponseDataBuilder) updates) => - (toBuilder()..update(updates)).build(); - - @override - KanbanResponseDataBuilder toBuilder() => - new KanbanResponseDataBuilder()..replace(this); - - @override - bool operator ==(Object other) { - if (identical(other, this)) return true; - return other is KanbanResponseData && - statusIds == other.statusIds && - taskIds == other.taskIds; - } - - int __hashCode; - @override - int get hashCode { - return __hashCode ??= - $jf($jc($jc(0, statusIds.hashCode), taskIds.hashCode)); - } - - @override - String toString() { - return (newBuiltValueToStringHelper('KanbanResponseData') - ..add('statusIds', statusIds) - ..add('taskIds', taskIds)) - .toString(); - } -} - -class KanbanResponseDataBuilder - implements Builder { - _$KanbanResponseData _$v; - - ListBuilder _statusIds; - ListBuilder get statusIds => - _$this._statusIds ??= new ListBuilder(); - set statusIds(ListBuilder statusIds) => _$this._statusIds = statusIds; - - MapBuilder> _taskIds; - MapBuilder> get taskIds => - _$this._taskIds ??= new MapBuilder>(); - set taskIds(MapBuilder> taskIds) => - _$this._taskIds = taskIds; - - KanbanResponseDataBuilder(); - - KanbanResponseDataBuilder get _$this { - if (_$v != null) { - _statusIds = _$v.statusIds?.toBuilder(); - _taskIds = _$v.taskIds?.toBuilder(); - _$v = null; - } - return this; - } - - @override - void replace(KanbanResponseData other) { - if (other == null) { - throw new ArgumentError.notNull('other'); - } - _$v = other as _$KanbanResponseData; - } - - @override - void update(void Function(KanbanResponseDataBuilder) updates) { - if (updates != null) updates(this); - } - - @override - _$KanbanResponseData build() { - _$KanbanResponseData _$result; - try { - _$result = _$v ?? - new _$KanbanResponseData._( - statusIds: statusIds.build(), taskIds: taskIds.build()); - } catch (_) { - String _$failedField; - try { - _$failedField = 'statusIds'; - statusIds.build(); - _$failedField = 'taskIds'; - taskIds.build(); - } catch (e) { - throw new BuiltValueNestedFieldError( - 'KanbanResponseData', _$failedField, e.toString()); - } - rethrow; - } - replace(_$result); - return _$result; - } -} - class _$TaskTime extends TaskTime { @override final DateTime startDate; diff --git a/lib/data/repositories/task_repository.dart b/lib/data/repositories/task_repository.dart index 9b268f873..39e959a25 100644 --- a/lib/data/repositories/task_repository.dart +++ b/lib/data/repositories/task_repository.dart @@ -52,19 +52,14 @@ class TaskRepository { return taskResponse.data.toList(); } - Future sortTasks(Credentials credentials, - List statusIds, Map> taskIds) async { + Future sortTasks(Credentials credentials, List statusIds, + Map> taskIds) async { final url = credentials.url + '/tasks/sort'; final dynamic response = await webClient.post(url, credentials.token, data: json.encode({'status_ids': statusIds, 'task_ids': taskIds})); - return null; - - final KanbanResponse taskResponse = - serializers.deserializeWith(KanbanResponse.serializer, response); - - return taskResponse.data; + return true; } Future saveData(Credentials credentials, TaskEntity task) async { diff --git a/lib/redux/task/task_actions.dart b/lib/redux/task/task_actions.dart index 42b9a39ca..ef8c0fc5e 100644 --- a/lib/redux/task/task_actions.dart +++ b/lib/redux/task/task_actions.dart @@ -239,9 +239,10 @@ class SortTasksRequest implements StartSaving { } class SortTasksSuccess implements StopSaving, PersistData { - SortTasksSuccess(this.data); + SortTasksSuccess({this.statusIds, this.taskIds}); - final KanbanResponseData data; + final List statusIds; + final Map> taskIds; } class SortTasksFailure implements StopSaving { diff --git a/lib/redux/task/task_middleware.dart b/lib/redux/task/task_middleware.dart index df63a3190..5a4688949 100644 --- a/lib/redux/task/task_middleware.dart +++ b/lib/redux/task/task_middleware.dart @@ -272,9 +272,11 @@ Middleware _sortTasks(TaskRepository repository) { repository .sortTasks(store.state.credentials, action.statusIds, action.taskIds) - .then((KanbanResponseData data) { - print('## DONE: $data'); - store.dispatch(SortTasksSuccess(data)); + .then((_) { + store.dispatch(SortTasksSuccess( + statusIds: action.statusIds, + taskIds: action.taskIds, + )); if (action.completer != null) { action.completer.complete(null); }