drop: RepositoryV2

wip #377
zin- · Sep 7, 2024 · da45751 · da45751
1 parent d41dc3a
commit da45751
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 26 deletions.
diff --git a/lib/framework/repository/entity.dart b/lib/framework/repository/entity.dart
@@ -4,8 +4,6 @@
 // # 語源
 //
 // 「存在するもの」、「実体」
-abstract class EntityV2 {}
-
 abstract class EntityV1 {}
 
 mixin Entity {

diff --git a/lib/framework/repository/repository.dart b/lib/framework/repository/repository.dart
@@ -19,16 +19,4 @@ import 'package:mem/framework/repository/entity.dart';
 //  抽象的には得ると捉える事もできるだろうが、では`update`（更新する）ことはあるだろうか？
 //  更新することはないように感じる
 //  よって、ここでは`receive`（受け取る）、`replace`（置き換える）などの荷物や事物を扱う際の単語を採用する
-abstract class RepositoryV2<E extends EntityV2> {}
-
-mixin Receiver<E extends EntityV2, Result> on RepositoryV2<E> {
-  Future<Result> receive(E entity);
-}
-
-// FIXME 型指定は不要なはずなので、おかしい？（間違っている気がする
-//  というか、mixinの利用自体がなんか変なので辞めたほうが良いかも
-mixin Discarder<E extends EntityV2> on RepositoryV2<E> {
-  Future<void> discardAll();
-}
-
 abstract class Repository<E extends Entity> {}
diff --git a/lib/logger/log.dart b/lib/logger/log.dart
@@ -103,13 +103,15 @@ class Log with Entity {
     return elements.join('\n');
   }
 
+// coverage:ignore-start
   @override
   // TODO: implement copiedWith
   Entity copiedWith() => throw UnimplementedError();
 
   @override
   // TODO: implement toMap
   Map<String, dynamic> get toMap => throw UnimplementedError();
+// coverage:ignore-end
 }
 
 enum Level {

diff --git a/lib/notifications/schedule.dart b/lib/notifications/schedule.dart
@@ -4,7 +4,7 @@ import 'package:mem/notifications/notification_client.dart';
 import 'package:mem/notifications/mem_notifications.dart';
 import 'package:mem/notifications/notification/type.dart';
 
-abstract class Schedule extends EntityV2 {
+abstract class Schedule with Entity {
   final int id;
 
   Schedule(this.id);
@@ -34,10 +34,17 @@ abstract class Schedule extends EntityV2 {
         },
       );
 
+// coverage:ignore-start
   @override
-  String toString() => "${super.toString()}: ${{
-        "id": id,
-      }}";
+  // TODO: implement copiedWith
+  Entity copiedWith() => throw UnimplementedError();
+
+// coverage:ignore-end
+
+  @override
+  Map<String, dynamic> get toMap => {
+        'id': id,
+      };
 }
 
 class CancelSchedule extends Schedule {
@@ -55,10 +62,11 @@ class TimedSchedule extends Schedule {
   );
 
   @override
-  String toString() => "${super.toString()}${{
-        "startAt": startAt,
-        "params": params,
-      }}";
+  Map<String, dynamic> get toMap => super.toMap
+    ..addAll({
+      'startAt': startAt,
+      'params': params,
+    });
 }
 
 class PeriodicSchedule extends TimedSchedule {
@@ -72,5 +80,8 @@ class PeriodicSchedule extends TimedSchedule {
   );
 
   @override
-  String toString() => "${super.toString()}${{"duration": duration}}";
+  Map<String, dynamic> get toMap => super.toMap
+    ..addAll({
+      'duration': duration,
+    });
 }
diff --git a/lib/notifications/schedule_client.dart b/lib/notifications/schedule_client.dart
@@ -8,8 +8,7 @@ import 'package:mem/notifications/schedule.dart';
 import 'package:mem/permissions/permission.dart';
 import 'package:mem/permissions/permission_handler_wrapper.dart';
 
-class ScheduleClient extends RepositoryV2<Schedule>
-    with Receiver<Schedule, void> {
+class ScheduleClient extends Repository<Schedule> {
   static ScheduleClient? _instance;
   final AndroidAlarmManagerWrapper _androidAlarmManagerWrapper;
   final Future<void> Function(int id, Map<String, dynamic> params)
@@ -40,7 +39,6 @@ class ScheduleClient extends RepositoryV2<Schedule>
         },
       );
 
-  @override
   Future<void> receive(Schedule entity) => v(
         () async {
           if (await PermissionHandlerWrapper().grant(Permission.notification)) {