extract: Copyable

wip #377
zin- · Aug 31, 2024 · 8fdb7f1 · 8fdb7f1
1 parent 57aab7f
commit 8fdb7f1
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 76 deletions.
diff --git a/lib/act_counter/act_counter_entity.dart b/lib/act_counter/act_counter_entity.dart
@@ -6,12 +6,6 @@ class ActCounterEntity extends ActCounter with Entity, HomeWidgetEntity {
   ActCounterEntity(super.memId, super.name, super.actCount, super.updatedAt)
       : super();
 
-// coverage:ignore-start
-  @override
-  Entity copiedWith() => throw UnimplementedError();
-
-// coverage:ignore-end
-
   @override
   Map<String, dynamic> get toMap => {
         'initializeMethodName': initializeMethodName,

diff --git a/lib/framework/database/definition/database_definition.dart b/lib/framework/database/definition/database_definition.dart
@@ -21,12 +21,6 @@ class DatabaseDefinition with Entity {
     }
   }
 
-// coverage:ignore-start
-  @override
-  Entity copiedWith() => throw UnimplementedError();
-
-// coverage:ignore-end
-
   @override
   Map<String, dynamic> get toMap => {
         'name': name,

diff --git a/lib/framework/repository/entity.dart b/lib/framework/repository/entity.dart
@@ -9,9 +9,6 @@ abstract class EntityV1 {}
 mixin Entity {
   Map<String, dynamic> get toMap;
 
-  // FIXME EntityではなくCopyableみたいなmixinで切り出すべきかもしれない
-  Entity copiedWith();
-
   @override
   String toString() => "${super.toString()}: $toMap";
 
@@ -27,6 +24,10 @@ mixin Entity {
       identical(this, other) ||
       (runtimeType == other.runtimeType && hashCode == other.hashCode);
 }
+
+mixin Copyable on Entity {
+  Entity copiedWith();
+}
 // memo
 // - view, domain, dataのそれぞれの領域で似た内容でも型が変わることになるはず
 // これをしっかりと定義したい

diff --git a/lib/logger/log.dart b/lib/logger/log.dart
@@ -104,10 +104,6 @@ class Log with Entity {
   }
 
 // coverage:ignore-start
-  @override
-  // TODO: implement copiedWith
-  Entity copiedWith() => throw UnimplementedError();
-
   @override
   // TODO: implement toMap
   Map<String, dynamic> get toMap => throw UnimplementedError();

diff --git a/lib/notifications/notification/notification.dart b/lib/notifications/notification/notification.dart
@@ -23,10 +23,4 @@ class NotificationV2 with Entity, KeyWithValue<int, Map<String, dynamic>> {
       'payload': payload,
     };
   }
-
-// coverage:ignore-start
-  @override
-  Entity copiedWith() => throw UnimplementedError();
-
-// coverage:ignore-end
 }
diff --git a/lib/notifications/schedule.dart b/lib/notifications/schedule.dart
@@ -34,13 +34,6 @@ abstract class Schedule with Entity {
         },
       );
 
-// coverage:ignore-start
-  @override
-  // TODO: implement copiedWith
-  Entity copiedWith() => throw UnimplementedError();
-
-// coverage:ignore-end
-
   @override
   Map<String, dynamic> get toMap => {
         'id': id,

diff --git a/lib/repositories/act_entity.dart b/lib/repositories/act_entity.dart
@@ -6,7 +6,7 @@ import 'package:mem/databases/table_definitions/base.dart';
 import 'package:mem/framework/repository/database_tuple_entity.dart';
 import 'package:mem/framework/repository/entity.dart';
 
-class ActEntity extends ActV2 with Entity {
+class ActEntity extends ActV2 with Entity, Copyable {
   ActEntity(super.memId, super.period);
 
   ActEntity.fromMap(Map<String, dynamic> map)

diff --git a/lib/repositories/mem_entity.dart b/lib/repositories/mem_entity.dart
@@ -38,20 +38,6 @@ class MemEntity extends Mem with Entity {
           ).toMap,
         );
 
-// coverage:ignore-start
-  @override
-  Entity copiedWith({
-    String Function()? name,
-    DateTime? Function()? doneAt,
-    DateAndTimePeriod? Function()? period,
-  }) =>
-      MemEntity(
-        name == null ? this.name : name(),
-        doneAt == null ? this.doneAt : doneAt(),
-        period == null ? this.period : period(),
-// coverage:ignore-end
-      );
-
   @override
   Map<String, dynamic> get toMap => {
         defColMemsName.name: name,

diff --git a/lib/repositories/mem_item_entity.dart b/lib/repositories/mem_item_entity.dart
@@ -21,23 +21,6 @@ class MemItemEntity extends MemItemV2 with Entity {
       : this.fromMap(
             MemItemEntity(memItem.memId, memItem.type, memItem.value).toMap);
 
-// coverage:ignore-start
-  @override
-  Entity copiedWith() => throw UnimplementedError();
-
-  // @override
-  // Entity copiedWith({
-  //   int Function()? memId,
-  //   MemItemType Function()? type,
-  //   dynamic Function()? value,
-  // }) =>
-  //     MemItemEntity(
-  //       memId == null ? this.memId : memId(),
-  //       type == null ? this.type : type(),
-  //       value == null ? this.value : value(),
-  //     );
-// coverage:ignore-end
-
   @override
   Map<String, dynamic> get toMap => {
         defFkMemItemsMemId.name: memId,

diff --git a/lib/repositories/mem_notification_entity.dart b/lib/repositories/mem_notification_entity.dart
@@ -17,12 +17,6 @@ class MemNotificationEntity extends MemNotificationV2 with Entity {
   MemNotificationEntity.fromV1(MemNotification v1)
       : super(v1.memId, v1.type, v1.time, v1.message);
 
-// coverage:ignore-start
-  @override
-  Entity copiedWith() => throw UnimplementedError();
-
-// coverage:ignore-end
-
   @override
   Map<String, dynamic> get toMap => {
         defFkMemNotificationsMemId.name: memId,

diff --git a/lib/settings/preference.dart b/lib/settings/preference.dart
@@ -8,10 +8,4 @@ class PreferenceEntity<VALUE>
     this.key = key;
     this.value = value;
   }
-
-// coverage:ignore-start
-  @override
-  Entity copiedWith() => throw UnimplementedError();
-
-// coverage:ignore-end
 }