Move migration into one file, allow many to many with group and add user to calendar items and event

Author: CodeDoctorDE

api/lib/models/event/database.dart

@@ -20,7 +20,6 @@ class EventDatabaseService extends EventService with TableService {
       CREATE TABLE IF NOT EXISTS $name (
         id BLOB(16) PRIMARY KEY,
         parentId BLOB(16),
-        groupId BLOB(16),
         blocked INTEGER NOT NULL DEFAULT 1,
         name VARCHAR(100) NOT NULL DEFAULT '',
         description TEXT NOT NULL DEFAULT '',

api/lib/models/event/group.dart

@@ -0,0 +1,48 @@
+import 'dart:typed_data';
+
+import 'package:flow_api/models/event/model.dart';
+import 'package:flow_api/models/group/model.dart';
+import 'package:flow_api/services/database.dart';
+
+class EventGroupDatabaseConnector extends DatabaseModelConnector<Group, Event> {
+  @override
+  String get connectedIdName => "eventId";
+
+  @override
+  String get connectedTableName => "events";
+
+  @override
+  String get tableName => "eventGroups";
+
+  @override
+  Future<List<Event>> getConnected(Uint8List itemId,
+      {int offset = 0, int limit = 50}) async {
+    final result = await db?.query(
+      '$tableName JOIN events ON eventId = events.id',
+      limit: limit,
+      offset: offset,
+      where: '$connectedIdName = ?',
+      whereArgs: [itemId],
+    );
+    return result?.map((e) => Event.fromDatabase(e)).toList() ?? [];
+  }
+
+  @override
+  Future<List<Group>> getItems(Uint8List connectId,
+      {int offset = 0, int limit = 50}) async {
+    final result = await db?.query(
+      '$tableName JOIN groups ON groupId = groups.id',
+      limit: limit,
+      offset: offset,
+      where: '$itemIdName = ?',
+      whereArgs: [connectId],
+    );
+    return result?.map((e) => Group.fromDatabase(e)).toList() ?? [];
+  }
+
+  @override
+  String get itemIdName => 'groupId';
+
+  @override
+  String get itemTableName => 'groups';
+}

api/lib/models/event/item/database.dart

@@ -15,9 +15,10 @@ class CalendarItemDatabaseService extends CalendarItemService
   CalendarItemDatabaseService();
 
   @override
-  Future<void> create(Database db) async {
+  Future<void> create(DatabaseExecutor db,
+      [String name = 'calendarItems']) async {
     await db.execute("""
-      CREATE TABLE IF NOT EXISTS calendarItems (
+      CREATE TABLE IF NOT EXISTS $name (
         runtimeType VARCHAR(20) NOT NULL DEFAULT 'fixed',
         id BLOB(16) PRIMARY KEY,
         name VARCHAR(100) NOT NULL DEFAULT '',
@@ -42,16 +43,6 @@ class CalendarItemDatabaseService extends CalendarItemService
     """);
   }
 
-  @override
-  Future<void> migrate(Database db, int version) async {
-    if (version < 3) {
-      await db.transaction((txn) async {
-        await txn.execute("ALTER TABLE calendarItems ADD groupId BLOB(16)");
-        await txn.execute("ALTER TABLE calendarItems ADD placeId BLOB(16)");
-      });
-    }
-  }
-
   @override
   Future<List<ConnectedModel<CalendarItem, Event?>>> getCalendarItems(
       {List<EventStatus>? status,

api/lib/models/event/item/group.dart

@@ -0,0 +1,49 @@
+import 'dart:typed_data';
+
+import 'package:flow_api/models/event/item/model.dart';
+import 'package:flow_api/models/group/model.dart';
+import 'package:flow_api/services/database.dart';
+
+class CalendarItemGroupDatabaseConnector
+    extends DatabaseModelConnector<Group, CalendarItem> {
+  @override
+  String get connectedIdName => "itemId";
+
+  @override
+  String get connectedTableName => "calendarItems";
+
+  @override
+  String get tableName => "calendaritemGroups";
+
+  @override
+  Future<List<CalendarItem>> getConnected(Uint8List itemId,
+      {int offset = 0, int limit = 50}) async {
+    final result = await db?.query(
+      '$tableName JOIN calendarItems ON itemId = calendarItems.id',
+      limit: limit,
+      offset: offset,
+      where: '$connectedIdName = ?',
+      whereArgs: [itemId],
+    );
+    return result?.map((e) => CalendarItem.fromDatabase(e)).toList() ?? [];
+  }
+
+  @override
+  Future<List<Group>> getItems(Uint8List connectId,
+      {int offset = 0, int limit = 50}) async {
+    final result = await db?.query(
+      '$tableName JOIN groups ON groupId = groups.id',
+      limit: limit,
+      offset: offset,
+      where: '$itemIdName = ?',
+      whereArgs: [connectId],
+    );
+    return result?.map((e) => Group.fromDatabase(e)).toList() ?? [];
+  }
+
+  @override
+  String get itemIdName => 'groupId';
+
+  @override
+  String get itemTableName => 'groups';
+}

api/lib/models/event/item/model.dart

@@ -18,7 +18,7 @@ sealed class CalendarItem
   @override
   final String name, description;
   final String location;
-  final Uint8List? groupId, eventId;
+  final Uint8List? eventId;
   final DateTime? start, end;
   final EventStatus status;
 
@@ -27,7 +27,6 @@ sealed class CalendarItem
     this.name = '',
     this.description = '',
     this.location = '',
-    this.groupId,
     this.eventId,
     this.start,
     this.end,
@@ -65,7 +64,6 @@ final class FixedCalendarItem extends CalendarItem
     super.name,
     super.description,
     super.location,
-    super.groupId,
     super.eventId,
     super.start,
     super.end,
@@ -86,7 +84,6 @@ final class RepeatingCalendarItem extends CalendarItem
     super.name,
     super.description,
     super.location,
-    super.groupId,
     super.eventId,
     super.start,
     super.end,
@@ -116,7 +113,6 @@ final class AutoCalendarItem extends CalendarItem
     super.name,
     super.description,
     super.location,
-    super.groupId,
     super.eventId,
     super.status,
     super.start,

api/lib/models/event/item/model.mapper.dart

@@ -28,9 +28,3 @@ abstract class CalendarItemService extends ModelService {
 
   FutureOr<bool> deleteCalendarItem(Uint8List id);
 }
-
-abstract class CalendarItemResourceConnector<T> extends ModelService {
-  FutureOr<void> connect(Uint8List calendarItemId, Uint8List resourceId);
-  FutureOr<void> disconnect(Uint8List calendarItemId, Uint8List resourceId);
-  FutureOr<bool> isConnected(Uint8List calendarItemId, Uint8List resourceId);
-}