players cant be null

# Conflicts:
#	lib/data/dao/group_match_dao.dart
#	lib/data/dao/match_dao.dart
#	lib/data/dao/player_match_dao.dart
#	lib/data/db/database.dart
#	lib/data/db/database.g.dart
#	lib/data/db/tables/group_match_table.dart
#	lib/data/db/tables/player_match_table.dart
#	lib/data/dto/match.dart
#	lib/presentation/views/main_menu/home_view.dart
#	lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
#	lib/presentation/views/main_menu/match_view/match_view.dart
#	lib/services/data_transfer_service.dart
#	test/db_tests/game_test.dart
#	test/db_tests/group_match_test.dart
#	test/db_tests/player_match_test.dart

.gitea/workflows/push.yaml

@@ -85,6 +85,7 @@ jobs:
           strategy: 'patch'
           path: './pubspec.yaml'
 
+
       - name: Commit version update
         env:
           GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
@@ -106,7 +107,6 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.BOT_TOKEN }}
-          ref: ${{ gitea.ref_name }}
 
       # Required for Flutter action
       - name: Install jq

assets/schema.json

@@ -15,16 +15,91 @@
           },
           "name": {
             "type": "string"
+          },
+          "description": {
+            "type": "string"
           }
         },
         "required": [
           "id",
           "createdAt",
-          "name"
+          "name",
+          "description"
+        ]
+      }
+    },
+    "games": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "createdAt": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "ruleset": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "color": {
+            "type": "string"
+          },
+          "icon": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "createdAt",
+          "name",
+          "ruleset",
+          "description",
+          "color",
+          "icon"
         ]
       }
     },
     "groups": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "createdAt": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "memberIds": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "createdAt",
+          "description",
+          "memberIds"
+        ]
+      }
+    },
+    "teams": {
       "type": "array",
       "items": {
         "type": "object",
@@ -67,11 +142,14 @@
           "createdAt": {
             "type": "string"
           },
+          "endedAt": {
+            "type": ["string", "null"]
+          },
+          "gameId": {
+            "type": "string"
+          },
           "groupId": {
-            "anyOf": [
-              {"type": "string"},
-              {"type": "null"}
-            ]
+            "type": ["string", "null"]
           },
           "playerIds": {
             "type": "array",
@@ -79,26 +157,26 @@
               "type": "string"
             }
           },
-          "winnerId": {
-            "anyOf": [
-              {"type": "string"},
-              {"type": "null"}
-            ]
+          "notes": {
+            "type": "string"
           }
         },
         "required": [
           "id",
           "name",
           "createdAt",
-          "groupId",
-          "playerIds"
+          "gameId",
+          "playerIds",
+          "notes"
         ]
       }
     }
   },
   "required": [
     "players",
+    "games",
     "groups",
+    "teams",
     "matches"
   ]
 }

lib/core/custom_theme.dart

@@ -13,13 +13,13 @@ class CustomTheme {
   static const Color secondaryColor = Color(0xFFf2a981);
 
   /// Background color of the app theme
-  static const Color backgroundColor = Color(0xFF0B0B0B);
+  static const backgroundColor = Color(0xFF0B0B0B);
 
   /// Default color for boxes and containers
   static const Color boxColor = Color(0xFF101010);
 
   /// Default border color for boxes and containers
-  static const Color boxBorderColor = Color(0xFF272727);
+  static const Color boxBorder = Color(0xFF272727);
 
   /// Color for boxes and containers displayed on boxes
   static const Color onBoxColor = Color(0xFF181818);
@@ -27,9 +27,6 @@ class CustomTheme {
   /// Text color used throughout the app
   static const Color textColor = Color(0xFFFFFFFF);
 
-  /// Background color for the navigation bar
-  static const Color navBarBackgroundColor = Color(0xFF131313);
-
   /// Selected color for the [NavbarItem]
   static Color navBarItemSelectedColor = primaryColor.withGreen(100);
 
@@ -54,7 +51,7 @@ class CustomTheme {
   // ==================== Decorations ====================
   static BoxDecoration standardBoxDecoration = BoxDecoration(
     color: boxColor,
-    border: Border.all(color: boxBorderColor),
+    border: Border.all(color: boxBorder),
     borderRadius: standardBorderRadiusAll,
   );
 

lib/core/enums.dart

@@ -29,24 +29,38 @@ enum ImportResult {
 /// - [ExportResult.unknownException]: An exception occurred during export.
 enum ExportResult { success, canceled, unknownException }
 
-/// Different rulesets available for matches
-/// - [Ruleset.singleWinner]: The match is won by a single player
-/// - [Ruleset.singleLoser]: The match is lost by a single player
-/// - [Ruleset.mostPoints]: The player with the most points wins.
-/// - [Ruleset.leastPoints]: The player with the fewest points wins.
-enum Ruleset { singleWinner, singleLoser, mostPoints, leastPoints }
+/// Different rulesets available for games
+/// - [Ruleset.highestScore]: The player with the highest score wins.
+/// - [Ruleset.lowestScore]: The player with the lowest score wins.
+/// - [Ruleset.singleWinner]: The match is won by a single player.
+/// - [Ruleset.singleLoser]: The match has a single loser.
+/// - [Ruleset.multipleWinners]: Multiple players can be winners.
+enum Ruleset { highestScore, lowestScore, singleWinner, singleLoser, multipleWinners }
+
+/// Different colors available for games
+/// - [GameColor.red]: Red color
+/// - [GameColor.blue]: Blue color
+/// - [GameColor.green]: Green color
+/// - [GameColor.yellow]: Yellow color
+/// - [GameColor.purple]: Purple color
+/// - [GameColor.orange]: Orange color
+/// - [GameColor.pink]: Pink color
+/// - [GameColor.teal]: Teal color
+enum GameColor { red, blue, green, yellow, purple, orange, pink, teal }
 
 /// Translates a [Ruleset] enum value to its corresponding localized string.
 String translateRulesetToString(Ruleset ruleset, BuildContext context) {
   final loc = AppLocalizations.of(context);
   switch (ruleset) {
+    case Ruleset.highestScore:
+      return loc.highest_score;
+    case Ruleset.lowestScore:
+      return loc.lowest_score;
     case Ruleset.singleWinner:
       return loc.single_winner;
     case Ruleset.singleLoser:
       return loc.single_loser;
-    case Ruleset.mostPoints:
-      return loc.most_points;
-    case Ruleset.leastPoints:
-      return loc.least_points;
+    case Ruleset.multipleWinners:
+      return loc.multiple_winners;
   }
 }

lib/data/dao/game_dao.dart

@@ -0,0 +1,166 @@
+import 'package:drift/drift.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/game_table.dart';
+import 'package:tallee/data/dto/game.dart';
+import 'package:tallee/core/enums.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: Ruleset.values.firstWhere((e) => e.name == row.ruleset),
+            description: row.description,
+            color: GameColor.values.firstWhere((e) => e.name == row.color),
+            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: Ruleset.values.firstWhere((e) => e.name == result.ruleset),
+      description: result.description,
+      color: GameColor.values.firstWhere((e) => e.name == result.color),
+      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.name,
+          description: game.description,
+          color: game.color.name,
+          icon: 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.name,
+                description: game.description,
+                color: game.color.name,
+                icon: 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 Ruleset newRuleset}) async {
+    await (update(gameTable)..where((g) => g.id.equals(gameId))).write(
+      GameTableCompanion(ruleset: Value(newRuleset.name)),
+    );
+  }
+
+  /// 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 GameColor newColor}) async {
+    await (update(
+      gameTable,
+    )..where((g) => g.id.equals(gameId))).write(GameTableCompanion(color: Value(newColor.name)));
+  }
+
+  /// 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

@@ -0,0 +1,8 @@
+// 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,6 +23,7 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
         return Group(
           id: groupData.id,
           name: groupData.name,
+          description: groupData.description,
           members: members,
           createdAt: groupData.createdAt,
         );
@@ -42,6 +43,7 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
     return Group(
       id: result.id,
       name: result.name,
+      description: result.description,
       members: members,
       createdAt: result.createdAt,
     );
@@ -56,6 +58,7 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
           GroupTableCompanion.insert(
             id: group.id,
             name: group.name,
+            description: group.description,
             createdAt: group.createdAt,
           ),
           mode: InsertMode.insertOrReplace,
@@ -105,6 +108,7 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
                 (group) => GroupTableCompanion.insert(
                   id: group.id,
                   name: group.name,
+                  description: group.description,
                   createdAt: group.createdAt,
                 ),
               )
@@ -132,6 +136,7 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
                   (p) => PlayerTableCompanion.insert(
                     id: p.id,
                     name: p.name,
+                    description: p.description,
                     createdAt: p.createdAt,
                   ),
                 )
@@ -176,7 +181,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 {
@@ -187,6 +192,21 @@ 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

@@ -1,98 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:tallee/data/db/database.dart';
-import 'package:tallee/data/db/tables/group_match_table.dart';
-import 'package:tallee/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

@@ -1,10 +0,0 @@
-// 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,13 +1,17 @@
 import 'package:drift/drift.dart';
 import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/game_table.dart';
+import 'package:tallee/data/db/tables/group_table.dart';
 import 'package:tallee/data/db/tables/match_table.dart';
+import 'package:tallee/data/db/tables/player_match_table.dart';
+import 'package:tallee/data/dto/game.dart';
 import 'package:tallee/data/dto/group.dart';
 import 'package:tallee/data/dto/match.dart';
 import 'package:tallee/data/dto/player.dart';
 
 part 'match_dao.g.dart';
 
-@DriftAccessor(tables: [MatchTable])
+@DriftAccessor(tables: [MatchTable, GameTable, GroupTable, PlayerMatchTable])
 class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
   MatchDao(super.db);
 
@@ -18,20 +22,23 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
 
     return Future.wait(
       result.map((row) async {
-        final group = await db.groupMatchDao.getGroupOfMatch(matchId: row.id);
+        final game = await db.gameDao.getGameById(gameId: row.gameId);
+        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,
+          endedAt: row.endedAt,
         );
       }),
     );
@@ -42,69 +49,108 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     final query = select(matchTable)..where((g) => g.id.equals(matchId));
     final result = await query.getSingle();
 
-    List<Player>? players;
-    if (await db.playerMatchDao.matchHasPlayers(matchId: matchId)) {
-      players = await db.playerMatchDao.getPlayersOfMatch(matchId: matchId);
-    }
+    final game = await db.gameDao.getGameById(gameId: result.gameId);
+
     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!);
+    if (result.groupId != null) {
+      group = await db.groupDao.getGroupById(groupId: result.groupId!);
     }
 
+    final players = await db.playerMatchDao.getPlayersOfMatch(matchId: matchId) ?? [];
+
     return Match(
       id: result.id,
-      name: result.name,
-      players: players,
+      name: result.name ?? '',
+      game: game,
       group: group,
-      winner: winner,
+      players: players,
+      notes: result.notes ?? '',
       createdAt: result.createdAt,
+      endedAt: result.endedAt,
     );
   }
 
-  /// Adds a new [Match] to the database. Also adds players and group
-  /// associations. This method assumes that the players and groups added to
-  /// this match are already present in the database.
+  /// Adds a new [Match] to the database. Also adds players associations.
+  /// This method assumes that the game and group (if any) are already present
+  /// in the database.
   Future<void> addMatch({required Match match}) async {
     await db.transaction(() async {
       await into(matchTable).insert(
         MatchTableCompanion.insert(
           id: match.id,
-          name: match.name,
-          winnerId: Value(match.winner?.id),
+          gameId: match.game.id,
+          groupId: Value(match.group?.id),
+          name: Value(match.name),
+          notes: Value(match.notes),
           createdAt: match.createdAt,
+          endedAt: Value(match.endedAt),
         ),
         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]s to the database in a batch operation.
+  /// Adds multiple [Match]es 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)
+      final uniqueGames = <String, Game>{};
+      for (final match in matches) {
+        uniqueGames[match.game.id] = match.game;
+      }
+
+      if (uniqueGames.isNotEmpty) {
+        await db.batch(
+              (b) => b.insertAll(
+            db.gameTable,
+            uniqueGames.values
+                .map(
+                  (game) => GameTableCompanion.insert(
+                id: game.id,
+                name: game.name,
+                ruleset: game.ruleset.name,
+                description: game.description,
+                color: game.color.name,
+                icon: game.icon,
+                createdAt: game.createdAt,
+              ),
+            )
+                .toList(),
+            mode: InsertMode.insertOrIgnore,
+          ),
+        );
+      }
+
+      // Add all groups of the matches in batch
+      await db.batch(
+            (b) => b.insertAll(
+          db.groupTable,
+          matches
+              .where((match) => match.group != null)
+              .map(
+                (match) => GroupTableCompanion.insert(
+              id: match.group!.id,
+              name: match.group!.name,
+              description: match.group!.description,
+              createdAt: match.group!.createdAt,
+            ),
+          )
+              .toList(),
+          mode: InsertMode.insertOrIgnore,
+        ),
+      );
+
       // Add all matches in batch
       await db.batch(
             (b) => b.insertAll(
@@ -113,9 +159,12 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
               .map(
                 (match) => MatchTableCompanion.insert(
               id: match.id,
-                  name: match.name,
+              gameId: match.game.id,
+              groupId: Value(match.group?.id),
+              name: Value(match.name),
+              notes: Value(match.notes),
               createdAt: match.createdAt,
-                  winnerId: Value(match.winner?.id),
+              endedAt: Value(match.endedAt),
             ),
           )
               .toList(),
@@ -123,34 +172,12 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
         ),
       );
 
-      // 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(
-                (matches) => GroupTableCompanion.insert(
-                  id: matches.group!.id,
-                  name: matches.group!.name,
-                  createdAt: matches.group!.createdAt,
-                ),
-              )
-              .toList(),
-          mode: InsertMode.insertOrIgnore,
-        ),
-      );
-
       // Add all players of the matches in batch (unique)
       final uniquePlayers = <String, Player>{};
       for (final match in matches) {
-        if (match.players != null) {
-          for (final p in match.players!) {
+        for (final p in match.players) {
           uniquePlayers[p.id] = p;
         }
-        }
         // Also include members of groups
         if (match.group != null) {
           for (final m in match.group!.members) {
@@ -160,8 +187,6 @@ 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,
@@ -170,6 +195,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
                   (p) => PlayerTableCompanion.insert(
                 id: p.id,
                 name: p.name,
+                description: p.description,
                 createdAt: p.createdAt,
               ),
             )
@@ -182,19 +208,18 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
       // Add all player-match associations in batch
       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,
             );
           }
         }
-        }
       });
 
       // Add all player-group associations in batch
@@ -214,22 +239,6 @@ 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,
-            );
-          }
-        }
-      });
     });
   }
 
@@ -266,52 +275,20 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     return rowsAffected > 0;
   }
 
-  /// Sets the winner of the match with the given [matchId] to the player with
-  /// the given [winnerId].
+  /// Updates the notes of the match with the given [matchId].
   /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> setWinner({
+  Future<bool> updateMatchNotes({
     required String matchId,
-    required String winnerId,
+    required String? notes,
   }) async {
     final query = update(matchTable)..where((g) => g.id.equals(matchId));
     final rowsAffected = await query.write(
-      MatchTableCompanion(winnerId: Value(winnerId)),
+      MatchTableCompanion(notes: Value(notes)),
     );
     return rowsAffected > 0;
   }
 
-  /// 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].
+  /// Changes the name 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,
@@ -323,4 +300,94 @@ 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;
+  }
+
+  /// Updates the endedAt timestamp of the match with the given [matchId].
+  /// Pass null to remove the ended time (mark match as ongoing).
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> updateMatchEndedAt({
+    required String matchId,
+    required DateTime? endedAt,
+  }) async {
+    final query = update(matchTable)..where((g) => g.id.equals(matchId));
+    final rowsAffected = await query.write(
+      MatchTableCompanion(endedAt: Value(endedAt)),
+    );
+    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;
+  }
+
+  /// 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 ? 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,5 +4,11 @@ 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,7 +15,12 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
     final result = await query.get();
     return result
         .map(
-          (row) => Player(id: row.id, name: row.name, createdAt: row.createdAt),
+          (row) => Player(
+            id: row.id,
+            name: row.name,
+            description: row.description,
+            createdAt: row.createdAt,
+          ),
         )
         .toList();
   }
@@ -27,6 +32,7 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
     return Player(
       id: result.id,
       name: result.name,
+      description: result.description,
       createdAt: result.createdAt,
     );
   }
@@ -40,6 +46,7 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
         PlayerTableCompanion.insert(
           id: player.id,
           name: player.name,
+          description: player.description,
           createdAt: player.createdAt,
         ),
         mode: InsertMode.insertOrReplace,
@@ -63,6 +70,7 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
               (player) => PlayerTableCompanion.insert(
                 id: player.id,
                 name: player.name,
+                description: player.description,
                 createdAt: player.createdAt,
               ),
             )
@@ -91,7 +99,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_group_dao.dart

@@ -27,7 +27,7 @@ class PlayerGroupDao extends DatabaseAccessor<AppDatabase>
     }
 
     if (!await db.playerDao.playerExists(playerId: player.id)) {
-      db.playerDao.addPlayer(player: player);
+      await db.playerDao.addPlayer(player: player);
     }
 
     await into(playerGroupTable).insert(

lib/data/dao/player_match_dao.dart

@@ -1,23 +1,31 @@
 import 'package:drift/drift.dart';
 import 'package:tallee/data/db/database.dart';
 import 'package:tallee/data/db/tables/player_match_table.dart';
+import 'package:tallee/data/db/tables/team_table.dart';
 import 'package:tallee/data/dto/player.dart';
 
 part 'player_match_dao.g.dart';
 
-@DriftAccessor(tables: [PlayerMatchTable])
+@DriftAccessor(tables: [PlayerMatchTable, TeamTable])
 class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
     with _$PlayerMatchDaoMixin {
   PlayerMatchDao(super.db);
 
   /// Associates a player with a match by inserting a record into the
-  /// [PlayerMatchTable].
+  /// [PlayerMatchTable]. Optionally associates with a team and sets initial score.
   Future<void> addPlayerToMatch({
     required String matchId,
     required String playerId,
+    String? teamId,
+    int score = 0,
   }) async {
     await into(playerMatchTable).insert(
-      PlayerMatchTableCompanion.insert(playerId: playerId, matchId: matchId),
+      PlayerMatchTableCompanion.insert(
+        playerId: playerId,
+        matchId: matchId,
+        teamId: Value(teamId),
+        score: score,
+      ),
       mode: InsertMode.insertOrIgnore,
     );
   }
@@ -38,6 +46,50 @@ 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 {
@@ -96,7 +148,7 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
     final playersToAdd = newPlayerIdsSet.difference(currentPlayerIds);
     final playersToRemove = currentPlayerIds.difference(newPlayerIdsSet);
 
-    db.transaction(() async {
+    await db.transaction(() async {
       // Remove old players
       if (playersToRemove.isNotEmpty) {
         await (delete(playerMatchTable)..where(
@@ -114,6 +166,7 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
               (id) => PlayerMatchTableCompanion.insert(
             playerId: id,
             matchId: matchId,
+            score: 0,
           ),
         )
             .toList();
@@ -127,4 +180,23 @@ 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,7 +5,10 @@ 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

@@ -0,0 +1,191 @@
+import 'package:drift/drift.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/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

@@ -0,0 +1,12 @@
+// 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

@@ -0,0 +1,147 @@
+import 'package:drift/drift.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/team_table.dart';
+import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/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

@@ -0,0 +1,8 @@
+// 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,18 +1,22 @@
 import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart';
 import 'package:path_provider/path_provider.dart';
+import 'package:tallee/data/dao/game_dao.dart';
 import 'package:tallee/data/dao/group_dao.dart';
-import 'package:tallee/data/dao/group_match_dao.dart';
 import 'package:tallee/data/dao/match_dao.dart';
 import 'package:tallee/data/dao/player_dao.dart';
 import 'package:tallee/data/dao/player_group_dao.dart';
 import 'package:tallee/data/dao/player_match_dao.dart';
-import 'package:tallee/data/db/tables/group_match_table.dart';
+import 'package:tallee/data/dao/score_dao.dart';
+import 'package:tallee/data/dao/team_dao.dart';
+import 'package:tallee/data/db/tables/game_table.dart';
 import 'package:tallee/data/db/tables/group_table.dart';
 import 'package:tallee/data/db/tables/match_table.dart';
 import 'package:tallee/data/db/tables/player_group_table.dart';
 import 'package:tallee/data/db/tables/player_match_table.dart';
 import 'package:tallee/data/db/tables/player_table.dart';
+import 'package:tallee/data/db/tables/score_table.dart';
+import 'package:tallee/data/db/tables/team_table.dart';
 
 part 'database.g.dart';
 
@@ -23,7 +27,9 @@ part 'database.g.dart';
     MatchTable,
     PlayerGroupTable,
     PlayerMatchTable,
-    GroupMatchTable,
+    GameTable,
+    TeamTable,
+    ScoreTable,
   ],
   daos: [
     PlayerDao,
@@ -31,7 +37,9 @@ part 'database.g.dart';
     MatchDao,
     PlayerGroupDao,
     PlayerMatchDao,
-    GroupMatchDao,
+    GameDao,
+    ScoreDao,
+    TeamDao
   ],
 )
 class AppDatabase extends _$AppDatabase {
@@ -52,9 +60,7 @@ class AppDatabase extends _$AppDatabase {
   static QueryExecutor _openConnection() {
     return driftDatabase(
       name: 'gametracker_db',
-      native: const DriftNativeOptions(
-        databaseDirectory: getApplicationSupportDirectory,
-      ),
+      native: const DriftNativeOptions(databaseDirectory: getApplicationSupportDirectory),
     );
   }
 }

lib/data/db/tables/game_table.dart

@@ -0,0 +1,14 @@
+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()();
+  TextColumn get color => text()();
+  TextColumn get icon => text()();
+  DateTimeColumn get createdAt => dateTime()();
+
+  @override
+  Set<Column<Object>> get primaryKey => {id};
+}

lib/data/db/tables/group_match_table.dart

@@ -1,13 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:tallee/data/db/tables/group_table.dart';
-import 'package:tallee/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,6 +3,7 @@ import 'package:drift/drift.dart';
 class GroupTable extends Table {
   TextColumn get id => text()();
   TextColumn get name => text()();
+  TextColumn get description => text()();
   DateTimeColumn get createdAt => dateTime()();
 
   @override

lib/data/db/tables/match_table.dart

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

lib/data/db/tables/player_match_table.dart

@@ -1,12 +1,16 @@
 import 'package:drift/drift.dart';
 import 'package:tallee/data/db/tables/match_table.dart';
 import 'package:tallee/data/db/tables/player_table.dart';
+import 'package:tallee/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,6 +3,7 @@ import 'package:drift/drift.dart';
 class PlayerTable extends Table {
   TextColumn get id => text()();
   TextColumn get name => text()();
+  TextColumn get description => text()();
   DateTimeColumn get createdAt => dateTime()();
 
   @override

lib/data/db/tables/score_table.dart

@@ -0,0 +1,16 @@
+import 'package:drift/drift.dart';
+import 'package:tallee/data/db/tables/match_table.dart';
+import 'package:tallee/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

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,51 @@
+import 'package:clock/clock.dart';
+import 'package:uuid/uuid.dart';
+import 'package:tallee/core/enums.dart';
+
+class Game {
+  final String id;
+  final DateTime createdAt;
+  final String name;
+  final Ruleset ruleset;
+  final String description;
+  final GameColor color;
+  final String icon;
+
+  Game({
+    String? id,
+    DateTime? createdAt,
+    required this.name,
+    required this.ruleset,
+    required this.description,
+    required this.color,
+    required 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 = Ruleset.values.firstWhere((e) => e.name == json['ruleset']),
+      description = json['description'],
+      color = GameColor.values.firstWhere((e) => e.name == 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.name,
+    'description': description,
+    'color': color.name,
+    'icon': icon,
+  };
+}
+

lib/data/dto/group.dart

@@ -4,37 +4,40 @@ import 'package:uuid/uuid.dart';
 
 class Group {
   final String id;
-  final DateTime createdAt;
   final String name;
+  final String description;
+  final DateTime createdAt;
   final List<Player> members;
 
   Group({
     String? id,
     DateTime? createdAt,
     required this.name,
+    required this.description,
     required this.members,
   }) : id = id ?? const Uuid().v4(),
        createdAt = createdAt ?? clock.now();
 
   @override
   String toString() {
-    return 'Group{id: $id, name: $name,members: $members}';
+    return 'Group{id: $id, name: $name, description: $description, members: $members}';
   }
 
-  /// Creates a Group instance from a JSON object.
+  /// Creates a Group instance from a JSON object (memberIds format).
+  /// Player objects are reconstructed from memberIds by the DataTransferService.
   Group.fromJson(Map<String, dynamic> json)
     : id = json['id'],
       createdAt = DateTime.parse(json['createdAt']),
       name = json['name'],
-      members = (json['members'] as List)
-          .map((memberJson) => Player.fromJson(memberJson))
-          .toList();
+      description = json['description'],
+      members = []; // Populated during import via DataTransferService
 
-  /// Converts the Group instance to a JSON object.
+  /// Converts the Group instance to a JSON object using normalized format (memberIds only).
   Map<String, dynamic> toJson() => {
     'id': id,
     'createdAt': createdAt.toIso8601String(),
     'name': name,
-    'members': members.map((member) => member.toJson()).toList(),
+    'description': description,
+    'memberIds': members.map((member) => member.id).toList(),
   };
 }

lib/data/dto/match.dart

@@ -1,4 +1,6 @@
 import 'package:clock/clock.dart';
+import 'package:tallee/core/enums.dart';
+import 'package:tallee/data/dto/game.dart';
 import 'package:tallee/data/dto/group.dart';
 import 'package:tallee/data/dto/player.dart';
 import 'package:uuid/uuid.dart';
@@ -6,46 +8,53 @@ import 'package:uuid/uuid.dart';
 class Match {
   final String id;
   final DateTime createdAt;
+  final DateTime? endedAt;
   final String name;
-  final List<Player>? players;
+  final Game game;
   final Group? group;
+  final List<Player> players;
+  final String notes;
   Player? winner;
 
   Match({
     String? id,
     DateTime? createdAt,
+    this.endedAt,
     required this.name,
-    this.players,
+    required this.game,
     this.group,
+    this.players = const [],
+    required this.notes,
     this.winner,
   }) : id = id ?? const Uuid().v4(),
         createdAt = createdAt ?? clock.now();
 
   @override
   String toString() {
-    return 'Match{\n\tid: $id,\n\tname: $name,\n\tplayers: $players,\n\tgroup: $group,\n\twinner: $winner\n}';
+    return 'Match{id: $id, name: $name, game: $game, group: $group, players: $players, notes: $notes, endedAt: $endedAt}';
   }
 
-  /// Creates a Match instance from a JSON object.
+  /// Creates a Match instance from a JSON object (ID references format).
+  /// Related objects are reconstructed from IDs by the DataTransferService.
   Match.fromJson(Map<String, dynamic> json)
       : id = json['id'],
-      name = json['name'],
         createdAt = DateTime.parse(json['createdAt']),
-      players = json['players'] != null
-          ? (json['players'] as List)
-                .map((playerJson) => Player.fromJson(playerJson))
-                .toList()
-          : null,
-      group = json['group'] != null ? Group.fromJson(json['group']) : null,
-      winner = json['winner'] != null ? Player.fromJson(json['winner']) : null;
+        endedAt = json['endedAt'] != null ? DateTime.parse(json['endedAt']) : null,
+        name = json['name'],
+        game = Game(name: '', ruleset: Ruleset.singleWinner, description: '', color: GameColor.blue, icon: ''), // Populated during import via DataTransferService
+        group = null, // Populated during import via DataTransferService
+        players = [], // Populated during import via DataTransferService
+        notes = json['notes'] ?? '';
 
-  /// Converts the Match instance to a JSON object.
+  /// Converts the Match instance to a JSON object using normalized format (ID references only).
   Map<String, dynamic> toJson() => {
     'id': id,
     'createdAt': createdAt.toIso8601String(),
+    'endedAt': endedAt?.toIso8601String(),
     'name': name,
-    'players': players?.map((player) => player.toJson()).toList(),
-    'group': group?.toJson(),
-    'winner': winner?.toJson(),
+    'gameId': game.id,
+    'groupId': group?.id,
+    'playerIds': players.map((player) => player.id).toList(),
+    'notes': notes,
   };
 }

lib/data/dto/player.dart

@@ -5,26 +5,33 @@ class Player {
   final String id;
   final DateTime createdAt;
   final String name;
+  final String description;
 
-  Player({String? id, DateTime? createdAt, required this.name})
-    : id = id ?? const Uuid().v4(),
+  Player({
+    String? id,
+    DateTime? createdAt,
+    required this.name,
+    required this.description,
+  }) : id = id ?? const Uuid().v4(),
        createdAt = createdAt ?? clock.now();
 
   @override
   String toString() {
-    return 'Player{id: $id,name: $name}';
+    return 'Player{id: $id, name: $name, description: $description}';
   }
 
   /// 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

@@ -0,0 +1,40 @@
+import 'package:clock/clock.dart';
+import 'package:tallee/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 (memberIds format).
+  /// Player objects are reconstructed from memberIds by the DataTransferService.
+  Team.fromJson(Map<String, dynamic> json)
+    : id = json['id'],
+      name = json['name'],
+      createdAt = DateTime.parse(json['createdAt']),
+      members = []; // Populated during import via DataTransferService
+
+  /// Converts the Team instance to a JSON object using normalized format (memberIds only).
+  Map<String, dynamic> toJson() => {
+    'id': id,
+    'name': name,
+    'createdAt': createdAt.toIso8601String(),
+    'memberIds': members.map((member) => member.id).toList(),
+  };
+}
+

lib/l10n/arb/app_de.arb

@@ -22,15 +22,9 @@
   "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",
-  "delete_match": "Spiel löschen",
   "edit_group": "Gruppe bearbeiten",
-  "enter_results": "Ergebnisse eintragen",
   "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",
@@ -52,7 +46,6 @@
   "licenses": "Lizenzen",
   "match_in_progress": "Spiel läuft...",
   "match_name": "Spieltitel",
-  "match_profile": "Spielprofil",
   "matches": "Spiele",
   "members": "Mitglieder",
   "most_points": "Höchste Punkte",
@@ -65,7 +58,6 @@
   "no_players_found_with_that_name": "Keine Spieler:in mit diesem Namen gefunden",
   "no_players_selected": "Keine Spieler:innen ausgewählt",
   "no_recent_matches_available": "Keine letzten Spiele verfügbar",
-  "no_results_entered_yet": "Noch keine Ergebnisse eingetragen",
   "no_second_match_available": "Kein zweites Spiel verfügbar",
   "no_statistics_available": "Keine Statistiken verfügbar",
   "none": "Kein",
@@ -78,14 +70,11 @@
   "privacy_policy": "Datenschutzerklärung",
   "quick_create": "Schnellzugriff",
   "recent_matches": "Letzte Spiele",
-  "result": "Ergebnis",
-  "results": "Ergebnisse",
   "ruleset": "Regelwerk",
   "ruleset_least_points": "Umgekehrte Wertung: Der/die Spieler:in mit den wenigsten Punkten gewinnt.",
   "ruleset_most_points": "Traditionelles Regelwerk: Der/die Spieler:in mit den meisten Punkten gewinnt.",
   "ruleset_single_loser": "Genau ein:e Verlierer:in wird bestimmt; der letzte Platz erhält die Strafe oder Konsequenz.",
   "ruleset_single_winner": "Genau ein:e Gewinner:in wird gewählt; Unentschieden werden durch einen vordefinierten Tie-Breaker aufgelöst.",
-  "save_changes": "Änderungen speichern",
   "search_for_groups": "Nach Gruppen suchen",
   "search_for_players": "Nach Spieler:innen suchen",
   "select_winner": "Gewinner:in wählen:",
@@ -93,6 +82,9 @@
   "settings": "Einstellungen",
   "single_loser": "Ein:e Verlierer:in",
   "single_winner": "Ein:e Gewinner:in",
+  "highest_score": "Höchste Punkte",
+  "lowest_score": "Niedrigste Punkte",
+  "multiple_winners": "Mehrere Gewinner:innen",
   "statistics": "Statistiken",
   "stats": "Statistiken",
   "successfully_added_player": "Spieler:in {playerName} erfolgreich hinzugefügt",

lib/l10n/arb/app_en.arb

@@ -37,10 +37,10 @@
     "description": "Button text to create a match"
   },
   "@create_new_group": {
-    "description": "Appbar text to create a new group"
+    "description": "Button text to create a new group"
   },
   "@create_new_match": {
-    "description": "Appbar text to create a new match"
+    "description": "Button text to create a new match"
   },
   "@created_on": {
     "description": "Label for creation date"
@@ -72,26 +72,14 @@
     "description": "Confirmation dialog for deleting all data"
   },
   "@delete_group": {
-    "description": "Confirmation dialog for deleting a group"
-  },
-  "@delete_match": {
-    "description": "Button text to delete a match"
+    "description": "Button text to delete a group"
   },
   "@edit_group": {
-      "description": "Button & Appbar label for editing a group"
-  },
-  "@enter_results": {
-    "description": "Button text to enter match results"
+    "description": "Button text to edit 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"
   },
@@ -155,9 +143,6 @@
   "@match_name": {
     "description": "Placeholder for match name input"
   },
-  "@match_profile": {
-    "description": "Title for match profile view"
-  },
   "@matches": {
     "description": "Label for matches"
   },
@@ -194,9 +179,6 @@
   "@no_recent_matches_available": {
     "description": "Message when no recent matches exist"
   },
-  "@no_results_entered_yet": {
-    "description": "Message when no results have been entered yet"
-  },
   "@no_second_match_available": {
     "description": "Message when no second match exists"
   },
@@ -238,9 +220,6 @@
   "@recent_matches": {
     "description": "Title for recent matches section"
   },
-  "@results": {
-    "description": "Label for match results"
-  },
   "@ruleset": {
     "description": "Ruleset label"
   },
@@ -256,9 +235,6 @@
   "@ruleset_single_winner": {
     "description": "Description for single winner ruleset"
   },
-  "@save_changes": {
-    "description": "Save changes button text"
-  },
   "@search_for_groups": {
     "description": "Hint text for group search input field"
   },
@@ -345,12 +321,8 @@
   "delete": "Delete",
   "delete_all_data": "Delete all data",
   "delete_group": "Delete Group",
-  "delete_match": "Delete Match",
   "edit_group": "Edit Group",
-  "enter_results": "Enter Results",
   "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",
@@ -372,7 +344,6 @@
   "licenses": "Licenses",
   "match_in_progress": "Match in progress...",
   "match_name": "Match name",
-  "match_profile": "Match Profile",
   "matches": "Matches",
   "members": "Members",
   "most_points": "Most Points",
@@ -385,7 +356,6 @@
   "no_players_found_with_that_name": "No players found with that name",
   "no_players_selected": "No players selected",
   "no_recent_matches_available": "No recent matches available",
-  "no_results_entered_yet": "No results entered yet",
   "no_second_match_available": "No second match available",
   "no_statistics_available": "No statistics available",
   "none": "None",
@@ -398,13 +368,11 @@
   "privacy_policy": "Privacy Policy",
   "quick_create": "Quick Create",
   "recent_matches": "Recent Matches",
-  "results": "Results",
   "ruleset": "Ruleset",
   "ruleset_least_points": "Inverse scoring: the player with the fewest points wins.",
   "ruleset_most_points": "Traditional ruleset: the player with the most points wins.",
   "ruleset_single_loser": "Exactly one loser is determined; last place receives the penalty or consequence.",
   "ruleset_single_winner": "Exactly one winner is chosen; ties are resolved by a predefined tiebreaker.",
-  "save_changes": "Save Changes",
   "search_for_groups": "Search for groups",
   "search_for_players": "Search for players",
   "select_winner": "Select Winner:",
@@ -412,6 +380,9 @@
   "settings": "Settings",
   "single_loser": "Single Loser",
   "single_winner": "Single Winner",
+  "highest_score": "Highest Score",
+  "lowest_score": "Lowest Score",
+  "multiple_winners": "Multiple Winners",
   "statistics": "Statistics",
   "stats": "Stats",
   "successfully_added_player": "Successfully added player {playerName}",

lib/l10n/generated/app_localizations.dart

@@ -170,7 +170,7 @@ abstract class AppLocalizations {
   /// **'Create match'**
   String get create_match;
 
-  /// Appbar text to create a new group
+  /// Button 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;
 
-  /// Appbar text to create a new match
+  /// Button text to create a new match
   ///
   /// In en, this message translates to:
   /// **'Create new match'**
@@ -230,48 +230,24 @@ abstract class AppLocalizations {
   /// **'Delete all data'**
   String get delete_all_data;
 
-  /// Confirmation dialog for deleting a group
+  /// Button text to delete a group
   ///
   /// In en, this message translates to:
   /// **'Delete Group'**
   String get delete_group;
 
-  /// Button text to delete a match
-  ///
-  /// In en, this message translates to:
-  /// **'Delete Match'**
-  String get delete_match;
-
-  /// Button & Appbar label for editing a group
+  /// Button text to edit a group
   ///
   /// In en, this message translates to:
   /// **'Edit Group'**
   String get edit_group;
 
-  /// Button text to enter match results
-  ///
-  /// In en, this message translates to:
-  /// **'Enter Results'**
-  String get enter_results;
-
   /// Error message when group creation fails
   ///
   /// In en, this message translates to:
   /// **'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:
@@ -398,12 +374,6 @@ abstract class AppLocalizations {
   /// **'Match name'**
   String get match_name;
 
-  /// Title for match profile view
-  ///
-  /// In en, this message translates to:
-  /// **'Match Profile'**
-  String get match_profile;
-
   /// Label for matches
   ///
   /// In en, this message translates to:
@@ -476,12 +446,6 @@ abstract class AppLocalizations {
   /// **'No recent matches available'**
   String get no_recent_matches_available;
 
-  /// Message when no results have been entered yet
-  ///
-  /// In en, this message translates to:
-  /// **'No results entered yet'**
-  String get no_results_entered_yet;
-
   /// Message when no second match exists
   ///
   /// In en, this message translates to:
@@ -554,12 +518,6 @@ abstract class AppLocalizations {
   /// **'Recent Matches'**
   String get recent_matches;
 
-  /// Label for match results
-  ///
-  /// In en, this message translates to:
-  /// **'Results'**
-  String get results;
-
   /// Ruleset label
   ///
   /// In en, this message translates to:
@@ -590,12 +548,6 @@ abstract class AppLocalizations {
   /// **'Exactly one winner is chosen; ties are resolved by a predefined tiebreaker.'**
   String get ruleset_single_winner;
 
-  /// Save changes button text
-  ///
-  /// In en, this message translates to:
-  /// **'Save Changes'**
-  String get save_changes;
-
   /// Hint text for group search input field
   ///
   /// In en, this message translates to:
@@ -638,6 +590,24 @@ abstract class AppLocalizations {
   /// **'Single Winner'**
   String get single_winner;
 
+  /// No description provided for @highest_score.
+  ///
+  /// In en, this message translates to:
+  /// **'Highest Score'**
+  String get highest_score;
+
+  /// No description provided for @lowest_score.
+  ///
+  /// In en, this message translates to:
+  /// **'Lowest Score'**
+  String get lowest_score;
+
+  /// No description provided for @multiple_winners.
+  ///
+  /// In en, this message translates to:
+  /// **'Multiple Winners'**
+  String get multiple_winners;
+
   /// Statistics tab label
   ///
   /// In en, this message translates to:

lib/l10n/generated/app_localizations_de.dart

@@ -81,27 +81,13 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get delete_group => 'Gruppe löschen';
 
-  @override
-  String get delete_match => 'Spiel löschen';
-
   @override
   String get edit_group => 'Gruppe bearbeiten';
 
-  @override
-  String get enter_results => 'Ergebnisse eintragen';
-
   @override
   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';
 
@@ -165,9 +151,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get match_name => 'Spieltitel';
 
-  @override
-  String get match_profile => 'Spielprofil';
-
   @override
   String get matches => 'Spiele';
 
@@ -205,9 +188,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get no_recent_matches_available => 'Keine letzten Spiele verfügbar';
 
-  @override
-  String get no_results_entered_yet => 'Noch keine Ergebnisse eingetragen';
-
   @override
   String get no_second_match_available => 'Kein zweites Spiel verfügbar';
 
@@ -246,9 +226,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get recent_matches => 'Letzte Spiele';
 
-  @override
-  String get results => 'Ergebnisse';
-
   @override
   String get ruleset => 'Regelwerk';
 
@@ -268,9 +245,6 @@ class AppLocalizationsDe extends AppLocalizations {
   String get ruleset_single_winner =>
       'Genau ein:e Gewinner:in wird gewählt; Unentschieden werden durch einen vordefinierten Tie-Breaker aufgelöst.';
 
-  @override
-  String get save_changes => 'Änderungen speichern';
-
   @override
   String get search_for_groups => 'Nach Gruppen suchen';
 
@@ -292,6 +266,15 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get single_winner => 'Ein:e Gewinner:in';
 
+  @override
+  String get highest_score => 'Höchste Punkte';
+
+  @override
+  String get lowest_score => 'Niedrigste Punkte';
+
+  @override
+  String get multiple_winners => 'Mehrere Gewinner:innen';
+
   @override
   String get statistics => 'Statistiken';
 

lib/l10n/generated/app_localizations_en.dart

@@ -81,27 +81,13 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get delete_group => 'Delete Group';
 
-  @override
-  String get delete_match => 'Delete Match';
-
   @override
   String get edit_group => 'Edit Group';
 
-  @override
-  String get enter_results => 'Enter Results';
-
   @override
   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';
 
@@ -165,9 +151,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get match_name => 'Match name';
 
-  @override
-  String get match_profile => 'Match Profile';
-
   @override
   String get matches => 'Matches';
 
@@ -205,9 +188,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get no_recent_matches_available => 'No recent matches available';
 
-  @override
-  String get no_results_entered_yet => 'No results entered yet';
-
   @override
   String get no_second_match_available => 'No second match available';
 
@@ -246,9 +226,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get recent_matches => 'Recent Matches';
 
-  @override
-  String get results => 'Results';
-
   @override
   String get ruleset => 'Ruleset';
 
@@ -268,9 +245,6 @@ class AppLocalizationsEn extends AppLocalizations {
   String get ruleset_single_winner =>
       'Exactly one winner is chosen; ties are resolved by a predefined tiebreaker.';
 
-  @override
-  String get save_changes => 'Save Changes';
-
   @override
   String get search_for_groups => 'Search for groups';
 
@@ -292,6 +266,15 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get single_winner => 'Single Winner';
 
+  @override
+  String get highest_score => 'Highest Score';
+
+  @override
+  String get lowest_score => 'Lowest Score';
+
+  @override
+  String get multiple_winners => 'Multiple Winners';
+
   @override
   String get statistics => 'Statistics';
 

lib/main.dart

@@ -29,9 +29,7 @@ class GameTracker extends StatelessWidget {
             return supportedLocale;
           }
         }
-        return supportedLocales.firstWhere(
-          (locale) => locale.languageCode == 'en',
-        );
+        return supportedLocales.firstWhere((locale) => locale.languageCode == 'en');
       },
       debugShowCheckedModeBanner: false,
       onGenerateTitle: (context) => AppLocalizations.of(context).app_name,
@@ -40,22 +38,10 @@ class GameTracker extends StatelessWidget {
         primaryColor: CustomTheme.primaryColor,
         scaffoldBackgroundColor: CustomTheme.backgroundColor,
         appBarTheme: CustomTheme.appBarTheme,
-        radioTheme: RadioThemeData(
-          fillColor: WidgetStateProperty.resolveWith<Color>((states) {
-            if (states.contains(WidgetState.selected)) {
-              return CustomTheme.primaryColor;
-            }
-            return CustomTheme.textColor;
-          }),
-        ),
         colorScheme: ColorScheme.fromSeed(
           seedColor: CustomTheme.primaryColor,
           brightness: Brightness.dark,
-          primary: CustomTheme.primaryColor,
-          onPrimary: CustomTheme.textColor,
-          surface: CustomTheme.backgroundColor,
-          onSurface: CustomTheme.textColor,
-        ),
+        ).copyWith(surface: CustomTheme.backgroundColor),
         pageTransitionsTheme: const PageTransitionsTheme(
           builders: {
             TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),

lib/presentation/views/main_menu/custom_navigation_bar.dart

@@ -1,8 +1,10 @@
+import 'dart:ui';
+
 import 'package:flutter/material.dart';
 import 'package:tallee/core/adaptive_page_route.dart';
 import 'package:tallee/core/custom_theme.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/group_view/group_view.dart';
+import 'package:tallee/presentation/views/main_menu/group_view/groups_view.dart';
 import 'package:tallee/presentation/views/main_menu/home_view.dart';
 import 'package:tallee/presentation/views/main_menu/match_view/match_view.dart';
 import 'package:tallee/presentation/views/main_menu/settings_view/settings_view.dart';
@@ -38,7 +40,7 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
       ),
       KeyedSubtree(
         key: ValueKey('groups_$tabKeyCount'),
-        child: const GroupView(),
+        child: const GroupsView(),
       ),
       KeyedSubtree(
         key: ValueKey('stats_$tabKeyCount'),
@@ -73,28 +75,66 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
       backgroundColor: CustomTheme.backgroundColor,
       body: tabs[currentIndex],
       extendBody: true,
-      bottomNavigationBar: Container(
-        height: 115,
+      bottomNavigationBar: SizedBox(
+        height: 70 + MediaQuery.of(context).padding.bottom,
+        child: Stack(
+          children: [
+            // Dynamically generated blur layers for ultra-smooth transition
+            ...List.generate(34, (index) {
+              // Use cubic curve for an even more natural, smoother transition
+              final progress = index / 34.0; // 0.0 to 1.0
+              final cubic = progress * progress * progress; // cubic curve
+              final blurStrength =
+                  0.5 + (cubic * 50.0); // Very smooth from 0.5 to 50.5
+
+              // Height goes completely from 100% to 0% (all the way down)
+              // With extra density at the bottom for softer transition
+              final heightFactor = index < 25
+                  // First 25 layers: 100% to 30%
+                  ? 1.0 - (progress * 0.7)
+                  // Last 10 layers: 30% to 0% (denser)
+                  : 0.3 - ((index - 25) / 34.0);
+
+              return Positioned(
+                left: 0,
+                right: 0,
+                bottom: 0,
+                height:
+                    (70 + MediaQuery.of(context).padding.bottom) *
+                    heightFactor.clamp(0.05, 1.0),
+                child: ClipRect(
+                  child: BackdropFilter(
+                    filter: ImageFilter.blur(
+                      sigmaX: blurStrength,
+                      sigmaY: blurStrength,
+                    ),
+                    child: Container(color: Colors.transparent),
+                  ),
+                ),
+              );
+            }),
+            // Gradient overlay
+            Positioned.fill(
+              child: Container(
                 decoration: BoxDecoration(
-          color: CustomTheme.navBarBackgroundColor,
-          border: Border.all(
-            strokeAlign: BorderSide.strokeAlignOutside,
-            color: CustomTheme.boxBorderColor,
-            width: 2,
-          ),
-          borderRadius: const BorderRadius.only(
-            topLeft: Radius.circular(30),
-            topRight: Radius.circular(30),
-          ),
-          boxShadow: [
-            BoxShadow(
-              color: Colors.black.withValues(alpha: 0.1),
-              blurRadius: 20,
-              offset: const Offset(0, -5),
-            ),
+                  gradient: LinearGradient(
+                    begin: Alignment.bottomCenter,
+                    end: Alignment.topCenter,
+                    colors: [
+                      CustomTheme.boxColor.withValues(alpha: 1),
+                      CustomTheme.boxColor.withValues(alpha: 0.5),
+                      CustomTheme.boxColor.withValues(alpha: 0.2),
+                      CustomTheme.boxColor.withValues(alpha: 0.0),
                     ],
+                    stops: const [0.0, 0.4, 0.8, 1],
                   ),
-        child: SafeArea(
+                ),
+              ),
+            ),
+            // Navbar content
+            SafeArea(
+              child: SizedBox(
+                height: 70,
                 child: Row(
                   mainAxisAlignment: MainAxisAlignment.spaceAround,
                   children: <Widget>[
@@ -130,6 +170,9 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
                 ),
               ),
             ),
+          ],
+        ),
+      ),
     );
   }
 

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

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:tallee/core/constants.dart';
 import 'package:tallee/core/custom_theme.dart';
 import 'package:tallee/core/enums.dart';
 import 'package:tallee/data/db/database.dart';
@@ -11,10 +12,8 @@ import 'package:tallee/presentation/widgets/player_selection.dart';
 import 'package:tallee/presentation/widgets/text_input/text_input_field.dart';
 
 class CreateGroupView extends StatefulWidget {
-  const CreateGroupView({super.key, this.groupToEdit});
-
-  /// The group to edit, if any
-  final Group? groupToEdit;
+  /// A view that allows the user to create a new group
+  const CreateGroupView({super.key});
 
   @override
   State<CreateGroupView> createState() => _CreateGroupViewState();
@@ -23,29 +22,16 @@ 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(() {});
     });
@@ -61,58 +47,10 @@ 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(
-            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);
-                            }
-                          }
-                        });
-                      }
-                    },
-                  ),
-                ],
-        ),
+        appBar: AppBar(title: Text(loc.create_new_group)),
         body: SafeArea(
           child: Column(
             mainAxisAlignment: MainAxisAlignment.start,
@@ -122,11 +60,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];
@@ -135,9 +73,7 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                 ),
               ),
               CustomWidthButton(
-                text: widget.groupToEdit == null
-                    ? loc.create_group
-                    : loc.edit_group,
+                text: loc.create_group,
                 sizeRelativeToWidth: 0.95,
                 buttonType: ButtonType.primary,
                 onPressed:
@@ -145,37 +81,29 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                         (selectedPlayers.length < 2))
                     ? null
                     : () async {
-                        late Group? updatedGroup;
-                        late bool success;
-                        if (widget.groupToEdit == null) {
-                          success = await db.groupDao.addGroup(
+                        bool success = await db.groupDao.addGroup(
                           group: Group(
                             name: _groupNameController.text.trim(),
+                            description: '',
                             members: selectedPlayers,
                           ),
                         );
-                        } 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);
+                          Navigator.pop(context);
                         } else {
-                          showSnackbar(
-                            message: widget.groupToEdit == null
-                                ? loc.error_creating_group
-                                : loc.error_editing_group,
+                          ScaffoldMessenger.of(context).showSnackBar(
+                            SnackBar(
+                              backgroundColor: CustomTheme.boxColor,
+                              content: Center(
+                                child: Text(
+                                  AppLocalizations.of(
+                                    context,
+                                  ).error_creating_group,
+                                  style: const TextStyle(color: Colors.white),
+                                ),
+                              ),
+                            ),
                           );
                         }
                       },
@@ -187,20 +115,4 @@ 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_profile_view.dart

@@ -1,14 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
-import 'package:tallee/core/adaptive_page_route.dart';
 import 'package:tallee/core/custom_theme.dart';
 import 'package:tallee/data/db/database.dart';
 import 'package:tallee/data/dto/group.dart';
 import 'package:tallee/data/dto/match.dart';
 import 'package:tallee/data/dto/player.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/group_view/create_group_view.dart';
 import 'package:tallee/presentation/widgets/app_skeleton.dart';
 import 'package:tallee/presentation/widgets/buttons/animated_dialog_button.dart';
 import 'package:tallee/presentation/widgets/buttons/main_menu_button.dart';
@@ -17,10 +15,10 @@ import 'package:tallee/presentation/widgets/custom_alert_dialog.dart';
 import 'package:tallee/presentation/widgets/tiles/info_tile.dart';
 import 'package:tallee/presentation/widgets/tiles/text_icon_tile.dart';
 
-class GroupDetailView extends StatefulWidget {
+class GroupProfileView extends StatefulWidget {
   /// A view that displays the profile of a group
   /// - [group]: The group to display
-  const GroupDetailView({
+  const GroupProfileView({
     super.key,
     required this.group,
     required this.callback,
@@ -32,24 +30,21 @@ class GroupDetailView extends StatefulWidget {
   final VoidCallback callback;
 
   @override
-  State<GroupDetailView> createState() => _GroupDetailViewState();
+  State<GroupProfileView> createState() => _GroupProfileViewState();
 }
 
-class _GroupDetailViewState extends State<GroupDetailView> {
+class _GroupProfileViewState extends State<GroupProfileView> {
   late final AppDatabase db;
   bool isLoading = true;
-  late Group _group;
 
   /// Total matches played in this group
   int totalMatches = 0;
 
-  /// The best player in this group
   String bestPlayer = '';
 
   @override
   void initState() {
     super.initState();
-    _group = widget.group;
     db = Provider.of<AppDatabase>(context, listen: false);
     _loadStatistics();
   }
@@ -92,7 +87,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                 ),
               ).then((confirmed) async {
                 if (confirmed! && context.mounted) {
-                  await db.groupDao.deleteGroup(groupId: _group.id);
+                  await db.groupDao.deleteGroup(groupId: widget.group.id);
                   if (!context.mounted) return;
                   Navigator.pop(context);
                   widget.callback.call();
@@ -123,7 +118,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                 ),
                 const SizedBox(height: 10),
                 Text(
-                  _group.name,
+                  widget.group.name,
                   style: const TextStyle(
                     fontSize: 28,
                     fontWeight: FontWeight.bold,
@@ -133,7 +128,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                 ),
                 const SizedBox(height: 5),
                 Text(
-                  '${loc.created_on} ${DateFormat.yMMMd(Localizations.localeOf(context).toString()).format(_group.createdAt)}',
+                  '${loc.created_on} ${DateFormat.yMMMd(Localizations.localeOf(context).toString()).format(widget.group.createdAt)}',
                   style: const TextStyle(
                     fontSize: 12,
                     color: CustomTheme.textColor,
@@ -150,7 +145,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                     crossAxisAlignment: WrapCrossAlignment.start,
                     spacing: 12,
                     runSpacing: 8,
-                    children: _group.members.map((member) {
+                    children: widget.group.members.map((member) {
                       return TextIconTile(
                         text: member.name,
                         iconEnabled: false,
@@ -168,7 +163,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                       children: [
                         _buildStatRow(
                           loc.members,
-                          _group.members.length.toString(),
+                          widget.group.members.length.toString(),
                         ),
                         _buildStatRow(
                           loc.played_matches,
@@ -186,22 +181,19 @@ class _GroupDetailViewState extends State<GroupDetailView> {
               child: MainMenuButton(
                 text: loc.edit_group,
                 icon: Icons.edit,
-                onPressed: () async {
-                  final updatedGroup = await Navigator.push<Group?>(
+                onPressed: () {
+                  // TODO: Uncomment when GroupDetailView is implemented
+                  /*
+                  await Navigator.push(
                     context,
                     adaptivePageRoute(
                       builder: (context) {
-                        return CreateGroupView(groupToEdit: _group);
+
+                        return const GroupDetailView();
                       },
                     ),
-                  );
-                  if (updatedGroup != null && mounted) {
-                    setState(() {
-                      _group = updatedGroup;
-                    });
-                    _loadStatistics();
-                    widget.callback();
-                  }
+                  );*/
+                  print('Edit Group pressed');
                 },
               ),
             ),
@@ -244,7 +236,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
   Future<void> _loadStatistics() async {
     final matches = await db.matchDao.getAllMatches();
     final groupMatches = matches
-        .where((match) => match.group?.id == _group.id)
+        .where((match) => match.group?.id == widget.group.id)
         .toList();
 
     setState(() {

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

@@ -8,21 +8,21 @@ import 'package:tallee/data/dto/group.dart';
 import 'package:tallee/data/dto/player.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
 import 'package:tallee/presentation/views/main_menu/group_view/create_group_view.dart';
-import 'package:tallee/presentation/views/main_menu/group_view/group_detail_view.dart';
+import 'package:tallee/presentation/views/main_menu/group_view/group_profile_view.dart';
 import 'package:tallee/presentation/widgets/app_skeleton.dart';
 import 'package:tallee/presentation/widgets/buttons/main_menu_button.dart';
 import 'package:tallee/presentation/widgets/tiles/group_tile.dart';
 import 'package:tallee/presentation/widgets/top_centered_message.dart';
 
-class GroupView extends StatefulWidget {
+class GroupsView extends StatefulWidget {
   /// A view that displays a list of groups
-  const GroupView({super.key});
+  const GroupsView({super.key});
 
   @override
-  State<GroupView> createState() => _GroupViewState();
+  State<GroupsView> createState() => _GroupsViewState();
 }
 
-class _GroupViewState extends State<GroupView> {
+class _GroupsViewState extends State<GroupsView> {
   late final AppDatabase db;
 
   /// Loaded groups from the database
@@ -35,7 +35,8 @@ class _GroupViewState extends State<GroupView> {
     7,
     Group(
       name: 'Skeleton Group',
-      members: List.filled(6, Player(name: 'Skeleton Player')),
+      description: '',
+      members: List.filled(6, Player(name: 'Skeleton Player', description: '')),
     ),
   );
 
@@ -82,7 +83,7 @@ class _GroupViewState extends State<GroupView> {
                         context,
                         adaptivePageRoute(
                           builder: (context) {
-                            return GroupDetailView(
+                            return GroupProfileView(
                               group: groups[index],
                               callback: loadGroups,
                             );

lib/presentation/views/main_menu/home_view.dart

@@ -2,7 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:tallee/core/adaptive_page_route.dart';
 import 'package:tallee/core/constants.dart';
+import 'package:tallee/core/enums.dart';
 import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/dto/game.dart';
 import 'package:tallee/data/dto/group.dart';
 import 'package:tallee/data/dto/match.dart';
 import 'package:tallee/data/dto/player.dart';
@@ -40,13 +42,16 @@ class _HomeViewState extends State<HomeView> {
     2,
     Match(
       name: 'Skeleton Match',
+      game: Game(name: '', ruleset: Ruleset.singleWinner, description: '', color: GameColor.blue, icon: ''),
       group: Group(
         name: 'Skeleton Group',
+        description: '',
         members: [
-          Player(name: 'Skeleton Player 1'),
-          Player(name: 'Skeleton Player 2'),
+          Player(name: 'Skeleton Player 1', description: ''),
+          Player(name: 'Skeleton Player 2', description: ''),
         ],
       ),
+      notes: '',
     ),
   );
 
@@ -99,9 +104,7 @@ class _HomeViewState extends State<HomeView> {
                         if (recentMatches.isNotEmpty)
                           for (Match match in recentMatches)
                             Padding(
-                              padding: const EdgeInsets.symmetric(
-                                vertical: 6.0,
-                              ),
+                              padding: const EdgeInsets.symmetric(vertical: 6.0),
                               child: MatchTile(
                                 compact: true,
                                 width: constraints.maxWidth * 0.9,
@@ -110,19 +113,15 @@ class _HomeViewState extends State<HomeView> {
                                   await Navigator.of(context).push(
                                     adaptivePageRoute(
                                       fullscreenDialog: true,
-                                      builder: (context) =>
-                                          MatchResultView(match: match),
+                                      builder: (context) => MatchResultView(match: match),
                                     ),
                                   );
-                                  await updatedWinnerinRecentMatches(match.id);
+                                  await updatedWinnerInRecentMatches(match.id);
                                 },
                               ),
                             )
                         else
-                          Center(
-                            heightFactor: 5,
-                            child: Text(loc.no_recent_matches_available),
-                          ),
+                          Center(heightFactor: 5, child: Text(loc.no_recent_matches_available)),
                       ],
                     ),
                   ),
@@ -138,40 +137,22 @@ class _HomeViewState extends State<HomeView> {
                         Row(
                           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                           children: [
-                            QuickCreateButton(
-                              text: 'Category 1',
-                              onPressed: () {},
-                            ),
-                            QuickCreateButton(
-                              text: 'Category 2',
-                              onPressed: () {},
-                            ),
+                            QuickCreateButton(text: 'Category 1', onPressed: () {}),
+                            QuickCreateButton(text: 'Category 2', onPressed: () {}),
                           ],
                         ),
                         Row(
                           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                           children: [
-                            QuickCreateButton(
-                              text: 'Category 3',
-                              onPressed: () {},
-                            ),
-                            QuickCreateButton(
-                              text: 'Category 4',
-                              onPressed: () {},
-                            ),
+                            QuickCreateButton(text: 'Category 3', onPressed: () {}),
+                            QuickCreateButton(text: 'Category 4', onPressed: () {}),
                           ],
                         ),
                         Row(
                           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                           children: [
-                            QuickCreateButton(
-                              text: 'Category 5',
-                              onPressed: () {},
-                            ),
-                            QuickCreateButton(
-                              text: 'Category 6',
-                              onPressed: () {},
-                            ),
+                            QuickCreateButton(text: 'Category 5', onPressed: () {}),
+                            QuickCreateButton(text: 'Category 6', onPressed: () {}),
                           ],
                         ),
                       ],
@@ -200,9 +181,7 @@ class _HomeViewState extends State<HomeView> {
       matchCount = results[0] as int;
       groupCount = results[1] as int;
       loadedRecentMatches = results[2] as List<Match>;
-      recentMatches =
-          (loadedRecentMatches
-                ..sort((a, b) => b.createdAt.compareTo(a.createdAt)))
+      recentMatches = (loadedRecentMatches..sort((a, b) => b.createdAt.compareTo(a.createdAt)))
           .take(2)
           .toList();
       if (mounted) {
@@ -214,7 +193,7 @@ class _HomeViewState extends State<HomeView> {
   }
 
   /// Updates the winner information for a specific match in the recent matches list.
-  Future<void> updatedWinnerinRecentMatches(String matchId) async {
+  Future<void> updatedWinnerInRecentMatches(String matchId) async {
     final db = Provider.of<AppDatabase>(context, listen: false);
     final winner = await db.matchDao.getWinner(matchId: matchId);
     final matchIndex = recentMatches.indexWhere((match) => match.id == matchId);

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

@@ -5,6 +5,7 @@ import 'package:tallee/core/constants.dart';
 import 'package:tallee/core/custom_theme.dart';
 import 'package:tallee/core/enums.dart';
 import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/dto/game.dart';
 import 'package:tallee/data/dto/group.dart';
 import 'package:tallee/data/dto/match.dart';
 import 'package:tallee/data/dto/player.dart';
@@ -20,14 +21,11 @@ import 'package:tallee/presentation/widgets/tiles/choose_tile.dart';
 class CreateMatchView extends StatefulWidget {
   /// A view that allows creating a new match
   /// [onWinnerChanged]: Optional callback invoked when the winner is changed
-  const CreateMatchView({super.key, this.onWinnerChanged, this.match});
+  const CreateMatchView({super.key, this.onWinnerChanged});
 
   /// Optional callback invoked when the winner is changed
   final VoidCallback? onWinnerChanged;
 
-  /// An optional match to prefill the fields
-  final Match? match;
-
   @override
   State<CreateMatchView> createState() => _CreateMatchViewState();
 }
@@ -65,10 +63,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   int selectedGameIndex = -1;
 
   /// The currently selected players
-  List<Player>? selectedPlayers;
-
-  /// GlobalKey for ScaffoldMessenger to show snackbars
-  final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
+  List<Player> selectedPlayers = [];
 
   @override
   void initState() {
@@ -89,20 +84,6 @@ class _CreateMatchViewState extends State<CreateMatchView> {
         filteredPlayerList = List.from(playerList);
       });
     });
-
-    // If a match is provided, prefill the fields
-    if (widget.match != null) {
-      final match = widget.match!;
-      _matchNameController.text = match.name;
-      selectedGroup = match.group;
-      selectedGroupId = match.group?.id ?? '';
-      selectedPlayers = match.players ?? [];
-      if (selectedGroup != null) {
-        filteredPlayerList = playerList
-            .where((p) => !selectedGroup!.members.any((m) => m.id == p.id))
-            .toList();
-      }
-    }
   }
 
   @override
@@ -119,19 +100,14 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   }
 
   List<(String, String, Ruleset)> games = [
-    ('Example Game 1', 'This is a description', Ruleset.leastPoints),
+    ('Example Game 1', 'This is a description', Ruleset.lowestScore),
     ('Example Game 2', '', Ruleset.singleWinner),
   ];
 
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
-    final buttonText = widget.match != null
-        ? loc.save_changes
-        : loc.create_match;
-
     return ScaffoldMessenger(
-      key: _scaffoldMessengerKey,
       child: Scaffold(
         resizeToAvoidBottomInset: false,
         backgroundColor: CustomTheme.backgroundColor,
@@ -202,7 +178,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
               Expanded(
                 child: PlayerSelection(
                   key: ValueKey(selectedGroup?.id ?? 'no_group'),
-                  initialSelectedPlayers: selectedPlayers ?? [],
+                  initialSelectedPlayers: selectedPlayers,
                   availablePlayers: filteredPlayerList,
                   onChanged: (value) {
                     setState(() {
@@ -212,12 +188,60 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                 ),
               ),
               CustomWidthButton(
-                text: buttonText,
+                text: loc.create_match,
                 sizeRelativeToWidth: 0.95,
                 buttonType: ButtonType.primary,
                 onPressed: _enableCreateGameButton()
-                    ? () {
-                        buttonNavigation(context);
+                    ? () async {
+                  // Use a game from the games list
+                  Game? gameToUse;
+                  if (selectedGameIndex == -1) {
+                    // Use the first game as default if none selected
+                    final selectedGame = games[0];
+                    gameToUse = Game(
+                      name: selectedGame.$1,
+                      description: selectedGame.$2,
+                      ruleset: selectedGame.$3,
+                      color: GameColor.blue,
+                      icon: '',
+                    );
+                  } else {
+                    // Use the selected game from the list
+                    final selectedGame = games[selectedGameIndex];
+                    gameToUse = Game(
+                      name: selectedGame.$1,
+                      description: selectedGame.$2,
+                      ruleset: selectedGame.$3,
+                      color: GameColor.blue,
+                      icon: '',
+                    );
+                  }
+                  // Add the game to the database if it doesn't exist
+                  await db.gameDao.addGame(game: gameToUse);
+
+                  Match match = Match(
+                    name: _matchNameController.text.isEmpty
+                        ? (hintText ?? '')
+                        : _matchNameController.text.trim(),
+                    createdAt: DateTime.now(),
+                    game: gameToUse,
+                    group: selectedGroup,
+                    players: selectedPlayers,
+                    notes: '',
+                  );
+                  await db.matchDao.addMatch(match: match);
+                  if (context.mounted) {
+                    Navigator.pushReplacement(
+                      context,
+                      adaptivePageRoute(
+                        fullscreenDialog: true,
+                        builder: (context) => MatchResultView(
+                          match: match,
+                          onWinnerChanged: widget.onWinnerChanged,
+                        ),
+                      ),
+                    );
+                  }
                 }
                     : null,
               ),
@@ -235,35 +259,6 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   /// - Either a group is selected OR at least 2 players are selected
   bool _enableCreateGameButton() {
     return (selectedGroup != null ||
-        (selectedPlayers != null && selectedPlayers!.length > 1));
-  }
-
-  void buttonNavigation(BuildContext context) async {
-    if (widget.match != null) {
-      // TODO: Implement updating match logic here
-      Navigator.pop(context);
-    } else {
-      Match match = Match(
-        name: _matchNameController.text.isEmpty
-            ? (hintText ?? '')
-            : _matchNameController.text.trim(),
-        createdAt: DateTime.now(),
-        group: selectedGroup,
-        players: selectedPlayers,
-      );
-      await db.matchDao.addMatch(match: match);
-      if (context.mounted) {
-        Navigator.pushReplacement(
-          context,
-          adaptivePageRoute(
-            fullscreenDialog: true,
-            builder: (context) => MatchResultView(
-              match: match,
-              onWinnerChanged: widget.onWinnerChanged,
-            ),
-          ),
-        );
-      }
-    }
+        (selectedPlayers.length > 1));
   }
 }

lib/presentation/views/main_menu/match_view/match_detail_view.dart

@@ -1,285 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:tallee/core/adaptive_page_route.dart';
-import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/data/db/database.dart';
-import 'package:tallee/data/dto/match.dart';
-import 'package:tallee/data/dto/player.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/create_match/create_match_view.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/match_result_view.dart';
-import 'package:tallee/presentation/widgets/buttons/animated_dialog_button.dart';
-import 'package:tallee/presentation/widgets/buttons/main_menu_button.dart';
-import 'package:tallee/presentation/widgets/colored_icon_container.dart';
-import 'package:tallee/presentation/widgets/custom_alert_dialog.dart';
-import 'package:tallee/presentation/widgets/tiles/info_tile.dart';
-import 'package:tallee/presentation/widgets/tiles/text_icon_tile.dart';
-
-class MatchDetailView extends StatefulWidget {
-  /// A view that displays the profile of a match
-  /// - [match]: The match to display
-  /// - [callback]: Callback to refresh the match list
-  const MatchDetailView({
-    super.key,
-    required this.match,
-    required this.callback,
-  });
-
-  /// The match to display
-  final Match match;
-
-  /// Callback to refresh the match list
-  final VoidCallback callback;
-
-  @override
-  State<MatchDetailView> createState() => _MatchDetailViewState();
-}
-
-class _MatchDetailViewState extends State<MatchDetailView> {
-  late final AppDatabase db;
-
-  late Player? currentWinner;
-
-  /// All players who participated in the match
-  late final List<Player> allPlayers;
-
-  @override
-  void initState() {
-    super.initState();
-    db = Provider.of<AppDatabase>(context, listen: false);
-    allPlayers = _getAllPlayers();
-    currentWinner = widget.match.winner;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final loc = AppLocalizations.of(context);
-
-    return Scaffold(
-      backgroundColor: CustomTheme.backgroundColor,
-      appBar: AppBar(
-        title: Text(loc.match_profile),
-        actions: [
-          IconButton(
-            icon: const Icon(Icons.delete),
-            onPressed: () async {
-              showDialog<bool>(
-                context: context,
-                builder: (context) => CustomAlertDialog(
-                  title: '${loc.delete_match}?',
-                  content: loc.this_cannot_be_undone,
-                  actions: [
-                    AnimatedDialogButton(
-                      onPressed: () => Navigator.of(context).pop(false),
-                      child: Text(
-                        loc.cancel,
-                        style: const TextStyle(color: CustomTheme.textColor),
-                      ),
-                    ),
-                    AnimatedDialogButton(
-                      onPressed: () => Navigator.of(context).pop(true),
-                      child: Text(
-                        loc.delete,
-                        style: const TextStyle(
-                          color: CustomTheme.secondaryColor,
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ).then((confirmed) async {
-                if (confirmed! && context.mounted) {
-                  await db.matchDao.deleteMatch(matchId: widget.match.id);
-                  if (!context.mounted) return;
-                  Navigator.pop(context);
-                  widget.callback.call();
-                }
-              });
-            },
-          ),
-        ],
-      ),
-      body: SafeArea(
-        child: Stack(
-          alignment: Alignment.center,
-          children: [
-            ListView(
-              padding: const EdgeInsets.only(
-                left: 12,
-                right: 12,
-                top: 20,
-                bottom: 100,
-              ),
-              children: [
-                const Center(
-                  child: ColoredIconContainer(
-                    icon: Icons.sports_esports,
-                    containerSize: 55,
-                    iconSize: 38,
-                  ),
-                ),
-                const SizedBox(height: 10),
-                Text(
-                  widget.match.name,
-                  style: const TextStyle(
-                    fontSize: 28,
-                    fontWeight: FontWeight.bold,
-                    color: CustomTheme.textColor,
-                  ),
-                  textAlign: TextAlign.center,
-                ),
-                const SizedBox(height: 5),
-                Text(
-                  '${loc.created_on} ${DateFormat.yMMMd(Localizations.localeOf(context).toString()).format(widget.match.createdAt)}',
-                  style: const TextStyle(
-                    fontSize: 12,
-                    color: CustomTheme.textColor,
-                  ),
-                  textAlign: TextAlign.center,
-                ),
-                const SizedBox(height: 10),
-                if (widget.match.group != null) ...[
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      const Icon(Icons.group),
-                      const SizedBox(width: 8),
-                      Text(
-                        // TODO: Update after DB changes
-                        '${widget.match.group!.name} ${widget.match.players != null ? '+ ${widget.match.players!.length}' : ''}',
-                        style: const TextStyle(fontWeight: FontWeight.bold),
-                      ),
-                    ],
-                  ),
-                  const SizedBox(height: 20),
-                ],
-                InfoTile(
-                  title: loc.players,
-                  icon: Icons.people,
-                  horizontalAlignment: CrossAxisAlignment.start,
-                  content: Wrap(
-                    alignment: WrapAlignment.start,
-                    crossAxisAlignment: WrapCrossAlignment.start,
-                    spacing: 12,
-                    runSpacing: 8,
-                    children: allPlayers.map((player) {
-                      return TextIconTile(
-                        text: player.name,
-                        iconEnabled: false,
-                      );
-                    }).toList(),
-                  ),
-                ),
-                const SizedBox(height: 15),
-                InfoTile(
-                  title: loc.results,
-                  icon: Icons.emoji_events,
-                  content: Padding(
-                    padding: const EdgeInsets.symmetric(
-                      vertical: 4,
-                      horizontal: 8,
-                    ),
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        /// TODO: Implement different ruleset results display
-                        if (currentWinner != null) ...[
-                          Text(
-                            loc.winner,
-                            style: const TextStyle(
-                              fontSize: 16,
-                              color: CustomTheme.textColor,
-                            ),
-                          ),
-                          Text(
-                            currentWinner!.name,
-                            style: TextStyle(
-                              fontSize: 16,
-                              fontWeight: FontWeight.bold,
-                              color: widget.match.winner != null
-                                  ? CustomTheme.primaryColor
-                                  : CustomTheme.textColor,
-                            ),
-                          ),
-                        ] else ...[
-                          Text(
-                            loc.no_results_entered_yet,
-                            style: const TextStyle(
-                              fontSize: 14,
-                              color: CustomTheme.textColor,
-                            ),
-                          ),
-                        ],
-                      ],
-                    ),
-                  ),
-                ),
-              ],
-            ),
-            Positioned(
-              bottom: MediaQuery.paddingOf(context).bottom,
-              child: Row(
-                children: [
-                  MainMenuButton(
-                    icon: Icons.edit,
-                    onPressed: () => Navigator.push(
-                      context,
-                      adaptivePageRoute(
-                        fullscreenDialog: true,
-                        builder: (context) =>
-                            CreateMatchView(match: widget.match),
-                      ),
-                    ),
-                  ),
-                  const SizedBox(width: 15),
-                  MainMenuButton(
-                    text: loc.enter_results,
-                    icon: Icons.emoji_events,
-                    onPressed: () async {
-                      currentWinner = await Navigator.push(
-                        context,
-                        adaptivePageRoute(
-                          fullscreenDialog: true,
-                          builder: (context) => MatchResultView(
-                            match: widget.match,
-                            onWinnerChanged: () {
-                              widget.callback.call();
-                              setState(() {});
-                            },
-                          ),
-                        ),
-                      );
-                    },
-                  ),
-                ],
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  /// Gets all players who participated in the match (from group and individual players)
-  List<Player> _getAllPlayers() {
-    final List<Player> players = [];
-
-    // Add group members if group exists
-    if (widget.match.group != null) {
-      players.addAll(widget.match.group!.members);
-    }
-
-    // Add individual players
-    if (widget.match.players != null) {
-      for (var player in widget.match.players!) {
-        // Avoid duplicates
-        if (!players.any((p) => p.id == player.id)) {
-          players.add(player);
-        }
-      }
-    }
-
-    return players;
-  }
-}

lib/presentation/views/main_menu/match_view/match_result_view.dart

@@ -54,7 +54,7 @@ class _MatchResultViewState extends State<MatchResultView> {
           icon: const Icon(Icons.close),
           onPressed: () {
             widget.onWinnerChanged?.call();
-            Navigator.of(context).pop(_selectedPlayer);
+            Navigator.of(context).pop();
           },
         ),
         title: Text(widget.match.name),
@@ -74,7 +74,7 @@ class _MatchResultViewState extends State<MatchResultView> {
                 ),
                 decoration: BoxDecoration(
                   color: CustomTheme.boxColor,
-                  border: Border.all(color: CustomTheme.boxBorderColor),
+                  border: Border.all(color: CustomTheme.boxBorder),
                   borderRadius: BorderRadius.circular(12),
                 ),
                 child: Column(
@@ -153,12 +153,10 @@ class _MatchResultViewState extends State<MatchResultView> {
   List<Player> getAllPlayers(Match match) {
     List<Player> players = [];
 
-    if (match.group == null && match.players != null) {
-      players = [...match.players!];
-    } else if (match.group != null && match.players != null) {
-      players = [...match.players!, ...match.group!.members];
+    if (match.group == null) {
+      players = [...match.players];
     } else {
-      players = [...match.group!.members];
+      players = [...match.players, ...match.group!.members];
     }
 
     players.sort((a, b) => a.name.compareTo(b.name));

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

@@ -6,13 +6,15 @@ import 'package:provider/provider.dart';
 import 'package:tallee/core/adaptive_page_route.dart';
 import 'package:tallee/core/constants.dart';
 import 'package:tallee/core/custom_theme.dart';
+import 'package:tallee/core/enums.dart';
 import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/dto/game.dart';
 import 'package:tallee/data/dto/group.dart';
 import 'package:tallee/data/dto/match.dart';
 import 'package:tallee/data/dto/player.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
 import 'package:tallee/presentation/views/main_menu/match_view/create_match/create_match_view.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/match_detail_view.dart';
+import 'package:tallee/presentation/views/main_menu/match_view/match_result_view.dart';
 import 'package:tallee/presentation/widgets/app_skeleton.dart';
 import 'package:tallee/presentation/widgets/buttons/main_menu_button.dart';
 import 'package:tallee/presentation/widgets/tiles/match_tile.dart';
@@ -36,12 +38,15 @@ class _MatchViewState extends State<MatchView> {
     4,
     Match(
       name: 'Skeleton match name',
+      game: Game(name: '', ruleset: Ruleset.singleWinner, description: '', color: GameColor.blue, icon: ''),
       group: Group(
         name: 'Group name',
-        members: List.filled(5, Player(name: 'Player')),
+        description: '',
+        members: List.filled(5, Player(name: 'Player', description: '')),
       ),
-      winner: Player(name: 'Player'),
-      players: [Player(name: 'Player')],
+      winner: Player(name: 'Player', description: ''),
+      players: [Player(name: 'Player', description: '')],
+      notes: '',
     ),
   );
 
@@ -89,9 +94,10 @@ class _MatchViewState extends State<MatchView> {
                           Navigator.push(
                             context,
                             adaptivePageRoute(
-                              builder: (context) => MatchDetailView(
+                              fullscreenDialog: true,
+                              builder: (context) => MatchResultView(
                                 match: matches[index],
-                                callback: loadGames,
+                                onWinnerChanged: loadGames,
                               ),
                             ),
                           );
@@ -127,7 +133,6 @@ class _MatchViewState extends State<MatchView> {
 
   /// Loads the games from the database and sorts them by creation date.
   void loadGames() {
-    isLoading = true;
     Future.wait([
       db.matchDao.getAllMatches(),
       Future.delayed(Constants.MINIMUM_SKELETON_DURATION),

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

@@ -1396,13 +1396,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// cross_file 0.3.5+2
+/// cross_file 0.3.5+1
 const _cross_file = Package(
     name: 'cross_file',
     description: 'An abstraction to allow working with files across multiple platforms.',
     repository: 'https://github.com/flutter/packages/tree/main/packages/cross_file',
     authors: [],
-    version: '0.3.5+2',
+    version: '0.3.5+1',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -1628,13 +1628,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// dbus 0.7.12
+/// dbus 0.7.11
 const _dbus = Package(
     name: 'dbus',
     description: 'A native Dart implementation of the D-Bus message bus client. This package allows Dart applications to directly access services on the Linux desktop.',
     homepage: 'https://github.com/canonical/dbus.dart',
     authors: [],
-    version: '0.7.12',
+    version: '0.7.11',
     spdxIdentifiers: ['MPL-2.0'],
     isMarkdown: false,
     isSdk: false,
@@ -2015,7 +2015,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
   defined by the Mozilla Public License, v. 2.0.''',
   );
 
-/// dio 5.9.1
+/// dio 5.9.0
 const _dio = Package(
     name: 'dio',
     description: '''A powerful HTTP networking package,
@@ -2026,7 +2026,7 @@ Custom adapters, Transformers, etc.
     homepage: 'https://github.com/cfug/dio',
     repository: 'https://github.com/cfug/dio/blob/main/dio',
     authors: [],
-    version: '5.9.1',
+    version: '5.9.0',
     spdxIdentifiers: ['MIT'],
     isMarkdown: false,
     isSdk: false,
@@ -2497,14 +2497,14 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// file_picker 10.3.10
+/// file_picker 10.3.8
 const _file_picker = Package(
     name: 'file_picker',
     description: 'A package that allows you to use a native file explorer to pick single or multiple absolute file paths, with extension filtering support.',
     homepage: 'https://github.com/miguelpruivo/plugins_flutter_file_picker',
     repository: 'https://github.com/miguelpruivo/flutter_file_picker',
     authors: [],
-    version: '10.3.10',
+    version: '10.3.8',
     spdxIdentifiers: ['MIT'],
     isMarkdown: false,
     isSdk: false,
@@ -2947,13 +2947,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// hooks 1.0.1
+/// hooks 1.0.0
 const _hooks = Package(
     name: 'hooks',
     description: 'A library that contains a Dart API for the JSON-based protocol for `hook/build.dart` and `hook/link.dart`.',
     repository: 'https://github.com/dart-lang/native/tree/main/pkgs/hooks',
     authors: [],
-    version: '1.0.1',
+    version: '1.0.0',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -3271,13 +3271,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// json_annotation 4.10.0
+/// json_annotation 4.9.0
 const _json_annotation = Package(
     name: 'json_annotation',
     description: 'Classes and helper functions that support JSON code generation via the `json_serializable` package.',
     repository: 'https://github.com/google/json_serializable.dart/tree/master/json_annotation',
     authors: [],
-    version: '4.10.0',
+    version: '4.9.0',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -4085,13 +4085,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// objective_c 9.3.0
+/// objective_c 9.2.4
 const _objective_c = Package(
     name: 'objective_c',
     description: 'A library to access Objective C from Flutter that acts as a support library for package:ffigen.',
     repository: 'https://github.com/dart-lang/native/tree/main/pkgs/objective_c',
     authors: [],
-    version: '9.3.0',
+    version: '9.2.4',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -5869,13 +5869,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// source_span 1.10.2
+/// source_span 1.10.1
 const _source_span = Package(
     name: 'source_span',
     description: 'Provides a standard representation for source code locations and spans.',
     repository: 'https://github.com/dart-lang/tools/tree/main/pkgs/source_span',
     authors: [],
-    version: '1.10.2',
+    version: '1.10.1',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -7499,12 +7499,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.''',
   );
 
-/// tallee 0.0.16+250
+/// tallee 0.0.13+247
 const _tallee = Package(
     name: 'tallee',
     description: 'Tracking App for Card Games',
     authors: [],
-    version: '0.0.16+250',
+    version: '0.0.13+247',
     spdxIdentifiers: ['LGPL-3.0'],
     isMarkdown: false,
     isSdk: false,

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

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

lib/presentation/views/main_menu/statistics_view.dart

@@ -167,7 +167,7 @@ class _StatisticsViewState extends State<StatisticsView> {
       final playerId = winCounts[i].$1;
       final player = players.firstWhere(
         (p) => p.id == playerId,
-        orElse: () => Player(id: playerId, name: loc.not_available),
+        orElse: () => Player(id: playerId, name: loc.not_available, description: ''),
       );
       winCounts[i] = (player.name, winCounts[i].$2);
     }
@@ -202,8 +202,7 @@ class _StatisticsViewState extends State<StatisticsView> {
           }
         }
       }
-      if (match.players != null) {
-        final members = match.players!.map((p) => p.id).toList();
+      final members = match.players.map((p) => p.id).toList();
       for (var playerId in members) {
         final index = matchCounts.indexWhere((entry) => entry.$1 == playerId);
         // -1 means player not found in matchCounts
@@ -215,7 +214,6 @@ class _StatisticsViewState extends State<StatisticsView> {
           }
         }
     }
-    }
 
     // Adding all players with zero matches
     for (var player in players) {
@@ -231,7 +229,7 @@ class _StatisticsViewState extends State<StatisticsView> {
       final playerId = matchCounts[i].$1;
       final player = players.firstWhere(
         (p) => p.id == playerId,
-        orElse: () => Player(id: playerId, name: loc.not_available),
+        orElse: () => Player(id: playerId, name: loc.not_available, description: ''),
       );
       matchCounts[i] = (player.name, matchCounts[i].$2);
     }

lib/presentation/widgets/buttons/main_menu_button.dart

@@ -2,25 +2,25 @@ import 'package:flutter/material.dart';
 
 class MainMenuButton extends StatefulWidget {
   /// A button for the main menu with an optional icon and a press animation.
-  /// - [onPressed]: The callback to be invoked when the button is pressed.
-  /// - [icon]: The icon of the button.
   /// - [text]: The text of the button.
+  /// - [icon]: The icon of the button.
+  /// - [onPressed]: The callback to be invoked when the button is pressed.
   const MainMenuButton({
     super.key,
+    required this.text,
+    this.icon,
     required this.onPressed,
-    required this.icon,
-    this.text,
   });
 
+  /// The text of the button.
+  final String text;
+
+  /// The icon of the button.
+  final IconData? icon;
+
   /// The callback to be invoked when the button is pressed.
   final void Function() onPressed;
 
-  /// The icon of the button.
-  final IconData icon;
-
-  /// The text of the button.
-  final String? text;
-
   @override
   State<MainMenuButton> createState() => _MainMenuButtonState();
 }
@@ -71,11 +71,12 @@ class _MainMenuButtonState extends State<MainMenuButton>
             mainAxisSize: MainAxisSize.min,
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
+              if (widget.icon != null) ...[
                 Icon(widget.icon, size: 26, color: Colors.black),
-              if (widget.text != null) ...[
                 const SizedBox(width: 7),
+              ],
               Text(
-                  widget.text!,
+                widget.text,
                 style: const TextStyle(
                   fontSize: 18,
                   fontWeight: FontWeight.bold,
@@ -83,7 +84,6 @@ class _MainMenuButtonState extends State<MainMenuButton>
                 ),
               ),
             ],
-            ],
           ),
         ),
       ),

lib/presentation/widgets/custom_alert_dialog.dart

@@ -32,7 +32,7 @@ class CustomAlertDialog extends StatelessWidget {
       actionsAlignment: MainAxisAlignment.spaceAround,
       shape: RoundedRectangleBorder(
         borderRadius: CustomTheme.standardBorderRadiusAll,
-        side: const BorderSide(color: CustomTheme.boxBorderColor),
+        side: const BorderSide(color: CustomTheme.boxBorder),
       ),
     );
   }

lib/presentation/widgets/navbar_item.dart

@@ -87,17 +87,7 @@ class _NavbarItemState extends State<NavbarItem>
             mainAxisSize: MainAxisSize.min,
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              AnimatedContainer(
-                width: 50,
-                height: 50,
-                decoration: BoxDecoration(
-                  color: widget.isSelected
-                      ? CustomTheme.primaryColor.withAlpha(50)
-                      : Colors.transparent,
-                  borderRadius: const BorderRadius.all(Radius.circular(15)),
-                ),
-                duration: const Duration(milliseconds: 200),
-                child: ScaleTransition(
+              ScaleTransition(
                 scale: widget.isSelected
                     ? _scaleAnimation
                     : const AlwaysStoppedAnimation(1.0),
@@ -109,7 +99,7 @@ class _NavbarItemState extends State<NavbarItem>
                   size: 32,
                 ),
               ),
-              ),
+              const SizedBox(height: 4),
               Text(
                 widget.label,
                 style: TextStyle(

lib/presentation/widgets/player_selection.dart

@@ -62,7 +62,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
   /// Skeleton data used while loading players.
   late final List<Player> skeletonData = List.filled(
     7,
-    Player(name: 'Player 0'),
+    Player(name: 'Player 0', description: ''),
   );
 
   @override
@@ -70,7 +70,6 @@ class _PlayerSelectionState extends State<PlayerSelection> {
     super.initState();
     db = Provider.of<AppDatabase>(context, listen: false);
     suggestedPlayers = skeletonData;
-    selectedPlayers = widget.initialSelectedPlayers ?? [];
     loadPlayerList();
   }
 
@@ -101,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.any((p) => p.id == player.id);
+                    return !selectedPlayers.contains(player);
                   }).toList();
                 } else {
                   // If there is input, it filters by name match (case-insensitive) and ensures
@@ -110,7 +109,9 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                     final bool nameMatches = player.name.toLowerCase().contains(
                       value.toLowerCase(),
                     );
-                    final bool isNotSelected = !selectedPlayers.any((p) => p.id == player.id);
+                    final bool isNotSelected = !selectedPlayers.contains(
+                      player,
+                    );
                     return nameMatches && isNotSelected;
                   }).toList();
                 }
@@ -125,8 +126,6 @@ class _PlayerSelectionState extends State<PlayerSelection> {
           const SizedBox(height: 10),
           SizedBox(
             height: 50,
-            child: AppSkeleton(
-              enabled: isLoading,
             child: selectedPlayers.isEmpty
                 ? Center(child: Text(loc.no_players_selected))
                 : SingleChildScrollView(
@@ -168,7 +167,6 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                     ),
                   ),
           ),
-          ),
           const SizedBox(height: 10),
           Text(
             loc.all_players,
@@ -247,22 +245,8 @@ class _PlayerSelectionState extends State<PlayerSelection> {
             // Otherwise, use the loaded players from the database.
             loadedPlayers.sort((a, b) => a.name.compareTo(b.name));
             allPlayers = [...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;
         });
       });
@@ -276,7 +260,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
     final loc = AppLocalizations.of(context);
     final playerName = _searchBarController.text.trim();
 
-    final createdPlayer = Player(name: playerName);
+    final createdPlayer = Player(name: playerName, description: '');
     final success = await db.playerDao.addPlayer(player: createdPlayer);
 
     if (!context.mounted) return;

lib/presentation/widgets/text_input/custom_search_bar.dart

@@ -88,7 +88,7 @@ class CustomSearchBar extends StatelessWidget {
       ],
       backgroundColor: WidgetStateProperty.all(CustomTheme.boxColor),
       side: WidgetStateProperty.all(
-        const BorderSide(color: CustomTheme.boxBorderColor),
+        const BorderSide(color: CustomTheme.boxBorder),
       ),
       shape: WidgetStateProperty.all(
         RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),

lib/presentation/widgets/text_input/text_input_field.dart

@@ -44,11 +44,11 @@ class TextInputField extends StatelessWidget {
         counterText: '',
         enabledBorder: const OutlineInputBorder(
           borderRadius: BorderRadius.all(Radius.circular(12)),
-          borderSide: BorderSide(color: CustomTheme.boxBorderColor),
+          borderSide: BorderSide(color: CustomTheme.boxBorder),
         ),
         focusedBorder: const OutlineInputBorder(
           borderRadius: BorderRadius.all(Radius.circular(12)),
-          borderSide: BorderSide(color: CustomTheme.boxBorderColor),
+          borderSide: BorderSide(color: CustomTheme.boxBorder),
         ),
         floatingLabelBehavior: FloatingLabelBehavior.never,
       ),

lib/presentation/widgets/tiles/custom_radio_list_tile.dart

@@ -31,12 +31,16 @@ class CustomRadioListTile<T> extends StatelessWidget {
         padding: const EdgeInsets.symmetric(horizontal: 2),
         decoration: BoxDecoration(
           color: CustomTheme.boxColor,
-          border: Border.all(color: CustomTheme.boxBorderColor),
+          border: Border.all(color: CustomTheme.boxBorder),
           borderRadius: CustomTheme.standardBorderRadiusAll,
         ),
         child: Row(
           children: [
-            Radio<T>(value: value, toggleable: true),
+            Radio<T>(
+              value: value,
+              activeColor: CustomTheme.primaryColor,
+              toggleable: true,
+            ),
             Expanded(
               child: Text(
                 text,

lib/presentation/widgets/tiles/match_tile.dart

@@ -91,7 +91,7 @@ class _MatchTileState extends State<MatchTile> {
                   const SizedBox(width: 6),
                   Expanded(
                     child: Text(
-                      '${group.name}${widget.match.players != null ? ' + ${widget.match.players?.length}' : ''}',
+                      '${group.name} + ${widget.match.players.length}',
                       style: const TextStyle(fontSize: 14, color: Colors.grey),
                       overflow: TextOverflow.ellipsis,
                     ),
@@ -106,7 +106,7 @@ class _MatchTileState extends State<MatchTile> {
                   const SizedBox(width: 6),
                   Expanded(
                     child: Text(
-                      '${widget.match.players!.length} ${loc.players}',
+                      '${widget.match.players.length} ${loc.players}',
                       style: const TextStyle(fontSize: 14, color: Colors.grey),
                       overflow: TextOverflow.ellipsis,
                     ),
@@ -241,14 +241,12 @@ class _MatchTileState extends State<MatchTile> {
     final playerIds = <String>{};
 
     // Add players from game.players
-    if (widget.match.players != null) {
-      for (var player in widget.match.players!) {
+    for (var player in widget.match.players) {
       if (!playerIds.contains(player.id)) {
         allPlayers.add(player);
         playerIds.add(player.id);
       }
     }
-    }
 
     // Add players from game.group.players
     if (widget.match.group?.members != null) {

lib/services/data_transfer_service.dart

@@ -8,53 +8,65 @@ import 'package:json_schema/json_schema.dart';
 import 'package:provider/provider.dart';
 import 'package:tallee/core/enums.dart';
 import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/dto/game.dart';
 import 'package:tallee/data/dto/group.dart';
 import 'package:tallee/data/dto/match.dart';
 import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/data/dto/team.dart';
 
 class DataTransferService {
   /// Deletes all data from the database.
   static Future<void> deleteAllData(BuildContext context) async {
     final db = Provider.of<AppDatabase>(context, listen: false);
     await db.matchDao.deleteAllMatches();
+    await db.teamDao.deleteAllTeams();
     await db.groupDao.deleteAllGroups();
+    await db.gameDao.deleteAllGames();
     await db.playerDao.deleteAllPlayers();
   }
 
   /// Retrieves all application data and converts it to a JSON string.
-  /// Returns the JSON string representation of the data.
+  /// Returns the JSON string representation of the data in normalized format.
   static Future<String> getAppDataAsJson(BuildContext context) async {
     final db = Provider.of<AppDatabase>(context, listen: false);
     final matches = await db.matchDao.getAllMatches();
     final groups = await db.groupDao.getAllGroups();
     final players = await db.playerDao.getAllPlayers();
+    final games = await db.gameDao.getAllGames();
+    final teams = await db.teamDao.getAllTeams();
 
-    // Construct a JSON representation of the data
+    // Construct a JSON representation of the data in normalized format
     final Map<String, dynamic> jsonMap = {
       'players': players.map((p) => p.toJson()).toList(),
-
+      'games': games.map((g) => g.toJson()).toList(),
       'groups': groups
-          .map(
-            (g) => {
+          .map((g) => {
         'id': g.id,
         'name': g.name,
+        'description': g.description,
         'createdAt': g.createdAt.toIso8601String(),
         'memberIds': (g.members).map((m) => m.id).toList(),
-            },
-          )
+      })
+          .toList(),
+      'teams': teams
+          .map((t) => {
+        'id': t.id,
+        'name': t.name,
+        'createdAt': t.createdAt.toIso8601String(),
+        'memberIds': (t.members).map((m) => m.id).toList(),
+      })
           .toList(),
-
       'matches': matches
-          .map(
-            (m) => {
+          .map((m) => {
         'id': m.id,
         'name': m.name,
         'createdAt': m.createdAt.toIso8601String(),
+        'endedAt': m.endedAt?.toIso8601String(),
+        'gameId': m.game.id,
         'groupId': m.group?.id,
-              'playerIds': (m.players ?? []).map((p) => p.id).toList(),
-              'winnerId': m.winner?.id,
-            },
-          )
+        'playerIds': m.players.map((p) => p.id).toList(),
+        'notes': m.notes,
+      })
           .toList(),
     };
 
@@ -68,7 +80,7 @@ class DataTransferService {
   /// [fileName] The desired name for the exported file (without extension).
   static Future<ExportResult> exportData(
       String jsonString,
-    String fileName,
+      String fileName
       ) async {
     try {
       final bytes = Uint8List.fromList(utf8.encode(jsonString));
@@ -82,6 +94,7 @@ class DataTransferService {
       } else {
         return ExportResult.success;
       }
+
     } catch (e, stack) {
       print('[exportData] $e');
       print(stack);
@@ -109,17 +122,15 @@ class DataTransferService {
       final isValid = await _validateJsonSchema(jsonString);
       if (!isValid) return ImportResult.invalidSchema;
 
-      final Map<String, dynamic> decoded =
-          json.decode(jsonString) as Map<String, dynamic>;
+      final Map<String, dynamic> decoded = json.decode(jsonString) as Map<String, dynamic>;
 
-      final List<dynamic> playersJson =
-          (decoded['players'] as List<dynamic>?) ?? [];
-      final List<dynamic> groupsJson =
-          (decoded['groups'] as List<dynamic>?) ?? [];
-      final List<dynamic> matchesJson =
-          (decoded['matches'] as List<dynamic>?) ?? [];
+      final List<dynamic> playersJson = (decoded['players'] as List<dynamic>?) ?? [];
+      final List<dynamic> gamesJson = (decoded['games'] as List<dynamic>?) ?? [];
+      final List<dynamic> groupsJson = (decoded['groups'] as List<dynamic>?) ?? [];
+      final List<dynamic> teamsJson = (decoded['teams'] as List<dynamic>?) ?? [];
+      final List<dynamic> matchesJson = (decoded['matches'] as List<dynamic>?) ?? [];
 
-      // Players
+      // Import Players
       final List<Player> importedPlayers = playersJson
           .map((p) => Player.fromJson(p as Map<String, dynamic>))
           .toList();
@@ -128,11 +139,19 @@ class DataTransferService {
         for (final p in importedPlayers) p.id: p,
       };
 
-      // Groups
+      // Import Games
+      final List<Game> importedGames = gamesJson
+          .map((g) => Game.fromJson(g as Map<String, dynamic>))
+          .toList();
+
+      final Map<String, Game> gameById = {
+        for (final g in importedGames) g.id: g,
+      };
+
+      // Import Groups
       final List<Group> importedGroups = groupsJson.map((g) {
         final map = g as Map<String, dynamic>;
-        final memberIds = (map['memberIds'] as List<dynamic>? ?? [])
-            .cast<String>();
+        final memberIds = (map['memberIds'] as List<dynamic>? ?? []).cast<String>();
 
         final members = memberIds
             .map((id) => playerById[id])
@@ -142,6 +161,7 @@ class DataTransferService {
         return Group(
           id: map['id'] as String,
           name: map['name'] as String,
+          description: map['description'] as String,
           members: members,
           createdAt: DateTime.parse(map['createdAt'] as String),
         );
@@ -151,34 +171,57 @@ class DataTransferService {
         for (final g in importedGroups) g.id: g,
       };
 
-      // Matches
+      // Import Teams
+      final List<Team> importedTeams = teamsJson.map((t) {
+        final map = t as Map<String, dynamic>;
+        final memberIds = (map['memberIds'] as List<dynamic>? ?? []).cast<String>();
+
+        final members = memberIds
+            .map((id) => playerById[id])
+            .whereType<Player>()
+            .toList();
+
+        return Team(
+          id: map['id'] as String,
+          name: map['name'] as String,
+          members: members,
+          createdAt: DateTime.parse(map['createdAt'] as String),
+        );
+      }).toList();
+
+      // Import Matches
       final List<Match> importedMatches = matchesJson.map((m) {
         final map = m as Map<String, dynamic>;
 
+        final String gameId = map['gameId'] as String;
         final String? groupId = map['groupId'] as String?;
-        final List<String> playerIds =
-            (map['playerIds'] as List<dynamic>? ?? []).cast<String>();
-        final String? winnerId = map['winnerId'] as String?;
+        final List<String> playerIds = (map['playerIds'] as List<dynamic>? ?? []).cast<String>();
+        final DateTime? endedAt = map['endedAt'] != null ? DateTime.parse(map['endedAt'] as String) : null;
 
+        final game = gameById[gameId];
         final group = (groupId == null) ? null : groupById[groupId];
         final players = playerIds
             .map((id) => playerById[id])
             .whereType<Player>()
             .toList();
-        final winner = (winnerId == null) ? null : playerById[winnerId];
 
         return Match(
           id: map['id'] as String,
           name: map['name'] as String,
+          game: game ?? Game(name: 'Unknown', ruleset: Ruleset.singleWinner, description: '', color: GameColor.blue, icon: ''),
           group: group,
           players: players,
           createdAt: DateTime.parse(map['createdAt'] as String),
-          winner: winner,
+          endedAt: endedAt,
+          notes: map['notes'] as String? ?? '',
         );
       }).toList();
 
+      // Import all data into the database
       await db.playerDao.addPlayersAsList(players: importedPlayers);
+      await db.gameDao.addGamesAsList(games: importedGames);
       await db.groupDao.addGroupsAsList(groups: importedGroups);
+      await db.teamDao.addTeamsAsList(teams: importedTeams);
       await db.matchDao.addMatchAsList(matches: importedMatches);
 
       return ImportResult.success;

pubspec.yaml

@@ -1,7 +1,7 @@
 name: tallee
 description: "Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.16+250
+version: 0.0.14+248
 
 environment:
   sdk: ^3.8.1

test/db_tests/game_test.dart

@@ -1,362 +1,542 @@
 import 'package:clock/clock.dart';
-import 'package:drift/drift.dart';
+import 'package:drift/drift.dart' hide isNull;
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:tallee/core/enums.dart';
 import 'package:tallee/data/db/database.dart';
-import 'package:tallee/data/dto/group.dart';
-import 'package:tallee/data/dto/match.dart';
-import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/data/dto/game.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 testMatch1;
-  late Match testMatch2;
-  late Match testMatchOnlyPlayers;
-  late Match testMatchOnlyGroup;
-  final fixedDate = DateTime(2025, 19, 11, 00, 11, 23);
+  late Game testGame1;
+  late Game testGame2;
+  late Game testGame3;
+  final fixedDate = DateTime(2025, 11, 19, 00, 11, 23);
   final fakeClock = Clock(() => fixedDate);
 
-  setUp(() async {
+  setUp(() {
     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 2',
-        members: [testPlayer1, testPlayer2, testPlayer3],
+      testGame1 = Game(
+        name: 'Chess',
+        ruleset: Ruleset.singleWinner,
+        description: 'A classic strategy game',
+        color: GameColor.blue,
+        icon: 'chess_icon',
       );
-      testGroup2 = Group(
-        name: 'Test Group 2',
-        members: [testPlayer4, testPlayer5],
+      testGame2 = Game(
+        id: 'game2',
+        name: 'Poker',
+        ruleset: Ruleset.multipleWinners,
+        description: 'Card game with multiple winners',
+        color: GameColor.red,
+        icon: 'poker_icon',
       );
-      testMatch1 = Match(
-        name: 'First Test Match',
-        group: testGroup1,
-        players: [testPlayer4, testPlayer5],
-        winner: testPlayer4,
-      );
-      testMatch2 = Match(
-        name: 'Second Test Match',
-        group: testGroup2,
-        players: [testPlayer1, testPlayer2, testPlayer3],
-        winner: testPlayer2,
-      );
-      testMatchOnlyPlayers = Match(
-        name: 'Test Match with Players',
-        players: [testPlayer1, testPlayer2, testPlayer3],
-        winner: testPlayer3,
-      );
-      testMatchOnlyGroup = Match(
-        name: 'Test Match with Group',
-        group: testGroup2,
+      testGame3 = Game(
+        id: 'game3',
+        name: 'Monopoly',
+        ruleset: Ruleset.highestScore,
+        description: 'A board game about real estate',
+        color: GameColor.orange,
+        icon: '',
       );
     });
-    await database.playerDao.addPlayersAsList(
-      players: [
-        testPlayer1,
-        testPlayer2,
-        testPlayer3,
-        testPlayer4,
-        testPlayer5,
-      ],
-    );
-    await database.groupDao.addGroupsAsList(groups: [testGroup1, testGroup2]);
   });
+
   tearDown(() async {
     await database.close();
   });
 
-  group('Match Tests', () {
-    test('Adding and fetching single match works correctly', () async {
-      await database.matchDao.addMatch(match: testMatch1);
+  group('Game Tests', () {
 
-      final result = await database.matchDao.getMatchById(
-        matchId: testMatch1.id,
-      );
+    // Verifies that getAllGames returns an empty list when the database has no games.
+    test('getAllGames returns empty list when no games exist', () async {
+      final allGames = await database.gameDao.getAllGames();
+      expect(allGames, isEmpty);
+    });
 
-      expect(result.id, testMatch1.id);
-      expect(result.name, testMatch1.name);
-      expect(result.createdAt, testMatch1.createdAt);
+    // Verifies that a single game can be added and retrieved with all fields intact.
+    test('Adding and fetching a single game works correctly', () async {
+      await database.gameDao.addGame(game: testGame1);
 
-      if (result.winner != null && testMatch1.winner != null) {
-        expect(result.winner!.id, testMatch1.winner!.id);
-        expect(result.winner!.name, testMatch1.winner!.name);
-        expect(result.winner!.createdAt, testMatch1.winner!.createdAt);
-      } else {
-        expect(result.winner, testMatch1.winner);
-      }
+      final allGames = await database.gameDao.getAllGames();
+      expect(allGames.length, 1);
+      expect(allGames.first.id, testGame1.id);
+      expect(allGames.first.name, testGame1.name);
+      expect(allGames.first.ruleset, testGame1.ruleset);
+      expect(allGames.first.description, testGame1.description);
+      expect(allGames.first.color, testGame1.color);
+      expect(allGames.first.icon, testGame1.icon);
+      expect(allGames.first.createdAt, testGame1.createdAt);
+    });
 
-      if (result.group != null) {
-        expect(result.group!.members.length, testGroup1.members.length);
+    // Verifies that multiple games can be added and retrieved correctly.
+    test('Adding and fetching multiple games works correctly', () async {
+      await database.gameDao.addGame(game: testGame1);
+      await database.gameDao.addGame(game: testGame2);
+      await database.gameDao.addGame(game: testGame3);
 
-        for (int i = 0; i < testGroup1.members.length; i++) {
-          expect(result.group!.members[i].id, testGroup1.members[i].id);
-          expect(result.group!.members[i].name, testGroup1.members[i].name);
-        }
-      } else {
-        fail('Group is null');
-      }
-      if (result.players != null) {
-        expect(result.players!.length, testMatch1.players!.length);
+      final allGames = await database.gameDao.getAllGames();
+      expect(allGames.length, 3);
 
-        for (int i = 0; i < testMatch1.players!.length; i++) {
-          expect(result.players![i].id, testMatch1.players![i].id);
-          expect(result.players![i].name, testMatch1.players![i].name);
+      final names = allGames.map((g) => g.name).toList();
+      expect(names, containsAll(['Chess', 'Poker', 'Monopoly']));
+    });
+
+    // Verifies that getGameById returns the correct game with all properties.
+    test('getGameById returns correct game', () async {
+      await database.gameDao.addGame(game: testGame1);
+      await database.gameDao.addGame(game: testGame2);
+
+      final game = await database.gameDao.getGameById(gameId: testGame2.id);
+      expect(game.id, testGame2.id);
+      expect(game.name, testGame2.name);
+      expect(game.ruleset, testGame2.ruleset);
+      expect(game.description, testGame2.description);
+      expect(game.color, testGame2.color);
+      expect(game.icon, testGame2.icon);
+    });
+
+    // Verifies that getGameById throws a StateError when the game doesn't exist.
+    test('getGameById throws exception for non-existent game', () async {
       expect(
-            result.players![i].createdAt,
-            testMatch1.players![i].createdAt,
+            () => database.gameDao.getGameById(gameId: 'non-existent-id'),
+        throwsA(isA<StateError>()),
       );
-        }
-      } else {
-        fail('Players is null');
-      }
     });
 
-    test('Adding and fetching multiple matches works correctly', () async {
-      await database.matchDao.addMatchAsList(
-        matches: [
-          testMatch1,
-          testMatch2,
-          testMatchOnlyGroup,
-          testMatchOnlyPlayers,
-        ],
-      );
+    // Verifies that addGame returns true when a game is successfully added.
+    test('addGame returns true when game is added successfully', () async {
+      final result = await database.gameDao.addGame(game: testGame1);
+      expect(result, true);
 
-      final allMatches = await database.matchDao.getAllMatches();
-      expect(allMatches.length, 4);
-
-      final testMatches = {
-        testMatch1.id: testMatch1,
-        testMatch2.id: testMatch2,
-        testMatchOnlyGroup.id: testMatchOnlyGroup,
-        testMatchOnlyPlayers.id: testMatchOnlyPlayers,
-      };
-
-      for (final match in allMatches) {
-        final testMatch = testMatches[match.id]!;
-
-        // Match-Checks
-        expect(match.id, testMatch.id);
-        expect(match.name, testMatch.name);
-        expect(match.createdAt, testMatch.createdAt);
-        if (match.winner != null && testMatch.winner != null) {
-          expect(match.winner!.id, testMatch.winner!.id);
-          expect(match.winner!.name, testMatch.winner!.name);
-          expect(match.winner!.createdAt, testMatch.winner!.createdAt);
-        } else {
-          expect(match.winner, testMatch.winner);
-        }
-
-        // Group-Checks
-        if (testMatch.group != null) {
-          expect(match.group!.id, testMatch.group!.id);
-          expect(match.group!.name, testMatch.group!.name);
-          expect(match.group!.createdAt, testMatch.group!.createdAt);
-
-          // Group Members-Checks
-          expect(match.group!.members.length, testMatch.group!.members.length);
-          for (int i = 0; i < testMatch.group!.members.length; i++) {
-            expect(match.group!.members[i].id, testMatch.group!.members[i].id);
-            expect(
-              match.group!.members[i].name,
-              testMatch.group!.members[i].name,
-            );
-            expect(
-              match.group!.members[i].createdAt,
-              testMatch.group!.members[i].createdAt,
-            );
-          }
-        } else {
-          expect(match.group, null);
-        }
-
-        // Players-Checks
-        if (testMatch.players != null) {
-          expect(match.players!.length, testMatch.players!.length);
-          for (int i = 0; i < testMatch.players!.length; i++) {
-            expect(match.players![i].id, testMatch.players![i].id);
-            expect(match.players![i].name, testMatch.players![i].name);
-            expect(
-              match.players![i].createdAt,
-              testMatch.players![i].createdAt,
-            );
-          }
-        } else {
-          expect(match.players, null);
-        }
-      }
+      final allGames = await database.gameDao.getAllGames();
+      expect(allGames.length, 1);
     });
 
-    test('Adding the same match twice does not create duplicates', () async {
-      await database.matchDao.addMatch(match: testMatch1);
-      await database.matchDao.addMatch(match: testMatch1);
+    // Verifies that addGame returns false when trying to add a duplicate game.
+    test('addGame returns false when game already exists', () async {
+      final firstAdd = await database.gameDao.addGame(game: testGame1);
+      expect(firstAdd, true);
 
-      final matchCount = await database.matchDao.getMatchCount();
-      expect(matchCount, 1);
+      final secondAdd = await database.gameDao.addGame(game: testGame1);
+      expect(secondAdd, false);
+
+      final allGames = await database.gameDao.getAllGames();
+      expect(allGames.length, 1);
     });
 
-    test('Match existence check works correctly', () async {
-      var matchExists = await database.matchDao.matchExists(
-        matchId: testMatch1.id,
+    // Verifies that a game with null optional fields can be added and retrieved.
+    test('addGame handles game with null optional fields', () async {
+      final gameWithNulls = Game(name: 'Simple Game', ruleset: Ruleset.lowestScore, description: 'A simple game', color: GameColor.green, icon: '');
+      final result = await database.gameDao.addGame(game: gameWithNulls);
+      expect(result, true);
+
+      final fetchedGame = await database.gameDao.getGameById(
+        gameId: gameWithNulls.id,
       );
-      expect(matchExists, false);
-
-      await database.matchDao.addMatch(match: testMatch1);
-
-      matchExists = await database.matchDao.matchExists(matchId: testMatch1.id);
-      expect(matchExists, true);
+      expect(fetchedGame.name, 'Simple Game');
+      expect(fetchedGame.description, 'A simple game');
+      expect(fetchedGame.color, GameColor.green);
+      expect(fetchedGame.icon, isNull);
     });
 
-    test('Deleting a match works correctly', () async {
-      await database.matchDao.addMatch(match: testMatch1);
-
-      final matchDeleted = await database.matchDao.deleteMatch(
-        matchId: testMatch1.id,
+    // Verifies that multiple games can be added at once using addGamesAsList.
+    test('addGamesAsList adds multiple games correctly', () async {
+      final result = await database.gameDao.addGamesAsList(
+        games: [testGame1, testGame2, testGame3],
       );
-      expect(matchDeleted, true);
+      expect(result, true);
 
-      final matchExists = await database.matchDao.matchExists(
-        matchId: testMatch1.id,
-      );
-      expect(matchExists, false);
+      final allGames = await database.gameDao.getAllGames();
+      expect(allGames.length, 3);
     });
 
-    test('Getting the match count works correctly', () async {
-      var matchCount = await database.matchDao.getMatchCount();
-      expect(matchCount, 0);
+    // Verifies that addGamesAsList returns false when given an empty list.
+    test('addGamesAsList returns false for empty list', () async {
+      final result = await database.gameDao.addGamesAsList(games: []);
+      expect(result, false);
 
-      await database.matchDao.addMatch(match: testMatch1);
-
-      matchCount = await database.matchDao.getMatchCount();
-      expect(matchCount, 1);
-
-      await database.matchDao.addMatch(match: testMatch2);
-
-      matchCount = await database.matchDao.getMatchCount();
-      expect(matchCount, 2);
-
-      await database.matchDao.deleteMatch(matchId: testMatch1.id);
-
-      matchCount = await database.matchDao.getMatchCount();
-      expect(matchCount, 1);
-
-      await database.matchDao.deleteMatch(matchId: testMatch2.id);
-
-      matchCount = await database.matchDao.getMatchCount();
-      expect(matchCount, 0);
+      final allGames = await database.gameDao.getAllGames();
+      expect(allGames.length, 0);
     });
 
-    test('Checking if match has winner works correctly', () async {
-      await database.matchDao.addMatch(match: testMatch1);
-      await database.matchDao.addMatch(match: testMatchOnlyGroup);
+    // Verifies that addGamesAsList ignores duplicate games when adding.
+    test('addGamesAsList ignores duplicate games', () async {
+      await database.gameDao.addGame(game: testGame1);
 
-      var hasWinner = await database.matchDao.hasWinner(matchId: testMatch1.id);
-      expect(hasWinner, true);
-
-      hasWinner = await database.matchDao.hasWinner(
-        matchId: testMatchOnlyGroup.id,
+      final result = await database.gameDao.addGamesAsList(
+        games: [testGame1, testGame2],
       );
-      expect(hasWinner, false);
+      expect(result, true);
+
+      final allGames = await database.gameDao.getAllGames();
+      expect(allGames.length, 2);
     });
 
-    test('Fetching the winner of a match works correctly', () async {
-      await database.matchDao.addMatch(match: testMatch1);
+    // Verifies that deleteGame returns true and removes the game from database.
+    test('deleteGame returns true when game is deleted', () async {
+      await database.gameDao.addGame(game: testGame1);
 
-      final winner = await database.matchDao.getWinner(matchId: testMatch1.id);
-      if (winner == null) {
-        fail('Winner is null');
-      } else {
-        expect(winner.id, testMatch1.winner!.id);
-        expect(winner.name, testMatch1.winner!.name);
-        expect(winner.createdAt, testMatch1.winner!.createdAt);
-      }
+      final result = await database.gameDao.deleteGame(gameId: testGame1.id);
+      expect(result, true);
+
+      final allGames = await database.gameDao.getAllGames();
+      expect(allGames, isEmpty);
     });
 
-    test('Updating the winner of a match works correctly', () async {
-      await database.matchDao.addMatch(match: testMatch1);
-
-      final winner = await database.matchDao.getWinner(matchId: testMatch1.id);
-      if (winner == null) {
-        fail('Winner is null');
-      } else {
-        expect(winner.id, testMatch1.winner!.id);
-        expect(winner.name, testMatch1.winner!.name);
-        expect(winner.createdAt, testMatch1.winner!.createdAt);
-        expect(winner.id, testPlayer4.id);
-        expect(winner.id != testPlayer5.id, true);
-      }
-
-      await database.matchDao.setWinner(
-        matchId: testMatch1.id,
-        winnerId: testPlayer5.id,
+    // Verifies that deleteGame returns false for a non-existent game ID.
+    test('deleteGame returns false for non-existent game', () async {
+      final result = await database.gameDao.deleteGame(
+        gameId: 'non-existent-id',
       );
-
-      final newWinner = await database.matchDao.getWinner(
-        matchId: testMatch1.id,
-      );
-
-      if (newWinner == null) {
-        fail('New winner is null');
-      } else {
-        expect(newWinner.id, testPlayer5.id);
-        expect(newWinner.name, testPlayer5.name);
-        expect(newWinner.createdAt, testPlayer5.createdAt);
-      }
+      expect(result, false);
     });
 
-    test('Removing a winner works correctly', () async {
-      await database.matchDao.addMatch(match: testMatch2);
-
-      var hasWinner = await database.matchDao.hasWinner(matchId: testMatch2.id);
-      expect(hasWinner, true);
-
-      await database.matchDao.removeWinner(matchId: testMatch2.id);
-
-      hasWinner = await database.matchDao.hasWinner(matchId: testMatch2.id);
-      expect(hasWinner, false);
-
-      final removedWinner = await database.matchDao.getWinner(
-        matchId: testMatch2.id,
+    // Verifies that deleteGame only removes the specified game, leaving others intact.
+    test('deleteGame only deletes the specified game', () async {
+      await database.gameDao.addGamesAsList(
+        games: [testGame1, testGame2, testGame3],
       );
 
-      expect(removedWinner, null);
+      await database.gameDao.deleteGame(gameId: testGame2.id);
+
+      final allGames = await database.gameDao.getAllGames();
+      expect(allGames.length, 2);
+      expect(allGames.any((g) => g.id == testGame2.id), false);
+      expect(allGames.any((g) => g.id == testGame1.id), true);
+      expect(allGames.any((g) => g.id == testGame3.id), true);
     });
 
-    test('Renaming a match works correctly', () async {
-      await database.matchDao.addMatch(match: testMatch1);
+    // Verifies that gameExists returns true when the game exists in database.
+    test('gameExists returns true for existing game', () async {
+      await database.gameDao.addGame(game: testGame1);
 
-      var fetchedMatch = await database.matchDao.getMatchById(
-        matchId: testMatch1.id,
+      final exists = await database.gameDao.gameExists(gameId: testGame1.id);
+      expect(exists, true);
+    });
+
+    // Verifies that gameExists returns false for a non-existent game ID.
+    test('gameExists returns false for non-existent game', () async {
+      final exists = await database.gameDao.gameExists(
+        gameId: 'non-existent-id',
       );
-      expect(fetchedMatch.name, testMatch1.name);
+      expect(exists, false);
+    });
 
-      const newName = 'Updated Match Name';
-      await database.matchDao.updateMatchName(
-        matchId: testMatch1.id,
-        newName: newName,
+    // Verifies that gameExists returns false after a game has been deleted.
+    test('gameExists returns false after game is deleted', () async {
+      await database.gameDao.addGame(game: testGame1);
+      await database.gameDao.deleteGame(gameId: testGame1.id);
+
+      final exists = await database.gameDao.gameExists(gameId: testGame1.id);
+      expect(exists, false);
+    });
+
+    // Verifies that updateGameName correctly updates only the name field.
+    test('updateGameName updates the name correctly', () async {
+      await database.gameDao.addGame(game: testGame1);
+
+      await database.gameDao.updateGameName(
+        gameId: testGame1.id,
+        newName: 'Updated Chess',
       );
 
-      fetchedMatch = await database.matchDao.getMatchById(
-        matchId: testMatch1.id,
+      final updatedGame = await database.gameDao.getGameById(
+        gameId: testGame1.id,
       );
-      expect(fetchedMatch.name, newName);
+      expect(updatedGame.name, 'Updated Chess');
+      expect(updatedGame.ruleset, testGame1.ruleset);
+    });
+
+    // Verifies that updateGameName does nothing when game doesn't exist.
+    test('updateGameName does nothing for non-existent game', () async {
+      await database.gameDao.updateGameName(
+        gameId: 'non-existent-id',
+        newName: 'New Name',
+      );
+
+      final allGames = await database.gameDao.getAllGames();
+      expect(allGames, isEmpty);
+    });
+
+    // Verifies that updateGameRuleset correctly updates only the ruleset field.
+    test('updateGameRuleset updates the ruleset correctly', () async {
+      await database.gameDao.addGame(game: testGame1);
+
+      await database.gameDao.updateGameRuleset(
+        gameId: testGame1.id,
+        newRuleset: Ruleset.highestScore,
+      );
+
+      final updatedGame = await database.gameDao.getGameById(
+        gameId: testGame1.id,
+      );
+      expect(updatedGame.ruleset, Ruleset.highestScore);
+      expect(updatedGame.name, testGame1.name);
+    });
+
+    // Verifies that updateGameRuleset does nothing when game doesn't exist.
+    test('updateGameRuleset does nothing for non-existent game', () async {
+      await database.gameDao.updateGameRuleset(
+        gameId: 'non-existent-id',
+        newRuleset: Ruleset.lowestScore,
+      );
+
+      final allGames = await database.gameDao.getAllGames();
+      expect(allGames, isEmpty);
+    });
+
+    // Verifies that updateGameDescription correctly updates the description.
+    test('updateGameDescription updates the description correctly', () async {
+      await database.gameDao.addGame(game: testGame1);
+
+      await database.gameDao.updateGameDescription(
+        gameId: testGame1.id,
+        newDescription: 'An updated description',
+      );
+
+      final updatedGame = await database.gameDao.getGameById(
+        gameId: testGame1.id,
+      );
+      expect(updatedGame.description, 'An updated description');
+    });
+
+    // Verifies that updateGameDescription can set the description to an empty string.
+    test('updateGameDescription can set description to empty string', () async {
+      await database.gameDao.addGame(game: testGame1);
+
+      await database.gameDao.updateGameDescription(
+        gameId: testGame1.id,
+        newDescription: '',
+      );
+
+      final updatedGame = await database.gameDao.getGameById(
+        gameId: testGame1.id,
+      );
+      expect(updatedGame.description, '');
+    });
+
+    // Verifies that updateGameDescription does nothing when game doesn't exist.
+    test('updateGameDescription does nothing for non-existent game', () async {
+      await database.gameDao.updateGameDescription(
+        gameId: 'non-existent-id',
+        newDescription: 'New Description',
+      );
+
+      final allGames = await database.gameDao.getAllGames();
+      expect(allGames, isEmpty);
+    });
+
+    // Verifies that updateGameColor correctly updates the color value.
+    test('updateGameColor updates the color correctly', () async {
+      await database.gameDao.addGame(game: testGame1);
+
+      await database.gameDao.updateGameColor(
+        gameId: testGame1.id,
+        newColor: GameColor.green,
+      );
+
+      final updatedGame = await database.gameDao.getGameById(
+        gameId: testGame1.id,
+      );
+      expect(updatedGame.color, GameColor.green);
+    });
+
+    // Verifies that updateGameColor does nothing when game doesn't exist.
+    test('updateGameColor does nothing for non-existent game', () async {
+      await database.gameDao.updateGameColor(
+        gameId: 'non-existent-id',
+        newColor: GameColor.green,
+      );
+
+      final allGames = await database.gameDao.getAllGames();
+      expect(allGames, isEmpty);
+    });
+
+    // Verifies that updateGameIcon correctly updates the icon value.
+    test('updateGameIcon updates the icon correctly', () async {
+      await database.gameDao.addGame(game: testGame1);
+
+      await database.gameDao.updateGameIcon(
+        gameId: testGame1.id,
+        newIcon: 'new_chess_icon',
+      );
+
+      final updatedGame = await database.gameDao.getGameById(
+        gameId: testGame1.id,
+      );
+      expect(updatedGame.icon, 'new_chess_icon');
+    });
+
+    // Verifies that updateGameIcon can update the icon.
+    test('updateGameIcon updates icon correctly', () async {
+      await database.gameDao.addGame(game: testGame1);
+
+      await database.gameDao.updateGameIcon(
+        gameId: testGame1.id,
+        newIcon: 'new_icon',
+      );
+
+      final updatedGame = await database.gameDao.getGameById(
+        gameId: testGame1.id,
+      );
+      expect(updatedGame.icon, 'new_icon');
+    });
+
+    // Verifies that updateGameIcon does nothing when game doesn't exist.
+    test('updateGameIcon does nothing for non-existent game', () async {
+      await database.gameDao.updateGameIcon(
+        gameId: 'non-existent-id',
+        newIcon: 'some_icon',
+      );
+
+      final allGames = await database.gameDao.getAllGames();
+      expect(allGames, isEmpty);
+    });
+
+    // Verifies that getGameCount returns 0 when no games exist.
+    test('getGameCount returns 0 when no games exist', () async {
+      final count = await database.gameDao.getGameCount();
+      expect(count, 0);
+    });
+
+    // Verifies that getGameCount returns the correct count after adding games.
+    test('getGameCount returns correct count after adding games', () async {
+      await database.gameDao.addGamesAsList(
+        games: [testGame1, testGame2, testGame3],
+      );
+
+      final count = await database.gameDao.getGameCount();
+      expect(count, 3);
+    });
+
+    // Verifies that getGameCount updates correctly after deleting a game.
+    test('getGameCount updates correctly after deletion', () async {
+      await database.gameDao.addGamesAsList(
+        games: [testGame1, testGame2],
+      );
+
+      final countBefore = await database.gameDao.getGameCount();
+      expect(countBefore, 2);
+
+      await database.gameDao.deleteGame(gameId: testGame1.id);
+
+      final countAfter = await database.gameDao.getGameCount();
+      expect(countAfter, 1);
+    });
+
+    // Verifies that deleteAllGames removes all games from the database.
+    test('deleteAllGames removes all games', () async {
+      await database.gameDao.addGamesAsList(
+        games: [testGame1, testGame2, testGame3],
+      );
+
+      final countBefore = await database.gameDao.getGameCount();
+      expect(countBefore, 3);
+
+      final result = await database.gameDao.deleteAllGames();
+      expect(result, true);
+
+      final countAfter = await database.gameDao.getGameCount();
+      expect(countAfter, 0);
+    });
+
+    // Verifies that deleteAllGames returns false when no games exist.
+    test('deleteAllGames returns false when no games exist', () async {
+      final result = await database.gameDao.deleteAllGames();
+      expect(result, false);
+    });
+
+    // Verifies that games with special characters (quotes, emojis) are stored correctly.
+    test('Game with special characters in name is stored correctly', () async {
+      final specialGame = Game(
+        name: 'Game\'s & "Special" <Name>',
+        ruleset: Ruleset.multipleWinners,
+        description: 'Description with émojis 🎮🎲',
+        color: GameColor.purple,
+        icon: '',
+      );
+      await database.gameDao.addGame(game: specialGame);
+
+      final fetchedGame = await database.gameDao.getGameById(
+        gameId: specialGame.id,
+      );
+      expect(fetchedGame.name, 'Game\'s & "Special" <Name>');
+      expect(fetchedGame.description, 'Description with émojis 🎮🎲');
+    });
+
+    // Verifies that games with empty string fields are stored and retrieved correctly.
+    test('Game with empty string fields is stored correctly', () async {
+      final emptyGame = Game(
+        name: '',
+        ruleset: Ruleset.singleWinner,
+        description: '',
+        icon: '',
+        color: GameColor.red,
+      );
+      await database.gameDao.addGame(game: emptyGame);
+
+      final fetchedGame = await database.gameDao.getGameById(
+        gameId: emptyGame.id,
+      );
+      expect(fetchedGame.name, '');
+      expect(fetchedGame.ruleset, Ruleset.singleWinner);
+      expect(fetchedGame.description, '');
+      expect(fetchedGame.icon, '');
+    });
+
+    // Verifies that games with very long strings (10000 chars) are handled correctly.
+    test('Game with very long strings is stored correctly', () async {
+      final longString = 'A' * 10000;
+      final longGame = Game(
+        name: longString,
+        description: longString,
+        ruleset: Ruleset.multipleWinners,
+        color: GameColor.yellow,
+        icon: '',
+      );
+      await database.gameDao.addGame(game: longGame);
+
+      final fetchedGame = await database.gameDao.getGameById(
+        gameId: longGame.id,
+      );
+      expect(fetchedGame.name.length, 10000);
+      expect(fetchedGame.description.length, 10000);
+      expect(fetchedGame.ruleset, Ruleset.multipleWinners);
+    });
+
+    // Verifies that multiple sequential updates to the same game work correctly.
+    test('Multiple updates to the same game work correctly', () async {
+      await database.gameDao.addGame(game: testGame1);
+
+      await database.gameDao.updateGameName(
+        gameId: testGame1.id,
+        newName: 'Updated Name',
+      );
+      await database.gameDao.updateGameColor(
+        gameId: testGame1.id,
+        newColor: GameColor.teal,
+      );
+      await database.gameDao.updateGameDescription(
+        gameId: testGame1.id,
+        newDescription: 'Updated Description',
+      );
+
+      final updatedGame = await database.gameDao.getGameById(
+        gameId: testGame1.id,
+      );
+      expect(updatedGame.name, 'Updated Name');
+      expect(updatedGame.color, GameColor.teal);
+      expect(updatedGame.description, 'Updated Description');
+      expect(updatedGame.ruleset, testGame1.ruleset);
+      expect(updatedGame.icon, testGame1.icon);
     });
   });
 }

test/db_tests/group_match_test.dart

@@ -1,221 +0,0 @@
-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:tallee/data/db/database.dart';
-import 'package:tallee/data/dto/group.dart';
-import 'package:tallee/data/dto/match.dart';
-import 'package:tallee/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

@@ -1,5 +1,5 @@
 import 'package:clock/clock.dart';
-import 'package:drift/drift.dart';
+import 'package:drift/drift.dart' hide isNull;
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:tallee/data/db/database.dart';
@@ -29,27 +29,31 @@ void main() {
     );
 
     withClock(fakeClock, () {
-      testPlayer1 = Player(name: 'Alice');
-      testPlayer2 = Player(name: 'Bob');
-      testPlayer3 = Player(name: 'Charlie');
-      testPlayer4 = Player(name: 'Diana');
+      testPlayer1 = Player(name: 'Alice', description: '');
+      testPlayer2 = Player(name: 'Bob', description: '');
+      testPlayer3 = Player(name: 'Charlie', description: '');
+      testPlayer4 = Player(name: 'Diana', description: '');
       testGroup1 = Group(
         name: 'Test Group',
+        description: '',
         members: [testPlayer1, testPlayer2, testPlayer3],
       );
       testGroup2 = Group(
         id: 'gr2',
         name: 'Second Group',
+        description: '',
         members: [testPlayer2, testPlayer3, testPlayer4],
       );
       testGroup3 = Group(
         id: 'gr2',
         name: 'Second Group',
+        description: '',
         members: [testPlayer2, testPlayer4],
       );
       testGroup4 = Group(
         id: 'gr2',
         name: 'Second Group',
+        description: '',
         members: [testPlayer1, testPlayer2, testPlayer3, testPlayer4],
       );
     });
@@ -58,6 +62,8 @@ void main() {
     await database.close();
   });
   group('Group Tests', () {
+
+    // Verifies that a single group can be added and retrieved with all fields and members intact.
     test('Adding and fetching a single group works correctly', () async {
       await database.groupDao.addGroup(group: testGroup1);
 
@@ -80,6 +86,7 @@ void main() {
       }
     });
 
+    // Verifies that multiple groups can be added and retrieved with correct members.
     test('Adding and fetching multiple groups works correctly', () async {
       await database.groupDao.addGroupsAsList(
         groups: [testGroup1, testGroup2, testGroup3, testGroup4],
@@ -106,6 +113,7 @@ void main() {
       }
     });
 
+    // Verifies that adding the same group twice does not create duplicates.
     test('Adding the same group twice does not create duplicates', () async {
       await database.groupDao.addGroup(group: testGroup1);
       await database.groupDao.addGroup(group: testGroup1);
@@ -114,6 +122,7 @@ void main() {
       expect(allGroups.length, 1);
     });
 
+    // Verifies that groupExists returns correct boolean based on group presence.
     test('Group existence check works correctly', () async {
       var groupExists = await database.groupDao.groupExists(
         groupId: testGroup1.id,
@@ -126,6 +135,7 @@ void main() {
       expect(groupExists, true);
     });
 
+    // Verifies that deleteGroup removes the group and returns true.
     test('Deleting a group works correctly', () async {
       await database.groupDao.addGroup(group: testGroup1);
 
@@ -140,12 +150,13 @@ void main() {
       expect(groupExists, false);
     });
 
-    test('Updating a group name works correcly', () async {
+    // Verifies that updateGroupName correctly updates only the name field.
+    test('Updating a group name works correctly', () async {
       await database.groupDao.addGroup(group: testGroup1);
 
       const newGroupName = 'new group name';
 
-      await database.groupDao.updateGroupname(
+      await database.groupDao.updateGroupName(
         groupId: testGroup1.id,
         newName: newGroupName,
       );
@@ -156,6 +167,7 @@ void main() {
       expect(result.name, newGroupName);
     });
 
+    // Verifies that getGroupCount returns correct count through add/delete operations.
     test('Getting the group count works correctly', () async {
       final initialCount = await database.groupDao.getGroupCount();
       expect(initialCount, 0);
@@ -173,5 +185,190 @@ void main() {
       final finalCount = await database.groupDao.getGroupCount();
       expect(finalCount, 0);
     });
+
+    // Verifies that getAllGroups returns an empty list when no groups exist.
+    test('getAllGroups returns empty list when no groups exist', () async {
+      final allGroups = await database.groupDao.getAllGroups();
+      expect(allGroups, isEmpty);
+    });
+
+    // Verifies that getGroupById throws StateError for non-existent group ID.
+    test('getGroupById throws exception for non-existent group', () async {
+      expect(
+        () => database.groupDao.getGroupById(groupId: 'non-existent-id'),
+        throwsA(isA<StateError>()),
+      );
+    });
+
+    // Verifies that addGroup returns false when trying to add a duplicate group.
+    test('addGroup returns false when group already exists', () async {
+      final firstAdd = await database.groupDao.addGroup(group: testGroup1);
+      expect(firstAdd, true);
+
+      final secondAdd = await database.groupDao.addGroup(group: testGroup1);
+      expect(secondAdd, false);
+
+      final allGroups = await database.groupDao.getAllGroups();
+      expect(allGroups.length, 1);
+    });
+
+    // Verifies that addGroupsAsList handles an empty list without errors.
+    test('addGroupsAsList handles empty list correctly', () async {
+      await database.groupDao.addGroupsAsList(groups: []);
+
+      final allGroups = await database.groupDao.getAllGroups();
+      expect(allGroups.length, 0);
+    });
+
+    // Verifies that deleteGroup returns false for a non-existent group ID.
+    test('deleteGroup returns false for non-existent group', () async {
+      final deleted = await database.groupDao.deleteGroup(
+        groupId: 'non-existent-id',
+      );
+      expect(deleted, false);
+    });
+
+    // Verifies that updateGroupName returns false for a non-existent group ID.
+    test('updateGroupName returns false for non-existent group', () async {
+      final updated = await database.groupDao.updateGroupName(
+        groupId: 'non-existent-id',
+        newName: 'New Name',
+      );
+      expect(updated, false);
+    });
+
+    // Verifies that updateGroupDescription correctly updates the description field.
+    test('Updating a group description works correctly', () async {
+      await database.groupDao.addGroup(group: testGroup1);
+
+      const newDescription = 'This is a new description';
+
+      final updated = await database.groupDao.updateGroupDescription(
+        groupId: testGroup1.id,
+        newDescription: newDescription,
+      );
+      expect(updated, true);
+
+      final result = await database.groupDao.getGroupById(
+        groupId: testGroup1.id,
+      );
+      expect(result.description, newDescription);
+    });
+
+    // Verifies that updateGroupDescription can set the description to null.
+    test('updateGroupDescription can set description to null', () async {
+      final groupWithDescription = Group(
+        name: 'Group with description',
+        description: 'Initial description',
+        members: [testPlayer1],
+      );
+      await database.groupDao.addGroup(group: groupWithDescription);
+
+      final updated = await database.groupDao.updateGroupDescription(
+        groupId: groupWithDescription.id,
+        newDescription: 'Updated description',
+      );
+      expect(updated, true);
+
+      final result = await database.groupDao.getGroupById(
+        groupId: groupWithDescription.id,
+      );
+      expect(result.description, 'Updated description');
+    });
+
+    // Verifies that updateGroupDescription returns false for a non-existent group.
+    test('updateGroupDescription returns false for non-existent group',
+        () async {
+      final updated = await database.groupDao.updateGroupDescription(
+        groupId: 'non-existent-id',
+        newDescription: 'New Description',
+      );
+      expect(updated, false);
+    });
+
+    // Verifies that deleteAllGroups removes all groups from the database.
+    test('deleteAllGroups removes all groups', () async {
+      await database.groupDao.addGroupsAsList(
+        groups: [testGroup1, testGroup2],
+      );
+
+      final countBefore = await database.groupDao.getGroupCount();
+      expect(countBefore, 2);
+
+      final deleted = await database.groupDao.deleteAllGroups();
+      expect(deleted, true);
+
+      final countAfter = await database.groupDao.getGroupCount();
+      expect(countAfter, 0);
+    });
+
+    // Verifies that deleteAllGroups returns false when no groups exist.
+    test('deleteAllGroups returns false when no groups exist', () async {
+      final deleted = await database.groupDao.deleteAllGroups();
+      expect(deleted, false);
+    });
+
+    // Verifies that groups with special characters (quotes, emojis) are stored correctly.
+    test('Group with special characters in name is stored correctly', () async {
+      final specialGroup = Group(
+        name: 'Group\'s & "Special" <Name>',
+        description: 'Description with émojis 🎮🎲',
+        members: [testPlayer1],
+      );
+      await database.groupDao.addGroup(group: specialGroup);
+
+      final fetchedGroup = await database.groupDao.getGroupById(
+        groupId: specialGroup.id,
+      );
+      expect(fetchedGroup.name, 'Group\'s & "Special" <Name>');
+      expect(fetchedGroup.description, 'Description with émojis 🎮🎲');
+    });
+
+    // Verifies that a group with an empty members list can be stored and retrieved.
+    test('Group with empty members list is stored correctly', () async {
+      final emptyGroup = Group(
+        name: 'Empty Group',
+        description: '',
+        members: [],
+      );
+      await database.groupDao.addGroup(group: emptyGroup);
+
+      final fetchedGroup = await database.groupDao.getGroupById(
+        groupId: emptyGroup.id,
+      );
+      expect(fetchedGroup.name, 'Empty Group');
+      expect(fetchedGroup.members, isEmpty);
+    });
+
+    // Verifies that multiple sequential updates to the same group work correctly.
+    test('Multiple updates to the same group work correctly', () async {
+      await database.groupDao.addGroup(group: testGroup1);
+
+      await database.groupDao.updateGroupName(
+        groupId: testGroup1.id,
+        newName: 'Updated Name',
+      );
+      await database.groupDao.updateGroupDescription(
+        groupId: testGroup1.id,
+        newDescription: 'Updated Description',
+      );
+
+      final updatedGroup = await database.groupDao.getGroupById(
+        groupId: testGroup1.id,
+      );
+      expect(updatedGroup.name, 'Updated Name');
+      expect(updatedGroup.description, 'Updated Description');
+      expect(updatedGroup.members.length, testGroup1.members.length);
+    });
+
+    // Verifies that addGroupsAsList with duplicate groups only adds unique ones.
+    test('addGroupsAsList with duplicate groups only adds once', () async {
+      await database.groupDao.addGroupsAsList(
+        groups: [testGroup1, testGroup1, testGroup1],
+      );
+
+      final allGroups = await database.groupDao.getAllGroups();
+      expect(allGroups.length, 1);
+    });
   });
 }

test/db_tests/match_test.dart

@@ -0,0 +1,294 @@
+import 'package:clock/clock.dart';
+import 'package:drift/drift.dart';
+import 'package:drift/native.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/dto/game.dart';
+import 'package:tallee/data/dto/group.dart';
+import 'package:tallee/data/dto/match.dart';
+import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/core/enums.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 Game testGame;
+  late Match testMatch1;
+  late Match testMatch2;
+  late Match testMatchOnlyPlayers;
+  late Match testMatchOnlyGroup;
+  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', description: '');
+      testPlayer2 = Player(name: 'Bob', description: '');
+      testPlayer3 = Player(name: 'Charlie', description: '');
+      testPlayer4 = Player(name: 'Diana', description: '');
+      testPlayer5 = Player(name: 'Eve', description: '');
+      testGroup1 = Group(
+        name: 'Test Group 2',
+        description: '',
+        members: [testPlayer1, testPlayer2, testPlayer3],
+      );
+      testGroup2 = Group(
+        name: 'Test Group 2',
+        description: '',
+        members: [testPlayer4, testPlayer5],
+      );
+      testGame = Game(name: 'Test Game', ruleset: Ruleset.singleWinner, description: 'A test game', color: GameColor.blue, icon: '');
+      testMatch1 = Match(
+        name: 'First Test Match',
+        game: testGame,
+        group: testGroup1,
+        players: [testPlayer4, testPlayer5],
+        winner: testPlayer4,
+        notes: '',
+      );
+      testMatch2 = Match(
+        name: 'Second Test Match',
+        game: testGame,
+        group: testGroup2,
+        players: [testPlayer1, testPlayer2, testPlayer3],
+        winner: testPlayer2,
+        notes: '',
+      );
+      testMatchOnlyPlayers = Match(
+        name: 'Test Match with Players',
+        game: testGame,
+        players: [testPlayer1, testPlayer2, testPlayer3],
+        winner: testPlayer3,
+        notes: '',
+      );
+      testMatchOnlyGroup = Match(
+        name: 'Test Match with Group',
+        game: testGame,
+        group: testGroup2,
+        notes: '',
+      );
+    });
+    await database.playerDao.addPlayersAsList(
+      players: [
+        testPlayer1,
+        testPlayer2,
+        testPlayer3,
+        testPlayer4,
+        testPlayer5,
+      ],
+    );
+    await database.groupDao.addGroupsAsList(groups: [testGroup1, testGroup2]);
+    await database.gameDao.addGame(game: testGame);
+  });
+  tearDown(() async {
+    await database.close();
+  });
+
+  group('Match Tests', () {
+
+    // Verifies that a single match can be added and retrieved with all fields, group, and players intact.
+    test('Adding and fetching single match works correctly', () async {
+      await database.matchDao.addMatch(match: testMatch1);
+
+      final result = await database.matchDao.getMatchById(
+        matchId: testMatch1.id,
+      );
+
+      expect(result.id, testMatch1.id);
+      expect(result.name, testMatch1.name);
+      expect(result.createdAt, testMatch1.createdAt);
+
+      if (result.group != null) {
+        expect(result.group!.members.length, testGroup1.members.length);
+
+        for (int i = 0; i < testGroup1.members.length; i++) {
+          expect(result.group!.members[i].id, testGroup1.members[i].id);
+          expect(result.group!.members[i].name, testGroup1.members[i].name);
+        }
+      } else {
+        fail('Group is null');
+      }
+      if (result.players != null) {
+        expect(result.players!.length, testMatch1.players!.length);
+
+        for (int i = 0; i < testMatch1.players!.length; i++) {
+          expect(result.players![i].id, testMatch1.players![i].id);
+          expect(result.players![i].name, testMatch1.players![i].name);
+          expect(
+            result.players![i].createdAt,
+            testMatch1.players![i].createdAt,
+          );
+        }
+      } else {
+        fail('Players is null');
+      }
+    });
+
+    // Verifies that multiple matches can be added and retrieved with correct groups and players.
+    test('Adding and fetching multiple matches works correctly', () async {
+      await database.matchDao.addMatchAsList(
+        matches: [
+          testMatch1,
+          testMatch2,
+          testMatchOnlyGroup,
+          testMatchOnlyPlayers,
+        ],
+      );
+
+      final allMatches = await database.matchDao.getAllMatches();
+      expect(allMatches.length, 4);
+
+      final testMatches = {
+        testMatch1.id: testMatch1,
+        testMatch2.id: testMatch2,
+        testMatchOnlyGroup.id: testMatchOnlyGroup,
+        testMatchOnlyPlayers.id: testMatchOnlyPlayers,
+      };
+
+      for (final match in allMatches) {
+        final testMatch = testMatches[match.id]!;
+
+        // Match-Checks
+        expect(match.id, testMatch.id);
+        expect(match.name, testMatch.name);
+        expect(match.createdAt, testMatch.createdAt);
+
+        // Group-Checks
+        if (testMatch.group != null) {
+          expect(match.group!.id, testMatch.group!.id);
+          expect(match.group!.name, testMatch.group!.name);
+          expect(match.group!.createdAt, testMatch.group!.createdAt);
+
+          // Group Members-Checks
+          expect(match.group!.members.length, testMatch.group!.members.length);
+          for (int i = 0; i < testMatch.group!.members.length; i++) {
+            expect(match.group!.members[i].id, testMatch.group!.members[i].id);
+            expect(
+              match.group!.members[i].name,
+              testMatch.group!.members[i].name,
+            );
+            expect(
+              match.group!.members[i].createdAt,
+              testMatch.group!.members[i].createdAt,
+            );
+          }
+        } else {
+          expect(match.group, null);
+        }
+
+        // Players-Checks
+        if (testMatch.players != null) {
+          expect(match.players!.length, testMatch.players!.length);
+          for (int i = 0; i < testMatch.players!.length; i++) {
+            expect(match.players![i].id, testMatch.players![i].id);
+            expect(match.players![i].name, testMatch.players![i].name);
+            expect(
+              match.players![i].createdAt,
+              testMatch.players![i].createdAt,
+            );
+          }
+        } else {
+          expect(match.players, null);
+        }
+      }
+    });
+
+    // Verifies that adding the same match twice does not create duplicates.
+    test('Adding the same match twice does not create duplicates', () async {
+      await database.matchDao.addMatch(match: testMatch1);
+      await database.matchDao.addMatch(match: testMatch1);
+
+      final matchCount = await database.matchDao.getMatchCount();
+      expect(matchCount, 1);
+    });
+
+    // Verifies that matchExists returns correct boolean based on match presence.
+    test('Match existence check works correctly', () async {
+      var matchExists = await database.matchDao.matchExists(
+        matchId: testMatch1.id,
+      );
+      expect(matchExists, false);
+
+      await database.matchDao.addMatch(match: testMatch1);
+
+      matchExists = await database.matchDao.matchExists(matchId: testMatch1.id);
+      expect(matchExists, true);
+    });
+
+    // Verifies that deleteMatch removes the match and returns true.
+    test('Deleting a match works correctly', () async {
+      await database.matchDao.addMatch(match: testMatch1);
+
+      final matchDeleted = await database.matchDao.deleteMatch(
+        matchId: testMatch1.id,
+      );
+      expect(matchDeleted, true);
+
+      final matchExists = await database.matchDao.matchExists(
+        matchId: testMatch1.id,
+      );
+      expect(matchExists, false);
+    });
+
+    // Verifies that getMatchCount returns correct count through add/delete operations.
+    test('Getting the match count works correctly', () async {
+      var matchCount = await database.matchDao.getMatchCount();
+      expect(matchCount, 0);
+
+      await database.matchDao.addMatch(match: testMatch1);
+
+      matchCount = await database.matchDao.getMatchCount();
+      expect(matchCount, 1);
+
+      await database.matchDao.addMatch(match: testMatch2);
+
+      matchCount = await database.matchDao.getMatchCount();
+      expect(matchCount, 2);
+
+      await database.matchDao.deleteMatch(matchId: testMatch1.id);
+
+      matchCount = await database.matchDao.getMatchCount();
+      expect(matchCount, 1);
+
+      await database.matchDao.deleteMatch(matchId: testMatch2.id);
+
+      matchCount = await database.matchDao.getMatchCount();
+      expect(matchCount, 0);
+    });
+
+    // Verifies that updateMatchName correctly updates only the name field.
+    test('Renaming a match works correctly', () async {
+      await database.matchDao.addMatch(match: testMatch1);
+
+      var fetchedMatch = await database.matchDao.getMatchById(
+        matchId: testMatch1.id,
+      );
+      expect(fetchedMatch.name, testMatch1.name);
+
+      const newName = 'Updated Match Name';
+      await database.matchDao.updateMatchName(
+        matchId: testMatch1.id,
+        newName: newName,
+      );
+
+      fetchedMatch = await database.matchDao.getMatchById(
+        matchId: testMatch1.id,
+      );
+      expect(fetchedMatch.name, newName);
+    });
+  });
+}

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);
 
@@ -26,12 +26,13 @@ void main() {
     );
 
     withClock(fakeClock, () {
-      testPlayer1 = Player(name: 'Alice');
-      testPlayer2 = Player(name: 'Bob');
-      testPlayer3 = Player(name: 'Charlie');
-      testPlayer4 = Player(name: 'Diana');
-      testgroup = Group(
+      testPlayer1 = Player(name: 'Alice', description: '');
+      testPlayer2 = Player(name: 'Bob', description: '');
+      testPlayer3 = Player(name: 'Charlie', description: '');
+      testPlayer4 = Player(name: 'Diana', description: '');
+      testGroup = Group(
         name: 'Test Group',
+        description: '',
         members: [testPlayer1, testPlayer2, testPlayer3],
       );
     });
@@ -41,63 +42,271 @@ void main() {
   });
 
   group('Player-Group Tests', () {
-    /// No need to test if group has players since the members attribute is
-    /// not nullable
 
+    // Verifies that a player can be added to an existing group and isPlayerInGroup returns true.
     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: '',
       );
 
       expect(playerAdded, false);
     });
 
+    // Verifies that a player can be removed from a group and the group's member count decreases.
     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);
     });
 
+    // Verifies that getPlayersOfGroup returns all members of a group with correct data.
     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].name, testgroup.members[i].name);
-        expect(players[i].createdAt, testgroup.members[i].createdAt);
+        expect(players[i].id, testGroup.members[i].id);
+        expect(players[i].name, testGroup.members[i].name);
+        expect(players[i].createdAt, testGroup.members[i].createdAt);
       }
     });
+
+    // Verifies that isPlayerInGroup returns false for non-existent player.
+    test('isPlayerInGroup returns false for non-existent player', () async {
+      await database.groupDao.addGroup(group: testGroup);
+
+      final result = await database.playerGroupDao.isPlayerInGroup(
+        playerId: 'non-existent-player-id',
+        groupId: testGroup.id,
+      );
+
+      expect(result, false);
+    });
+
+    // Verifies that isPlayerInGroup returns false for non-existent group.
+    test('isPlayerInGroup returns false for non-existent group', () async {
+      await database.playerDao.addPlayer(player: testPlayer1);
+
+      final result = await database.playerGroupDao.isPlayerInGroup(
+        playerId: testPlayer1.id,
+        groupId: 'non-existent-group-id',
+      );
+
+      expect(result, false);
+    });
+
+    // Verifies that addPlayerToGroup returns false when player already in group.
+    test('addPlayerToGroup returns false when player already in group', () async {
+      await database.groupDao.addGroup(group: testGroup);
+
+      // testPlayer1 is already in testGroup via group creation
+      final result = await database.playerGroupDao.addPlayerToGroup(
+        player: testPlayer1,
+        groupId: testGroup.id,
+      );
+
+      expect(result, false);
+    });
+
+    // Verifies that addPlayerToGroup adds player to player table if not exists.
+    test('addPlayerToGroup adds player to player table if not exists', () async {
+      await database.groupDao.addGroup(group: testGroup);
+
+      // testPlayer4 is not in the database yet
+      var playerExists = await database.playerDao.playerExists(
+        playerId: testPlayer4.id,
+      );
+      expect(playerExists, false);
+
+      await database.playerGroupDao.addPlayerToGroup(
+        player: testPlayer4,
+        groupId: testGroup.id,
+      );
+
+      // Now player should exist in player table
+      playerExists = await database.playerDao.playerExists(
+        playerId: testPlayer4.id,
+      );
+      expect(playerExists, true);
+    });
+
+    // Verifies that removePlayerFromGroup returns false for non-existent player.
+    test('removePlayerFromGroup returns false for non-existent player', () async {
+      await database.groupDao.addGroup(group: testGroup);
+
+      final result = await database.playerGroupDao.removePlayerFromGroup(
+        playerId: 'non-existent-player-id',
+        groupId: testGroup.id,
+      );
+
+      expect(result, false);
+    });
+
+    // Verifies that removePlayerFromGroup returns false for non-existent group.
+    test('removePlayerFromGroup returns false for non-existent group', () async {
+      await database.playerDao.addPlayer(player: testPlayer1);
+
+      final result = await database.playerGroupDao.removePlayerFromGroup(
+        playerId: testPlayer1.id,
+        groupId: 'non-existent-group-id',
+      );
+
+      expect(result, false);
+    });
+
+    // Verifies that getPlayersOfGroup returns empty list for group with no members.
+    test('getPlayersOfGroup returns empty list for empty group', () async {
+      final emptyGroup = Group(name: 'Empty Group', description: '', members: []);
+      await database.groupDao.addGroup(group: emptyGroup);
+
+      final players = await database.playerGroupDao.getPlayersOfGroup(
+        groupId: emptyGroup.id,
+      );
+
+      expect(players, isEmpty);
+    });
+
+    // Verifies that getPlayersOfGroup returns empty list for non-existent group.
+    test('getPlayersOfGroup returns empty list for non-existent group', () async {
+      final players = await database.playerGroupDao.getPlayersOfGroup(
+        groupId: 'non-existent-group-id',
+      );
+
+      expect(players, isEmpty);
+    });
+
+    // Verifies that removing all players from a group leaves the group empty.
+    test('Removing all players from a group leaves group empty', () async {
+      await database.groupDao.addGroup(group: testGroup);
+
+      for (final player in testGroup.members) {
+        await database.playerGroupDao.removePlayerFromGroup(
+          playerId: player.id,
+          groupId: testGroup.id,
+        );
+      }
+
+      final players = await database.playerGroupDao.getPlayersOfGroup(
+        groupId: testGroup.id,
+      );
+      expect(players, isEmpty);
+
+      // Group should still exist
+      final groupExists = await database.groupDao.groupExists(
+        groupId: testGroup.id,
+      );
+      expect(groupExists, true);
+    });
+
+    // Verifies that a player can be in multiple groups.
+    test('Player can be in multiple groups', () async {
+      final secondGroup = Group(name: 'Second Group', description: '', members: []);
+      await database.groupDao.addGroup(group: testGroup);
+      await database.groupDao.addGroup(group: secondGroup);
+
+      // Add testPlayer1 to second group (already in testGroup)
+      await database.playerGroupDao.addPlayerToGroup(
+        player: testPlayer1,
+        groupId: secondGroup.id,
+      );
+
+      final inFirstGroup = await database.playerGroupDao.isPlayerInGroup(
+        playerId: testPlayer1.id,
+        groupId: testGroup.id,
+      );
+      final inSecondGroup = await database.playerGroupDao.isPlayerInGroup(
+        playerId: testPlayer1.id,
+        groupId: secondGroup.id,
+      );
+
+      expect(inFirstGroup, true);
+      expect(inSecondGroup, true);
+    });
+
+    // Verifies that removing player from one group doesn't affect other groups.
+    test('Removing player from one group does not affect other groups', () async {
+      final secondGroup = Group(name: 'Second Group', description: '', members: [testPlayer1]);
+      await database.groupDao.addGroup(group: testGroup);
+      await database.groupDao.addGroup(group: secondGroup);
+
+      // Remove testPlayer1 from testGroup
+      await database.playerGroupDao.removePlayerFromGroup(
+        playerId: testPlayer1.id,
+        groupId: testGroup.id,
+      );
+
+      final inFirstGroup = await database.playerGroupDao.isPlayerInGroup(
+        playerId: testPlayer1.id,
+        groupId: testGroup.id,
+      );
+      final inSecondGroup = await database.playerGroupDao.isPlayerInGroup(
+        playerId: testPlayer1.id,
+        groupId: secondGroup.id,
+      );
+
+      expect(inFirstGroup, false);
+      expect(inSecondGroup, true);
+    });
+
+    // Verifies that addPlayerToGroup returns true on successful addition.
+    test('addPlayerToGroup returns true on successful addition', () async {
+      await database.groupDao.addGroup(group: testGroup);
+      await database.playerDao.addPlayer(player: testPlayer4);
+
+      final result = await database.playerGroupDao.addPlayerToGroup(
+        player: testPlayer4,
+        groupId: testGroup.id,
+      );
+
+      expect(result, true);
+    });
+
+    // Verifies that removing the same player twice returns false on second attempt.
+    test('Removing same player twice returns false on second attempt', () async {
+      await database.groupDao.addGroup(group: testGroup);
+
+      final firstRemoval = await database.playerGroupDao.removePlayerFromGroup(
+        playerId: testPlayer1.id,
+        groupId: testGroup.id,
+      );
+      expect(firstRemoval, true);
+
+      final secondRemoval = await database.playerGroupDao.removePlayerFromGroup(
+        playerId: testPlayer1.id,
+        groupId: testGroup.id,
+      );
+      expect(secondRemoval, false);
+    });
   });
 }

test/db_tests/player_match_test.dart

@@ -1,11 +1,14 @@
 import 'package:clock/clock.dart';
-import 'package:drift/drift.dart' hide isNotNull;
+import 'package:drift/drift.dart' hide isNotNull, isNull;
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:tallee/core/enums.dart';
 import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/dto/game.dart';
 import 'package:tallee/data/dto/group.dart';
 import 'package:tallee/data/dto/match.dart';
 import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/data/dto/team.dart';
 
 void main() {
   late AppDatabase database;
@@ -15,10 +18,13 @@ 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);
+  late Team testTeam1;
+  late Team testTeam2;
+  final fixedDate = DateTime(2025, 11, 19, 00, 11, 23);
   final fakeClock = Clock(() => fixedDate);
 
   setUp(() async {
@@ -31,23 +37,37 @@ void main() {
     );
 
     withClock(fakeClock, () {
-      testPlayer1 = Player(name: 'Alice');
-      testPlayer2 = Player(name: 'Bob');
-      testPlayer3 = Player(name: 'Charlie');
-      testPlayer4 = Player(name: 'Diana');
-      testPlayer5 = Player(name: 'Eve');
-      testPlayer6 = Player(name: 'Frank');
-      testgroup = Group(
+      testPlayer1 = Player(name: 'Alice', description: '');
+      testPlayer2 = Player(name: 'Bob', description: '');
+      testPlayer3 = Player(name: 'Charlie', description: '');
+      testPlayer4 = Player(name: 'Diana', description: '');
+      testPlayer5 = Player(name: 'Eve', description: '');
+      testPlayer6 = Player(name: 'Frank', description: '');
+      testGroup = Group(
         name: 'Test Group',
+        description: '',
         members: [testPlayer1, testPlayer2, testPlayer3],
       );
+      testGame = Game(name: 'Test Game', ruleset: Ruleset.singleWinner, description: 'A test game', color: GameColor.blue, icon: '');
       testMatchOnlyGroup = Match(
         name: 'Test Match with Group',
-        group: testgroup,
+        game: testGame,
+        group: testGroup,
+        notes: '',
       );
       testMatchOnlyPlayers = Match(
         name: 'Test Match with Players',
+        game: testGame,
         players: [testPlayer4, testPlayer5, testPlayer6],
+        notes: '',
+      );
+      testTeam1 = Team(
+        name: 'Team Alpha',
+        members: [testPlayer1, testPlayer2],
+      );
+      testTeam2 = Team(
+        name: 'Team Beta',
+        members: [testPlayer3, testPlayer4],
       );
     });
     await database.playerDao.addPlayersAsList(
@@ -60,13 +80,16 @@ 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();
   });
 
   group('Player-Match Tests', () {
+
+    // Verifies that matchHasPlayers returns false initially and true after adding a player.
     test('Match has player works correctly', () async {
       await database.matchDao.addMatch(match: testMatchOnlyGroup);
       await database.playerDao.addPlayer(player: testPlayer1);
@@ -89,6 +112,7 @@ void main() {
       expect(matchHasPlayers, true);
     });
 
+    // Verifies that a player can be added to a match and isPlayerInMatch returns true.
     test('Adding a player to a match works correctly', () async {
       await database.matchDao.addMatch(match: testMatchOnlyGroup);
       await database.playerDao.addPlayer(player: testPlayer5);
@@ -112,6 +136,7 @@ void main() {
       expect(playerAdded, false);
     });
 
+    // Verifies that a player can be removed from a match and the player count decreases.
     test('Removing player from match works correctly', () async {
       await database.matchDao.addMatch(match: testMatchOnlyPlayers);
 
@@ -134,6 +159,7 @@ void main() {
       expect(playerExists, false);
     });
 
+    // Verifies that getPlayersOfMatch returns all players of a match with correct data.
     test('Retrieving players of a match works correctly', () async {
       await database.matchDao.addMatch(match: testMatchOnlyPlayers);
       final players = await database.playerMatchDao.getPlayersOfMatch(
@@ -154,7 +180,8 @@ void main() {
       }
     });
 
-    test('Updating the match players works coreclty', () async {
+    // Verifies that updatePlayersFromMatch replaces all existing players with new ones.
+    test('Updating the match players works correctly', () async {
       await database.matchDao.addMatch(match: testMatchOnlyPlayers);
 
       final newPlayers = [testPlayer1, testPlayer2, testPlayer4];
@@ -197,12 +224,13 @@ void main() {
       }
     });
 
+    // Verifies that the same player can be added to multiple different matches.
     test(
-      'Adding the same player to seperate matches works correctly',
+      'Adding the same player to separate matches works correctly',
           () async {
         final playersList = [testPlayer1, testPlayer2, testPlayer3];
-        final match1 = Match(name: 'Match 1', players: playersList);
-        final match2 = Match(name: 'Match 2', players: playersList);
+        final match1 = Match(name: 'Match 1', game: testGame, players: playersList, notes: '');
+        final match2 = Match(name: 'Match 2', game: testGame, players: playersList, notes: '');
 
         await Future.wait([
           database.matchDao.addMatch(match: match1),
@@ -233,5 +261,628 @@ void main() {
         );
       },
     );
+
+    // Verifies that getPlayersOfMatch returns null for a non-existent match.
+    test('getPlayersOfMatch returns null for non-existent match', () async {
+      final players = await database.playerMatchDao.getPlayersOfMatch(
+        matchId: 'non-existent-match-id',
+      );
+
+      expect(players, isNull);
+    });
+
+    // Verifies that adding a player with initial score works correctly.
+    test('Adding player with initial score works correctly', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyGroup);
+
+      await database.playerMatchDao.addPlayerToMatch(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer1.id,
+        score: 100,
+      );
+
+      final score = await database.playerMatchDao.getPlayerScore(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer1.id,
+      );
+
+      expect(score, 100);
+    });
+
+    // Verifies that getPlayerScore returns the correct score.
+    test('getPlayerScore returns correct score', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyPlayers);
+
+      // Default score should be 0 when added through match
+      final score = await database.playerMatchDao.getPlayerScore(
+        matchId: testMatchOnlyPlayers.id,
+        playerId: testPlayer4.id,
+      );
+
+      expect(score, 0);
+    });
+
+    // Verifies that getPlayerScore returns null for non-existent player-match combination.
+    test('getPlayerScore returns null for non-existent player in match', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyGroup);
+
+      final score = await database.playerMatchDao.getPlayerScore(
+        matchId: testMatchOnlyGroup.id,
+        playerId: 'non-existent-player-id',
+      );
+
+      expect(score, isNull);
+    });
+
+    // Verifies that updatePlayerScore updates the score correctly.
+    test('updatePlayerScore updates score correctly', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyPlayers);
+
+      final updated = await database.playerMatchDao.updatePlayerScore(
+        matchId: testMatchOnlyPlayers.id,
+        playerId: testPlayer4.id,
+        newScore: 50,
+      );
+
+      expect(updated, true);
+
+      final score = await database.playerMatchDao.getPlayerScore(
+        matchId: testMatchOnlyPlayers.id,
+        playerId: testPlayer4.id,
+      );
+
+      expect(score, 50);
+    });
+
+    // Verifies that updatePlayerScore returns false for non-existent player-match.
+    test('updatePlayerScore returns false for non-existent player-match', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyGroup);
+
+      final updated = await database.playerMatchDao.updatePlayerScore(
+        matchId: testMatchOnlyGroup.id,
+        playerId: 'non-existent-player-id',
+        newScore: 50,
+      );
+
+      expect(updated, false);
+    });
+
+    // Verifies that adding a player with teamId works correctly.
+    test('Adding player with teamId works correctly', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyGroup);
+      await database.teamDao.addTeam(team: testTeam1);
+
+      await database.playerMatchDao.addPlayerToMatch(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer1.id,
+        teamId: testTeam1.id,
+      );
+
+      final playersInTeam = await database.playerMatchDao.getPlayersInTeam(
+        matchId: testMatchOnlyGroup.id,
+        teamId: testTeam1.id,
+      );
+
+      expect(playersInTeam.length, 1);
+      expect(playersInTeam[0].id, testPlayer1.id);
+    });
+
+    // Verifies that updatePlayerTeam updates the team correctly.
+    test('updatePlayerTeam updates team correctly', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyGroup);
+      await database.teamDao.addTeam(team: testTeam1);
+      await database.teamDao.addTeam(team: testTeam2);
+
+      await database.playerMatchDao.addPlayerToMatch(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer1.id,
+        teamId: testTeam1.id,
+      );
+
+      // Update player's team
+      final updated = await database.playerMatchDao.updatePlayerTeam(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer1.id,
+        teamId: testTeam2.id,
+      );
+
+      expect(updated, true);
+
+      // Verify player is now in testTeam2
+      final playersInTeam2 = await database.playerMatchDao.getPlayersInTeam(
+        matchId: testMatchOnlyGroup.id,
+        teamId: testTeam2.id,
+      );
+
+      expect(playersInTeam2.length, 1);
+      expect(playersInTeam2[0].id, testPlayer1.id);
+
+      // Verify player is no longer in testTeam1
+      final playersInTeam1 = await database.playerMatchDao.getPlayersInTeam(
+        matchId: testMatchOnlyGroup.id,
+        teamId: testTeam1.id,
+      );
+
+      expect(playersInTeam1.isEmpty, true);
+    });
+
+    // Verifies that updatePlayerTeam can set team to null.
+    test('updatePlayerTeam can remove player from team', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyGroup);
+      await database.teamDao.addTeam(team: testTeam1);
+
+      await database.playerMatchDao.addPlayerToMatch(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer1.id,
+        teamId: testTeam1.id,
+      );
+
+      // Remove player from team by setting teamId to null
+      final updated = await database.playerMatchDao.updatePlayerTeam(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer1.id,
+        teamId: null,
+      );
+
+      expect(updated, true);
+
+      final playersInTeam = await database.playerMatchDao.getPlayersInTeam(
+        matchId: testMatchOnlyGroup.id,
+        teamId: testTeam1.id,
+      );
+
+      expect(playersInTeam.isEmpty, true);
+    });
+
+    // Verifies that updatePlayerTeam returns false for non-existent player-match.
+    test('updatePlayerTeam returns false for non-existent player-match', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyGroup);
+
+      final updated = await database.playerMatchDao.updatePlayerTeam(
+        matchId: testMatchOnlyGroup.id,
+        playerId: 'non-existent-player-id',
+        teamId: testTeam1.id,
+      );
+
+      expect(updated, false);
+    });
+
+    // Verifies that getPlayersInTeam returns empty list for non-existent team.
+    test('getPlayersInTeam returns empty list for non-existent team', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyPlayers);
+
+      final players = await database.playerMatchDao.getPlayersInTeam(
+        matchId: testMatchOnlyPlayers.id,
+        teamId: 'non-existent-team-id',
+      );
+
+      expect(players.isEmpty, true);
+    });
+
+    // Verifies that getPlayersInTeam returns all players of a team.
+    test('getPlayersInTeam returns all players of a team', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyGroup);
+      await database.teamDao.addTeam(team: testTeam1);
+
+      await database.playerMatchDao.addPlayerToMatch(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer1.id,
+        teamId: testTeam1.id,
+      );
+      await database.playerMatchDao.addPlayerToMatch(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer2.id,
+        teamId: testTeam1.id,
+      );
+
+      final playersInTeam = await database.playerMatchDao.getPlayersInTeam(
+        matchId: testMatchOnlyGroup.id,
+        teamId: testTeam1.id,
+      );
+
+      expect(playersInTeam.length, 2);
+      final playerIds = playersInTeam.map((p) => p.id).toSet();
+      expect(playerIds.contains(testPlayer1.id), true);
+      expect(playerIds.contains(testPlayer2.id), true);
+    });
+
+    // Verifies that removePlayerFromMatch returns false for non-existent player.
+    test('removePlayerFromMatch returns false for non-existent player', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyPlayers);
+
+      final removed = await database.playerMatchDao.removePlayerFromMatch(
+        playerId: 'non-existent-player-id',
+        matchId: testMatchOnlyPlayers.id,
+      );
+
+      expect(removed, false);
+    });
+
+    // Verifies that adding the same player twice to the same match is ignored.
+    test('Adding same player twice to same match is ignored', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyGroup);
+
+      await database.playerMatchDao.addPlayerToMatch(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer1.id,
+        score: 10,
+      );
+
+      // Try to add the same player again with different score
+      await database.playerMatchDao.addPlayerToMatch(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer1.id,
+        score: 100,
+      );
+
+      // Score should still be 10 because insert was ignored
+      final score = await database.playerMatchDao.getPlayerScore(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer1.id,
+      );
+
+      expect(score, 10);
+
+      // Verify player count is still 1
+      final players = await database.playerMatchDao.getPlayersOfMatch(
+        matchId: testMatchOnlyGroup.id,
+      );
+
+      expect(players?.length, 1);
+    });
+
+    // Verifies that updatePlayersFromMatch with empty list removes all players.
+    test('updatePlayersFromMatch with empty list removes all players', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyPlayers);
+
+      // Verify players exist initially
+      var players = await database.playerMatchDao.getPlayersOfMatch(
+        matchId: testMatchOnlyPlayers.id,
+      );
+      expect(players?.length, 3);
+
+      // Update with empty list
+      await database.playerMatchDao.updatePlayersFromMatch(
+        matchId: testMatchOnlyPlayers.id,
+        newPlayer: [],
+      );
+
+      // Verify all players are removed
+      players = await database.playerMatchDao.getPlayersOfMatch(
+        matchId: testMatchOnlyPlayers.id,
+      );
+      expect(players, isNull);
+    });
+
+    // Verifies that updatePlayersFromMatch with same players makes no changes.
+    test('updatePlayersFromMatch with same players makes no changes', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyPlayers);
+
+      final originalPlayers = [testPlayer4, testPlayer5, testPlayer6];
+
+      await database.playerMatchDao.updatePlayersFromMatch(
+        matchId: testMatchOnlyPlayers.id,
+        newPlayer: originalPlayers,
+      );
+
+      final players = await database.playerMatchDao.getPlayersOfMatch(
+        matchId: testMatchOnlyPlayers.id,
+      );
+
+      expect(players?.length, originalPlayers.length);
+      final playerIds = players!.map((p) => p.id).toSet();
+      for (final originalPlayer in originalPlayers) {
+        expect(playerIds.contains(originalPlayer.id), true);
+      }
+    });
+
+    // Verifies that matchHasPlayers returns false for non-existent match.
+    test('matchHasPlayers returns false for non-existent match', () async {
+      final hasPlayers = await database.playerMatchDao.matchHasPlayers(
+        matchId: 'non-existent-match-id',
+      );
+
+      expect(hasPlayers, false);
+    });
+
+    // Verifies that isPlayerInMatch returns false for non-existent match.
+    test('isPlayerInMatch returns false for non-existent match', () async {
+      final isInMatch = await database.playerMatchDao.isPlayerInMatch(
+        matchId: 'non-existent-match-id',
+        playerId: testPlayer1.id,
+      );
+
+      expect(isInMatch, false);
+    });
+
+    // Verifies that updatePlayersFromMatch preserves scores for existing players.
+    test('updatePlayersFromMatch only modifies player associations', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyPlayers);
+
+      // Update score for existing player
+      await database.playerMatchDao.updatePlayerScore(
+        matchId: testMatchOnlyPlayers.id,
+        playerId: testPlayer4.id,
+        newScore: 75,
+      );
+
+      // Update players, keeping testPlayer4 and adding testPlayer1
+      await database.playerMatchDao.updatePlayersFromMatch(
+        matchId: testMatchOnlyPlayers.id,
+        newPlayer: [testPlayer4, testPlayer1],
+      );
+
+      // Verify testPlayer4's score is preserved
+      final score = await database.playerMatchDao.getPlayerScore(
+        matchId: testMatchOnlyPlayers.id,
+        playerId: testPlayer4.id,
+      );
+
+      expect(score, 75);
+
+      // Verify testPlayer1 was added with default score
+      final newPlayerScore = await database.playerMatchDao.getPlayerScore(
+        matchId: testMatchOnlyPlayers.id,
+        playerId: testPlayer1.id,
+      );
+
+      expect(newPlayerScore, 0);
+    });
+
+    // Verifies that adding a player with both score and teamId works correctly.
+    test('Adding player with score and teamId works correctly', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyGroup);
+      await database.teamDao.addTeam(team: testTeam1);
+
+      await database.playerMatchDao.addPlayerToMatch(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer1.id,
+        teamId: testTeam1.id,
+        score: 150,
+      );
+
+      // Verify score
+      final score = await database.playerMatchDao.getPlayerScore(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer1.id,
+      );
+      expect(score, 150);
+
+      // Verify team assignment
+      final playersInTeam = await database.playerMatchDao.getPlayersInTeam(
+        matchId: testMatchOnlyGroup.id,
+        teamId: testTeam1.id,
+      );
+      expect(playersInTeam.length, 1);
+      expect(playersInTeam[0].id, testPlayer1.id);
+    });
+
+    // Verifies that updating score with negative value works.
+    test('updatePlayerScore with negative score works', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyPlayers);
+
+      final updated = await database.playerMatchDao.updatePlayerScore(
+        matchId: testMatchOnlyPlayers.id,
+        playerId: testPlayer4.id,
+        newScore: -10,
+      );
+
+      expect(updated, true);
+
+      final score = await database.playerMatchDao.getPlayerScore(
+        matchId: testMatchOnlyPlayers.id,
+        playerId: testPlayer4.id,
+      );
+
+      expect(score, -10);
+    });
+
+    // Verifies that updating score with zero value works.
+    test('updatePlayerScore with zero score works', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyPlayers);
+
+      // First set a non-zero score
+      await database.playerMatchDao.updatePlayerScore(
+        matchId: testMatchOnlyPlayers.id,
+        playerId: testPlayer4.id,
+        newScore: 100,
+      );
+
+      // Then update to zero
+      final updated = await database.playerMatchDao.updatePlayerScore(
+        matchId: testMatchOnlyPlayers.id,
+        playerId: testPlayer4.id,
+        newScore: 0,
+      );
+
+      expect(updated, true);
+
+      final score = await database.playerMatchDao.getPlayerScore(
+        matchId: testMatchOnlyPlayers.id,
+        playerId: testPlayer4.id,
+      );
+
+      expect(score, 0);
+    });
+
+    // Verifies that getPlayersInTeam returns empty list for non-existent match.
+    test('getPlayersInTeam returns empty list for non-existent match', () async {
+      await database.teamDao.addTeam(team: testTeam1);
+
+      final players = await database.playerMatchDao.getPlayersInTeam(
+        matchId: 'non-existent-match-id',
+        teamId: testTeam1.id,
+      );
+
+      expect(players.isEmpty, true);
+    });
+
+    // Verifies that players in different teams within the same match are returned correctly.
+    test('Players in different teams within same match are separate', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyGroup);
+      await database.teamDao.addTeam(team: testTeam1);
+      await database.teamDao.addTeam(team: testTeam2);
+
+      // Add players to different teams
+      await database.playerMatchDao.addPlayerToMatch(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer1.id,
+        teamId: testTeam1.id,
+      );
+      await database.playerMatchDao.addPlayerToMatch(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer2.id,
+        teamId: testTeam1.id,
+      );
+      await database.playerMatchDao.addPlayerToMatch(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer3.id,
+        teamId: testTeam2.id,
+      );
+
+      // Verify team 1 players
+      final playersInTeam1 = await database.playerMatchDao.getPlayersInTeam(
+        matchId: testMatchOnlyGroup.id,
+        teamId: testTeam1.id,
+      );
+      expect(playersInTeam1.length, 2);
+      final team1Ids = playersInTeam1.map((p) => p.id).toSet();
+      expect(team1Ids.contains(testPlayer1.id), true);
+      expect(team1Ids.contains(testPlayer2.id), true);
+      expect(team1Ids.contains(testPlayer3.id), false);
+
+      // Verify team 2 players
+      final playersInTeam2 = await database.playerMatchDao.getPlayersInTeam(
+        matchId: testMatchOnlyGroup.id,
+        teamId: testTeam2.id,
+      );
+      expect(playersInTeam2.length, 1);
+      expect(playersInTeam2[0].id, testPlayer3.id);
+    });
+
+    // Verifies that removePlayerFromMatch does not affect other matches.
+    test('removePlayerFromMatch does not affect other matches', () async {
+      final playersList = [testPlayer1, testPlayer2];
+      final match1 = Match(name: 'Match 1', game: testGame, players: playersList, notes: '');
+      final match2 = Match(name: 'Match 2', game: testGame, players: playersList, notes: '');
+
+      await Future.wait([
+        database.matchDao.addMatch(match: match1),
+        database.matchDao.addMatch(match: match2),
+      ]);
+
+      // Remove player from match1
+      final removed = await database.playerMatchDao.removePlayerFromMatch(
+        playerId: testPlayer1.id,
+        matchId: match1.id,
+      );
+      expect(removed, true);
+
+      // Verify player is removed from match1
+      final isInMatch1 = await database.playerMatchDao.isPlayerInMatch(
+        matchId: match1.id,
+        playerId: testPlayer1.id,
+      );
+      expect(isInMatch1, false);
+
+      // Verify player still exists in match2
+      final isInMatch2 = await database.playerMatchDao.isPlayerInMatch(
+        matchId: match2.id,
+        playerId: testPlayer1.id,
+      );
+      expect(isInMatch2, true);
+    });
+
+    // Verifies that updating scores for players in different matches are independent.
+    test('Player scores are independent across matches', () async {
+      final playersList = [testPlayer1];
+      final match1 = Match(name: 'Match 1', game: testGame, players: playersList, notes: '');
+      final match2 = Match(name: 'Match 2', game: testGame, players: playersList, notes: '');
+
+      await Future.wait([
+        database.matchDao.addMatch(match: match1),
+        database.matchDao.addMatch(match: match2),
+      ]);
+
+      // Update score in match1
+      await database.playerMatchDao.updatePlayerScore(
+        matchId: match1.id,
+        playerId: testPlayer1.id,
+        newScore: 100,
+      );
+
+      // Update score in match2
+      await database.playerMatchDao.updatePlayerScore(
+        matchId: match2.id,
+        playerId: testPlayer1.id,
+        newScore: 50,
+      );
+
+      // Verify scores are independent
+      final scoreInMatch1 = await database.playerMatchDao.getPlayerScore(
+        matchId: match1.id,
+        playerId: testPlayer1.id,
+      );
+      final scoreInMatch2 = await database.playerMatchDao.getPlayerScore(
+        matchId: match2.id,
+        playerId: testPlayer1.id,
+      );
+
+      expect(scoreInMatch1, 100);
+      expect(scoreInMatch2, 50);
+    });
+
+    // Verifies that updatePlayersFromMatch on non-existent match fails with constraint error.
+    test('updatePlayersFromMatch on non-existent match fails with foreign key constraint', () async {
+      // Should throw due to foreign key constraint - match doesn't exist
+      await expectLater(
+        database.playerMatchDao.updatePlayersFromMatch(
+          matchId: 'non-existent-match-id',
+          newPlayer: [testPlayer1, testPlayer2],
+        ),
+        throwsA(anything),
+      );
+    });
+
+    // Verifies that a player can be in a match without being assigned to a team.
+    test('Player can exist in match without team assignment', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyGroup);
+      await database.teamDao.addTeam(team: testTeam1);
+
+      // Add player to match without team
+      await database.playerMatchDao.addPlayerToMatch(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer1.id,
+      );
+
+      // Add another player to match with team
+      await database.playerMatchDao.addPlayerToMatch(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer2.id,
+        teamId: testTeam1.id,
+      );
+
+      // Verify both players are in the match
+      final isPlayer1InMatch = await database.playerMatchDao.isPlayerInMatch(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer1.id,
+      );
+      final isPlayer2InMatch = await database.playerMatchDao.isPlayerInMatch(
+        matchId: testMatchOnlyGroup.id,
+        playerId: testPlayer2.id,
+      );
+
+      expect(isPlayer1InMatch, true);
+      expect(isPlayer2InMatch, true);
+
+      // Verify only player2 is in the team
+      final playersInTeam = await database.playerMatchDao.getPlayersInTeam(
+        matchId: testMatchOnlyGroup.id,
+        teamId: testTeam1.id,
+      );
+
+      expect(playersInTeam.length, 1);
+      expect(playersInTeam[0].id, testPlayer2.id);
+    });
   });
 }

test/db_tests/player_test.dart

@@ -1,5 +1,5 @@
 import 'package:clock/clock.dart';
-import 'package:drift/drift.dart';
+import 'package:drift/drift.dart' hide isNull;
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:tallee/data/db/database.dart';
@@ -24,10 +24,10 @@ void main() {
     );
 
     withClock(fakeClock, () {
-      testPlayer1 = Player(name: 'Test Player');
-      testPlayer2 = Player(name: 'Second Player');
-      testPlayer3 = Player(name: 'Charlie');
-      testPlayer4 = Player(name: 'Diana');
+      testPlayer1 = Player(name: 'Test Player', description: '');
+      testPlayer2 = Player(name: 'Second Player', description: '');
+      testPlayer3 = Player(name: 'Charlie', description: '');
+      testPlayer4 = Player(name: 'Diana', description: '');
     });
   });
   tearDown(() async {
@@ -35,6 +35,8 @@ void main() {
   });
 
   group('Player Tests', () {
+
+    // Verifies that players can be added and retrieved with all fields intact.
     test('Adding and fetching single player works correctly', () async {
       await database.playerDao.addPlayer(player: testPlayer1);
       await database.playerDao.addPlayer(player: testPlayer2);
@@ -55,6 +57,7 @@ void main() {
       expect(fetchedPlayer2.createdAt, testPlayer2.createdAt);
     });
 
+    // Verifies that multiple players can be added at once and retrieved correctly.
     test('Adding and fetching multiple players works correctly', () async {
       await database.playerDao.addPlayersAsList(
         players: [testPlayer1, testPlayer2, testPlayer3, testPlayer4],
@@ -63,7 +66,7 @@ void main() {
       final allPlayers = await database.playerDao.getAllPlayers();
       expect(allPlayers.length, 4);
 
-      // Map for connencting fetched players with expected players
+      // Map for connecting fetched players with expected players
       final testPlayers = {
         testPlayer1.id: testPlayer1,
         testPlayer2.id: testPlayer2,
@@ -80,6 +83,7 @@ void main() {
       }
     });
 
+    // Verifies that adding the same player twice does not create duplicates.
     test('Adding the same player twice does not create duplicates', () async {
       await database.playerDao.addPlayer(player: testPlayer1);
       await database.playerDao.addPlayer(player: testPlayer1);
@@ -88,6 +92,7 @@ void main() {
       expect(allPlayers.length, 1);
     });
 
+    // Verifies that playerExists returns correct boolean based on player presence.
     test('Player existence check works correctly', () async {
       var playerExists = await database.playerDao.playerExists(
         playerId: testPlayer1.id,
@@ -102,6 +107,7 @@ void main() {
       expect(playerExists, true);
     });
 
+    // Verifies that deletePlayer removes the player and returns true.
     test('Deleting a player works correctly', () async {
       await database.playerDao.addPlayer(player: testPlayer1);
       final playerDeleted = await database.playerDao.deletePlayer(
@@ -115,12 +121,13 @@ void main() {
       expect(playerExists, false);
     });
 
-    test('Updating a player name works correcly', () async {
+    // Verifies that updatePlayerName correctly updates only the name field.
+    test('Updating a player name works correctly', () 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,
       );
@@ -131,6 +138,7 @@ void main() {
       expect(result.name, newPlayerName);
     });
 
+    // Verifies that getPlayerCount returns correct count through add/delete operations.
     test('Getting the player count works correctly', () async {
       var playerCount = await database.playerDao.getPlayerCount();
       expect(playerCount, 0);
@@ -155,5 +163,215 @@ void main() {
       playerCount = await database.playerDao.getPlayerCount();
       expect(playerCount, 0);
     });
+
+    // Verifies that getAllPlayers returns an empty list when no players exist.
+    test('getAllPlayers returns empty list when no players exist', () async {
+      final allPlayers = await database.playerDao.getAllPlayers();
+      expect(allPlayers, isEmpty);
+    });
+
+    // Verifies that getPlayerById returns the correct player.
+    test('getPlayerById returns correct player', () async {
+      await database.playerDao.addPlayer(player: testPlayer1);
+      await database.playerDao.addPlayer(player: testPlayer2);
+
+      final fetchedPlayer = await database.playerDao.getPlayerById(
+        playerId: testPlayer1.id,
+      );
+
+      expect(fetchedPlayer.id, testPlayer1.id);
+      expect(fetchedPlayer.name, testPlayer1.name);
+      expect(fetchedPlayer.createdAt, testPlayer1.createdAt);
+      expect(fetchedPlayer.description, testPlayer1.description);
+    });
+
+    // Verifies that getPlayerById throws StateError for non-existent player ID.
+    test('getPlayerById throws exception for non-existent player', () async {
+      expect(
+        () => database.playerDao.getPlayerById(playerId: 'non-existent-id'),
+        throwsA(isA<StateError>()),
+      );
+    });
+
+    // Verifies that addPlayer returns false when trying to add a duplicate player.
+    test('addPlayer returns false when player already exists', () async {
+      final firstAdd = await database.playerDao.addPlayer(player: testPlayer1);
+      expect(firstAdd, true);
+
+      final secondAdd = await database.playerDao.addPlayer(player: testPlayer1);
+      expect(secondAdd, false);
+    });
+
+    // Verifies that addPlayersAsList handles empty list correctly.
+    test('addPlayersAsList handles empty list correctly', () async {
+      final result = await database.playerDao.addPlayersAsList(players: []);
+      expect(result, false);
+
+      final allPlayers = await database.playerDao.getAllPlayers();
+      expect(allPlayers, isEmpty);
+    });
+
+    // Verifies that addPlayersAsList ignores duplicate player IDs.
+    test('addPlayersAsList with duplicate IDs ignores duplicates', () async {
+      await database.playerDao.addPlayersAsList(
+        players: [testPlayer1, testPlayer1, testPlayer2],
+      );
+
+      final allPlayers = await database.playerDao.getAllPlayers();
+      expect(allPlayers.length, 2);
+    });
+
+    // Verifies that deletePlayer returns false for non-existent player.
+    test('deletePlayer returns false for non-existent player', () async {
+      final result = await database.playerDao.deletePlayer(
+        playerId: 'non-existent-id',
+      );
+      expect(result, false);
+    });
+
+    // Verifies that updatePlayerName does nothing for non-existent player (no exception).
+    test('updatePlayerName does nothing for non-existent player', () async {
+      // Should not throw, just do nothing
+      await database.playerDao.updatePlayerName(
+        playerId: 'non-existent-id',
+        newName: 'New Name',
+      );
+
+      final allPlayers = await database.playerDao.getAllPlayers();
+      expect(allPlayers, isEmpty);
+    });
+
+    // Verifies that deleteAllPlayers removes all players.
+    test('deleteAllPlayers removes all players', () async {
+      await database.playerDao.addPlayersAsList(
+        players: [testPlayer1, testPlayer2, testPlayer3],
+      );
+
+      var playerCount = await database.playerDao.getPlayerCount();
+      expect(playerCount, 3);
+
+      final result = await database.playerDao.deleteAllPlayers();
+      expect(result, true);
+
+      playerCount = await database.playerDao.getPlayerCount();
+      expect(playerCount, 0);
+    });
+
+    // Verifies that deleteAllPlayers returns false when no players exist.
+    test('deleteAllPlayers returns false when no players exist', () async {
+      final result = await database.playerDao.deleteAllPlayers();
+      expect(result, false);
+    });
+
+    // Verifies that a player with special characters in name is stored correctly.
+    test('Player with special characters in name is stored correctly', () async {
+      final specialPlayer = Player(name: 'Test!@#\$%^&*()_+-=[]{}|;\':",.<>?/`~', description: '');
+
+      await database.playerDao.addPlayer(player: specialPlayer);
+
+      final fetchedPlayer = await database.playerDao.getPlayerById(
+        playerId: specialPlayer.id,
+      );
+      expect(fetchedPlayer.name, specialPlayer.name);
+    });
+
+    // Verifies that a player with description is stored correctly.
+    test('Player with description is stored correctly', () async {
+      final playerWithDescription = Player(
+        name: 'Described Player',
+        description: 'This is a test description',
+      );
+
+      await database.playerDao.addPlayer(player: playerWithDescription);
+
+      final fetchedPlayer = await database.playerDao.getPlayerById(
+        playerId: playerWithDescription.id,
+      );
+      expect(fetchedPlayer.name, playerWithDescription.name);
+      expect(fetchedPlayer.description, playerWithDescription.description);
+    });
+
+    // Verifies that a player with null description is stored correctly.
+    test('Player with null description is stored correctly', () async {
+      final playerWithoutDescription = Player(name: 'No Description Player', description: '');
+
+      await database.playerDao.addPlayer(player: playerWithoutDescription);
+
+      final fetchedPlayer = await database.playerDao.getPlayerById(
+        playerId: playerWithoutDescription.id,
+      );
+      expect(fetchedPlayer.description, '');
+    });
+
+    // Verifies that multiple updates to the same player work correctly.
+    test('Multiple updates to the same player work correctly', () async {
+      await database.playerDao.addPlayer(player: testPlayer1);
+
+      await database.playerDao.updatePlayerName(
+        playerId: testPlayer1.id,
+        newName: 'First Update',
+      );
+
+      var fetchedPlayer = await database.playerDao.getPlayerById(
+        playerId: testPlayer1.id,
+      );
+      expect(fetchedPlayer.name, 'First Update');
+
+      await database.playerDao.updatePlayerName(
+        playerId: testPlayer1.id,
+        newName: 'Second Update',
+      );
+
+      fetchedPlayer = await database.playerDao.getPlayerById(
+        playerId: testPlayer1.id,
+      );
+      expect(fetchedPlayer.name, 'Second Update');
+
+      await database.playerDao.updatePlayerName(
+        playerId: testPlayer1.id,
+        newName: 'Third Update',
+      );
+
+      fetchedPlayer = await database.playerDao.getPlayerById(
+        playerId: testPlayer1.id,
+      );
+      expect(fetchedPlayer.name, 'Third Update');
+    });
+
+    // Verifies that a player with empty string name is stored correctly.
+    test('Player with empty string name is stored correctly', () async {
+      final emptyNamePlayer = Player(name: '', description: '');
+
+      await database.playerDao.addPlayer(player: emptyNamePlayer);
+
+      final fetchedPlayer = await database.playerDao.getPlayerById(
+        playerId: emptyNamePlayer.id,
+      );
+      expect(fetchedPlayer.name, '');
+    });
+
+    // Verifies that a player with very long name is stored correctly.
+    test('Player with very long name is stored correctly', () async {
+      final longName = 'A' * 1000;
+      final longNamePlayer = Player(name: longName, description: '');
+
+      await database.playerDao.addPlayer(player: longNamePlayer);
+
+      final fetchedPlayer = await database.playerDao.getPlayerById(
+        playerId: longNamePlayer.id,
+      );
+      expect(fetchedPlayer.name, longName);
+    });
+
+    // Verifies that addPlayer returns true on first add.
+    test('addPlayer returns true when player is added successfully', () async {
+      final result = await database.playerDao.addPlayer(player: testPlayer1);
+      expect(result, true);
+
+      final playerExists = await database.playerDao.playerExists(
+        playerId: testPlayer1.id,
+      );
+      expect(playerExists, true);
+    });
   });
 }

test/db_tests/score_test.dart

@@ -0,0 +1,739 @@
+import 'package:clock/clock.dart';
+import 'package:drift/drift.dart' hide isNull, isNotNull;
+import 'package:drift/native.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/dto/game.dart';
+import 'package:tallee/data/dto/match.dart';
+import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/core/enums.dart';
+
+void main() {
+  late AppDatabase database;
+  late Player testPlayer1;
+  late Player testPlayer2;
+  late Player testPlayer3;
+  late Game testGame;
+  late Match testMatch1;
+  late Match testMatch2;
+  final fixedDate = DateTime(2025, 11, 19, 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', description: '');
+      testPlayer2 = Player(name: 'Bob', description: '');
+      testPlayer3 = Player(name: 'Charlie', description: '');
+      testGame = Game(name: 'Test Game', ruleset: Ruleset.singleWinner, description: 'A test game', color: GameColor.blue, icon: '');
+      testMatch1 = Match(
+        name: 'Test Match 1',
+        game: testGame,
+        players: [testPlayer1, testPlayer2],
+        notes: '',
+      );
+      testMatch2 = Match(
+        name: 'Test Match 2',
+        game: testGame,
+        players: [testPlayer2, testPlayer3],
+        notes: '',
+      );
+    });
+
+    await database.playerDao.addPlayersAsList(
+      players: [testPlayer1, testPlayer2, testPlayer3],
+    );
+    await database.gameDao.addGame(game: testGame);
+    await database.matchDao.addMatch(match: testMatch1);
+    await database.matchDao.addMatch(match: testMatch2);
+  });
+
+  tearDown(() async {
+    await database.close();
+  });
+
+  group('Score Tests', () {
+
+    // Verifies that a score can be added and retrieved with all fields intact.
+    test('Adding and fetching a score works correctly', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 10,
+        change: 10,
+      );
+
+      final score = await database.scoreDao.getScoreForRound(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+      );
+
+      expect(score, isNotNull);
+      expect(score!.playerId, testPlayer1.id);
+      expect(score.matchId, testMatch1.id);
+      expect(score.roundNumber, 1);
+      expect(score.score, 10);
+      expect(score.change, 10);
+    });
+
+    // Verifies that getScoresForMatch returns all scores for a given match.
+    test('Getting scores for a match works correctly', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 10,
+        change: 10,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer2.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 20,
+        change: 20,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 2,
+        score: 25,
+        change: 15,
+      );
+
+      final scores = await database.scoreDao.getScoresForMatch(
+        matchId: testMatch1.id,
+      );
+
+      expect(scores.length, 3);
+    });
+
+    // Verifies that getPlayerScoresInMatch returns all scores for a player in a match, ordered by round.
+    test('Getting player scores in a match works correctly', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 10,
+        change: 10,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 2,
+        score: 25,
+        change: 15,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 3,
+        score: 30,
+        change: 5,
+      );
+
+      final playerScores = await database.scoreDao.getPlayerScoresInMatch(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+      );
+
+      expect(playerScores.length, 3);
+      expect(playerScores[0].roundNumber, 1);
+      expect(playerScores[1].roundNumber, 2);
+      expect(playerScores[2].roundNumber, 3);
+      expect(playerScores[0].score, 10);
+      expect(playerScores[1].score, 25);
+      expect(playerScores[2].score, 30);
+    });
+
+    // Verifies that getScoreForRound returns null for a non-existent round number.
+    test('Getting score for a non-existent round returns null', () async {
+      final score = await database.scoreDao.getScoreForRound(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 999,
+      );
+
+      expect(score, isNull);
+    });
+
+    // Verifies that updateScore correctly updates the score and change values.
+    test('Updating a score works correctly', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 10,
+        change: 10,
+      );
+
+      final updated = await database.scoreDao.updateScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        newScore: 50,
+        newChange: 40,
+      );
+
+      expect(updated, true);
+
+      final score = await database.scoreDao.getScoreForRound(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+      );
+
+      expect(score, isNotNull);
+      expect(score!.score, 50);
+      expect(score.change, 40);
+    });
+
+    // Verifies that updateScore returns false for a non-existent score entry.
+    test('Updating a non-existent score returns false', () async {
+      final updated = await database.scoreDao.updateScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 999,
+        newScore: 50,
+        newChange: 40,
+      );
+
+      expect(updated, false);
+    });
+
+    // Verifies that deleteScore removes the score entry and returns true.
+    test('Deleting a score works correctly', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 10,
+        change: 10,
+      );
+
+      final deleted = await database.scoreDao.deleteScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+      );
+
+      expect(deleted, true);
+
+      final score = await database.scoreDao.getScoreForRound(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+      );
+
+      expect(score, isNull);
+    });
+
+    // Verifies that deleteScore returns false for a non-existent score entry.
+    test('Deleting a non-existent score returns false', () async {
+      final deleted = await database.scoreDao.deleteScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 999,
+      );
+
+      expect(deleted, false);
+    });
+
+    // Verifies that deleteScoresForMatch removes all scores for a match but keeps other match scores.
+    test('Deleting scores for a match works correctly', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 10,
+        change: 10,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer2.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 20,
+        change: 20,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch2.id,
+        roundNumber: 1,
+        score: 15,
+        change: 15,
+      );
+
+      final deleted = await database.scoreDao.deleteScoresForMatch(
+        matchId: testMatch1.id,
+      );
+
+      expect(deleted, true);
+
+      final match1Scores = await database.scoreDao.getScoresForMatch(
+        matchId: testMatch1.id,
+      );
+      expect(match1Scores.length, 0);
+
+      final match2Scores = await database.scoreDao.getScoresForMatch(
+        matchId: testMatch2.id,
+      );
+      expect(match2Scores.length, 1);
+    });
+
+    // Verifies that deleteScoresForPlayer removes all scores for a player across all matches.
+    test('Deleting scores for a player works correctly', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 10,
+        change: 10,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch2.id,
+        roundNumber: 1,
+        score: 15,
+        change: 15,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer2.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 20,
+        change: 20,
+      );
+
+      final deleted = await database.scoreDao.deleteScoresForPlayer(
+        playerId: testPlayer1.id,
+      );
+
+      expect(deleted, true);
+
+      final player1Scores = await database.scoreDao.getPlayerScoresInMatch(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+      );
+      expect(player1Scores.length, 0);
+
+      final player2Scores = await database.scoreDao.getPlayerScoresInMatch(
+        playerId: testPlayer2.id,
+        matchId: testMatch1.id,
+      );
+      expect(player2Scores.length, 1);
+    });
+
+    // Verifies that getLatestRoundNumber returns the highest round number for a match.
+    test('Getting latest round number works correctly', () async {
+      var latestRound = await database.scoreDao.getLatestRoundNumber(
+        matchId: testMatch1.id,
+      );
+      expect(latestRound, 0);
+
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 10,
+        change: 10,
+      );
+
+      latestRound = await database.scoreDao.getLatestRoundNumber(
+        matchId: testMatch1.id,
+      );
+      expect(latestRound, 1);
+
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 5,
+        score: 50,
+        change: 40,
+      );
+
+      latestRound = await database.scoreDao.getLatestRoundNumber(
+        matchId: testMatch1.id,
+      );
+      expect(latestRound, 5);
+    });
+
+    // Verifies that getTotalScoreForPlayer returns the latest score (cumulative) for a player.
+    test('Getting total score for a player works correctly', () async {
+      var totalScore = await database.scoreDao.getTotalScoreForPlayer(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+      );
+      expect(totalScore, 0);
+
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 10,
+        change: 10,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 2,
+        score: 25,
+        change: 15,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 3,
+        score: 40,
+        change: 15,
+      );
+
+      totalScore = await database.scoreDao.getTotalScoreForPlayer(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+      );
+      expect(totalScore, 40);
+    });
+
+    // Verifies that adding a score with the same player/match/round replaces the existing one.
+    test('Adding the same score twice replaces the existing one', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 10,
+        change: 10,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 99,
+        change: 99,
+      );
+
+      final score = await database.scoreDao.getScoreForRound(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+      );
+
+      expect(score, isNotNull);
+      expect(score!.score, 99);
+      expect(score.change, 99);
+    });
+
+    // Verifies that getScoresForMatch returns empty list for match with no scores.
+    test('Getting scores for match with no scores returns empty list', () async {
+      final scores = await database.scoreDao.getScoresForMatch(
+        matchId: testMatch1.id,
+      );
+
+      expect(scores.isEmpty, true);
+    });
+
+    // Verifies that getPlayerScoresInMatch returns empty list when player has no scores.
+    test('Getting player scores with no scores returns empty list', () async {
+      final playerScores = await database.scoreDao.getPlayerScoresInMatch(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+      );
+
+      expect(playerScores.isEmpty, true);
+    });
+
+    // Verifies that scores can have negative values.
+    test('Score can have negative values', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: -10,
+        change: -10,
+      );
+
+      final score = await database.scoreDao.getScoreForRound(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+      );
+
+      expect(score, isNotNull);
+      expect(score!.score, -10);
+      expect(score.change, -10);
+    });
+
+    // Verifies that scores can have zero values.
+    test('Score can have zero values', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 0,
+        change: 0,
+      );
+
+      final score = await database.scoreDao.getScoreForRound(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+      );
+
+      expect(score, isNotNull);
+      expect(score!.score, 0);
+      expect(score.change, 0);
+    });
+
+    // Verifies that very large round numbers are supported.
+    test('Score supports very large round numbers', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 999999,
+        score: 100,
+        change: 100,
+      );
+
+      final score = await database.scoreDao.getScoreForRound(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 999999,
+      );
+
+      expect(score, isNotNull);
+      expect(score!.roundNumber, 999999);
+    });
+
+    // Verifies that getLatestRoundNumber returns max correctly for non-consecutive rounds.
+    test('Getting latest round number with non-consecutive rounds', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 10,
+        change: 10,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 5,
+        score: 50,
+        change: 40,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 3,
+        score: 30,
+        change: 20,
+      );
+
+      final latestRound = await database.scoreDao.getLatestRoundNumber(
+        matchId: testMatch1.id,
+      );
+
+      expect(latestRound, 5);
+    });
+
+    // Verifies that deleteScoresForMatch returns false when no scores exist.
+    test('Deleting scores for empty match returns false', () async {
+      final deleted = await database.scoreDao.deleteScoresForMatch(
+        matchId: testMatch1.id,
+      );
+
+      expect(deleted, false);
+    });
+
+    // Verifies that deleteScoresForPlayer returns false when player has no scores.
+    test('Deleting scores for player with no scores returns false', () async {
+      final deleted = await database.scoreDao.deleteScoresForPlayer(
+        playerId: testPlayer1.id,
+      );
+
+      expect(deleted, false);
+    });
+
+    // Verifies that multiple players in same match can have independent score updates.
+    test('Multiple players in same match have independent scores', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 10,
+        change: 10,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer2.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 20,
+        change: 20,
+      );
+
+      await database.scoreDao.updateScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        newScore: 100,
+        newChange: 90,
+      );
+
+      final player1Score = await database.scoreDao.getScoreForRound(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+      );
+      final player2Score = await database.scoreDao.getScoreForRound(
+        playerId: testPlayer2.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+      );
+
+      expect(player1Score!.score, 100);
+      expect(player2Score!.score, 20);
+    });
+
+    // Verifies that scores are isolated across different matches.
+    test('Scores are isolated across different matches', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 10,
+        change: 10,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch2.id,
+        roundNumber: 1,
+        score: 50,
+        change: 50,
+      );
+
+      final match1Scores = await database.scoreDao.getPlayerScoresInMatch(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+      );
+      final match2Scores = await database.scoreDao.getPlayerScoresInMatch(
+        playerId: testPlayer1.id,
+        matchId: testMatch2.id,
+      );
+
+      expect(match1Scores.length, 1);
+      expect(match2Scores.length, 1);
+      expect(match1Scores[0].score, 10);
+      expect(match2Scores[0].score, 50);
+    });
+
+    // Verifies that getTotalScoreForPlayer returns latest score across multiple rounds.
+    test('Total score for player returns latest cumulative score', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 2,
+        score: 25,
+        change: 25,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 10,
+        change: 10,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 3,
+        score: 50,
+        change: 25,
+      );
+
+      final totalScore = await database.scoreDao.getTotalScoreForPlayer(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+      );
+
+      // Should return the highest round's score
+      expect(totalScore, 50);
+    });
+
+    // Verifies that updating one player's score doesn't affect another player's score in same round.
+    test('Updating one player score does not affect other players in same round', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 10,
+        change: 10,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer2.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 20,
+        change: 20,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer3.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 30,
+        change: 30,
+      );
+
+      await database.scoreDao.updateScore(
+        playerId: testPlayer2.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        newScore: 99,
+        newChange: 89,
+      );
+
+      final scores = await database.scoreDao.getScoresForMatch(
+        matchId: testMatch1.id,
+      );
+
+      expect(scores.length, 3);
+      expect(scores.where((s) => s.playerId == testPlayer1.id).first.score, 10);
+      expect(scores.where((s) => s.playerId == testPlayer2.id).first.score, 99);
+      expect(scores.where((s) => s.playerId == testPlayer3.id).first.score, 30);
+    });
+
+    // Verifies that deleting a player's scores only affects that specific player.
+    test('Deleting player scores only affects target player', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 10,
+        change: 10,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer2.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 20,
+        change: 20,
+      );
+
+      await database.scoreDao.deleteScoresForPlayer(
+        playerId: testPlayer1.id,
+      );
+
+      final match1Scores = await database.scoreDao.getScoresForMatch(
+        matchId: testMatch1.id,
+      );
+
+      expect(match1Scores.length, 1);
+      expect(match1Scores[0].playerId, testPlayer2.id);
+    });
+  });
+}

test/db_tests/team_test.dart

@@ -0,0 +1,527 @@
+import 'package:clock/clock.dart';
+import 'package:drift/drift.dart';
+import 'package:drift/native.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/dto/game.dart';
+import 'package:tallee/data/dto/match.dart';
+import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/data/dto/team.dart';
+import 'package:tallee/core/enums.dart';
+
+void main() {
+  late AppDatabase database;
+  late Player testPlayer1;
+  late Player testPlayer2;
+  late Player testPlayer3;
+  late Player testPlayer4;
+  late Team testTeam1;
+  late Team testTeam2;
+  late Team testTeam3;
+  late Game testGame1;
+  late Game testGame2;
+  final fixedDate = DateTime(2025, 11, 19, 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', description: '');
+      testPlayer2 = Player(name: 'Bob', description: '');
+      testPlayer3 = Player(name: 'Charlie', description: '');
+      testPlayer4 = Player(name: 'Diana', description: '');
+      testTeam1 = Team(
+        name: 'Team Alpha',
+        members: [testPlayer1, testPlayer2],
+      );
+      testTeam2 = Team(
+        name: 'Team Beta',
+        members: [testPlayer3, testPlayer4],
+      );
+      testTeam3 = Team(
+        name: 'Team Gamma',
+        members: [testPlayer1, testPlayer3],
+      );
+      testGame1 = Game(name: 'Game 1', ruleset: Ruleset.singleWinner, description: 'Test game 1', color: GameColor.blue, icon: '');
+      testGame2 = Game(name: 'Game 2', ruleset: Ruleset.highestScore, description: 'Test game 2', color: GameColor.red, icon: '');
+    });
+
+    await database.playerDao.addPlayersAsList(
+      players: [testPlayer1, testPlayer2, testPlayer3, testPlayer4],
+    );
+    await database.gameDao.addGame(game: testGame1);
+    await database.gameDao.addGame(game: testGame2);
+  });
+
+  tearDown(() async {
+    await database.close();
+  });
+
+  group('Team Tests', () {
+
+    // Verifies that a single team can be added and retrieved with all fields intact.
+    test('Adding and fetching a single team works correctly', () async {
+      final added = await database.teamDao.addTeam(team: testTeam1);
+      expect(added, true);
+
+      final fetchedTeam = await database.teamDao.getTeamById(
+        teamId: testTeam1.id,
+      );
+
+      expect(fetchedTeam.id, testTeam1.id);
+      expect(fetchedTeam.name, testTeam1.name);
+      expect(fetchedTeam.createdAt, testTeam1.createdAt);
+    });
+
+    // Verifies that multiple teams can be added at once and retrieved correctly.
+    test('Adding and fetching multiple teams works correctly', () async {
+      await database.teamDao.addTeamsAsList(
+        teams: [testTeam1, testTeam2, testTeam3],
+      );
+
+      final allTeams = await database.teamDao.getAllTeams();
+      expect(allTeams.length, 3);
+
+      final testTeams = {
+        testTeam1.id: testTeam1,
+        testTeam2.id: testTeam2,
+        testTeam3.id: testTeam3,
+      };
+
+      for (final team in allTeams) {
+        final testTeam = testTeams[team.id]!;
+
+        expect(team.id, testTeam.id);
+        expect(team.name, testTeam.name);
+        expect(team.createdAt, testTeam.createdAt);
+      }
+    });
+
+    // Verifies that adding the same team twice does not create duplicates and returns false.
+    test('Adding the same team twice does not create duplicates', () async {
+      await database.teamDao.addTeam(team: testTeam1);
+      final addedAgain = await database.teamDao.addTeam(team: testTeam1);
+
+      expect(addedAgain, false);
+
+      final teamCount = await database.teamDao.getTeamCount();
+      expect(teamCount, 1);
+    });
+
+    // Verifies that teamExists returns correct boolean based on team presence.
+    test('Team existence check works correctly', () async {
+      var teamExists = await database.teamDao.teamExists(teamId: testTeam1.id);
+      expect(teamExists, false);
+
+      await database.teamDao.addTeam(team: testTeam1);
+
+      teamExists = await database.teamDao.teamExists(teamId: testTeam1.id);
+      expect(teamExists, true);
+    });
+
+    // Verifies that deleteTeam removes the team and returns true.
+    test('Deleting a team works correctly', () async {
+      await database.teamDao.addTeam(team: testTeam1);
+
+      final teamDeleted = await database.teamDao.deleteTeam(
+        teamId: testTeam1.id,
+      );
+      expect(teamDeleted, true);
+
+      final teamExists = await database.teamDao.teamExists(
+        teamId: testTeam1.id,
+      );
+      expect(teamExists, false);
+    });
+
+    // Verifies that deleteTeam returns false for a non-existent team ID.
+    test('Deleting a non-existent team returns false', () async {
+      final teamDeleted = await database.teamDao.deleteTeam(
+        teamId: 'non-existent-id',
+      );
+      expect(teamDeleted, false);
+    });
+
+    // Verifies that getTeamCount returns correct count through add/delete operations.
+    test('Getting the team count works correctly', () async {
+      var teamCount = await database.teamDao.getTeamCount();
+      expect(teamCount, 0);
+
+      await database.teamDao.addTeam(team: testTeam1);
+
+      teamCount = await database.teamDao.getTeamCount();
+      expect(teamCount, 1);
+
+      await database.teamDao.addTeam(team: testTeam2);
+
+      teamCount = await database.teamDao.getTeamCount();
+      expect(teamCount, 2);
+
+      await database.teamDao.deleteTeam(teamId: testTeam1.id);
+
+      teamCount = await database.teamDao.getTeamCount();
+      expect(teamCount, 1);
+
+      await database.teamDao.deleteTeam(teamId: testTeam2.id);
+
+      teamCount = await database.teamDao.getTeamCount();
+      expect(teamCount, 0);
+    });
+
+    // Verifies that updateTeamName correctly updates only the name field.
+    test('Updating team name works correctly', () async {
+      await database.teamDao.addTeam(team: testTeam1);
+
+      var fetchedTeam = await database.teamDao.getTeamById(
+        teamId: testTeam1.id,
+      );
+      expect(fetchedTeam.name, testTeam1.name);
+
+      const newName = 'Updated Team Name';
+      await database.teamDao.updateTeamName(
+        teamId: testTeam1.id,
+        newName: newName,
+      );
+
+      fetchedTeam = await database.teamDao.getTeamById(teamId: testTeam1.id);
+      expect(fetchedTeam.name, newName);
+    });
+
+    // Verifies that deleteAllTeams removes all teams from the database.
+    test('Deleting all teams works correctly', () async {
+      await database.teamDao.addTeamsAsList(
+        teams: [testTeam1, testTeam2, testTeam3],
+      );
+
+      var teamCount = await database.teamDao.getTeamCount();
+      expect(teamCount, 3);
+
+      final deleted = await database.teamDao.deleteAllTeams();
+      expect(deleted, true);
+
+      teamCount = await database.teamDao.getTeamCount();
+      expect(teamCount, 0);
+    });
+
+    // Verifies that deleteAllTeams returns false when no teams exist.
+    test('Deleting all teams when empty returns false', () async {
+      final deleted = await database.teamDao.deleteAllTeams();
+      expect(deleted, false);
+    });
+
+    // Verifies that addTeamsAsList returns false when given an empty list.
+    test('Adding teams as list with empty list returns false', () async {
+      final added = await database.teamDao.addTeamsAsList(teams: []);
+      expect(added, false);
+    });
+
+    // Verifies that addTeamsAsList with duplicate IDs ignores duplicates and keeps the first.
+    test('Adding teams with duplicate IDs ignores duplicates', () async {
+      final duplicateTeam = Team(
+        id: testTeam1.id,
+        name: 'Duplicate Team',
+        members: [testPlayer4],
+      );
+
+      await database.teamDao.addTeamsAsList(
+        teams: [testTeam1, duplicateTeam, testTeam2],
+      );
+
+      final teamCount = await database.teamDao.getTeamCount();
+      expect(teamCount, 2);
+
+      // The first one should be kept (insertOrIgnore)
+      final fetchedTeam = await database.teamDao.getTeamById(
+        teamId: testTeam1.id,
+      );
+      expect(fetchedTeam.name, testTeam1.name);
+    });
+
+    // Verifies that getAllTeams returns empty list when no teams exist.
+    test('Getting all teams when empty returns empty list', () async {
+      final allTeams = await database.teamDao.getAllTeams();
+      expect(allTeams.isEmpty, true);
+    });
+
+    // Verifies that getTeamById throws exception for non-existent team.
+    test('Getting non-existent team throws exception', () async {
+      expect(
+        () => database.teamDao.getTeamById(teamId: 'non-existent-id'),
+        throwsA(isA<StateError>()),
+      );
+    });
+
+    // Verifies that updating team name preserves other fields.
+    test('Updating team name preserves other team fields', () async {
+      await database.teamDao.addTeam(team: testTeam1);
+      final originalTeam = await database.teamDao.getTeamById(
+        teamId: testTeam1.id,
+      );
+      final originalCreatedAt = originalTeam.createdAt;
+
+      const newName = 'Brand New Team Name';
+      await database.teamDao.updateTeamName(
+        teamId: testTeam1.id,
+        newName: newName,
+      );
+
+      final updatedTeam = await database.teamDao.getTeamById(
+        teamId: testTeam1.id,
+      );
+
+      expect(updatedTeam.name, newName);
+      expect(updatedTeam.id, testTeam1.id);
+      expect(updatedTeam.createdAt, originalCreatedAt);
+    });
+
+    // Verifies that team name can be updated to an empty string.
+    test('Updating team name to empty string works', () async {
+      await database.teamDao.addTeam(team: testTeam1);
+
+      await database.teamDao.updateTeamName(
+        teamId: testTeam1.id,
+        newName: '',
+      );
+
+      final updatedTeam = await database.teamDao.getTeamById(
+        teamId: testTeam1.id,
+      );
+
+      expect(updatedTeam.name, '');
+    });
+
+    // Verifies that team name can be updated to a very long string.
+    test('Updating team name to long string works', () async {
+      await database.teamDao.addTeam(team: testTeam1);
+      final longName = 'A' * 500; // 500 character name
+
+      await database.teamDao.updateTeamName(
+        teamId: testTeam1.id,
+        newName: longName,
+      );
+
+      final updatedTeam = await database.teamDao.getTeamById(
+        teamId: testTeam1.id,
+      );
+
+      expect(updatedTeam.name, longName);
+      expect(updatedTeam.name.length, 500);
+    });
+
+    // Verifies that updating non-existent team name doesn't throw error.
+    test('Updating non-existent team name completes without error', () async {
+      expect(
+        () => database.teamDao.updateTeamName(
+          teamId: 'non-existent-id',
+          newName: 'New Name',
+        ),
+        returnsNormally,
+      );
+    });
+
+    // Verifies that deleteTeam only affects the specified team.
+    test('Deleting one team does not affect other teams', () async {
+      await database.teamDao.addTeamsAsList(
+        teams: [testTeam1, testTeam2, testTeam3],
+      );
+
+      await database.teamDao.deleteTeam(teamId: testTeam2.id);
+
+      final allTeams = await database.teamDao.getAllTeams();
+      expect(allTeams.length, 2);
+      expect(allTeams.any((t) => t.id == testTeam1.id), true);
+      expect(allTeams.any((t) => t.id == testTeam2.id), false);
+      expect(allTeams.any((t) => t.id == testTeam3.id), true);
+    });
+
+    // Verifies that teams with overlapping members are independent.
+    test('Teams with overlapping members are independent', () async {
+      // Create two matches since player_match has primary key {playerId, matchId}
+      final match1 = Match(name: 'Match 1', game: testGame1, notes: '');
+      final match2 = Match(name: 'Match 2', game: testGame2, notes: '');
+      await database.matchDao.addMatch(match: match1);
+      await database.matchDao.addMatch(match: match2);
+
+      // Add teams to database
+      await database.teamDao.addTeamsAsList(
+        teams: [testTeam1, testTeam3],
+      );
+
+      // Associate players with teams through match1
+      // testTeam1: player1, player2
+      await database.playerMatchDao.addPlayerToMatch(
+        playerId: testPlayer1.id,
+        matchId: match1.id,
+        teamId: testTeam1.id,
+        score: 0,
+      );
+      await database.playerMatchDao.addPlayerToMatch(
+        playerId: testPlayer2.id,
+        matchId: match1.id,
+        teamId: testTeam1.id,
+        score: 0,
+      );
+
+      // Associate players with teams through match2
+      // testTeam3: player1, player3 (overlapping player1)
+      await database.playerMatchDao.addPlayerToMatch(
+        playerId: testPlayer1.id,
+        matchId: match2.id,
+        teamId: testTeam3.id,
+        score: 0,
+      );
+      await database.playerMatchDao.addPlayerToMatch(
+        playerId: testPlayer3.id,
+        matchId: match2.id,
+        teamId: testTeam3.id,
+        score: 0,
+      );
+
+      final team1 = await database.teamDao.getTeamById(teamId: testTeam1.id);
+      final team3 = await database.teamDao.getTeamById(teamId: testTeam3.id);
+
+      expect(team1.members.length, 2);
+      expect(team3.members.length, 2);
+      expect(team1.members.any((p) => p.id == testPlayer1.id), true);
+      expect(team3.members.any((p) => p.id == testPlayer1.id), true);
+    });
+
+    // Verifies that adding teams sequentially works correctly.
+    test('Adding teams sequentially maintains correct count', () async {
+      var count = await database.teamDao.getTeamCount();
+      expect(count, 0);
+
+      await database.teamDao.addTeam(team: testTeam1);
+      count = await database.teamDao.getTeamCount();
+      expect(count, 1);
+
+      await database.teamDao.addTeam(team: testTeam2);
+      count = await database.teamDao.getTeamCount();
+      expect(count, 2);
+
+      await database.teamDao.addTeam(team: testTeam3);
+      count = await database.teamDao.getTeamCount();
+      expect(count, 3);
+    });
+
+    // Verifies that getAllTeams returns all teams with correct data.
+    test('Getting all teams returns all teams with correct data', () async {
+      await database.teamDao.addTeamsAsList(
+        teams: [testTeam1, testTeam2, testTeam3],
+      );
+
+      final allTeams = await database.teamDao.getAllTeams();
+
+      expect(allTeams.length, 3);
+      expect(
+        allTeams.map((t) => t.id).toSet(),
+        {testTeam1.id, testTeam2.id, testTeam3.id},
+      );
+    });
+
+    // Verifies that teamExists returns false for deleted teams.
+    test('Team existence returns false after deletion', () async {
+      await database.teamDao.addTeam(team: testTeam1);
+      expect(await database.teamDao.teamExists(teamId: testTeam1.id), true);
+
+      await database.teamDao.deleteTeam(teamId: testTeam1.id);
+      expect(await database.teamDao.teamExists(teamId: testTeam1.id), false);
+    });
+
+    // Verifies that adding multiple teams in batch then deleting returns correct count.
+    test('Batch add then partial delete maintains correct count', () async {
+      await database.teamDao.addTeamsAsList(
+        teams: [testTeam1, testTeam2, testTeam3],
+      );
+
+      expect(await database.teamDao.getTeamCount(), 3);
+
+      await database.teamDao.deleteTeam(teamId: testTeam1.id);
+      expect(await database.teamDao.getTeamCount(), 2);
+
+      await database.teamDao.deleteTeam(teamId: testTeam3.id);
+      expect(await database.teamDao.getTeamCount(), 1);
+    });
+
+    // Verifies that deleteAllTeams with single team works.
+    test('Deleting all teams with single team returns true', () async {
+      await database.teamDao.addTeam(team: testTeam1);
+      expect(await database.teamDao.getTeamCount(), 1);
+
+      final deleted = await database.teamDao.deleteAllTeams();
+      expect(deleted, true);
+      expect(await database.teamDao.getTeamCount(), 0);
+    });
+
+    // Verifies that addTeam after deleteAllTeams works correctly.
+    test('Adding team after deleteAllTeams works correctly', () async {
+      await database.teamDao.addTeamsAsList(
+        teams: [testTeam1, testTeam2],
+      );
+      expect(await database.teamDao.getTeamCount(), 2);
+
+      await database.teamDao.deleteAllTeams();
+      expect(await database.teamDao.getTeamCount(), 0);
+
+      final added = await database.teamDao.addTeam(team: testTeam3);
+      expect(added, true);
+      expect(await database.teamDao.getTeamCount(), 1);
+
+      final fetchedTeam = await database.teamDao.getTeamById(
+        teamId: testTeam3.id,
+      );
+      expect(fetchedTeam.name, testTeam3.name);
+    });
+
+    // Verifies that addTeamsAsList with partial duplicates ignores duplicates.
+    test('Adding teams with some duplicates ignores only duplicates', () async {
+      await database.teamDao.addTeam(team: testTeam1);
+
+      final duplicateTeam1 = Team(
+        id: testTeam1.id,
+        name: 'Different Name',
+        members: [testPlayer3],
+      );
+
+      await database.teamDao.addTeamsAsList(
+        teams: [duplicateTeam1, testTeam2, testTeam3],
+      );
+
+      final allTeams = await database.teamDao.getAllTeams();
+      expect(allTeams.length, 3);
+
+      // Verify testTeam1 retained original name (was inserted first)
+      final team1 = await database.teamDao.getTeamById(teamId: testTeam1.id);
+      expect(team1.name, testTeam1.name);
+    });
+
+    // Verifies that team IDs are preserved correctly.
+    test('Team IDs are preserved through add and retrieve', () async {
+      await database.teamDao.addTeam(team: testTeam1);
+
+      final fetchedTeam = await database.teamDao.getTeamById(
+        teamId: testTeam1.id,
+      );
+
+      expect(fetchedTeam.id, testTeam1.id);
+    });
+
+    // Verifies that createdAt timestamps are preserved.
+    test('Team createdAt timestamps are preserved', () async {
+      await database.teamDao.addTeam(team: testTeam1);
+
+      final fetchedTeam = await database.teamDao.getTeamById(
+        teamId: testTeam1.id,
+      );
+
+      expect(fetchedTeam.createdAt, testTeam1.createdAt);
+    });
+  });
+}