drop: on DatabaseRepository

wip drop: `RepositoryV2` wip #377
zin- · Aug 28, 2024 · e17dd71 · e17dd71
1 parent fd828de
commit e17dd71
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/lib/framework/database/definition/database_definition.dart b/lib/framework/database/definition/database_definition.dart
@@ -2,7 +2,7 @@ import 'package:mem/framework/database/definition/exceptions.dart';
 import 'package:mem/framework/database/definition/table_definition.dart';
 import 'package:mem/framework/repository/entity.dart';
 
-class DatabaseDefinition extends EntityV2 {
+class DatabaseDefinition with Entity {
   final String name;
   final int version;
   final List<TableDefinition> tableDefinitions;
@@ -21,10 +21,16 @@ class DatabaseDefinition extends EntityV2 {
     }
   }
 
+// coverage:ignore-start
   @override
-  String toString() => "${super.toString()}: ${{
-        "name": name,
-        "version": version,
-        "tableDefinitions": tableDefinitions.map((e) => e.toString())
-      }}";
+  Entity copiedWith() => throw UnimplementedError();
+
+// coverage:ignore-end
+
+  @override
+  Map<String, dynamic> get toMap => {
+        'name': name,
+        'version': version,
+        'tableDefinitions': tableDefinitions.map((e) => e.toString())
+      };
 }
diff --git a/lib/framework/repository/database_repository.dart b/lib/framework/repository/database_repository.dart
@@ -8,8 +8,7 @@ import 'package:mem/framework/database/factory.dart';
 import 'package:mem/framework/repository/repository.dart';
 import 'package:mem/logger/log_service.dart';
 
-class DatabaseRepository extends RepositoryV2<DatabaseDefinition>
-    with Receiver<DatabaseDefinition, DatabaseAccessor> {
+class DatabaseRepository extends Repository<DatabaseDefinition> {
   static DatabaseRepository? _instance;
 
   final _cache = <String, DatabaseAccessor>{};
@@ -18,7 +17,6 @@ class DatabaseRepository extends RepositoryV2<DatabaseDefinition>
 
   factory DatabaseRepository() => _instance ??= DatabaseRepository._();
 
-  @override
   Future<DatabaseAccessor> receive(DatabaseDefinition entity) => v(
         () async =>
             _cache[entity.name] ??

diff --git a/lib/framework/repository/entity.dart b/lib/framework/repository/entity.dart
@@ -11,6 +11,7 @@ abstract class EntityV1 {}
 mixin Entity {
   Map<String, dynamic> get toMap;
 
+  // FIXME EntityではなくCopyableみたいなmixinで切り出すべきかもしれない
   Entity copiedWith();
 
   @override