Change users to have multiple groups

Author: CodeDoctorDE

api/lib/models/user/database.dart

@@ -10,11 +10,10 @@ class UserDatabaseService extends UserService with TableService {
   UserDatabaseService();
 
   @override
-  Future<void> create(Database db) {
+  Future<void> create(DatabaseExecutor db, [String name = 'users']) {
     return db.execute("""
-      CREATE TABLE IF NOT EXISTS users (
+      CREATE TABLE IF NOT EXISTS $name (
         id BLOB(16) PRIMARY KEY,
-        groupId BLOB(16),
         name VARCHAR(100) NOT NULL DEFAULT '',
         email VARCHAR(100) NOT NULL DEFAULT '',
         description TEXT,

api/lib/models/user/group.dart

@@ -0,0 +1,48 @@
+import 'dart:typed_data';
+
+import 'package:flow_api/models/user/model.dart';
+import 'package:flow_api/models/group/model.dart';
+import 'package:flow_api/services/database.dart';
+
+class UserGroupDatabaseConnector extends DatabaseModelConnector<Group, User> {
+  @override
+  String get connectedIdName => "userId";
+
+  @override
+  String get connectedTableName => "users";
+
+  @override
+  String get tableName => "userGroups";
+
+  @override
+  Future<List<User>> getConnected(Uint8List itemId,
+      {int offset = 0, int limit = 50}) async {
+    final result = await db?.query(
+      '$tableName JOIN users ON userId = users.id',
+      limit: limit,
+      offset: offset,
+      where: '$connectedIdName = ?',
+      whereArgs: [itemId],
+    );
+    return result?.map((e) => User.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/services/database.dart

@@ -15,6 +15,7 @@ import 'package:flow_api/models/resource/event.dart';
 import 'package:flow_api/models/resource/group.dart';
 import 'package:flow_api/models/resource/item.dart';
 import 'package:flow_api/models/resource/user.dart';
+import 'package:flow_api/models/user/group.dart';
 import 'package:flow_api/services/migration.dart';
 import 'package:flow_api/services/source.dart';
 import 'package:sqflite_common/sqlite_api.dart';
@@ -60,6 +61,8 @@ class DatabaseService extends SourceService {
   @override
   final UserDatabaseService user = UserDatabaseService();
   @override
+  final UserGroupDatabaseConnector userGroup = UserGroupDatabaseConnector();
+  @override
   final ResourceDatabaseService resource = ResourceDatabaseService();
   @override
   late final EventResourceDatabaseConnector eventResource =

api/lib/services/migration.dart

@@ -26,6 +26,7 @@ Future<void> migrateDatabase(DatabaseService service, Database db,
     await service.groupResource.create(db);
     await service.eventResource.create(db);
     await service.calendarItemResource.create(db);
+    await service.userGroup.create(db);
     await db.execute("ALTER TABLE places RENAME TO resources");
     await db.execute("PRAGMA foreign_keys=off");
     await db.transaction((txn) async {
@@ -51,6 +52,15 @@ Future<void> migrateDatabase(DatabaseService service, Database db,
       await txn
           .execute("ALTER TABLE calendarItems_temp RENAME TO calendarItems");
     });
+    await db.transaction((txn) async {
+      await service.user.create(txn, 'users_temp');
+      await txn.execute(
+          "INSERT INTO users_temp SELECT id, name, email, description, phone, image FROM users");
+      await txn.execute(
+          "INSERT INTO userGroups(userId, groupId) SELECT id, groupId FROM users");
+      await txn.execute("DROP TABLE users");
+      await txn.execute("ALTER TABLE users_temp RENAME TO users");
+    });
     await db.execute("PRAGMA foreign_keys=on");
   }
 }

api/lib/services/source.dart

@@ -37,6 +37,7 @@ abstract class SourceService {
   UserService? get user => null;
   LabelService? get label => null;
   ModelConnector<User, Event>? get eventUser => null;
+  ModelConnector<Group, User>? get userGroup => null;
   ModelConnector<Group, Event>? get eventGroup => null;
   ModelConnector<User, CalendarItem>? get calendarItemUser => null;
   ModelConnector<Group, CalendarItem>? get calendarItemGroup => null;

metadata/en-US/changelogs/9.txt

@@ -2,6 +2,7 @@
 * Add event notes
 * Add owner for notes
 * Change events and calendar items to have multiple users and groups
+* Change users to have multiple groups
 * Refactor places to resources
   * Allow many-to-many relationship
   * Add owner for resources