Merge pull request #82 from LinwoodDev/feature/resource-users-connections

Add resources and advanced user management

Author: CodeDoctorDE

api/lib/models/cached.dart

@@ -1,4 +1,5 @@
 import 'package:dart_mappable/dart_mappable.dart';
+import 'package:flow_api/services/database.dart';
 
 import 'event/item/model.dart';
 import 'event/model.dart';
@@ -27,19 +28,23 @@ class CachedData with CachedDataMappable {
       lastUpdated: other.lastUpdated ?? lastUpdated,
       events: [
         ...events,
-        ...other.events.where((e) => !events.any((e2) => e2.id == e.id))
+        ...other.events
+            .where((e) => !events.any((e2) => equalUint8List(e2.id, e.id)))
       ],
       notebooks: [
         ...notebooks,
-        ...other.notebooks.where((e) => !notebooks.any((e2) => e2.id == e.id))
+        ...other.notebooks
+            .where((e) => !notebooks.any((e2) => equalUint8List(e2.id, e.id)))
       ],
       items: [
         ...items,
-        ...other.items.where((e) => !items.any((e2) => e2.id == e.id))
+        ...other.items
+            .where((e) => !items.any((e2) => equalUint8List(e2.id, e.id)))
       ],
       notes: [
         ...notes,
-        ...other.notes.where((e) => !notes.any((e2) => e2.id == e.id))
+        ...other.notes
+            .where((e) => !notes.any((e2) => equalUint8List(e2.id, e.id)))
       ],
     );
   }

api/lib/models/event/database.dart

@@ -15,21 +15,19 @@ class EventDatabaseService extends EventService with TableService {
   }
 
   @override
-  FutureOr<void> create(Database db) async {
+  FutureOr<void> create(DatabaseExecutor db, [String name = 'events']) async {
     await db.execute("""
-      CREATE TABLE IF NOT EXISTS events (
+      CREATE TABLE IF NOT EXISTS $name (
         id BLOB(16) PRIMARY KEY,
         parentId BLOB(16),
         groupId BLOB(16),
-        placeId BLOB(16),
         blocked INTEGER NOT NULL DEFAULT 1,
         name VARCHAR(100) NOT NULL DEFAULT '',
         description TEXT NOT NULL DEFAULT '',
         location TEXT NOT NULL DEFAULT '',
         extra TEXT,
         FOREIGN KEY (parentId) REFERENCES events(id) ON DELETE CASCADE,
-        FOREIGN KEY (groupId) REFERENCES groups(id) ON DELETE CASCADE,
-        FOREIGN KEY (placeId) REFERENCES places(id) ON DELETE CASCADE
+        FOREIGN KEY (groupId) REFERENCES groups(id) ON DELETE CASCADE
       )
     """);
   }
@@ -61,7 +59,7 @@ class EventDatabaseService extends EventService with TableService {
   @override
   Future<List<Event>> getEvents(
       {Uint8List? groupId,
-      Uint8List? placeId,
+      List<Uint8List>? resourceIds,
       int offset = 0,
       int limit = 50,
       String search = ''}) async {
@@ -73,11 +71,13 @@ class EventDatabaseService extends EventService with TableService {
     }
     if (groupId != null) {
       where = where == null ? 'groupId = ?' : '$where AND groupId = ?';
-      whereArgs = whereArgs == null ? [groupId] : [...whereArgs, groupId];
+      whereArgs = [...?whereArgs, groupId];
     }
-    if (placeId != null) {
-      where = where == null ? 'placeId = ?' : '$where AND placeId = ?';
-      whereArgs = whereArgs == null ? [placeId] : [...whereArgs, placeId];
+    if (resourceIds != null) {
+      final statement =
+          "id IN (SELECT itemId FROM eventResources WHERE resourceId IN (${resourceIds.map((e) => '?').join(', ')}))";
+      where = where == null ? statement : '$where AND $statement';
+      whereArgs = [...?whereArgs, ...resourceIds];
     }
     final result = await db?.query(
       'events',
@@ -90,9 +90,6 @@ class EventDatabaseService extends EventService with TableService {
     return result.map(Event.fromDatabase).toList();
   }
 
-  @override
-  FutureOr<void> migrate(Database db, int version) {}
-
   @override
   FutureOr<bool> updateEvent(Event event) async {
     return await db?.update(

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

@@ -25,7 +25,6 @@ class CalendarItemDatabaseService extends CalendarItemService
         location VARCHAR(100) NOT NULL DEFAULT '',
         eventId BLOB(16),
         groupId BLOB(16),
-        placeId BLOB(16),
         start INTEGER,
         end INTEGER,
         status VARCHAR(20) NOT NULL DEFAULT 'confirmed',
@@ -58,7 +57,7 @@ class CalendarItemDatabaseService extends CalendarItemService
       {List<EventStatus>? status,
       Uint8List? eventId,
       Uint8List? groupId,
-      Uint8List? placeId,
+      List<Uint8List>? resourceIds,
       bool pending = false,
       int offset = 0,
       int limit = 50,
@@ -113,23 +112,23 @@ class CalendarItemDatabaseService extends CalendarItemService
       where = where == null ? statement : '$where AND $statement';
       whereArgs = [...?whereArgs, groupId, groupId];
     }
-    if (placeId != null) {
-      final statement = "(placeId = ? OR events.placeId = ?)";
-      where = where == null ? statement : '$where AND $statement';
-      whereArgs = [...?whereArgs, placeId, placeId];
-    }
     if (eventId != null) {
       where = where == null ? 'eventId = ?' : '$where AND eventId = ?';
       whereArgs = [...?whereArgs, eventId];
     }
+    if (resourceIds != null) {
+      final statement =
+          "(calendarItems.id IN (SELECT itemId FROM calendarItemResources WHERE resourceId IN (${List.filled(resourceIds.length, '?').join(', ')})) OR events.id IN (SELECT eventId FROM eventResources WHERE resourceId IN (${List.filled(resourceIds.length, '?').join(', ')})))";
+      where = where == null ? statement : '$where AND $statement';
+      whereArgs = [...?whereArgs, ...resourceIds, ...resourceIds];
+    }
     const eventPrefix = "event_";
     final result = await db?.query(
       "calendarItems LEFT JOIN events ON events.id = calendarItems.eventId",
       columns: [
         "events.id AS ${eventPrefix}id",
         "events.parentId AS ${eventPrefix}parentId",
         "events.groupId AS ${eventPrefix}groupId",
-        "events.placeId AS ${eventPrefix}placeId",
         "events.blocked AS ${eventPrefix}blocked",
         "events.name AS ${eventPrefix}name",
         "events.description AS ${eventPrefix}description",
@@ -215,7 +214,7 @@ abstract class CalendarItemDatabaseServiceLinker extends CalendarItemService
     List<EventStatus>? status,
     Uint8List? eventId,
     Uint8List? groupId,
-    Uint8List? placeId,
+    List<Uint8List>? resourceIds,
     bool pending = false,
     int offset = 0,
     int limit = 50,
@@ -228,7 +227,7 @@ abstract class CalendarItemDatabaseServiceLinker extends CalendarItemService
         status: status,
         eventId: eventId,
         groupId: groupId,
-        placeId: placeId,
+        resourceIds: resourceIds,
         pending: pending,
         offset: offset,
         limit: limit,

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, placeId, eventId;
+  final Uint8List? groupId, eventId;
   final DateTime? start, end;
   final EventStatus status;
 
@@ -28,15 +28,14 @@ sealed class CalendarItem
     this.description = '',
     this.location = '',
     this.groupId,
-    this.placeId,
     this.eventId,
     this.start,
     this.end,
     this.status = EventStatus.confirmed,
   });
 
   factory CalendarItem.fromDatabase(Map<String, dynamic> row) =>
-      CalendarItemMapper.fromMap(row);
+      FixedCalendarItemMapper.fromMap(row);
 
   CalendarItemType get type {
     if (start == null && end == null) {
@@ -67,7 +66,6 @@ final class FixedCalendarItem extends CalendarItem
     super.description,
     super.location,
     super.groupId,
-    super.placeId,
     super.eventId,
     super.start,
     super.end,
@@ -89,7 +87,6 @@ final class RepeatingCalendarItem extends CalendarItem
     super.description,
     super.location,
     super.groupId,
-    super.placeId,
     super.eventId,
     super.start,
     super.end,
@@ -120,7 +117,6 @@ final class AutoCalendarItem extends CalendarItem
     super.description,
     super.location,
     super.groupId,
-    super.placeId,
     super.eventId,
     super.status,
     super.start,