merge fix

# Conflicts:
#	lib/presentation/views/main_menu/group_view/create_group_view.dart
#	pubspec.yaml

lib/data/dao/game_dao.dart

@@ -1,179 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/game_table.dart';
-import 'package:game_tracker/data/dto/game.dart';
-
-part 'game_dao.g.dart';
-
-@DriftAccessor(tables: [GameTable])
-class GameDao extends DatabaseAccessor<AppDatabase> with _$GameDaoMixin {
-  GameDao(super.db);
-
-  /// Retrieves all games from the database.
-  Future<List<Game>> getAllGames() async {
-    final query = select(gameTable);
-    final result = await query.get();
-    return result
-        .map(
-          (row) => Game(
-            id: row.id,
-            name: row.name,
-            ruleset: row.ruleset,
-            description: row.description,
-            color: row.color != null ? int.tryParse(row.color!) : null,
-            icon: row.icon,
-            createdAt: row.createdAt,
-          ),
-        )
-        .toList();
-  }
-
-  /// Retrieves a [Game] by its [gameId].
-  Future<Game> getGameById({required String gameId}) async {
-    final query = select(gameTable)..where((g) => g.id.equals(gameId));
-    final result = await query.getSingle();
-    return Game(
-      id: result.id,
-      name: result.name,
-      ruleset: result.ruleset,
-      description: result.description,
-      color: result.color != null ? int.tryParse(result.color!) : null,
-      icon: result.icon,
-      createdAt: result.createdAt,
-    );
-  }
-
-  /// Adds a new [game] to the database.
-  /// If a game with the same ID already exists, no action is taken.
-  /// Returns `true` if the game was added, `false` otherwise.
-  Future<bool> addGame({required Game game}) async {
-    if (!await gameExists(gameId: game.id)) {
-      await into(gameTable).insert(
-        GameTableCompanion.insert(
-          id: game.id,
-          name: game.name,
-          ruleset: game.ruleset ?? '',
-          description: Value(game.description),
-          color: Value(game.color?.toString()),
-          icon: Value(game.icon),
-          createdAt: game.createdAt,
-        ),
-        mode: InsertMode.insertOrReplace,
-      );
-      return true;
-    }
-    return false;
-  }
-
-  /// Adds multiple [games] to the database in a batch operation.
-  /// Uses insertOrIgnore to avoid overwriting existing games.
-  Future<bool> addGamesAsList({required List<Game> games}) async {
-    if (games.isEmpty) return false;
-
-    await db.batch(
-      (b) => b.insertAll(
-        gameTable,
-        games
-            .map(
-              (game) => GameTableCompanion.insert(
-                id: game.id,
-                name: game.name,
-                ruleset: game.ruleset ?? '',
-                description: Value(game.description),
-                color: Value(game.color?.toString()),
-                icon: Value(game.icon),
-                createdAt: game.createdAt,
-              ),
-            )
-            .toList(),
-        mode: InsertMode.insertOrIgnore,
-      ),
-    );
-
-    return true;
-  }
-
-  /// Deletes the game with the given [gameId] from the database.
-  /// Returns `true` if the game was deleted, `false` if the game did not exist.
-  Future<bool> deleteGame({required String gameId}) async {
-    final query = delete(gameTable)..where((g) => g.id.equals(gameId));
-    final rowsAffected = await query.go();
-    return rowsAffected > 0;
-  }
-
-  /// Checks if a game with the given [gameId] exists in the database.
-  /// Returns `true` if the game exists, `false` otherwise.
-  Future<bool> gameExists({required String gameId}) async {
-    final query = select(gameTable)..where((g) => g.id.equals(gameId));
-    final result = await query.getSingleOrNull();
-    return result != null;
-  }
-
-  /// Updates the name of the game with the given [gameId] to [newName].
-  Future<void> updateGameName({
-    required String gameId,
-    required String newName,
-  }) async {
-    await (update(gameTable)..where((g) => g.id.equals(gameId))).write(
-      GameTableCompanion(name: Value(newName)),
-    );
-  }
-
-  /// Updates the ruleset of the game with the given [gameId].
-  Future<void> updateGameRuleset({
-    required String gameId,
-    required String newRuleset,
-  }) async {
-    await (update(gameTable)..where((g) => g.id.equals(gameId))).write(
-      GameTableCompanion(ruleset: Value(newRuleset)),
-    );
-  }
-
-  /// Updates the description of the game with the given [gameId].
-  Future<void> updateGameDescription({
-    required String gameId,
-    required String? newDescription,
-  }) async {
-    await (update(gameTable)..where((g) => g.id.equals(gameId))).write(
-      GameTableCompanion(description: Value(newDescription)),
-    );
-  }
-
-  /// Updates the color of the game with the given [gameId].
-  Future<void> updateGameColor({
-    required String gameId,
-    required int? newColor,
-  }) async {
-    await (update(gameTable)..where((g) => g.id.equals(gameId))).write(
-      GameTableCompanion(color: Value(newColor?.toString())),
-    );
-  }
-
-  /// Updates the icon of the game with the given [gameId].
-  Future<void> updateGameIcon({
-    required String gameId,
-    required String? newIcon,
-  }) async {
-    await (update(gameTable)..where((g) => g.id.equals(gameId))).write(
-      GameTableCompanion(icon: Value(newIcon)),
-    );
-  }
-
-  /// Retrieves the total count of games in the database.
-  Future<int> getGameCount() async {
-    final count =
-        await (selectOnly(gameTable)..addColumns([gameTable.id.count()]))
-            .map((row) => row.read(gameTable.id.count()))
-            .getSingle();
-    return count ?? 0;
-  }
-
-  /// Deletes all games from the database.
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> deleteAllGames() async {
-    final query = delete(gameTable);
-    final rowsAffected = await query.go();
-    return rowsAffected > 0;
-  }
-}
-

lib/data/dao/game_dao.g.dart

@@ -1,8 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'game_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$GameDaoMixin on DatabaseAccessor<AppDatabase> {
-  $GameTableTable get gameTable => attachedDatabase.gameTable;
-}

lib/data/dao/group_dao.dart

@@ -23,7 +23,6 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
         return Group(
           id: groupData.id,
           name: groupData.name,
-          description: groupData.description,
           members: members,
           createdAt: groupData.createdAt,
         );
@@ -43,7 +42,6 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
     return Group(
       id: result.id,
       name: result.name,
-      description: result.description,
       members: members,
       createdAt: result.createdAt,
     );
@@ -58,7 +56,6 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
           GroupTableCompanion.insert(
             id: group.id,
             name: group.name,
-            description: Value(group.description),
             createdAt: group.createdAt,
           ),
           mode: InsertMode.insertOrReplace,
@@ -108,7 +105,6 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
                 (group) => GroupTableCompanion.insert(
                   id: group.id,
                   name: group.name,
-                  description: Value(group.description),
                   createdAt: group.createdAt,
                 ),
               )
@@ -136,7 +132,6 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
                   (p) => PlayerTableCompanion.insert(
                     id: p.id,
                     name: p.name,
-                    description: Value(p.description),
                     createdAt: p.createdAt,
                   ),
                 )
@@ -181,7 +176,7 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
 
   /// Updates the name of the group with the given [id] to [newName].
   /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> updateGroupName({
+  Future<bool> updateGroupname({
     required String groupId,
     required String newName,
   }) async {
@@ -192,21 +187,6 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
     return rowsAffected > 0;
   }
 
-  /// Updates the description of the group with the given [groupId] to [newDescription].
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> updateGroupDescription({
-    required String groupId,
-    required String? newDescription,
-  }) async {
-    final rowsAffected =
-        await (update(groupTable)..where((g) => g.id.equals(groupId))).write(
-          GroupTableCompanion(description: Value(newDescription)),
-        );
-    return rowsAffected > 0;
-  }
-
-
-
   /// Retrieves the number of groups in the database.
   Future<int> getGroupCount() async {
     final count =

lib/data/dao/group_match_dao.dart

@@ -0,0 +1,98 @@
+import 'package:drift/drift.dart';
+import 'package:game_tracker/data/db/database.dart';
+import 'package:game_tracker/data/db/tables/group_match_table.dart';
+import 'package:game_tracker/data/dto/group.dart';
+
+part 'group_match_dao.g.dart';
+
+@DriftAccessor(tables: [GroupMatchTable])
+class GroupMatchDao extends DatabaseAccessor<AppDatabase>
+    with _$GroupMatchDaoMixin {
+  GroupMatchDao(super.db);
+
+  /// Associates a group with a match by inserting a record into the
+  /// [GroupMatchTable].
+  Future<void> addGroupToMatch({
+    required String matchId,
+    required String groupId,
+  }) async {
+    if (await matchHasGroup(matchId: matchId)) {
+      throw Exception('Match already has a group');
+    }
+    await into(groupMatchTable).insert(
+      GroupMatchTableCompanion.insert(groupId: groupId, matchId: matchId),
+      mode: InsertMode.insertOrIgnore,
+    );
+  }
+
+  /// Retrieves the [Group] associated with the given [matchId].
+  /// Returns `null` if no group is found.
+  Future<Group?> getGroupOfMatch({required String matchId}) async {
+    final result = await (select(
+      groupMatchTable,
+    )..where((g) => g.matchId.equals(matchId))).getSingleOrNull();
+
+    if (result == null) {
+      return null;
+    }
+
+    final group = await db.groupDao.getGroupById(groupId: result.groupId);
+    return group;
+  }
+
+  /// Checks if there is a group associated with the given [matchId].
+  /// Returns `true` if there is a group, otherwise `false`.
+  Future<bool> matchHasGroup({required String matchId}) async {
+    final count =
+        await (selectOnly(groupMatchTable)
+              ..where(groupMatchTable.matchId.equals(matchId))
+              ..addColumns([groupMatchTable.groupId.count()]))
+            .map((row) => row.read(groupMatchTable.groupId.count()))
+            .getSingle();
+    return (count ?? 0) > 0;
+  }
+
+  /// Checks if a specific group is associated with a specific match.
+  /// Returns `true` if the group is in the match, otherwise `false`.
+  Future<bool> isGroupInMatch({
+    required String matchId,
+    required String groupId,
+  }) async {
+    final count =
+        await (selectOnly(groupMatchTable)
+              ..where(
+                groupMatchTable.matchId.equals(matchId) &
+                    groupMatchTable.groupId.equals(groupId),
+              )
+              ..addColumns([groupMatchTable.groupId.count()]))
+            .map((row) => row.read(groupMatchTable.groupId.count()))
+            .getSingle();
+    return (count ?? 0) > 0;
+  }
+
+  /// Removes the association of a group from a match based on [groupId] and
+  /// [matchId].
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> removeGroupFromMatch({
+    required String matchId,
+    required String groupId,
+  }) async {
+    final query = delete(groupMatchTable)
+      ..where((g) => g.matchId.equals(matchId) & g.groupId.equals(groupId));
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
+  }
+
+  /// Updates the group associated with a match to [newGroupId] based on
+  /// [matchId].
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> updateGroupOfMatch({
+    required String matchId,
+    required String newGroupId,
+  }) async {
+    final updatedRows =
+        await (update(groupMatchTable)..where((g) => g.matchId.equals(matchId)))
+            .write(GroupMatchTableCompanion(groupId: Value(newGroupId)));
+    return updatedRows > 0;
+  }
+}

lib/data/dao/group_match_dao.g.dart

@@ -0,0 +1,10 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'group_match_dao.dart';
+
+// ignore_for_file: type=lint
+mixin _$GroupMatchDaoMixin on DatabaseAccessor<AppDatabase> {
+  $GroupTableTable get groupTable => attachedDatabase.groupTable;
+  $MatchTableTable get matchTable => attachedDatabase.matchTable;
+  $GroupMatchTableTable get groupMatchTable => attachedDatabase.groupMatchTable;
+}

lib/data/dao/match_dao.dart

@@ -1,17 +1,13 @@
 import 'package:drift/drift.dart';
 import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/game_table.dart';
-import 'package:game_tracker/data/db/tables/group_table.dart';
 import 'package:game_tracker/data/db/tables/match_table.dart';
-import 'package:game_tracker/data/db/tables/player_match_table.dart';
-import 'package:game_tracker/data/dto/game.dart';
 import 'package:game_tracker/data/dto/group.dart';
 import 'package:game_tracker/data/dto/match.dart';
 import 'package:game_tracker/data/dto/player.dart';
 
 part 'match_dao.g.dart';
 
-@DriftAccessor(tables: [MatchTable, GameTable, GroupTable, PlayerMatchTable])
+@DriftAccessor(tables: [MatchTable])
 class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
   MatchDao(super.db);
 
@@ -22,22 +18,20 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
 
     return Future.wait(
       result.map((row) async {
-        final game = await db.gameDao.getGameById(gameId: row.gameId);
+        final group = await db.groupMatchDao.getGroupOfMatch(matchId: row.id);
-        Group? group;
-        if (row.groupId != null) {
-          group = await db.groupDao.getGroupById(groupId: row.groupId!);
-        }
         final players = await db.playerMatchDao.getPlayersOfMatch(
           matchId: row.id,
         );
+        final winner = row.winnerId != null
+            ? await db.playerDao.getPlayerById(playerId: row.winnerId!)
+            : null;
         return Match(
           id: row.id,
-          name: row.name ?? '',
+          name: row.name,
-          game: game,
           group: group,
           players: players,
-          notes: row.notes,
           createdAt: row.createdAt,
+          winner: winner,
         );
       }),
     );
@@ -48,110 +42,100 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     final query = select(matchTable)..where((g) => g.id.equals(matchId));
     final result = await query.getSingle();
 
-    final game = await db.gameDao.getGameById(gameId: result.gameId);
-
-    Group? group;
-    if (result.groupId != null) {
-      group = await db.groupDao.getGroupById(groupId: result.groupId!);
-    }
-
     List<Player>? players;
     if (await db.playerMatchDao.matchHasPlayers(matchId: matchId)) {
       players = await db.playerMatchDao.getPlayersOfMatch(matchId: matchId);
     }
+    Group? group;
+    if (await db.groupMatchDao.matchHasGroup(matchId: matchId)) {
+      group = await db.groupMatchDao.getGroupOfMatch(matchId: matchId);
+    }
+    Player? winner;
+    if (result.winnerId != null) {
+      winner = await db.playerDao.getPlayerById(playerId: result.winnerId!);
+    }
 
     return Match(
       id: result.id,
-      name: result.name ?? '',
+      name: result.name,
-      game: game,
-      group: group,
       players: players,
-      notes: result.notes,
+      group: group,
+      winner: winner,
       createdAt: result.createdAt,
     );
   }
 
-  /// Adds a new [Match] to the database. Also adds players associations.
+  /// Adds a new [Match] to the database. Also adds players and group
-  /// This method assumes that the game and group (if any) are already present
+  /// associations. This method assumes that the players and groups added to
-  /// in the database.
+  /// this match are already present in the database.
   Future<void> addMatch({required Match match}) async {
-    if (match.game == null) {
-      throw ArgumentError('Match must have a game associated with it');
-    }
-
     await db.transaction(() async {
       await into(matchTable).insert(
         MatchTableCompanion.insert(
           id: match.id,
-          gameId: match.game!.id,
+          name: match.name,
-          groupId: Value(match.group?.id),
+          winnerId: Value(match.winner?.id),
-          name: Value(match.name),
-          notes: Value(match.notes),
           createdAt: match.createdAt,
         ),
         mode: InsertMode.insertOrReplace,
       );
 
       if (match.players != null) {
-        for (final p in match.players!) {
+        for (final p in match.players ?? []) {
           await db.playerMatchDao.addPlayerToMatch(
             matchId: match.id,
             playerId: p.id,
           );
         }
       }
+
+      if (match.group != null) {
+        await db.groupMatchDao.addGroupToMatch(
+          matchId: match.id,
+          groupId: match.group!.id,
+        );
+      }
     });
   }
 
-  /// Adds multiple [Match]es to the database in a batch operation.
+  /// Adds multiple [Match]s to the database in a batch operation.
   /// Also adds associated players and groups if they exist.
   /// If the [matches] list is empty, the method returns immediately.
-  /// This method should only be used to import matches from a different device.
+  /// This Method should only be used to import matches from a different device.
   Future<void> addMatchAsList({required List<Match> matches}) async {
     if (matches.isEmpty) return;
     await db.transaction(() async {
-      // Add all games first (deduplicated)
+      // Add all matches in batch
-      final uniqueGames = <String, Game>{};
+      await db.batch(
-      for (final match in matches) {
+        (b) => b.insertAll(
-        if (match.game != null) {
+          matchTable,
-          uniqueGames[match.game!.id] = match.game!;
+          matches
-        }
+              .map(
-      }
+                (match) => MatchTableCompanion.insert(
-
+                  id: match.id,
-      if (uniqueGames.isNotEmpty) {
+                  name: match.name,
-        await db.batch(
+                  createdAt: match.createdAt,
-          (b) => b.insertAll(
+                  winnerId: Value(match.winner?.id),
-            db.gameTable,
+                ),
-            uniqueGames.values
+              )
-                .map(
+              .toList(),
-                  (game) => GameTableCompanion.insert(
+          mode: InsertMode.insertOrReplace,
-                    id: game.id,
+        ),
-                    name: game.name,
+      );
-                    ruleset: game.ruleset ?? '',
-                    description: Value(game.description),
-                    color: Value(game.color?.toString()),
-                    icon: Value(game.icon),
-                    createdAt: game.createdAt,
-                  ),
-                )
-                .toList(),
-            mode: InsertMode.insertOrIgnore,
-          ),
-        );
-      }
 
       // Add all groups of the matches in batch
+      // Using insertOrIgnore to avoid overwriting existing groups (which would
+      // trigger cascade deletes on player_group associations)
       await db.batch(
         (b) => b.insertAll(
           db.groupTable,
           matches
               .where((match) => match.group != null)
               .map(
-                (match) => GroupTableCompanion.insert(
+                (matches) => GroupTableCompanion.insert(
-                  id: match.group!.id,
+                  id: matches.group!.id,
-                  name: match.group!.name,
+                  name: matches.group!.name,
-                  description: Value(match.group!.description),
+                  createdAt: matches.group!.createdAt,
-                  createdAt: match.group!.createdAt,
                 ),
               )
               .toList(),
@@ -159,27 +143,6 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
         ),
       );
 
-      // Add all matches in batch
-      await db.batch(
-        (b) => b.insertAll(
-          matchTable,
-          matches
-              .where((match) => match.game != null)
-              .map(
-                (match) => MatchTableCompanion.insert(
-                  id: match.id,
-                  gameId: match.game!.id,
-                  groupId: Value(match.group?.id),
-                  name: Value(match.name),
-                  notes: Value(match.notes),
-                  createdAt: match.createdAt,
-                ),
-              )
-              .toList(),
-          mode: InsertMode.insertOrReplace,
-        ),
-      );
-
       // Add all players of the matches in batch (unique)
       final uniquePlayers = <String, Player>{};
       for (final match in matches) {
@@ -197,6 +160,8 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
       }
 
       if (uniquePlayers.isNotEmpty) {
+        // Using insertOrIgnore to avoid triggering cascade deletes on
+        // player_group/player_match associations when players already exist
         await db.batch(
           (b) => b.insertAll(
             db.playerTable,
@@ -205,7 +170,6 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
                   (p) => PlayerTableCompanion.insert(
                     id: p.id,
                     name: p.name,
-                    description: Value(p.description),
                     createdAt: p.createdAt,
                   ),
                 )
@@ -219,13 +183,12 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
       await db.batch((b) {
         for (final match in matches) {
           if (match.players != null) {
-            for (final p in match.players!) {
+            for (final p in match.players ?? []) {
               b.insert(
                 db.playerMatchTable,
                 PlayerMatchTableCompanion.insert(
                   matchId: match.id,
                   playerId: p.id,
-                  score: 0,
                 ),
                 mode: InsertMode.insertOrIgnore,
               );
@@ -251,6 +214,22 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
           }
         }
       });
+
+      // Add all group-match associations in batch
+      await db.batch((b) {
+        for (final match in matches) {
+          if (match.group != null) {
+            b.insert(
+              db.groupMatchTable,
+              GroupMatchTableCompanion.insert(
+                matchId: match.id,
+                groupId: match.group!.id,
+              ),
+              mode: InsertMode.insertOrIgnore,
+            );
+          }
+        }
+      });
     });
   }
 
@@ -287,20 +266,52 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     return rowsAffected > 0;
   }
 
-  /// Updates the notes of the match with the given [matchId].
+  /// Sets the winner of the match with the given [matchId] to the player with
+  /// the given [winnerId].
   /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> updateMatchNotes({
+  Future<bool> setWinner({
     required String matchId,
-    required String? notes,
+    required String winnerId,
   }) async {
     final query = update(matchTable)..where((g) => g.id.equals(matchId));
     final rowsAffected = await query.write(
-      MatchTableCompanion(notes: Value(notes)),
+      MatchTableCompanion(winnerId: Value(winnerId)),
     );
     return rowsAffected > 0;
   }
 
-  /// Changes the name of the match with the given [matchId] to [newName].
+  /// Retrieves the winner of the match with the given [matchId].
+  /// Returns the [Player] who won the match, or `null` if no winner is set.
+  Future<Player?> getWinner({required String matchId}) async {
+    final query = select(matchTable)..where((g) => g.id.equals(matchId));
+    final result = await query.getSingleOrNull();
+    if (result == null || result.winnerId == null) {
+      return null;
+    }
+    final winner = await db.playerDao.getPlayerById(playerId: result.winnerId!);
+    return winner;
+  }
+
+  /// Removes the winner of the match with the given [matchId].
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> removeWinner({required String matchId}) async {
+    final query = update(matchTable)..where((g) => g.id.equals(matchId));
+    final rowsAffected = await query.write(
+      const MatchTableCompanion(winnerId: Value(null)),
+    );
+    return rowsAffected > 0;
+  }
+
+  /// Checks if the match with the given [matchId] has a winner set.
+  /// Returns `true` if a winner is set, otherwise `false`.
+  Future<bool> hasWinner({required String matchId}) async {
+    final query = select(matchTable)
+      ..where((g) => g.id.equals(matchId) & g.winnerId.isNotNull());
+    final result = await query.getSingleOrNull();
+    return result != null;
+  }
+
+  /// Changes the title of the match with the given [matchId] to [newName].
   /// Returns `true` if more than 0 rows were affected, otherwise `false`.
   Future<bool> updateMatchName({
     required String matchId,
@@ -312,80 +323,4 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     );
     return rowsAffected > 0;
   }
-
-  /// Updates the game of the match with the given [matchId].
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> updateMatchGame({
-    required String matchId,
-    required String gameId,
-  }) async {
-    final query = update(matchTable)..where((g) => g.id.equals(matchId));
-    final rowsAffected = await query.write(
-      MatchTableCompanion(gameId: Value(gameId)),
-    );
-    return rowsAffected > 0;
-  }
-
-  /// Updates the group of the match with the given [matchId].
-  /// Pass null to remove the group association.
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> updateMatchGroup({
-    required String matchId,
-    required String? groupId,
-  }) async {
-    final query = update(matchTable)..where((g) => g.id.equals(matchId));
-    final rowsAffected = await query.write(
-      MatchTableCompanion(groupId: Value(groupId)),
-    );
-    return rowsAffected > 0;
-  }
-
-  /// Updates the createdAt timestamp of the match with the given [matchId].
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> updateMatchCreatedAt({
-    required String matchId,
-    required DateTime createdAt,
-  }) async {
-    final query = update(matchTable)..where((g) => g.id.equals(matchId));
-    final rowsAffected = await query.write(
-      MatchTableCompanion(createdAt: Value(createdAt)),
-    );
-    return rowsAffected > 0;
-  }
-
-  // ============================================================
-  // TEMPORARY: Winner methods - these are stubs and do not persist data
-  // TODO: Implement proper winner handling
-  // ============================================================
-
-  /// TEMPORARY: Checks if a match has a winner.
-  /// Currently returns true if the match has any players.
-  Future<bool> hasWinner({required String matchId}) async {
-    final players = await db.playerMatchDao.getPlayersOfMatch(matchId: matchId);
-    return players?.isNotEmpty ?? false;
-  }
-
-  /// TEMPORARY: Gets the winner of a match.
-  /// Currently returns the first player in the match's player list.
-  Future<Player?> getWinner({required String matchId}) async {
-    final players = await db.playerMatchDao.getPlayersOfMatch(matchId: matchId);
-    return (players?.isNotEmpty ?? false) ? players!.first : null;
-  }
-
-  /// TEMPORARY: Sets the winner of a match.
-  /// Currently does nothing - winner is not persisted.
-  Future<bool> setWinner({
-    required String matchId,
-    required String winnerId,
-  }) async {
-    // TODO: Implement winner persistence
-    return true;
-  }
-
-  /// TEMPORARY: Removes the winner of a match.
-  /// Currently does nothing - winner is not persisted.
-  Future<bool> removeWinner({required String matchId}) async {
-    // TODO: Implement winner persistence
-    return true;
-  }
 }

lib/data/dao/match_dao.g.dart

@@ -4,11 +4,5 @@ part of 'match_dao.dart';
 
 // ignore_for_file: type=lint
 mixin _$MatchDaoMixin on DatabaseAccessor<AppDatabase> {
-  $GameTableTable get gameTable => attachedDatabase.gameTable;
-  $GroupTableTable get groupTable => attachedDatabase.groupTable;
   $MatchTableTable get matchTable => attachedDatabase.matchTable;
-  $PlayerTableTable get playerTable => attachedDatabase.playerTable;
-  $TeamTableTable get teamTable => attachedDatabase.teamTable;
-  $PlayerMatchTableTable get playerMatchTable =>
-      attachedDatabase.playerMatchTable;
 }

lib/data/dao/player_dao.dart

@@ -15,12 +15,7 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
     final result = await query.get();
     return result
         .map(
-          (row) => Player(
+          (row) => Player(id: row.id, name: row.name, createdAt: row.createdAt),
-            id: row.id,
-            name: row.name,
-            description: row.description,
-            createdAt: row.createdAt,
-          ),
         )
         .toList();
   }
@@ -32,7 +27,6 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
     return Player(
       id: result.id,
       name: result.name,
-      description: result.description,
       createdAt: result.createdAt,
     );
   }
@@ -46,7 +40,6 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
         PlayerTableCompanion.insert(
           id: player.id,
           name: player.name,
-          description: Value(player.description),
           createdAt: player.createdAt,
         ),
         mode: InsertMode.insertOrReplace,
@@ -70,7 +63,6 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
               (player) => PlayerTableCompanion.insert(
                 id: player.id,
                 name: player.name,
-                description: Value(player.description),
                 createdAt: player.createdAt,
               ),
             )
@@ -99,7 +91,7 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
   }
 
   /// Updates the name of the player with the given [playerId] to [newName].
-  Future<void> updatePlayerName({
+  Future<void> updatePlayername({
     required String playerId,
     required String newName,
   }) async {

lib/data/dao/player_match_dao.dart

@@ -1,31 +1,23 @@
 import 'package:drift/drift.dart';
 import 'package:game_tracker/data/db/database.dart';
 import 'package:game_tracker/data/db/tables/player_match_table.dart';
-import 'package:game_tracker/data/db/tables/team_table.dart';
 import 'package:game_tracker/data/dto/player.dart';
 
 part 'player_match_dao.g.dart';
 
-@DriftAccessor(tables: [PlayerMatchTable, TeamTable])
+@DriftAccessor(tables: [PlayerMatchTable])
 class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
     with _$PlayerMatchDaoMixin {
   PlayerMatchDao(super.db);
 
   /// Associates a player with a match by inserting a record into the
-  /// [PlayerMatchTable]. Optionally associates with a team and sets initial score.
+  /// [PlayerMatchTable].
   Future<void> addPlayerToMatch({
     required String matchId,
     required String playerId,
-    String? teamId,
-    int score = 0,
   }) async {
     await into(playerMatchTable).insert(
-      PlayerMatchTableCompanion.insert(
+      PlayerMatchTableCompanion.insert(playerId: playerId, matchId: matchId),
-        playerId: playerId,
-        matchId: matchId,
-        teamId: Value(teamId),
-        score: score,
-      ),
       mode: InsertMode.insertOrIgnore,
     );
   }
@@ -46,50 +38,6 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
     return players;
   }
 
-  /// Retrieves a player's score for a specific match.
-  /// Returns null if the player is not in the match.
-  Future<int?> getPlayerScore({
-    required String matchId,
-    required String playerId,
-  }) async {
-    final result = await (select(playerMatchTable)
-          ..where(
-            (p) => p.matchId.equals(matchId) & p.playerId.equals(playerId),
-          ))
-        .getSingleOrNull();
-    return result?.score;
-  }
-
-  /// Updates the score for a player in a match.
-  /// Returns `true` if the update was successful, otherwise `false`.
-  Future<bool> updatePlayerScore({
-    required String matchId,
-    required String playerId,
-    required int newScore,
-  }) async {
-    final rowsAffected = await (update(playerMatchTable)
-          ..where(
-            (p) => p.matchId.equals(matchId) & p.playerId.equals(playerId),
-          ))
-        .write(PlayerMatchTableCompanion(score: Value(newScore)));
-    return rowsAffected > 0;
-  }
-
-  /// Updates the team for a player in a match.
-  /// Returns `true` if the update was successful, otherwise `false`.
-  Future<bool> updatePlayerTeam({
-    required String matchId,
-    required String playerId,
-    required String? teamId,
-  }) async {
-    final rowsAffected = await (update(playerMatchTable)
-          ..where(
-            (p) => p.matchId.equals(matchId) & p.playerId.equals(playerId),
-          ))
-        .write(PlayerMatchTableCompanion(teamId: Value(teamId)));
-    return rowsAffected > 0;
-  }
-
   /// Checks if there are any players associated with the given [matchId].
   /// Returns `true` if there are players, otherwise `false`.
   Future<bool> matchHasPlayers({required String matchId}) async {
@@ -166,7 +114,6 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
               (id) => PlayerMatchTableCompanion.insert(
                 playerId: id,
                 matchId: matchId,
-                score: 0,
               ),
             )
             .toList();
@@ -180,23 +127,4 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
       }
     });
   }
-
-  /// Retrieves all players in a specific team for a match.
-  Future<List<Player>> getPlayersInTeam({
-    required String matchId,
-    required String teamId,
-  }) async {
-    final result = await (select(playerMatchTable)
-          ..where(
-            (p) => p.matchId.equals(matchId) & p.teamId.equals(teamId),
-          ))
-        .get();
-
-    if (result.isEmpty) return [];
-
-    final futures = result.map(
-      (row) => db.playerDao.getPlayerById(playerId: row.playerId),
-    );
-    return Future.wait(futures);
-  }
 }

lib/data/dao/player_match_dao.g.dart

@@ -5,10 +5,7 @@ part of 'player_match_dao.dart';
 // ignore_for_file: type=lint
 mixin _$PlayerMatchDaoMixin on DatabaseAccessor<AppDatabase> {
   $PlayerTableTable get playerTable => attachedDatabase.playerTable;
-  $GameTableTable get gameTable => attachedDatabase.gameTable;
-  $GroupTableTable get groupTable => attachedDatabase.groupTable;
   $MatchTableTable get matchTable => attachedDatabase.matchTable;
-  $TeamTableTable get teamTable => attachedDatabase.teamTable;
   $PlayerMatchTableTable get playerMatchTable =>
       attachedDatabase.playerMatchTable;
 }

lib/data/dao/score_dao.dart

@@ -1,191 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/score_table.dart';
-
-part 'score_dao.g.dart';
-
-/// A data class representing a score entry.
-class ScoreEntry {
-  final String playerId;
-  final String matchId;
-  final int roundNumber;
-  final int score;
-  final int change;
-
-  ScoreEntry({
-    required this.playerId,
-    required this.matchId,
-    required this.roundNumber,
-    required this.score,
-    required this.change,
-  });
-}
-
-@DriftAccessor(tables: [ScoreTable])
-class ScoreDao extends DatabaseAccessor<AppDatabase> with _$ScoreDaoMixin {
-  ScoreDao(super.db);
-
-  /// Adds a score entry to the database.
-  Future<void> addScore({
-    required String playerId,
-    required String matchId,
-    required int roundNumber,
-    required int score,
-    required int change,
-  }) async {
-    await into(scoreTable).insert(
-      ScoreTableCompanion.insert(
-        playerId: playerId,
-        matchId: matchId,
-        roundNumber: roundNumber,
-        score: score,
-        change: change,
-      ),
-      mode: InsertMode.insertOrReplace,
-    );
-  }
-
-  /// Retrieves all scores for a specific match.
-  Future<List<ScoreEntry>> getScoresForMatch({required String matchId}) async {
-    final query = select(scoreTable)..where((s) => s.matchId.equals(matchId));
-    final result = await query.get();
-    return result
-        .map(
-          (row) => ScoreEntry(
-            playerId: row.playerId,
-            matchId: row.matchId,
-            roundNumber: row.roundNumber,
-            score: row.score,
-            change: row.change,
-          ),
-        )
-        .toList();
-  }
-
-  /// Retrieves all scores for a specific player in a match.
-  Future<List<ScoreEntry>> getPlayerScoresInMatch({
-    required String playerId,
-    required String matchId,
-  }) async {
-    final query = select(scoreTable)
-      ..where(
-        (s) => s.playerId.equals(playerId) & s.matchId.equals(matchId),
-      )
-      ..orderBy([(s) => OrderingTerm.asc(s.roundNumber)]);
-    final result = await query.get();
-    return result
-        .map(
-          (row) => ScoreEntry(
-            playerId: row.playerId,
-            matchId: row.matchId,
-            roundNumber: row.roundNumber,
-            score: row.score,
-            change: row.change,
-          ),
-        )
-        .toList();
-  }
-
-  /// Retrieves the score for a specific round.
-  Future<ScoreEntry?> getScoreForRound({
-    required String playerId,
-    required String matchId,
-    required int roundNumber,
-  }) async {
-    final query = select(scoreTable)
-      ..where(
-        (s) =>
-            s.playerId.equals(playerId) &
-            s.matchId.equals(matchId) &
-            s.roundNumber.equals(roundNumber),
-      );
-    final result = await query.getSingleOrNull();
-    if (result == null) return null;
-    return ScoreEntry(
-      playerId: result.playerId,
-      matchId: result.matchId,
-      roundNumber: result.roundNumber,
-      score: result.score,
-      change: result.change,
-    );
-  }
-
-  /// Updates a score entry.
-  Future<bool> updateScore({
-    required String playerId,
-    required String matchId,
-    required int roundNumber,
-    required int newScore,
-    required int newChange,
-  }) async {
-    final rowsAffected = await (update(scoreTable)
-          ..where(
-            (s) =>
-                s.playerId.equals(playerId) &
-                s.matchId.equals(matchId) &
-                s.roundNumber.equals(roundNumber),
-          ))
-        .write(
-          ScoreTableCompanion(
-            score: Value(newScore),
-            change: Value(newChange),
-          ),
-        );
-    return rowsAffected > 0;
-  }
-
-  /// Deletes a score entry.
-  Future<bool> deleteScore({
-    required String playerId,
-    required String matchId,
-    required int roundNumber,
-  }) async {
-    final query = delete(scoreTable)
-      ..where(
-        (s) =>
-            s.playerId.equals(playerId) &
-            s.matchId.equals(matchId) &
-            s.roundNumber.equals(roundNumber),
-      );
-    final rowsAffected = await query.go();
-    return rowsAffected > 0;
-  }
-
-  /// Deletes all scores for a specific match.
-  Future<bool> deleteScoresForMatch({required String matchId}) async {
-    final query = delete(scoreTable)..where((s) => s.matchId.equals(matchId));
-    final rowsAffected = await query.go();
-    return rowsAffected > 0;
-  }
-
-  /// Deletes all scores for a specific player.
-  Future<bool> deleteScoresForPlayer({required String playerId}) async {
-    final query = delete(scoreTable)..where((s) => s.playerId.equals(playerId));
-    final rowsAffected = await query.go();
-    return rowsAffected > 0;
-  }
-
-  /// Gets the latest round number for a match.
-  Future<int> getLatestRoundNumber({required String matchId}) async {
-    final query = selectOnly(scoreTable)
-      ..where(scoreTable.matchId.equals(matchId))
-      ..addColumns([scoreTable.roundNumber.max()]);
-    final result = await query.getSingle();
-    return result.read(scoreTable.roundNumber.max()) ?? 0;
-  }
-
-  /// Gets the total score for a player in a match (sum of all changes).
-  Future<int> getTotalScoreForPlayer({
-    required String playerId,
-    required String matchId,
-  }) async {
-    final scores = await getPlayerScoresInMatch(
-      playerId: playerId,
-      matchId: matchId,
-    );
-    if (scores.isEmpty) return 0;
-    // Return the score from the latest round
-    return scores.last.score;
-  }
-}
-

lib/data/dao/score_dao.g.dart

@@ -1,12 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'score_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$ScoreDaoMixin on DatabaseAccessor<AppDatabase> {
-  $PlayerTableTable get playerTable => attachedDatabase.playerTable;
-  $GameTableTable get gameTable => attachedDatabase.gameTable;
-  $GroupTableTable get groupTable => attachedDatabase.groupTable;
-  $MatchTableTable get matchTable => attachedDatabase.matchTable;
-  $ScoreTableTable get scoreTable => attachedDatabase.scoreTable;
-}

lib/data/dao/team_dao.dart

@@ -1,147 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/team_table.dart';
-import 'package:game_tracker/data/dto/player.dart';
-import 'package:game_tracker/data/dto/team.dart';
-
-part 'team_dao.g.dart';
-
-@DriftAccessor(tables: [TeamTable])
-class TeamDao extends DatabaseAccessor<AppDatabase> with _$TeamDaoMixin {
-  TeamDao(super.db);
-
-  /// Retrieves all teams from the database.
-  /// Note: This returns teams without their members. Use getTeamById for full team data.
-  Future<List<Team>> getAllTeams() async {
-    final query = select(teamTable);
-    final result = await query.get();
-    return Future.wait(
-      result.map((row) async {
-        final members = await _getTeamMembers(teamId: row.id);
-        return Team(
-          id: row.id,
-          name: row.name,
-          createdAt: row.createdAt,
-          members: members,
-        );
-      }),
-    );
-  }
-
-  /// Retrieves a [Team] by its [teamId], including its members.
-  Future<Team> getTeamById({required String teamId}) async {
-    final query = select(teamTable)..where((t) => t.id.equals(teamId));
-    final result = await query.getSingle();
-    final members = await _getTeamMembers(teamId: teamId);
-    return Team(
-      id: result.id,
-      name: result.name,
-      createdAt: result.createdAt,
-      members: members,
-    );
-  }
-
-  /// Helper method to get team members from player_match_table.
-  /// This assumes team members are tracked via the player_match_table.
-  Future<List<Player>> _getTeamMembers({required String teamId}) async {
-    // Get all player_match entries with this teamId
-    final playerMatchQuery = select(db.playerMatchTable)
-      ..where((pm) => pm.teamId.equals(teamId));
-    final playerMatches = await playerMatchQuery.get();
-
-    if (playerMatches.isEmpty) return [];
-
-    // Get unique player IDs
-    final playerIds = playerMatches.map((pm) => pm.playerId).toSet();
-
-    // Fetch all players
-    final players = await Future.wait(
-      playerIds.map((id) => db.playerDao.getPlayerById(playerId: id)),
-    );
-    return players;
-  }
-
-  /// Adds a new [team] to the database.
-  /// Returns `true` if the team was added, `false` otherwise.
-  Future<bool> addTeam({required Team team}) async {
-    if (!await teamExists(teamId: team.id)) {
-      await into(teamTable).insert(
-        TeamTableCompanion.insert(
-          id: team.id,
-          name: team.name,
-          createdAt: team.createdAt,
-        ),
-        mode: InsertMode.insertOrReplace,
-      );
-      return true;
-    }
-    return false;
-  }
-
-  /// Adds multiple [teams] to the database in a batch operation.
-  Future<bool> addTeamsAsList({required List<Team> teams}) async {
-    if (teams.isEmpty) return false;
-
-    await db.batch(
-      (b) => b.insertAll(
-        teamTable,
-        teams
-            .map(
-              (team) => TeamTableCompanion.insert(
-                id: team.id,
-                name: team.name,
-                createdAt: team.createdAt,
-              ),
-            )
-            .toList(),
-        mode: InsertMode.insertOrIgnore,
-      ),
-    );
-
-    return true;
-  }
-
-  /// Deletes the team with the given [teamId] from the database.
-  /// Returns `true` if the team was deleted, `false` otherwise.
-  Future<bool> deleteTeam({required String teamId}) async {
-    final query = delete(teamTable)..where((t) => t.id.equals(teamId));
-    final rowsAffected = await query.go();
-    return rowsAffected > 0;
-  }
-
-  /// Checks if a team with the given [teamId] exists in the database.
-  /// Returns `true` if the team exists, `false` otherwise.
-  Future<bool> teamExists({required String teamId}) async {
-    final query = select(teamTable)..where((t) => t.id.equals(teamId));
-    final result = await query.getSingleOrNull();
-    return result != null;
-  }
-
-  /// Updates the name of the team with the given [teamId].
-  Future<void> updateTeamName({
-    required String teamId,
-    required String newName,
-  }) async {
-    await (update(teamTable)..where((t) => t.id.equals(teamId))).write(
-      TeamTableCompanion(name: Value(newName)),
-    );
-  }
-
-  /// Retrieves the total count of teams in the database.
-  Future<int> getTeamCount() async {
-    final count =
-        await (selectOnly(teamTable)..addColumns([teamTable.id.count()]))
-            .map((row) => row.read(teamTable.id.count()))
-            .getSingle();
-    return count ?? 0;
-  }
-
-  /// Deletes all teams from the database.
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> deleteAllTeams() async {
-    final query = delete(teamTable);
-    final rowsAffected = await query.go();
-    return rowsAffected > 0;
-  }
-}
-

lib/data/dao/team_dao.g.dart

@@ -1,8 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'team_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$TeamDaoMixin on DatabaseAccessor<AppDatabase> {
-  $TeamTableTable get teamTable => attachedDatabase.teamTable;
-}

lib/data/db/database.dart

@@ -1,21 +1,17 @@
 import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart';
-import 'package:game_tracker/data/dao/game_dao.dart';
 import 'package:game_tracker/data/dao/group_dao.dart';
+import 'package:game_tracker/data/dao/group_match_dao.dart';
 import 'package:game_tracker/data/dao/match_dao.dart';
 import 'package:game_tracker/data/dao/player_dao.dart';
 import 'package:game_tracker/data/dao/player_group_dao.dart';
 import 'package:game_tracker/data/dao/player_match_dao.dart';
-import 'package:game_tracker/data/dao/score_dao.dart';
+import 'package:game_tracker/data/db/tables/group_match_table.dart';
-import 'package:game_tracker/data/dao/team_dao.dart';
-import 'package:game_tracker/data/db/tables/game_table.dart';
 import 'package:game_tracker/data/db/tables/group_table.dart';
 import 'package:game_tracker/data/db/tables/match_table.dart';
 import 'package:game_tracker/data/db/tables/player_group_table.dart';
 import 'package:game_tracker/data/db/tables/player_match_table.dart';
 import 'package:game_tracker/data/db/tables/player_table.dart';
-import 'package:game_tracker/data/db/tables/score_table.dart';
-import 'package:game_tracker/data/db/tables/team_table.dart';
 import 'package:path_provider/path_provider.dart';
 
 part 'database.g.dart';
@@ -24,29 +20,25 @@ part 'database.g.dart';
   tables: [
     PlayerTable,
     GroupTable,
-    GameTable,
-    TeamTable,
     MatchTable,
     PlayerGroupTable,
     PlayerMatchTable,
-    ScoreTable,
+    GroupMatchTable,
   ],
   daos: [
     PlayerDao,
     GroupDao,
-    GameDao,
-    TeamDao,
     MatchDao,
     PlayerGroupDao,
     PlayerMatchDao,
-    ScoreDao,
+    GroupMatchDao,
   ],
 )
 class AppDatabase extends _$AppDatabase {
   AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection());
 
   @override
-  int get schemaVersion => 2;
+  int get schemaVersion => 1;
 
   @override
   MigrationStrategy get migration {

lib/data/db/tables/game_table.dart

@@ -1,14 +0,0 @@
-import 'package:drift/drift.dart';
-
-class GameTable extends Table {
-  TextColumn get id => text()();
-  TextColumn get name => text()();
-  TextColumn get ruleset => text()();
-  TextColumn get description => text().nullable()();
-  TextColumn get color => text().nullable()();
-  TextColumn get icon => text().nullable()();
-  DateTimeColumn get createdAt => dateTime()();
-
-  @override
-  Set<Column<Object>> get primaryKey => {id};
-}

lib/data/db/tables/group_match_table.dart

@@ -0,0 +1,13 @@
+import 'package:drift/drift.dart';
+import 'package:game_tracker/data/db/tables/group_table.dart';
+import 'package:game_tracker/data/db/tables/match_table.dart';
+
+class GroupMatchTable extends Table {
+  TextColumn get groupId =>
+      text().references(GroupTable, #id, onDelete: KeyAction.cascade)();
+  TextColumn get matchId =>
+      text().references(MatchTable, #id, onDelete: KeyAction.cascade)();
+
+  @override
+  Set<Column<Object>> get primaryKey => {groupId, matchId};
+}

lib/data/db/tables/group_table.dart

@@ -3,7 +3,6 @@ import 'package:drift/drift.dart';
 class GroupTable extends Table {
   TextColumn get id => text()();
   TextColumn get name => text()();
-  TextColumn get description => text().nullable()();
   DateTimeColumn get createdAt => dateTime()();
 
   @override

lib/data/db/tables/match_table.dart

@@ -1,17 +1,11 @@
 import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/tables/game_table.dart';
-import 'package:game_tracker/data/db/tables/group_table.dart';
 
 class MatchTable extends Table {
   TextColumn get id => text()();
-  TextColumn get gameId =>
+  TextColumn get name => text()();
-      text().references(GameTable, #id, onDelete: KeyAction.cascade)();
+  late final winnerId = text().nullable()();
-  TextColumn get groupId =>
-      text().references(GroupTable, #id, onDelete: KeyAction.cascade).nullable()(); // Nullable if not part of a group
-  TextColumn get name => text().nullable()();
-  TextColumn get notes => text().nullable()();
   DateTimeColumn get createdAt => dateTime()();
 
   @override
   Set<Column<Object>> get primaryKey => {id};
-}
+}

lib/data/db/tables/player_match_table.dart

@@ -1,16 +1,12 @@
 import 'package:drift/drift.dart';
 import 'package:game_tracker/data/db/tables/match_table.dart';
 import 'package:game_tracker/data/db/tables/player_table.dart';
-import 'package:game_tracker/data/db/tables/team_table.dart';
 
 class PlayerMatchTable extends Table {
   TextColumn get playerId =>
       text().references(PlayerTable, #id, onDelete: KeyAction.cascade)();
   TextColumn get matchId =>
       text().references(MatchTable, #id, onDelete: KeyAction.cascade)();
-  TextColumn get teamId =>
-      text().references(TeamTable, #id).nullable()();
-  IntColumn get score => integer()();
 
   @override
   Set<Column<Object>> get primaryKey => {playerId, matchId};

lib/data/db/tables/player_table.dart

@@ -3,7 +3,6 @@ import 'package:drift/drift.dart';
 class PlayerTable extends Table {
   TextColumn get id => text()();
   TextColumn get name => text()();
-  TextColumn get description => text().nullable()();
   DateTimeColumn get createdAt => dateTime()();
 
   @override

lib/data/db/tables/score_table.dart

@@ -1,16 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/tables/match_table.dart';
-import 'package:game_tracker/data/db/tables/player_table.dart';
-
-class ScoreTable extends Table {
-  TextColumn get playerId =>
-      text().references(PlayerTable, #id, onDelete: KeyAction.cascade)();
-  TextColumn get matchId =>
-      text().references(MatchTable, #id, onDelete: KeyAction.cascade)();
-  IntColumn get roundNumber => integer()();
-  IntColumn get score => integer()();
-  IntColumn get change => integer()();
-
-  @override
-  Set<Column<Object>> get primaryKey => {playerId, matchId, roundNumber};
-}

lib/data/db/tables/team_table.dart

@@ -1,10 +0,0 @@
-import 'package:drift/drift.dart';
-
-class TeamTable extends Table {
-  TextColumn get id => text()();
-  TextColumn get name => text()();
-  DateTimeColumn get createdAt => dateTime()();
-
-  @override
-  Set<Column<Object>> get primaryKey => {id};
-}

lib/data/dto/game.dart

@@ -1,50 +0,0 @@
-import 'package:clock/clock.dart';
-import 'package:uuid/uuid.dart';
-
-class Game {
-  final String id;
-  final DateTime createdAt;
-  final String name;
-  final String? ruleset;
-  final String? description;
-  final int? color;
-  final String? icon;
-
-  Game({
-    String? id,
-    DateTime? createdAt,
-    required this.name,
-    this.ruleset,
-    this.description,
-    this.color,
-    this.icon,
-  }) : id = id ?? const Uuid().v4(),
-       createdAt = createdAt ?? clock.now();
-
-  @override
-  String toString() {
-    return 'Game{id: $id, name: $name, ruleset: $ruleset, description: $description, color: $color, icon: $icon}';
-  }
-
-  /// Creates a Game instance from a JSON object.
-  Game.fromJson(Map<String, dynamic> json)
-    : id = json['id'],
-      createdAt = DateTime.parse(json['createdAt']),
-      name = json['name'],
-      ruleset = json['ruleset'],
-      description = json['description'],
-      color = json['color'],
-      icon = json['icon'];
-
-  /// Converts the Game instance to a JSON object.
-  Map<String, dynamic> toJson() => {
-    'id': id,
-    'createdAt': createdAt.toIso8601String(),
-    'name': name,
-    'ruleset': ruleset,
-    'description': description,
-    'color': color,
-    'icon': icon,
-  };
-}
-

lib/data/dto/group.dart

@@ -4,23 +4,21 @@ import 'package:uuid/uuid.dart';
 
 class Group {
   final String id;
-  final String name;
-  final String? description;
   final DateTime createdAt;
+  final String name;
   final List<Player> members;
 
   Group({
     String? id,
     DateTime? createdAt,
     required this.name,
-    this.description,
     required this.members,
   }) : id = id ?? const Uuid().v4(),
        createdAt = createdAt ?? clock.now();
 
   @override
   String toString() {
-    return 'Group{id: $id, name: $name, description: $description, members: $members}';
+    return 'Group{id: $id, name: $name,members: $members}';
   }
 
   /// Creates a Group instance from a JSON object.
@@ -28,7 +26,6 @@ class Group {
     : id = json['id'],
       createdAt = DateTime.parse(json['createdAt']),
       name = json['name'],
-      description = json['description'],
       members = (json['members'] as List)
           .map((memberJson) => Player.fromJson(memberJson))
           .toList();
@@ -38,7 +35,6 @@ class Group {
     'id': id,
     'createdAt': createdAt.toIso8601String(),
     'name': name,
-    'description': description,
     'members': members.map((member) => member.toJson()).toList(),
   };
 }

lib/data/dto/match.dart

@@ -1,5 +1,4 @@
 import 'package:clock/clock.dart';
-import 'package:game_tracker/data/dto/game.dart';
 import 'package:game_tracker/data/dto/group.dart';
 import 'package:game_tracker/data/dto/player.dart';
 import 'package:uuid/uuid.dart';
@@ -8,51 +7,45 @@ class Match {
   final String id;
   final DateTime createdAt;
   final String name;
-  final Game? game;
-  final Group? group;
   final List<Player>? players;
-  final String? notes;
+  final Group? group;
   Player? winner;
 
   Match({
     String? id,
     DateTime? createdAt,
     required this.name,
-    this.game,
-    this.group,
     this.players,
-    this.notes,
+    this.group,
     this.winner,
   }) : id = id ?? const Uuid().v4(),
        createdAt = createdAt ?? clock.now();
 
   @override
   String toString() {
-    return 'Match{id: $id, name: $name, game: $game, group: $group, players: $players, notes: $notes, winner: $winner}';
+    return 'Match{\n\tid: $id,\n\tname: $name,\n\tplayers: $players,\n\tgroup: $group,\n\twinner: $winner\n}';
   }
 
   /// Creates a Match instance from a JSON object.
   Match.fromJson(Map<String, dynamic> json)
     : id = json['id'],
-      createdAt = DateTime.parse(json['createdAt']),
       name = json['name'],
-      game = json['game'] != null ? Game.fromJson(json['game']) : null,
+      createdAt = DateTime.parse(json['createdAt']),
-      group = json['group'] != null ? Group.fromJson(json['group']) : null,
       players = json['players'] != null
           ? (json['players'] as List)
-              .map((playerJson) => Player.fromJson(playerJson))
+                .map((playerJson) => Player.fromJson(playerJson))
-              .toList()
+                .toList()
           : null,
-      notes = json['notes'];
+      group = json['group'] != null ? Group.fromJson(json['group']) : null,
+      winner = json['winner'] != null ? Player.fromJson(json['winner']) : null;
 
   /// Converts the Match instance to a JSON object.
   Map<String, dynamic> toJson() => {
     'id': id,
     'createdAt': createdAt.toIso8601String(),
     'name': name,
-    'game': game?.toJson(),
-    'group': group?.toJson(),
     'players': players?.map((player) => player.toJson()).toList(),
-    'notes': notes,
+    'group': group?.toJson(),
+    'winner': winner?.toJson(),
   };
 }

lib/data/dto/player.dart

@@ -5,33 +5,26 @@ class Player {
   final String id;
   final DateTime createdAt;
   final String name;
-  final String? description;
 
-  Player({
+  Player({String? id, DateTime? createdAt, required this.name})
-    String? id,
+    : id = id ?? const Uuid().v4(),
-    DateTime? createdAt,
+      createdAt = createdAt ?? clock.now();
-    required this.name,
-    this.description,
-  }) : id = id ?? const Uuid().v4(),
-       createdAt = createdAt ?? clock.now();
 
   @override
   String toString() {
-    return 'Player{id: $id, name: $name, description: $description}';
+    return 'Player{id: $id,name: $name}';
   }
 
   /// Creates a Player instance from a JSON object.
   Player.fromJson(Map<String, dynamic> json)
     : id = json['id'],
       createdAt = DateTime.parse(json['createdAt']),
-      name = json['name'],
+      name = json['name'];
-      description = json['description'];
 
   /// Converts the Player instance to a JSON object.
   Map<String, dynamic> toJson() => {
     'id': id,
     'createdAt': createdAt.toIso8601String(),
     'name': name,
-    'description': description,
   };
 }

lib/data/dto/team.dart

@@ -1,41 +0,0 @@
-import 'package:clock/clock.dart';
-import 'package:game_tracker/data/dto/player.dart';
-import 'package:uuid/uuid.dart';
-
-class Team {
-  final String id;
-  final String name;
-  final DateTime createdAt;
-  final List<Player> members;
-
-  Team({
-    String? id,
-    required this.name,
-    DateTime? createdAt,
-    required this.members,
-  }) : id = id ?? const Uuid().v4(),
-       createdAt = createdAt ?? clock.now();
-
-  @override
-  String toString() {
-    return 'Team{id: $id, name: $name, members: $members}';
-  }
-
-  /// Creates a Team instance from a JSON object.
-  Team.fromJson(Map<String, dynamic> json)
-    : id = json['id'],
-      name = json['name'],
-      createdAt = DateTime.parse(json['createdAt']),
-      members = (json['members'] as List)
-          .map((memberJson) => Player.fromJson(memberJson))
-          .toList();
-
-  /// Converts the Team instance to a JSON object.
-  Map<String, dynamic> toJson() => {
-    'id': id,
-    'name': name,
-    'createdAt': createdAt.toIso8601String(),
-    'members': members.map((member) => member.toJson()).toList(),
-  };
-}
-

lib/l10n/arb/app_de.arb

@@ -22,9 +22,13 @@
   "days_ago": "vor {count} Tagen",
   "delete": "Löschen",
   "delete_all_data": "Alle Daten löschen",
+  "delete_group": "Diese Gruppe löschen",
+  "edit_group": "Gruppe bearbeiten",
   "delete_group": "Gruppe löschen",
   "edit_group": "Gruppe bearbeiten",
   "error_creating_group": "Fehler beim Erstellen der Gruppe, bitte erneut versuchen",
+  "error_deleting_group": "Fehler beim Löschen der Gruppe, bitte erneut versuchen",
+  "error_editing_group": "Fehler beim Bearbeiten der Gruppe, bitte erneut versuchen",
   "error_reading_file": "Fehler beim Lesen der Datei",
   "export_canceled": "Export abgebrochen",
   "export_data": "Daten exportieren",

lib/l10n/arb/app_en.arb

@@ -37,10 +37,10 @@
     "description": "Button text to create a match"
   },
   "@create_new_group": {
-    "description": "Button text to create a new group"
+    "description": "Appbar text to create a new group"
   },
   "@create_new_match": {
-    "description": "Button text to create a new match"
+    "description": "Appbar text to create a new match"
   },
   "@created_on": {
     "description": "Label for creation date"
@@ -72,14 +72,20 @@
     "description": "Confirmation dialog for deleting all data"
   },
   "@delete_group": {
-    "description": "Button text to delete a group"
+    "description": "Confirmation dialog for deleting a group"
   },
   "@edit_group": {
-    "description": "Button text to edit a group"
+      "description": "Button & Appbar label for editing a group"
   },
   "@error_creating_group": {
     "description": "Error message when group creation fails"
   },
+  "@error_deleting_group": {
+      "description": "Error message when group deletion fails"
+  },
+  "@error_editing_group": {
+      "description": "Error message when group editing fails"
+  },
   "@error_reading_file": {
     "description": "Error message when file cannot be read"
   },
@@ -323,6 +329,8 @@
   "delete_group": "Delete Group",
   "edit_group": "Edit Group",
   "error_creating_group": "Error while creating group, please try again",
+  "error_deleting_group": "Error while deleting group, please try again",
+  "error_editing_group": "Error while editing group, please try again",
   "error_reading_file": "Error reading file",
   "export_canceled": "Export canceled",
   "export_data": "Export data",

lib/l10n/generated/app_localizations.dart

@@ -170,7 +170,7 @@ abstract class AppLocalizations {
   /// **'Create match'**
   String get create_match;
 
-  /// Button text to create a new group
+  /// Appbar text to create a new group
   ///
   /// In en, this message translates to:
   /// **'Create new group'**
@@ -182,7 +182,7 @@ abstract class AppLocalizations {
   /// **'Created on'**
   String get created_on;
 
-  /// Button text to create a new match
+  /// Appbar text to create a new match
   ///
   /// In en, this message translates to:
   /// **'Create new match'**
@@ -230,13 +230,13 @@ abstract class AppLocalizations {
   /// **'Delete all data'**
   String get delete_all_data;
 
-  /// Button text to delete a group
+  /// Confirmation dialog for deleting a group
   ///
   /// In en, this message translates to:
   /// **'Delete Group'**
   String get delete_group;
 
-  /// Button text to edit a group
+  /// Button & Appbar label for editing a group
   ///
   /// In en, this message translates to:
   /// **'Edit Group'**
@@ -248,6 +248,18 @@ abstract class AppLocalizations {
   /// **'Error while creating group, please try again'**
   String get error_creating_group;
 
+  /// Error message when group deletion fails
+  ///
+  /// In en, this message translates to:
+  /// **'Error while deleting group, please try again'**
+  String get error_deleting_group;
+
+  /// Error message when group editing fails
+  ///
+  /// In en, this message translates to:
+  /// **'Error while editing group, please try again'**
+  String get error_editing_group;
+
   /// Error message when file cannot be read
   ///
   /// In en, this message translates to:

lib/l10n/generated/app_localizations_de.dart

@@ -88,6 +88,14 @@ class AppLocalizationsDe extends AppLocalizations {
   String get error_creating_group =>
       'Fehler beim Erstellen der Gruppe, bitte erneut versuchen';
 
+  @override
+  String get error_deleting_group =>
+      'Fehler beim Löschen der Gruppe, bitte erneut versuchen';
+
+  @override
+  String get error_editing_group =>
+      'Fehler beim Bearbeiten der Gruppe, bitte erneut versuchen';
+
   @override
   String get error_reading_file => 'Fehler beim Lesen der Datei';
 

lib/l10n/generated/app_localizations_en.dart

@@ -88,6 +88,14 @@ class AppLocalizationsEn extends AppLocalizations {
   String get error_creating_group =>
       'Error while creating group, please try again';
 
+  @override
+  String get error_deleting_group =>
+      'Error while deleting group, please try again';
+
+  @override
+  String get error_editing_group =>
+      'Error while editing group, please try again';
+
   @override
   String get error_reading_file => 'Error reading file';
 

lib/presentation/views/main_menu/custom_navigation_bar.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:game_tracker/presentation/views/main_menu/group_view/groups_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/group_view/group_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/home_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/match_view/match_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/settings_view/settings_view.dart';

lib/presentation/views/main_menu/group_view/create_group_view.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:game_tracker/core/constants.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/core/enums.dart';
 import 'package:game_tracker/data/db/database.dart';
@@ -12,8 +11,10 @@ import 'package:game_tracker/presentation/widgets/text_input/text_input_field.da
 import 'package:provider/provider.dart';
 
 class CreateGroupView extends StatefulWidget {
-  /// A view that allows the user to create a new group
+  const CreateGroupView({super.key, this.groupToEdit});
-  const CreateGroupView({super.key});
+
+  /// The group to edit, if any
+  final Group? groupToEdit;
 
   @override
   State<CreateGroupView> createState() => _CreateGroupViewState();
@@ -22,16 +23,29 @@ class CreateGroupView extends StatefulWidget {
 class _CreateGroupViewState extends State<CreateGroupView> {
   late final AppDatabase db;
 
+  /// GlobalKey for ScaffoldMessenger to show snackbars
+  final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
+
   /// Controller for the group name input field
   final _groupNameController = TextEditingController();
 
   /// List of currently selected players
   List<Player> selectedPlayers = [];
 
+  /// List of initially selected players (when editing a group)
+  List<Player> initialSelectedPlayers = [];
+
   @override
   void initState() {
     super.initState();
     db = Provider.of<AppDatabase>(context, listen: false);
+    if(widget.groupToEdit != null) {
+      _groupNameController.text = widget.groupToEdit!.name;
+      setState(() {
+        initialSelectedPlayers = widget.groupToEdit!.members;
+        selectedPlayers = widget.groupToEdit!.members;
+      });
+    }
     _groupNameController.addListener(() {
       setState(() {});
     });
@@ -47,10 +61,42 @@ class _CreateGroupViewState extends State<CreateGroupView> {
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
     return ScaffoldMessenger(
+      key: _scaffoldMessengerKey,
       child: Scaffold(
         resizeToAvoidBottomInset: false,
         backgroundColor: CustomTheme.backgroundColor,
-        appBar: AppBar(title: Text(loc.create_new_group)),
+        appBar: AppBar(title: Text(widget.groupToEdit == null ? loc.create_new_group : loc.edit_group), actions: widget.groupToEdit == null ? [] : [IconButton(icon: const Icon(Icons.delete), onPressed: () async {
+          if(widget.groupToEdit != null) {
+            showDialog<bool>(
+              context: context,
+              builder: (context) => AlertDialog(
+                title: Text(loc.delete_group),
+                content: Text(loc.this_cannot_be_undone),
+                actions: [
+                  TextButton(
+                    onPressed: () => Navigator.of(context).pop(false),
+                    child: Text(loc.cancel),
+                  ),
+                  TextButton(
+                    onPressed: () => Navigator.of(context).pop(true),
+                    child: Text(loc.delete),
+                  ),
+                ],
+              ),
+            ).then((confirmed) async {
+              if (confirmed == true && context.mounted) {
+                bool success = await db.groupDao.deleteGroup(groupId: widget.groupToEdit!.id);
+                if (!context.mounted) return;
+                if (success) {
+                  Navigator.pop(context);
+                } else {
+                  if (!mounted) return;
+                  showSnackbar(message: loc.error_deleting_group);
+                }
+              }
+            });
+          }
+        },)],),
         body: SafeArea(
           child: Column(
             mainAxisAlignment: MainAxisAlignment.start,
@@ -60,11 +106,11 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                 child: TextInputField(
                   controller: _groupNameController,
                   hintText: loc.group_name,
-                  maxLength: Constants.MAX_GROUP_NAME_LENGTH,
                 ),
               ),
               Expanded(
                 child: PlayerSelection(
+                  initialSelectedPlayers: initialSelectedPlayers,
                   onChanged: (value) {
                     setState(() {
                       selectedPlayers = [...value];
@@ -73,7 +119,7 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                 ),
               ),
               CustomWidthButton(
-                text: loc.create_group,
+                text: widget.groupToEdit == null ? loc.create_group : loc.edit_group,
                 sizeRelativeToWidth: 0.95,
                 buttonType: ButtonType.primary,
                 onPressed:
@@ -81,29 +127,34 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                         (selectedPlayers.length < 2))
                     ? null
                     : () async {
-                        bool success = await db.groupDao.addGroup(
+                        late Group? updatedGroup;
-                          group: Group(
+                        late bool success;
-                            name: _groupNameController.text.trim(),
+                        if (widget.groupToEdit == null) {
-                            members: selectedPlayers,
+                          success = await db.groupDao.addGroup(
-                          ),
+                            group: Group(
-                        );
+                              name: _groupNameController.text.trim(),
-                        if (!context.mounted) return;
+                              members: selectedPlayers,
-                        if (success) {
-                          Navigator.pop(context);
-                        } else {
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(
-                              backgroundColor: CustomTheme.boxColor,
-                              content: Center(
-                                child: Text(
-                                  AppLocalizations.of(
-                                    context,
-                                  ).error_creating_group,
-                                  style: const TextStyle(color: Colors.white),
-                                ),
-                              ),
                             ),
                           );
+                        } else {
+                          updatedGroup = Group(
+                            id: widget.groupToEdit!.id,
+                            name: _groupNameController.text.trim(),
+                            members: selectedPlayers,
+                          );
+                          //TODO: Implement group editing in database
+                          /*
+                          success = await db.groupDao.updateGroup(
+                            group: updatedGroup,
+                          );
+                          */
+                          success = true;
+                        }
+                        if (!context.mounted) return;
+                        if (success) {
+                          Navigator.pop(context, updatedGroup);
+                        } else {
+                          showSnackbar(message: widget.groupToEdit == null ? loc.error_creating_group : loc.error_editing_group);
                         }
                       },
               ),
@@ -114,4 +165,21 @@ class _CreateGroupViewState extends State<CreateGroupView> {
       ),
     );
   }
+  /// Displays a snackbar with the given message and optional action.
+  ///
+  /// [message] The message to display in the snackbar.
+  void showSnackbar({
+    required String message,
+  }) {
+    final messenger = _scaffoldMessengerKey.currentState;
+    if (messenger != null) {
+      messenger.hideCurrentSnackBar();
+      messenger.showSnackBar(
+        SnackBar(
+          content: Text(message, style: const TextStyle(color: Colors.white)),
+          backgroundColor: CustomTheme.boxColor,
+        ),
+      );
+    }
+  }
 }

lib/presentation/views/main_menu/group_view/group_detail_view.dart

@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/data/db/database.dart';
 import 'package:game_tracker/data/dto/group.dart';
 import 'package:game_tracker/data/dto/match.dart';
 import 'package:game_tracker/data/dto/player.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/views/main_menu/group_view/create_group_view.dart';
 import 'package:game_tracker/presentation/widgets/app_skeleton.dart';
 import 'package:game_tracker/presentation/widgets/buttons/animated_dialog_button.dart';
 import 'package:game_tracker/presentation/widgets/buttons/main_menu_button.dart';
@@ -15,10 +17,10 @@ import 'package:game_tracker/presentation/widgets/tiles/text_icon_tile.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 
-class GroupProfileView extends StatefulWidget {
+class GroupDetailView extends StatefulWidget {
   /// A view that displays the profile of a group
   /// - [group]: The group to display
-  const GroupProfileView({
+  const GroupDetailView({
     super.key,
     required this.group,
     required this.callback,
@@ -30,12 +32,13 @@ class GroupProfileView extends StatefulWidget {
   final VoidCallback callback;
 
   @override
-  State<GroupProfileView> createState() => _GroupProfileViewState();
+  State<GroupDetailView> createState() => _GroupDetailViewState();
 }
 
-class _GroupProfileViewState extends State<GroupProfileView> {
+class _GroupDetailViewState extends State<GroupDetailView> {
   late final AppDatabase db;
   bool isLoading = true;
+  late Group _group;
 
   /// Total matches played in this group
   int totalMatches = 0;
@@ -45,6 +48,7 @@ class _GroupProfileViewState extends State<GroupProfileView> {
   @override
   void initState() {
     super.initState();
+    _group = widget.group;
     db = Provider.of<AppDatabase>(context, listen: false);
     _loadStatistics();
   }
@@ -85,7 +89,7 @@ class _GroupProfileViewState extends State<GroupProfileView> {
                 ),
               ).then((confirmed) async {
                 if (confirmed! && context.mounted) {
-                  await db.groupDao.deleteGroup(groupId: widget.group.id);
+                  await db.groupDao.deleteGroup(groupId: _group.id);
                   if (!context.mounted) return;
                   Navigator.pop(context);
                   widget.callback.call();
@@ -116,7 +120,7 @@ class _GroupProfileViewState extends State<GroupProfileView> {
                 ),
                 const SizedBox(height: 10),
                 Text(
-                  widget.group.name,
+                  _group.name,
                   style: const TextStyle(
                     fontSize: 28,
                     fontWeight: FontWeight.bold,
@@ -126,7 +130,7 @@ class _GroupProfileViewState extends State<GroupProfileView> {
                 ),
                 const SizedBox(height: 5),
                 Text(
-                  '${loc.created_on} ${DateFormat.yMMMd(Localizations.localeOf(context).toString()).format(widget.group.createdAt)}',
+                  '${loc.created_on} ${DateFormat.yMMMd(Localizations.localeOf(context).toString()).format(_group.createdAt)}',
                   style: const TextStyle(
                     fontSize: 12,
                     color: CustomTheme.textColor,
@@ -143,7 +147,7 @@ class _GroupProfileViewState extends State<GroupProfileView> {
                     crossAxisAlignment: WrapCrossAlignment.start,
                     spacing: 12,
                     runSpacing: 8,
-                    children: widget.group.members.map((member) {
+                    children: _group.members.map((member) {
                       return TextIconTile(
                         text: member.name,
                         iconEnabled: false,
@@ -161,7 +165,7 @@ class _GroupProfileViewState extends State<GroupProfileView> {
                       children: [
                         _buildStatRow(
                           loc.members,
-                          widget.group.members.length.toString(),
+                          _group.members.length.toString(),
                         ),
                         _buildStatRow(
                           loc.played_matches,
@@ -179,19 +183,24 @@ class _GroupProfileViewState extends State<GroupProfileView> {
               child: MainMenuButton(
                 text: loc.edit_group,
                 icon: Icons.edit,
-                onPressed: () {
+                onPressed: () async {
-                  // TODO: Uncomment when GroupDetailView is implemented
+                  final updatedGroup = await Navigator.push<Group?>(
-                  /*
-                  await Navigator.push(
                     context,
                     adaptivePageRoute(
                       builder: (context) {
-
+                        return CreateGroupView(
-                        return const GroupDetailView();
+                          groupToEdit: _group,
+                        );
                       },
                     ),
-                  );*/
+                  );
-                  print('Edit Group pressed');
+                  if (updatedGroup != null && mounted) {
+                    setState(() {
+                      _group = updatedGroup;
+                    });
+                    _loadStatistics();
+                    widget.callback();
+                  }
                 },
               ),
             ),
@@ -233,9 +242,8 @@ class _GroupProfileViewState extends State<GroupProfileView> {
   /// Loads statistics for this group
   Future<void> _loadStatistics() async {
     final matches = await db.matchDao.getAllMatches();
-    final groupMatches = matches
+    final groupMatches =
-        .where((match) => match.group?.id == widget.group.id)
+    matches.where((match) => match.group?.id == _group.id).toList();
-        .toList();
 
     setState(() {
       totalMatches = groupMatches.length;
@@ -253,7 +261,7 @@ class _GroupProfileViewState extends State<GroupProfileView> {
       if (match.winner != null) {
         bestPlayerCounts.update(
           match.winner!,
-          (value) => value + 1,
+              (value) => value + 1,
           ifAbsent: () => 1,
         );
       }
@@ -268,4 +276,4 @@ class _GroupProfileViewState extends State<GroupProfileView> {
 
     return bestPlayer;
   }
-}
+}

lib/presentation/views/main_menu/group_view/group_view.dart

@@ -6,8 +6,8 @@ import 'package:game_tracker/data/db/database.dart';
 import 'package:game_tracker/data/dto/group.dart';
 import 'package:game_tracker/data/dto/player.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/views/main_menu/group_view/group_detail_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/group_view/create_group_view.dart';
-import 'package:game_tracker/presentation/views/main_menu/group_view/group_profile_view.dart';
 import 'package:game_tracker/presentation/widgets/app_skeleton.dart';
 import 'package:game_tracker/presentation/widgets/buttons/main_menu_button.dart';
 import 'package:game_tracker/presentation/widgets/tiles/group_tile.dart';
@@ -82,7 +82,7 @@ class _GroupsViewState extends State<GroupsView> {
                         context,
                         adaptivePageRoute(
                           builder: (context) {
-                            return GroupProfileView(
+                            return GroupDetailView(
                               group: groups[index],
                               callback: loadGroups,
                             );

lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart

@@ -64,6 +64,9 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   /// The currently selected players
   List<Player>? selectedPlayers;
 
+  /// GlobalKey for ScaffoldMessenger to show snackbars
+  final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
+
   @override
   void initState() {
     super.initState();
@@ -107,6 +110,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
     return ScaffoldMessenger(
+      key: _scaffoldMessengerKey,
       child: Scaffold(
         resizeToAvoidBottomInset: false,
         backgroundColor: CustomTheme.backgroundColor,

lib/presentation/views/main_menu/settings_view/settings_view.dart

@@ -31,6 +31,7 @@ class _SettingsViewState extends State<SettingsView> {
     version: 'n.A.',
     buildNumber: 'n.A.',
   );
+
   @override
   void initState() {
     super.initState();

lib/presentation/widgets/player_selection.dart

@@ -70,6 +70,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
     super.initState();
     db = Provider.of<AppDatabase>(context, listen: false);
     suggestedPlayers = skeletonData;
+    selectedPlayers = widget.initialSelectedPlayers ?? [];
     loadPlayerList();
   }
 
@@ -84,7 +85,6 @@ class _PlayerSelectionState extends State<PlayerSelection> {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           CustomSearchBar(
-            maxLength: Constants.MAX_PLAYER_NAME_LENGTH,
             controller: _searchBarController,
             constraints: const BoxConstraints(maxHeight: 45, minHeight: 45),
             hintText: loc.search_for_players,
@@ -100,7 +100,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                 if (value.isEmpty) {
                   // If the search is empty, it shows all unselected players.
                   suggestedPlayers = allPlayers.where((player) {
-                    return !selectedPlayers.contains(player);
+                    return !selectedPlayers.any((p) => p.id == player.id);
                   }).toList();
                 } else {
                   // If there is input, it filters by name match (case-insensitive) and ensures
@@ -109,9 +109,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                     final bool nameMatches = player.name.toLowerCase().contains(
                       value.toLowerCase(),
                     );
-                    final bool isNotSelected = !selectedPlayers.contains(
+                    final bool isNotSelected = !selectedPlayers.any((p) => p.id == player.id);
-                      player,
-                    );
                     return nameMatches && isNotSelected;
                   }).toList();
                 }
@@ -126,46 +124,49 @@ class _PlayerSelectionState extends State<PlayerSelection> {
           const SizedBox(height: 10),
           SizedBox(
             height: 50,
-            child: selectedPlayers.isEmpty
+            child: AppSkeleton(
-                ? Center(child: Text(loc.no_players_selected))
+              enabled: isLoading,
-                : SingleChildScrollView(
+              child: selectedPlayers.isEmpty
-                    scrollDirection: Axis.horizontal,
+                  ? Center(child: Text(loc.no_players_selected))
-                    child: Row(
+                  : SingleChildScrollView(
-                      children: [
+                      scrollDirection: Axis.horizontal,
-                        for (var player in selectedPlayers)
+                      child: Row(
-                          Padding(
+                        children: [
-                            padding: const EdgeInsets.only(right: 8.0),
+                          for (var player in selectedPlayers)
-                            child: TextIconTile(
+                            Padding(
-                              text: player.name,
+                              padding: const EdgeInsets.only(right: 8.0),
-                              onIconTap: () {
+                              child: TextIconTile(
-                                setState(() {
+                                text: player.name,
-                                  // Removes the player from the selection and notifies the parent.
+                                onIconTap: () {
-                                  selectedPlayers.remove(player);
+                                  setState(() {
-                                  widget.onChanged([...selectedPlayers]);
+                                    // Removes the player from the selection and notifies the parent.
+                                    selectedPlayers.remove(player);
+                                    widget.onChanged([...selectedPlayers]);
 
-                                  // Get the current search query
+                                    // Get the current search query
-                                  final currentSearch = _searchBarController
+                                    final currentSearch = _searchBarController
-                                      .text
+                                        .text
-                                      .toLowerCase();
+                                        .toLowerCase();
 
-                                  // If the player matches the current search query (or search is empty),
+                                    // If the player matches the current search query (or search is empty),
-                                  // they are added back to the `suggestedPlayers` and the list is re-sorted.
+                                    // they are added back to the `suggestedPlayers` and the list is re-sorted.
-                                  if (currentSearch.isEmpty ||
+                                    if (currentSearch.isEmpty ||
-                                      player.name.toLowerCase().contains(
+                                        player.name.toLowerCase().contains(
-                                        currentSearch,
+                                          currentSearch,
-                                      )) {
+                                        )) {
-                                    suggestedPlayers.add(player);
+                                      suggestedPlayers.add(player);
-                                    suggestedPlayers.sort(
+                                      suggestedPlayers.sort(
-                                      (a, b) => a.name.compareTo(b.name),
+                                        (a, b) => a.name.compareTo(b.name),
-                                    );
+                                      );
-                                  }
+                                    }
-                                });
+                                  });
-                              },
+                                },
+                              ),
                             ),
-                          ),
+                        ],
-                      ],
+                      ),
                     ),
-                  ),
+            ),
           ),
           const SizedBox(height: 10),
           Text(
@@ -245,7 +246,21 @@ class _PlayerSelectionState extends State<PlayerSelection> {
             // Otherwise, use the loaded players from the database.
             loadedPlayers.sort((a, b) => a.name.compareTo(b.name));
             allPlayers = [...loadedPlayers];
-            suggestedPlayers = [...loadedPlayers];
+            if (widget.initialSelectedPlayers != null) {
+              // Excludes already selected players from the suggested players list.
+              suggestedPlayers = loadedPlayers.where((p) => !widget.initialSelectedPlayers!.any((ip) => ip.id == p.id)).toList();
+              // Ensures that only players available for selection are pre-selected.
+              selectedPlayers = widget.initialSelectedPlayers!
+                  .where(
+                    (p) => allPlayers.any(
+                      (available) => available.id == p.id,
+                ),
+              )
+                  .toList();
+            } else {
+              // If no initial selection, all loaded players are suggested.
+              suggestedPlayers = [...loadedPlayers];
+            }
           }
           isLoading = false;
         });

lib/presentation/widgets/text_input/custom_search_bar.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/constants.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
 class CustomSearchBar extends StatelessWidget {
@@ -21,7 +22,6 @@ class CustomSearchBar extends StatelessWidget {
     this.onTrailingButtonPressed,
     this.onChanged,
     this.constraints,
-    this.maxLength,
   });
 
   /// The controller for the search bar's text input.
@@ -48,19 +48,15 @@ class CustomSearchBar extends StatelessWidget {
   /// The constraints for the search bar.
   final BoxConstraints? constraints;
 
-  /// Optional parameter for maximum length of the input text.
-  final int? maxLength;
-
   @override
   Widget build(BuildContext context) {
     /// Enforce maximum length on the input text
-    if (maxLength != null) {
+    const maxLength = Constants.MAX_PLAYER_NAME_LENGTH;
-      if (controller.text.length > maxLength!) {
+    if (controller.text.length > maxLength) {
-        controller.text = controller.text.substring(0, maxLength);
+      controller.text = controller.text.substring(0, maxLength);
-        controller.selection = TextSelection.fromPosition(
+      controller.selection = TextSelection.fromPosition(
-          TextPosition(offset: controller.text.length),
+        TextPosition(offset: controller.text.length),
-        );
+      );
-      }
     }
 
     return SearchBar(

lib/presentation/widgets/text_input/text_input_field.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
 class TextInputField extends StatelessWidget {
@@ -34,14 +33,11 @@ class TextInputField extends StatelessWidget {
       controller: controller,
       onChanged: onChanged,
       maxLength: maxLength,
-      maxLengthEnforcement: MaxLengthEnforcement.truncateAfterCompositionEnds,
       decoration: InputDecoration(
         filled: true,
         fillColor: CustomTheme.boxColor,
         hintText: hintText,
         hintStyle: const TextStyle(fontSize: 18),
-        // Hides the character counter
-        counterText: '',
         enabledBorder: OutlineInputBorder(
           borderRadius: const BorderRadius.all(Radius.circular(12)),
           borderSide: BorderSide(color: CustomTheme.boxBorder),

pubspec.yaml

@@ -1,7 +1,7 @@
 name: game_tracker
 description: "Game Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.10+237
+version: 0.0.9+242
 
 environment:
   sdk: ^3.8.1

test/db_tests/game_test.dart

@@ -3,7 +3,6 @@ import 'package:drift/drift.dart';
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/dto/game.dart';
 import 'package:game_tracker/data/dto/group.dart';
 import 'package:game_tracker/data/dto/match.dart';
 import 'package:game_tracker/data/dto/player.dart';
@@ -17,7 +16,6 @@ void main() {
   late Player testPlayer5;
   late Group testGroup1;
   late Group testGroup2;
-  late Game testGame;
   late Match testMatch1;
   late Match testMatch2;
   late Match testMatchOnlyPlayers;
@@ -48,30 +46,25 @@ void main() {
         name: 'Test Group 2',
         members: [testPlayer4, testPlayer5],
       );
-      testGame = Game(name: 'Test Game');
       testMatch1 = Match(
         name: 'First Test Match',
-        game: testGame,
         group: testGroup1,
         players: [testPlayer4, testPlayer5],
         winner: testPlayer4,
       );
       testMatch2 = Match(
         name: 'Second Test Match',
-        game: testGame,
         group: testGroup2,
         players: [testPlayer1, testPlayer2, testPlayer3],
         winner: testPlayer2,
       );
       testMatchOnlyPlayers = Match(
         name: 'Test Match with Players',
-        game: testGame,
         players: [testPlayer1, testPlayer2, testPlayer3],
         winner: testPlayer3,
       );
       testMatchOnlyGroup = Match(
         name: 'Test Match with Group',
-        game: testGame,
         group: testGroup2,
       );
     });
@@ -85,7 +78,6 @@ void main() {
       ],
     );
     await database.groupDao.addGroupsAsList(groups: [testGroup1, testGroup2]);
-    await database.gameDao.addGame(game: testGame);
   });
   tearDown(() async {
     await database.close();

test/db_tests/group_match_test.dart

@@ -0,0 +1,221 @@
+import 'package:clock/clock.dart';
+import 'package:drift/drift.dart' hide isNotNull;
+import 'package:drift/native.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:game_tracker/data/db/database.dart';
+import 'package:game_tracker/data/dto/group.dart';
+import 'package:game_tracker/data/dto/match.dart';
+import 'package:game_tracker/data/dto/player.dart';
+
+void main() {
+  late AppDatabase database;
+  late Player testPlayer1;
+  late Player testPlayer2;
+  late Player testPlayer3;
+  late Player testPlayer4;
+  late Player testPlayer5;
+  late Group testGroup1;
+  late Group testGroup2;
+  late Match testMatchWithGroup;
+  late Match testMatchWithPlayers;
+  final fixedDate = DateTime(2025, 19, 11, 00, 11, 23);
+  final fakeClock = Clock(() => fixedDate);
+
+  setUp(() async {
+    database = AppDatabase(
+      DatabaseConnection(
+        NativeDatabase.memory(),
+        // Recommended for widget tests to avoid test errors.
+        closeStreamsSynchronously: true,
+      ),
+    );
+
+    withClock(fakeClock, () {
+      testPlayer1 = Player(name: 'Alice');
+      testPlayer2 = Player(name: 'Bob');
+      testPlayer3 = Player(name: 'Charlie');
+      testPlayer4 = Player(name: 'Diana');
+      testPlayer5 = Player(name: 'Eve');
+      testGroup1 = Group(
+        name: 'Test Group',
+        members: [testPlayer1, testPlayer2, testPlayer3],
+      );
+      testGroup2 = Group(
+        name: 'Test Group',
+        members: [testPlayer3, testPlayer2],
+      );
+      testMatchWithPlayers = Match(
+        name: 'Test Match with Players',
+        players: [testPlayer4, testPlayer5],
+      );
+      testMatchWithGroup = Match(
+        name: 'Test Match with Group',
+        group: testGroup1,
+      );
+    });
+    await database.playerDao.addPlayersAsList(
+      players: [
+        testPlayer1,
+        testPlayer2,
+        testPlayer3,
+        testPlayer4,
+        testPlayer5,
+      ],
+    );
+    await database.groupDao.addGroupsAsList(groups: [testGroup1, testGroup2]);
+  });
+  tearDown(() async {
+    await database.close();
+  });
+  group('Group-Match Tests', () {
+    test('matchHasGroup() has group works correctly', () async {
+      await database.matchDao.addMatch(match: testMatchWithPlayers);
+      await database.groupDao.addGroup(group: testGroup1);
+
+      var matchHasGroup = await database.groupMatchDao.matchHasGroup(
+        matchId: testMatchWithPlayers.id,
+      );
+
+      expect(matchHasGroup, false);
+
+      await database.groupMatchDao.addGroupToMatch(
+        matchId: testMatchWithPlayers.id,
+        groupId: testGroup1.id,
+      );
+
+      matchHasGroup = await database.groupMatchDao.matchHasGroup(
+        matchId: testMatchWithPlayers.id,
+      );
+
+      expect(matchHasGroup, true);
+    });
+
+    test('Adding a group to a match works correctly', () async {
+      await database.matchDao.addMatch(match: testMatchWithPlayers);
+      await database.groupDao.addGroup(group: testGroup1);
+      await database.groupMatchDao.addGroupToMatch(
+        matchId: testMatchWithPlayers.id,
+        groupId: testGroup1.id,
+      );
+
+      var groupAdded = await database.groupMatchDao.isGroupInMatch(
+        matchId: testMatchWithPlayers.id,
+        groupId: testGroup1.id,
+      );
+      expect(groupAdded, true);
+
+      groupAdded = await database.groupMatchDao.isGroupInMatch(
+        matchId: testMatchWithPlayers.id,
+        groupId: '',
+      );
+      expect(groupAdded, false);
+    });
+
+    test('Removing group from match works correctly', () async {
+      await database.matchDao.addMatch(match: testMatchWithGroup);
+
+      final groupToRemove = testMatchWithGroup.group!;
+
+      final removed = await database.groupMatchDao.removeGroupFromMatch(
+        groupId: groupToRemove.id,
+        matchId: testMatchWithGroup.id,
+      );
+      expect(removed, true);
+
+      final result = await database.matchDao.getMatchById(
+        matchId: testMatchWithGroup.id,
+      );
+      expect(result.group, null);
+    });
+
+    test('Retrieving group of a match works correctly', () async {
+      await database.matchDao.addMatch(match: testMatchWithGroup);
+      final group = await database.groupMatchDao.getGroupOfMatch(
+        matchId: testMatchWithGroup.id,
+      );
+
+      if (group == null) {
+        fail('Group should not be null');
+      }
+
+      expect(group.id, testGroup1.id);
+      expect(group.name, testGroup1.name);
+      expect(group.createdAt, testGroup1.createdAt);
+      expect(group.members.length, testGroup1.members.length);
+      for (int i = 0; i < group.members.length; i++) {
+        expect(group.members[i].id, testGroup1.members[i].id);
+        expect(group.members[i].name, testGroup1.members[i].name);
+        expect(group.members[i].createdAt, testGroup1.members[i].createdAt);
+      }
+    });
+
+    test('Updating the group of a match works correctly', () async {
+      await database.matchDao.addMatch(match: testMatchWithGroup);
+
+      var group = await database.groupMatchDao.getGroupOfMatch(
+        matchId: testMatchWithGroup.id,
+      );
+
+      if (group == null) {
+        fail('Initial group should not be null');
+      } else {
+        expect(group.id, testGroup1.id);
+        expect(group.name, testGroup1.name);
+        expect(group.createdAt, testGroup1.createdAt);
+        expect(group.members.length, testGroup1.members.length);
+      }
+
+      await database.groupDao.addGroup(group: testGroup2);
+      await database.groupMatchDao.updateGroupOfMatch(
+        matchId: testMatchWithGroup.id,
+        newGroupId: testGroup2.id,
+      );
+
+      group = await database.groupMatchDao.getGroupOfMatch(
+        matchId: testMatchWithGroup.id,
+      );
+
+      if (group == null) {
+        fail('Updated group should not be null');
+      } else {
+        expect(group.id, testGroup2.id);
+        expect(group.name, testGroup2.name);
+        expect(group.createdAt, testGroup2.createdAt);
+        expect(group.members.length, testGroup2.members.length);
+        for (int i = 0; i < group.members.length; i++) {
+          expect(group.members[i].id, testGroup2.members[i].id);
+          expect(group.members[i].name, testGroup2.members[i].name);
+          expect(group.members[i].createdAt, testGroup2.members[i].createdAt);
+        }
+      }
+    });
+
+    test('Adding the same group to seperate matches works correctly', () async {
+      final match1 = Match(name: 'Match 1', group: testGroup1);
+      final match2 = Match(name: 'Match 2', group: testGroup1);
+
+      await Future.wait([
+        database.matchDao.addMatch(match: match1),
+        database.matchDao.addMatch(match: match2),
+      ]);
+
+      final group1 = await database.groupMatchDao.getGroupOfMatch(
+        matchId: match1.id,
+      );
+      final group2 = await database.groupMatchDao.getGroupOfMatch(
+        matchId: match2.id,
+      );
+
+      expect(group1, isNotNull);
+      expect(group2, isNotNull);
+
+      final groups = [group1!, group2!];
+      for (final group in groups) {
+        expect(group.members.length, testGroup1.members.length);
+        expect(group.id, testGroup1.id);
+        expect(group.name, testGroup1.name);
+        expect(group.createdAt, testGroup1.createdAt);
+      }
+    });
+  });
+}

test/db_tests/group_test.dart

@@ -145,7 +145,7 @@ void main() {
 
       const newGroupName = 'new group name';
 
-      await database.groupDao.updateGroupName(
+      await database.groupDao.updateGroupname(
         groupId: testGroup1.id,
         newName: newGroupName,
       );

test/db_tests/player_group_test.dart

@@ -12,7 +12,7 @@ void main() {
   late Player testPlayer2;
   late Player testPlayer3;
   late Player testPlayer4;
-  late Group testGroup;
+  late Group testgroup;
   final fixedDate = DateTime(2025, 19, 11, 00, 11, 23);
   final fakeClock = Clock(() => fixedDate);
 
@@ -30,7 +30,7 @@ void main() {
       testPlayer2 = Player(name: 'Bob');
       testPlayer3 = Player(name: 'Charlie');
       testPlayer4 = Player(name: 'Diana');
-      testGroup = Group(
+      testgroup = Group(
         name: 'Test Group',
         members: [testPlayer1, testPlayer2, testPlayer3],
       );
@@ -45,22 +45,22 @@ void main() {
     /// not nullable
 
     test('Adding a player to a group works correctly', () async {
-      await database.groupDao.addGroup(group: testGroup);
+      await database.groupDao.addGroup(group: testgroup);
       await database.playerDao.addPlayer(player: testPlayer4);
       await database.playerGroupDao.addPlayerToGroup(
-        groupId: testGroup.id,
+        groupId: testgroup.id,
         player: testPlayer4,
       );
 
       var playerAdded = await database.playerGroupDao.isPlayerInGroup(
-        groupId: testGroup.id,
+        groupId: testgroup.id,
         playerId: testPlayer4.id,
       );
 
       expect(playerAdded, true);
 
       playerAdded = await database.playerGroupDao.isPlayerInGroup(
-        groupId: testGroup.id,
+        groupId: testgroup.id,
         playerId: '',
       );
 
@@ -68,35 +68,35 @@ void main() {
     });
 
     test('Removing player from group works correctly', () async {
-      await database.groupDao.addGroup(group: testGroup);
+      await database.groupDao.addGroup(group: testgroup);
 
-      final playerToRemove = testGroup.members[0];
+      final playerToRemove = testgroup.members[0];
 
       final removed = await database.playerGroupDao.removePlayerFromGroup(
         playerId: playerToRemove.id,
-        groupId: testGroup.id,
+        groupId: testgroup.id,
       );
       expect(removed, true);
 
       final result = await database.groupDao.getGroupById(
-        groupId: testGroup.id,
+        groupId: testgroup.id,
       );
-      expect(result.members.length, testGroup.members.length - 1);
+      expect(result.members.length, testgroup.members.length - 1);
 
       final playerExists = result.members.any((p) => p.id == playerToRemove.id);
       expect(playerExists, false);
     });
 
     test('Retrieving players of a group works correctly', () async {
-      await database.groupDao.addGroup(group: testGroup);
+      await database.groupDao.addGroup(group: testgroup);
       final players = await database.playerGroupDao.getPlayersOfGroup(
-        groupId: testGroup.id,
+        groupId: testgroup.id,
       );
 
       for (int i = 0; i < players.length; i++) {
-        expect(players[i].id, testGroup.members[i].id);
+        expect(players[i].id, testgroup.members[i].id);
-        expect(players[i].name, testGroup.members[i].name);
+        expect(players[i].name, testgroup.members[i].name);
-        expect(players[i].createdAt, testGroup.members[i].createdAt);
+        expect(players[i].createdAt, testgroup.members[i].createdAt);
       }
     });
   });

test/db_tests/player_match_test.dart

@@ -3,7 +3,6 @@ import 'package:drift/drift.dart' hide isNotNull;
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/dto/game.dart';
 import 'package:game_tracker/data/dto/group.dart';
 import 'package:game_tracker/data/dto/match.dart';
 import 'package:game_tracker/data/dto/player.dart';
@@ -16,8 +15,7 @@ void main() {
   late Player testPlayer4;
   late Player testPlayer5;
   late Player testPlayer6;
-  late Group testGroup;
+  late Group testgroup;
-  late Game testGame;
   late Match testMatchOnlyGroup;
   late Match testMatchOnlyPlayers;
   final fixedDate = DateTime(2025, 19, 11, 00, 11, 23);
@@ -39,19 +37,16 @@ void main() {
       testPlayer4 = Player(name: 'Diana');
       testPlayer5 = Player(name: 'Eve');
       testPlayer6 = Player(name: 'Frank');
-      testGroup = Group(
+      testgroup = Group(
         name: 'Test Group',
         members: [testPlayer1, testPlayer2, testPlayer3],
       );
-      testGame = Game(name: 'Test Game');
       testMatchOnlyGroup = Match(
         name: 'Test Match with Group',
-        game: testGame,
+        group: testgroup,
-        group: testGroup,
       );
       testMatchOnlyPlayers = Match(
         name: 'Test Match with Players',
-        game: testGame,
         players: [testPlayer4, testPlayer5, testPlayer6],
       );
     });
@@ -65,8 +60,7 @@ void main() {
         testPlayer6,
       ],
     );
-    await database.groupDao.addGroup(group: testGroup);
+    await database.groupDao.addGroup(group: testgroup);
-    await database.gameDao.addGame(game: testGame);
   });
   tearDown(() async {
     await database.close();
@@ -160,7 +154,7 @@ void main() {
       }
     });
 
-    test('Updating the match players works correctly', () async {
+    test('Updating the match players works coreclty', () async {
       await database.matchDao.addMatch(match: testMatchOnlyPlayers);
 
       final newPlayers = [testPlayer1, testPlayer2, testPlayer4];
@@ -204,7 +198,7 @@ void main() {
     });
 
     test(
-      'Adding the same player to separate matches works correctly',
+      'Adding the same player to seperate matches works correctly',
       () async {
         final playersList = [testPlayer1, testPlayer2, testPlayer3];
         final match1 = Match(name: 'Match 1', players: playersList);

test/db_tests/player_test.dart

@@ -63,7 +63,7 @@ void main() {
       final allPlayers = await database.playerDao.getAllPlayers();
       expect(allPlayers.length, 4);
 
-      // Map for connecting fetched players with expected players
+      // Map for connencting fetched players with expected players
       final testPlayers = {
         testPlayer1.id: testPlayer1,
         testPlayer2.id: testPlayer2,
@@ -115,12 +115,12 @@ void main() {
       expect(playerExists, false);
     });
 
-    test('Updating a player name works correctly', () async {
+    test('Updating a player name works correcly', () async {
       await database.playerDao.addPlayer(player: testPlayer1);
 
       const newPlayerName = 'new player name';
 
-      await database.playerDao.updatePlayerName(
+      await database.playerDao.updatePlayername(
         playerId: testPlayer1.id,
         newName: newPlayerName,
       );