feat(task): cover basis for editing tasks

update/delete tasks and insert/delete sub-tasks closes #9
rafoolin · Aug 5, 2022 · e3e955d · e3e955d
1 parent 218a690
commit e3e955d
Show file tree

Hide file tree

Showing 12 changed files with 261 additions and 151 deletions.
diff --git a/app/lib/src/common/models/converters.dart b/app/lib/src/common/models/converters.dart
@@ -23,6 +23,6 @@ class TimeZConverter extends JsonConverter<TimeOfDay, String> {
 
   @override
   String toJson(TimeOfDay object) {
-    return object.toString();
+    return '${object.hour}:${object.minute}';
   }
 }
diff --git a/app/lib/src/features/task_management/application/task_service.dart b/app/lib/src/features/task_management/application/task_service.dart
@@ -9,6 +9,10 @@ class TaskService {
   TaskService(this._remoteTaskRepository);
 
   Stream<AsyncValue<TodoTask>> watchTask() {
+    return _remoteTaskRepository.watchTask();
+  }
+
+  Stream<AsyncValue<TodoTask>> subscribeTask() {
     return _remoteTaskRepository.subscribeTask();
   }
 
@@ -29,14 +33,16 @@ class TaskService {
     String? categoryId,
     DateTime? dueDatetime,
     String? note,
-    List<TodoSubTask>? subTasks,
+    List<TodoSubTask> addedSubTasks = const [],
+    List<TodoSubTask> removedSubTasks = const [],
   }) async {
     return _remoteTaskRepository.editTask(
       categoryId: categoryId,
       dueDatetime: dueDatetime,
       title: title,
       note: note,
-      subTasks: subTasks,
+      addedSubTasks: addedSubTasks,
+      removedSubTasks: removedSubTasks,
     );
   }
 }
diff --git a/app/lib/src/features/task_management/data/remote_task_repository.dart b/app/lib/src/features/task_management/data/remote_task_repository.dart
@@ -24,7 +24,7 @@ class RemoteTaskRepository {
         createdAt
         createdAt
         completedAt
-        sub_tasks (order_by: {dueAt: asc}){
+        sub_tasks (order_by: {title: asc}){
           __typename
           id
           title
@@ -76,7 +76,7 @@ class RemoteTaskRepository {
         createdAt
         createdAt
         completedAt
-        sub_tasks (order_by: {dueAt: asc}){
+        sub_tasks (order_by: {title: asc}){
           __typename
           id
           title
@@ -93,6 +93,7 @@ class RemoteTaskRepository {
 
     return _qlClient
         .watchQuery(WatchQueryOptions(
+          fetchResults: true,
           document: gql(query),
           variables: {'id': taskId},
           fetchPolicy: FetchPolicy.cacheAndNetwork,
@@ -167,23 +168,29 @@ class RemoteTaskRepository {
     required String? categoryId,
     required DateTime? dueDatetime,
     String? note,
-    List<TodoSubTask>? subTasks,
+    List<TodoSubTask> addedSubTasks = const [],
+    List<TodoSubTask> removedSubTasks = const [],
   }) async {
     const query = '''mutation (\$id: uuid!, \$set: tasks_set_input!, 
-      \$sub_tasks: [sub_tasks_insert_input!] = []) {
-    update_tasks_by_pk(pk_columns: {id: \$id}, _set: \$set) {
-      __typename
-      completed
-    }
-    insert_sub_tasks(objects: \$sub_tasks, 
-    on_conflict: {constraint: sub_tasks_pkey, update_columns: [title, 
-    completed, dueAt, note]}) {
-      affected_rows
-    }
-  }''';
+    \$added_sub_tasks: [sub_tasks_insert_input!] = [], \$removed_ids: [uuid!] = []) {
+  update_tasks_by_pk(pk_columns: {id: \$id}, _set: \$set) {
+    __typename
+    completed
+  }
+  delete_sub_tasks(where: {id: {_in: \$removed_ids}}) {
+    affected_rows
+  }
+  insert_sub_tasks(objects: \$added_sub_tasks, 
+  on_conflict: {constraint: sub_tasks_pkey, 
+  update_columns: [title, completed, dueAt, note]}) {
+    affected_rows
+  }
+}
+''';
 
     await _qlClient.mutate(MutationOptions(
       document: gql(query),
+      fetchPolicy: FetchPolicy.cacheAndNetwork,
       variables: {
         'id': taskId,
         'set': {
@@ -192,10 +199,18 @@ class RemoteTaskRepository {
           if (note != null) 'note': note,
           if (title != null) 'title': title,
         },
-        if (subTasks != null)
-          'subTasks': subTasks.map((s) => s.toJson()).toList(),
+        if (addedSubTasks.isNotEmpty)
+          'added_sub_tasks': addedSubTasks
+              .map(
+                (s) => {
+                  'title': s.title,
+                  'taskId': s.taskId,
+                },
+              )
+              .toList(),
+        if (removedSubTasks.isNotEmpty)
+          'removed_ids': removedSubTasks.map((s) => s.id).toList(),
       },
-      fetchPolicy: FetchPolicy.cacheAndNetwork,
     ));
   }
 }
diff --git a/app/lib/src/features/task_management/domain/edit_task.dart b/app/lib/src/features/task_management/domain/edit_task.dart
@@ -14,7 +14,8 @@ class EditTask with _$EditTask {
     String? categoryId,
     DateTime? dueDatetime,
     String? note,
-    List<TodoSubTask>? subTasks,
+    @Default([]) List<TodoSubTask> addedSubTasks,
+    @Default([]) List<TodoSubTask> removedSubTasks,
     @Default([]) List<TodoCategory>? categories,
   }) = _EditTask;
 
@@ -26,15 +27,20 @@ class EditTask with _$EditTask {
           categoryId: categoryId ?? initialTask!.categoryId,
           dueDatetime: dueDatetime ?? initialTask!.dueDatetime,
           note: note ?? initialTask!.note,
-          subTasks: [...(subTasks ?? []), ...initialTask?.subTasks ?? []]
-            ..toSet().toList(),
+          subTasks: [
+            for (TodoSubTask subTask in [
+              ...addedSubTasks,
+              ...initialTask?.subTasks ?? const []
+            ])
+              if (!removedSubTasks.contains(subTask)) subTask
+          ],
           title: title ?? initialTask!.title,
         );
 
   bool get changed =>
       (title != null && title != initialTask?.title) ||
       (dueDatetime != null && dueDatetime != initialTask?.dueDatetime) ||
       (note != null && note != initialTask?.note) ||
-      (subTasks != null && subTasks != initialTask?.subTasks) ||
+      (addedSubTasks.isNotEmpty || removedSubTasks.isNotEmpty) ||
       (categoryId != null && categoryId != initialTask?.categoryId);
 }
diff --git a/app/lib/src/features/task_management/domain/edit_task.freezed.dart b/app/lib/src/features/task_management/domain/edit_task.freezed.dart
@@ -21,7 +21,8 @@ mixin _$EditTask {
   String? get categoryId => throw _privateConstructorUsedError;
   DateTime? get dueDatetime => throw _privateConstructorUsedError;
   String? get note => throw _privateConstructorUsedError;
-  List<TodoSubTask>? get subTasks => throw _privateConstructorUsedError;
+  List<TodoSubTask> get addedSubTasks => throw _privateConstructorUsedError;
+  List<TodoSubTask> get removedSubTasks => throw _privateConstructorUsedError;
   List<TodoCategory>? get categories => throw _privateConstructorUsedError;
 
   @JsonKey(ignore: true)
@@ -39,7 +40,8 @@ abstract class $EditTaskCopyWith<$Res> {
       String? categoryId,
       DateTime? dueDatetime,
       String? note,
-      List<TodoSubTask>? subTasks,
+      List<TodoSubTask> addedSubTasks,
+      List<TodoSubTask> removedSubTasks,
       List<TodoCategory>? categories});
 
   $TodoTaskCopyWith<$Res>? get initialTask;
@@ -60,7 +62,8 @@ class _$EditTaskCopyWithImpl<$Res> implements $EditTaskCopyWith<$Res> {
     Object? categoryId = freezed,
     Object? dueDatetime = freezed,
     Object? note = freezed,
-    Object? subTasks = freezed,
+    Object? addedSubTasks = freezed,
+    Object? removedSubTasks = freezed,
     Object? categories = freezed,
   }) {
     return _then(_value.copyWith(
@@ -84,10 +87,14 @@ class _$EditTaskCopyWithImpl<$Res> implements $EditTaskCopyWith<$Res> {
           ? _value.note
           : note // ignore: cast_nullable_to_non_nullable
               as String?,
-      subTasks: subTasks == freezed
-          ? _value.subTasks
-          : subTasks // ignore: cast_nullable_to_non_nullable
-              as List<TodoSubTask>?,
+      addedSubTasks: addedSubTasks == freezed
+          ? _value.addedSubTasks
+          : addedSubTasks // ignore: cast_nullable_to_non_nullable
+              as List<TodoSubTask>,
+      removedSubTasks: removedSubTasks == freezed
+          ? _value.removedSubTasks
+          : removedSubTasks // ignore: cast_nullable_to_non_nullable
+              as List<TodoSubTask>,
       categories: categories == freezed
           ? _value.categories
           : categories // ignore: cast_nullable_to_non_nullable
@@ -119,7 +126,8 @@ abstract class _$$_EditTaskCopyWith<$Res> implements $EditTaskCopyWith<$Res> {
       String? categoryId,
       DateTime? dueDatetime,
       String? note,
-      List<TodoSubTask>? subTasks,
+      List<TodoSubTask> addedSubTasks,
+      List<TodoSubTask> removedSubTasks,
       List<TodoCategory>? categories});
 
   @override
@@ -143,7 +151,8 @@ class __$$_EditTaskCopyWithImpl<$Res> extends _$EditTaskCopyWithImpl<$Res>
     Object? categoryId = freezed,
     Object? dueDatetime = freezed,
     Object? note = freezed,
-    Object? subTasks = freezed,
+    Object? addedSubTasks = freezed,
+    Object? removedSubTasks = freezed,
     Object? categories = freezed,
   }) {
     return _then(_$_EditTask(
@@ -167,10 +176,14 @@ class __$$_EditTaskCopyWithImpl<$Res> extends _$EditTaskCopyWithImpl<$Res>
           ? _value.note
           : note // ignore: cast_nullable_to_non_nullable
               as String?,
-      subTasks: subTasks == freezed
-          ? _value._subTasks
-          : subTasks // ignore: cast_nullable_to_non_nullable
-              as List<TodoSubTask>?,
+      addedSubTasks: addedSubTasks == freezed
+          ? _value._addedSubTasks
+          : addedSubTasks // ignore: cast_nullable_to_non_nullable
+              as List<TodoSubTask>,
+      removedSubTasks: removedSubTasks == freezed
+          ? _value._removedSubTasks
+          : removedSubTasks // ignore: cast_nullable_to_non_nullable
+              as List<TodoSubTask>,
       categories: categories == freezed
           ? _value._categories
           : categories // ignore: cast_nullable_to_non_nullable
@@ -188,9 +201,11 @@ class _$_EditTask extends _EditTask {
       this.categoryId,
       this.dueDatetime,
       this.note,
-      final List<TodoSubTask>? subTasks,
+      final List<TodoSubTask> addedSubTasks = const [],
+      final List<TodoSubTask> removedSubTasks = const [],
       final List<TodoCategory>? categories = const []})
-      : _subTasks = subTasks,
+      : _addedSubTasks = addedSubTasks,
+        _removedSubTasks = removedSubTasks,
         _categories = categories,
         super._();
 
@@ -204,13 +219,20 @@ class _$_EditTask extends _EditTask {
   final DateTime? dueDatetime;
   @override
   final String? note;
-  final List<TodoSubTask>? _subTasks;
+  final List<TodoSubTask> _addedSubTasks;
   @override
-  List<TodoSubTask>? get subTasks {
-    final value = _subTasks;
-    if (value == null) return null;
+  @JsonKey()
+  List<TodoSubTask> get addedSubTasks {
     // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(value);
+    return EqualUnmodifiableListView(_addedSubTasks);
+  }
+
+  final List<TodoSubTask> _removedSubTasks;
+  @override
+  @JsonKey()
+  List<TodoSubTask> get removedSubTasks {
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_removedSubTasks);
   }
 
   final List<TodoCategory>? _categories;
@@ -225,7 +247,7 @@ class _$_EditTask extends _EditTask {
 
   @override
   String toString() {
-    return 'EditTask(initialTask: $initialTask, title: $title, categoryId: $categoryId, dueDatetime: $dueDatetime, note: $note, subTasks: $subTasks, categories: $categories)';
+    return 'EditTask(initialTask: $initialTask, title: $title, categoryId: $categoryId, dueDatetime: $dueDatetime, note: $note, addedSubTasks: $addedSubTasks, removedSubTasks: $removedSubTasks, categories: $categories)';
   }
 
   @override
@@ -241,7 +263,10 @@ class _$_EditTask extends _EditTask {
             const DeepCollectionEquality()
                 .equals(other.dueDatetime, dueDatetime) &&
             const DeepCollectionEquality().equals(other.note, note) &&
-            const DeepCollectionEquality().equals(other._subTasks, _subTasks) &&
+            const DeepCollectionEquality()
+                .equals(other._addedSubTasks, _addedSubTasks) &&
+            const DeepCollectionEquality()
+                .equals(other._removedSubTasks, _removedSubTasks) &&
             const DeepCollectionEquality()
                 .equals(other._categories, _categories));
   }
@@ -254,7 +279,8 @@ class _$_EditTask extends _EditTask {
       const DeepCollectionEquality().hash(categoryId),
       const DeepCollectionEquality().hash(dueDatetime),
       const DeepCollectionEquality().hash(note),
-      const DeepCollectionEquality().hash(_subTasks),
+      const DeepCollectionEquality().hash(_addedSubTasks),
+      const DeepCollectionEquality().hash(_removedSubTasks),
       const DeepCollectionEquality().hash(_categories));
 
   @JsonKey(ignore: true)
@@ -270,7 +296,8 @@ abstract class _EditTask extends EditTask {
       final String? categoryId,
       final DateTime? dueDatetime,
       final String? note,
-      final List<TodoSubTask>? subTasks,
+      final List<TodoSubTask> addedSubTasks,
+      final List<TodoSubTask> removedSubTasks,
       final List<TodoCategory>? categories}) = _$_EditTask;
   _EditTask._() : super._();
 
@@ -285,7 +312,9 @@ abstract class _EditTask extends EditTask {
   @override
   String? get note;
   @override
-  List<TodoSubTask>? get subTasks;
+  List<TodoSubTask> get addedSubTasks;
+  @override
+  List<TodoSubTask> get removedSubTasks;
   @override
   List<TodoCategory>? get categories;
   @override

diff --git a/app/lib/src/features/task_management/domain/todo_sub_task.dart b/app/lib/src/features/task_management/domain/todo_sub_task.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:uuid/uuid.dart';
 
 import '../../../common/models/converters.dart';
 
@@ -13,14 +14,14 @@ class TodoSubTask with _$TodoSubTask {
   factory TodoSubTask({
     required String id,
     required String title,
-    required String userId,
     required String taskId,
-    required DateTime createdAt,
-    @TimeZConverter() required TimeOfDay dueAt,
-    @Default(false) bool completed,
+    DateTime? createdAt,
+    @TimeZConverter() TimeOfDay? dueAt,
     String? note,
     int? indexValue,
     DateTime? updatedAt,
+    DateTime? completedAt,
+    @Default(false) bool completed,
   }) = _TodoSubTask;
 
   TodoSubTask._();
@@ -29,6 +30,17 @@ class TodoSubTask with _$TodoSubTask {
   factory TodoSubTask.fromJson(Map<String, dynamic> json) =>
       _$TodoSubTaskFromJson(json);
 
+  factory TodoSubTask.fromTitle({
+    required String title,
+    required String taskId,
+  }) =>
+      TodoSubTask(
+        id: const Uuid().v4(),
+        title: title,
+        taskId: taskId,
+        dueAt: TimeOfDay.now(),
+      );
+
   @override
   Map<String, dynamic> toJson() => _$TodoSubTaskToJson(this);
 }