migrate users db

filcnaplo/lib/api/login.dart

@@ -1,3 +1,5 @@
+import 'dart:developer';
+
 import 'package:filcnaplo/utils/jwt.dart';
 import 'package:filcnaplo_kreta_api/providers/absence_provider.dart';
 import 'package:filcnaplo_kreta_api/providers/event_provider.dart';

filcnaplo/lib/database/init.dart

@@ -9,7 +9,7 @@ Future<Database> initDB() async {
   var settingsDB = await createSettingsTable(db);
 
   // Create table Users
-  await db.execute("CREATE TABLE IF NOT EXISTS users (id TEXT NOT NULL, name TEXT, username TEXT, password TEXT, institute_code TEXT, student TEXT)");
+  var usersDB = await createUsersTable(db);
   await db.execute("CREATE TABLE IF NOT EXISTS user_data ("
       "id TEXT NOT NULL, grades TEXT, timetable TEXT, exams TEXT, homework TEXT, messages TEXT, notes TEXT, events TEXT, absences TEXT)");
 
@@ -18,7 +18,9 @@ Future<Database> initDB() async {
     await db.insert("settings", SettingsProvider.defaultSettings().toMap());
   }
 
-  await migrateDB(db, settingsDB.struct.keys);
+  // Migrate Databases
+  await migrateDB(db, "settings", settingsDB.struct.keys, SettingsProvider.defaultSettings().toMap(), createSettingsTable);
+  await migrateDB(db, "users", usersDB.struct.keys, {"role": 0}, createUsersTable);
 
   return db;
 }
@@ -38,35 +40,59 @@ Future<DatabaseStruct> createSettingsTable(Database db) async {
   return settingsDB;
 }
 
-Future<void> migrateDB(Database db, Iterable<String> keys) async {
+Future<DatabaseStruct> createUsersTable(Database db) async {
-  var settings = (await db.query("settings"))[0];
+  var usersDB = DatabaseStruct(
+      {"id": String, "name": String, "username": String, "password": String, "institute_code": String, "student": String, "role": String});
 
-  bool migrationRequired = keys.any((key) => !settings.containsKey(key) || settings[key] == null);
+  // Create table Users
+  await db.execute("CREATE TABLE IF NOT EXISTS users ($usersDB)");
+
+  return usersDB;
+}
+
+Future<void> migrateDB(
+  Database db,
+  String table,
+  Iterable<String> keys,
+  Map<String, Object?> defaultValues,
+  Future<DatabaseStruct> Function(Database) create,
+) async {
+  var originalRows = (await db.query(table));
+
+  if (originalRows.length == 0) {
+    await db.execute("drop table $table");
+    await create(db);
+    return;
+  }
+
+  await Future.forEach<Map<String, Object?>>(originalRows, (original) async {
+    bool migrationRequired = keys.any((key) => !original.containsKey(key) || original[key] == null);
 
     if (migrationRequired) {
-    var defaultSettings = SettingsProvider.defaultSettings();
+      print("INFO: Migrating $table");
-    var settingsCopy = Map<String, dynamic>.from(settings);
+      var copy = Map<String, dynamic>.from(original);
 
-    // Delete settings
+      // Delete table
-    await db.execute("drop table settings");
+      await db.execute("drop table $table");
 
       // Fill missing columns
       keys.forEach((key) {
         if (!keys.contains(key)) {
-        print("debug: dropping $key");
+          print("DEBUG: dropping $key");
-        settingsCopy.remove(key);
+          copy.remove(key);
         }
 
-      if (!settings.containsKey(key) || settings[key] == null) {
+        if (!original.containsKey(key) || original[key] == null) {
           print("DEBUG: migrating $key");
-        settingsCopy[key] = defaultSettings.toMap()[key];
+          copy[key] = defaultValues[key];
         }
       });
 
-    // Recreate settings
+      // Recreate table
-    await createSettingsTable(db);
+      await create(db);
-    await db.insert("settings", settingsCopy);
+      await db.insert(table, copy);
 
       print("INFO: Database migrated");
     }
+  });
 }

filcnaplo/lib/database/struct.dart

@@ -15,7 +15,7 @@ class DatabaseStruct {
         break;
     }
 
-    return "${name} ${typeName.toUpperCase()}";
+    return "${name} ${typeName.toUpperCase()} ${name == 'id' ? 'NOT NULL' : ''}";
   }
 
   @override