assets/schema.json

@@ -20,6 +20,7 @@
             "type": "string"
           }
         },
+        "additionalProperties": false,
         "required": [
           "id",
           "createdAt",
@@ -55,6 +56,7 @@
             "type": "string"
           }
         },
+        "additionalProperties": false,
         "required": [
           "id",
           "createdAt",
@@ -90,6 +92,7 @@
             }
           }
         },
+        "additionalProperties": false,
         "required": [
           "id",
           "name",
@@ -120,6 +123,7 @@
             }
           }
         },
+        "additionalProperties": false,
         "required": [
           "id",
           "name",
@@ -157,10 +161,31 @@
               "type": "string"
             }
           },
+          "scores": {
+            "type": "object",
+            "items": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "properties": {
+                  "roundNumber": {
+                    "type": "number"
+                  },
+                  "score": {
+                    "type": "number"
+                  },
+                  "change": {
+                    "type": "number"
+                  }
+                }
+              }
+            }
+          },
           "notes": {
             "type": "string"
           }
         },
+        "additionalProperties": false,
         "required": [
           "id",
           "name",
@@ -172,6 +197,7 @@
       }
     }
   },
+  "additionalProperties": false,
   "required": [
     "players",
     "games",

lib/core/common.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:tallee/core/enums.dart';
-import 'package:tallee/data/dto/match.dart';
+import 'package:tallee/data/models/match.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
 
 /// Translates a [Ruleset] enum value to its corresponding localized string.

lib/data/dao/game_dao.dart

@@ -1,8 +1,8 @@
 import 'package:drift/drift.dart';
+import 'package:tallee/core/enums.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';
+import 'package:tallee/data/models/game.dart';
 
 part 'game_dao.g.dart';
 
@@ -111,14 +111,20 @@ class GameDao extends DatabaseAccessor<AppDatabase> with _$GameDaoMixin {
   }
 
   /// 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)));
+  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 {
+  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)),
     );
@@ -135,24 +141,31 @@ class GameDao extends DatabaseAccessor<AppDatabase> with _$GameDaoMixin {
   }
 
   /// 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)));
+  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)));
+  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();
+    final count =
+        await (selectOnly(gameTable)..addColumns([gameTable.id.count()]))
+            .map((row) => row.read(gameTable.id.count()))
+            .getSingle();
     return count ?? 0;
   }
 

lib/data/dao/game_dao.g.dart

@@ -5,4 +5,12 @@ part of 'game_dao.dart';
 // ignore_for_file: type=lint
 mixin _$GameDaoMixin on DatabaseAccessor<AppDatabase> {
   $GameTableTable get gameTable => attachedDatabase.gameTable;
+  GameDaoManager get managers => GameDaoManager(this);
+}
+
+class GameDaoManager {
+  final _$GameDaoMixin _db;
+  GameDaoManager(this._db);
+  $$GameTableTableTableManager get gameTable =>
+      $$GameTableTableTableManager(_db.attachedDatabase, _db.gameTable);
 }

lib/data/dao/group_dao.dart

@@ -3,8 +3,8 @@ import 'package:tallee/data/db/database.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/dto/group.dart';
-import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/data/models/group.dart';
+import 'package:tallee/data/models/player.dart';
 
 part 'group_dao.g.dart';
 

lib/data/dao/group_dao.g.dart

@@ -10,4 +10,23 @@ mixin _$GroupDaoMixin on DatabaseAccessor<AppDatabase> {
       attachedDatabase.playerGroupTable;
   $GameTableTable get gameTable => attachedDatabase.gameTable;
   $MatchTableTable get matchTable => attachedDatabase.matchTable;
+  GroupDaoManager get managers => GroupDaoManager(this);
+}
+
+class GroupDaoManager {
+  final _$GroupDaoMixin _db;
+  GroupDaoManager(this._db);
+  $$GroupTableTableTableManager get groupTable =>
+      $$GroupTableTableTableManager(_db.attachedDatabase, _db.groupTable);
+  $$PlayerTableTableTableManager get playerTable =>
+      $$PlayerTableTableTableManager(_db.attachedDatabase, _db.playerTable);
+  $$PlayerGroupTableTableTableManager get playerGroupTable =>
+      $$PlayerGroupTableTableTableManager(
+        _db.attachedDatabase,
+        _db.playerGroupTable,
+      );
+  $$GameTableTableTableManager get gameTable =>
+      $$GameTableTableTableManager(_db.attachedDatabase, _db.gameTable);
+  $$MatchTableTableTableManager get matchTable =>
+      $$MatchTableTableTableManager(_db.attachedDatabase, _db.matchTable);
 }

lib/data/dao/match_dao.dart

@@ -4,10 +4,10 @@ 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';
+import 'package:tallee/data/models/game.dart';
+import 'package:tallee/data/models/group.dart';
+import 'package:tallee/data/models/match.dart';
+import 'package:tallee/data/models/player.dart';
 
 part 'match_dao.g.dart';
 
@@ -29,16 +29,20 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
         }
         final players =
             await db.playerMatchDao.getPlayersOfMatch(matchId: row.id) ?? [];
-        final winner = await getWinner(matchId: row.id);
+
+        final scores = await db.scoreDao.getAllMatchScores(matchId: row.id);
+
+        final winner = await db.scoreDao.getWinner(matchId: row.id);
         return Match(
           id: row.id,
-          name: row.name ?? '',
+          name: row.name,
           game: game,
           group: group,
           players: players,
           notes: row.notes ?? '',
           createdAt: row.createdAt,
           endedAt: row.endedAt,
+          scores: scores,
           winner: winner,
         );
       }),
@@ -60,17 +64,20 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     final players =
         await db.playerMatchDao.getPlayersOfMatch(matchId: matchId) ?? [];
 
-    final winner = await getWinner(matchId: matchId);
+    final scores = await db.scoreDao.getAllMatchScores(matchId: matchId);
+
+    final winner = await db.scoreDao.getWinner(matchId: matchId);
 
     return Match(
       id: result.id,
-      name: result.name ?? '',
+      name: result.name,
       game: game,
       group: group,
       players: players,
       notes: result.notes ?? '',
       createdAt: result.createdAt,
       endedAt: result.endedAt,
+      scores: scores,
       winner: winner,
     );
   }
@@ -85,7 +92,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
           id: match.id,
           gameId: match.game.id,
           groupId: Value(match.group?.id),
-          name: Value(match.name),
+          name: match.name,
           notes: Value(match.notes),
           createdAt: match.createdAt,
           endedAt: Value(match.endedAt),
@@ -100,8 +107,20 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
         );
       }
 
+      for (final pid in match.scores.keys) {
+        final playerScores = match.scores[pid]!;
+        await db.scoreDao.addScoresAsList(
+          entrys: playerScores,
+          playerId: pid,
+          matchId: match.id,
+        );
+      }
+
       if (match.winner != null) {
-        await setWinner(matchId: match.id, winnerId: match.winner!.id);
+        await db.scoreDao.setWinner(
+          matchId: match.id,
+          playerId: match.winner!.id,
+        );
       }
     });
   }
@@ -170,7 +189,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
                   id: match.id,
                   gameId: match.game.id,
                   groupId: Value(match.group?.id),
-                  name: Value(match.name),
+                  name: match.name,
                   notes: Value(match.notes),
                   createdAt: match.createdAt,
                   endedAt: Value(match.endedAt),
@@ -223,7 +242,6 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
               PlayerMatchTableCompanion.insert(
                 matchId: match.id,
                 playerId: p.id,
-                score: 0,
               ),
               mode: InsertMode.insertOrIgnore,
             );
@@ -280,10 +298,10 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
         final group = await db.groupDao.getGroupById(groupId: groupId);
         final players =
             await db.playerMatchDao.getPlayersOfMatch(matchId: row.id) ?? [];
-        final winner = await db.matchDao.getWinner(matchId: row.id);
+        final winner = await db.scoreDao.getWinner(matchId: row.id);
         return Match(
           id: row.id,
-          name: row.name ?? '',
+          name: row.name,
           game: game,
           group: group,
           players: players,
@@ -437,91 +455,4 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
       );
     });
   }
-
-  // ============================================================
-  // Winner methods - handle winner logic via player scores
-  // ============================================================
-
-  /// Checks if a match has a winner.
-  /// Returns true if any player in the match has their score set to 1.
-  Future<bool> hasWinner({required String matchId}) async {
-    final players =
-        await db.playerMatchDao.getPlayersOfMatch(matchId: matchId) ?? [];
-
-    for (final player in players) {
-      final score = await db.playerMatchDao.getPlayerScore(
-        matchId: matchId,
-        playerId: player.id,
-      );
-      if (score == 1) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /// Gets the winner of a match.
-  /// Returns the player with score 1, or null if no winner is set.
-  Future<Player?> getWinner({required String matchId}) async {
-    final players =
-        await db.playerMatchDao.getPlayersOfMatch(matchId: matchId) ?? [];
-
-    for (final player in players) {
-      final score = await db.playerMatchDao.getPlayerScore(
-        matchId: matchId,
-        playerId: player.id,
-      );
-      if (score == 1) {
-        return player;
-      }
-    }
-    return null;
-  }
-
-  /// Sets the winner of a match.
-  /// Sets all players' scores to 0, then sets the specified player's score to 1.
-  /// Returns `true` if the operation was successful, otherwise `false`.
-  Future<bool> setWinner({
-    required String matchId,
-    required String winnerId,
-  }) async {
-    await db.transaction(() async {
-      final players =
-          await db.playerMatchDao.getPlayersOfMatch(matchId: matchId) ?? [];
-
-      // Set all players' scores to 0
-      for (final player in players) {
-        await db.playerMatchDao.updatePlayerScore(
-          matchId: matchId,
-          playerId: player.id,
-          newScore: 0,
-        );
-      }
-
-      // Set the winner's score to 1
-      await db.playerMatchDao.updatePlayerScore(
-        matchId: matchId,
-        playerId: winnerId,
-        newScore: 1,
-      );
-    });
-    return true;
-  }
-
-  /// Removes the winner of a match.
-  /// Sets the current winner's score to 0 (no winner).
-  /// Returns `true` if a winner was removed, otherwise `false`.
-  Future<bool> removeWinner({required String matchId}) async {
-    final winner = await getWinner(matchId: matchId);
-    if (winner == null) {
-      return false;
-    }
-
-    final success = await db.playerMatchDao.updatePlayerScore(
-      matchId: matchId,
-      playerId: winner.id,
-      newScore: 0,
-    );
-    return success;
-  }
 }

lib/data/dao/match_dao.g.dart

@@ -11,4 +11,25 @@ mixin _$MatchDaoMixin on DatabaseAccessor<AppDatabase> {
   $TeamTableTable get teamTable => attachedDatabase.teamTable;
   $PlayerMatchTableTable get playerMatchTable =>
       attachedDatabase.playerMatchTable;
+  MatchDaoManager get managers => MatchDaoManager(this);
+}
+
+class MatchDaoManager {
+  final _$MatchDaoMixin _db;
+  MatchDaoManager(this._db);
+  $$GameTableTableTableManager get gameTable =>
+      $$GameTableTableTableManager(_db.attachedDatabase, _db.gameTable);
+  $$GroupTableTableTableManager get groupTable =>
+      $$GroupTableTableTableManager(_db.attachedDatabase, _db.groupTable);
+  $$MatchTableTableTableManager get matchTable =>
+      $$MatchTableTableTableManager(_db.attachedDatabase, _db.matchTable);
+  $$PlayerTableTableTableManager get playerTable =>
+      $$PlayerTableTableTableManager(_db.attachedDatabase, _db.playerTable);
+  $$TeamTableTableTableManager get teamTable =>
+      $$TeamTableTableTableManager(_db.attachedDatabase, _db.teamTable);
+  $$PlayerMatchTableTableTableManager get playerMatchTable =>
+      $$PlayerMatchTableTableTableManager(
+        _db.attachedDatabase,
+        _db.playerMatchTable,
+      );
 }

lib/data/dao/player_dao.dart

@@ -1,7 +1,7 @@
 import 'package:drift/drift.dart';
 import 'package:tallee/data/db/database.dart';
 import 'package:tallee/data/db/tables/player_table.dart';
-import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/data/models/player.dart';
 
 part 'player_dao.g.dart';
 

lib/data/dao/player_dao.g.dart

@@ -5,4 +5,12 @@ part of 'player_dao.dart';
 // ignore_for_file: type=lint
 mixin _$PlayerDaoMixin on DatabaseAccessor<AppDatabase> {
   $PlayerTableTable get playerTable => attachedDatabase.playerTable;
+  PlayerDaoManager get managers => PlayerDaoManager(this);
+}
+
+class PlayerDaoManager {
+  final _$PlayerDaoMixin _db;
+  PlayerDaoManager(this._db);
+  $$PlayerTableTableTableManager get playerTable =>
+      $$PlayerTableTableTableManager(_db.attachedDatabase, _db.playerTable);
 }

lib/data/dao/player_group_dao.dart

@@ -2,7 +2,7 @@ import 'package:drift/drift.dart';
 import 'package:tallee/data/db/database.dart';
 import 'package:tallee/data/db/tables/player_group_table.dart';
 import 'package:tallee/data/db/tables/player_table.dart';
-import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/data/models/player.dart';
 
 part 'player_group_dao.g.dart';
 

lib/data/dao/player_group_dao.g.dart

@@ -8,4 +8,19 @@ mixin _$PlayerGroupDaoMixin on DatabaseAccessor<AppDatabase> {
   $GroupTableTable get groupTable => attachedDatabase.groupTable;
   $PlayerGroupTableTable get playerGroupTable =>
       attachedDatabase.playerGroupTable;
+  PlayerGroupDaoManager get managers => PlayerGroupDaoManager(this);
+}
+
+class PlayerGroupDaoManager {
+  final _$PlayerGroupDaoMixin _db;
+  PlayerGroupDaoManager(this._db);
+  $$PlayerTableTableTableManager get playerTable =>
+      $$PlayerTableTableTableManager(_db.attachedDatabase, _db.playerTable);
+  $$GroupTableTableTableManager get groupTable =>
+      $$GroupTableTableTableManager(_db.attachedDatabase, _db.groupTable);
+  $$PlayerGroupTableTableTableManager get playerGroupTable =>
+      $$PlayerGroupTableTableTableManager(
+        _db.attachedDatabase,
+        _db.playerGroupTable,
+      );
 }

lib/data/dao/player_match_dao.dart

@@ -2,7 +2,7 @@ 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';
+import 'package:tallee/data/models/player.dart';
 
 part 'player_match_dao.g.dart';
 
@@ -17,14 +17,12 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
     required String matchId,
     required String playerId,
     String? teamId,
-    int score = 0,
   }) async {
     await into(playerMatchTable).insert(
       PlayerMatchTableCompanion.insert(
         playerId: playerId,
         matchId: matchId,
         teamId: Value(teamId),
-        score: score,
       ),
       mode: InsertMode.insertOrIgnore,
     );
@@ -46,35 +44,6 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
     return players;
   }
 
-  /// Retrieves a player's score for a specific match.
-  /// Returns null if the player is not in the match.
-  Future<int?> getPlayerScore({
-    required String matchId,
-    required String playerId,
-  }) async {
-    final result = await (select(playerMatchTable)
-      ..where(
-            (p) => p.matchId.equals(matchId) & p.playerId.equals(playerId),
-      ))
-        .getSingleOrNull();
-    return result?.score;
-  }
-
-  /// Updates the score for a player in a match.
-  /// Returns `true` if the update was successful, otherwise `false`.
-  Future<bool> updatePlayerScore({
-    required String matchId,
-    required String playerId,
-    required int newScore,
-  }) async {
-    final rowsAffected = await (update(playerMatchTable)
-      ..where(
-            (p) => p.matchId.equals(matchId) & p.playerId.equals(playerId),
-      ))
-        .write(PlayerMatchTableCompanion(score: Value(newScore)));
-    return rowsAffected > 0;
-  }
-
   /// Updates the team for a player in a match.
   /// Returns `true` if the update was successful, otherwise `false`.
   Future<bool> updatePlayerTeam({
@@ -82,8 +51,8 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
     required String playerId,
     required String? teamId,
   }) async {
-    final rowsAffected = await (update(playerMatchTable)
-      ..where(
+    final rowsAffected =
+        await (update(playerMatchTable)..where(
               (p) => p.matchId.equals(matchId) & p.playerId.equals(playerId),
             ))
             .write(PlayerMatchTableCompanion(teamId: Value(teamId)));
@@ -166,7 +135,6 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
               (id) => PlayerMatchTableCompanion.insert(
                 playerId: id,
                 matchId: matchId,
-            score: 0,
               ),
             )
             .toList();
@@ -186,11 +154,9 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
     required String matchId,
     required String teamId,
   }) async {
-    final result = await (select(playerMatchTable)
-      ..where(
-            (p) => p.matchId.equals(matchId) & p.teamId.equals(teamId),
-      ))
-        .get();
+    final result = await (select(
+      playerMatchTable,
+    )..where((p) => p.matchId.equals(matchId) & p.teamId.equals(teamId))).get();
 
     if (result.isEmpty) return [];
 

lib/data/dao/player_match_dao.g.dart

@@ -11,4 +11,25 @@ mixin _$PlayerMatchDaoMixin on DatabaseAccessor<AppDatabase> {
   $TeamTableTable get teamTable => attachedDatabase.teamTable;
   $PlayerMatchTableTable get playerMatchTable =>
       attachedDatabase.playerMatchTable;
+  PlayerMatchDaoManager get managers => PlayerMatchDaoManager(this);
+}
+
+class PlayerMatchDaoManager {
+  final _$PlayerMatchDaoMixin _db;
+  PlayerMatchDaoManager(this._db);
+  $$PlayerTableTableTableManager get playerTable =>
+      $$PlayerTableTableTableManager(_db.attachedDatabase, _db.playerTable);
+  $$GameTableTableTableManager get gameTable =>
+      $$GameTableTableTableManager(_db.attachedDatabase, _db.gameTable);
+  $$GroupTableTableTableManager get groupTable =>
+      $$GroupTableTableTableManager(_db.attachedDatabase, _db.groupTable);
+  $$MatchTableTableTableManager get matchTable =>
+      $$MatchTableTableTableManager(_db.attachedDatabase, _db.matchTable);
+  $$TeamTableTableTableManager get teamTable =>
+      $$TeamTableTableTableManager(_db.attachedDatabase, _db.teamTable);
+  $$PlayerMatchTableTableTableManager get playerMatchTable =>
+      $$PlayerMatchTableTableTableManager(
+        _db.attachedDatabase,
+        _db.playerMatchTable,
+      );
 }

lib/data/dao/score_dao.dart

@@ -1,27 +1,14 @@
+import 'dart:async';
+
 import 'package:drift/drift.dart';
 import 'package:tallee/data/db/database.dart';
-import 'package:tallee/data/db/tables/score_table.dart';
+import 'package:tallee/data/db/tables/score_entry_table.dart';
+import 'package:tallee/data/models/player.dart';
+import 'package:tallee/data/models/score_entry.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])
+@DriftAccessor(tables: [ScoreEntryTable])
 class ScoreDao extends DatabaseAccessor<AppDatabase> with _$ScoreDaoMixin {
   ScoreDao(super.db);
 
@@ -29,106 +16,132 @@ class ScoreDao extends DatabaseAccessor<AppDatabase> with _$ScoreDaoMixin {
   Future<void> addScore({
     required String playerId,
     required String matchId,
-    required int roundNumber,
-    required int score,
-    required int change,
+    required ScoreEntry entry,
   }) async {
-    await into(scoreTable).insert(
-      ScoreTableCompanion.insert(
+    await into(scoreEntryTable).insert(
+      ScoreEntryTableCompanion.insert(
         playerId: playerId,
         matchId: matchId,
-        roundNumber: roundNumber,
-        score: score,
-        change: change,
+        roundNumber: entry.roundNumber,
+        score: entry.score,
+        change: entry.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({
+  Future<void> addScoresAsList({
+    required List<ScoreEntry> entrys,
     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
+    if (entrys.isEmpty) return;
+    final entries = entrys
         .map(
-          (row) => ScoreEntry(
-            playerId: row.playerId,
-            matchId: row.matchId,
-            roundNumber: row.roundNumber,
-            score: row.score,
-            change: row.change,
+          (score) => ScoreEntryTableCompanion.insert(
+            playerId: playerId,
+            matchId: matchId,
+            roundNumber: score.roundNumber,
+            score: score.score,
+            change: score.change,
           ),
         )
         .toList();
+
+    await batch((batch) {
+      batch.insertAll(
+        scoreEntryTable,
+        entries,
+        mode: InsertMode.insertOrReplace,
+      );
+    });
   }
 
   /// Retrieves the score for a specific round.
-  Future<ScoreEntry?> getScoreForRound({
+  Future<ScoreEntry?> getScore({
     required String playerId,
     required String matchId,
-    required int roundNumber,
+    int roundNumber = 0,
   }) async {
-    final query = select(scoreTable)
+    final query = select(scoreEntryTable)
       ..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,
     );
   }
 
+  /// Retrieves all scores for a specific match.
+  Future<Map<String, List<ScoreEntry>>> getAllMatchScores({
+    required String matchId,
+  }) async {
+    final query = select(scoreEntryTable)
+      ..where((s) => s.matchId.equals(matchId));
+    final result = await query.get();
+
+    final Map<String, List<ScoreEntry>> scoresByPlayer = {};
+    for (final row in result) {
+      final score = ScoreEntry(
+        roundNumber: row.roundNumber,
+        score: row.score,
+        change: row.change,
+      );
+      scoresByPlayer.putIfAbsent(row.playerId, () => []).add(score);
+    }
+
+    return scoresByPlayer;
+  }
+
+  /// Retrieves all scores for a specific player in a match.
+  Future<List<ScoreEntry>> getAllPlayerScoresInMatch({
+    required String playerId,
+    required String matchId,
+  }) async {
+    final query = select(scoreEntryTable)
+      ..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(
+            roundNumber: row.roundNumber,
+            score: row.score,
+            change: row.change,
+          ),
+        )
+        .toList()
+      ..sort(
+        (scoreA, scoreB) => scoreA.roundNumber.compareTo(scoreB.roundNumber),
+      );
+  }
+
   /// Updates a score entry.
   Future<bool> updateScore({
     required String playerId,
     required String matchId,
-    required int roundNumber,
-    required int newScore,
-    required int newChange,
+    required ScoreEntry newEntry,
   }) async {
-    final rowsAffected = await (update(scoreTable)
-          ..where(
+    final rowsAffected =
+        await (update(scoreEntryTable)..where(
               (s) =>
                   s.playerId.equals(playerId) &
                   s.matchId.equals(matchId) &
-                s.roundNumber.equals(roundNumber),
+                  s.roundNumber.equals(newEntry.roundNumber),
             ))
             .write(
-          ScoreTableCompanion(
-            score: Value(newScore),
-            change: Value(newChange),
+              ScoreEntryTableCompanion(
+                score: Value(newEntry.score),
+                change: Value(newEntry.change),
               ),
             );
     return rowsAffected > 0;
@@ -138,9 +151,9 @@ class ScoreDao extends DatabaseAccessor<AppDatabase> with _$ScoreDaoMixin {
   Future<bool> deleteScore({
     required String playerId,
     required String matchId,
-    required int roundNumber,
+    int roundNumber = 0,
   }) async {
-    final query = delete(scoreTable)
+    final query = delete(scoreEntryTable)
       ..where(
         (s) =>
             s.playerId.equals(playerId) &
@@ -151,41 +164,164 @@ class ScoreDao extends DatabaseAccessor<AppDatabase> with _$ScoreDaoMixin {
     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));
+  Future<bool> deleteAllScoresForMatch({required String matchId}) async {
+    final query = delete(scoreEntryTable)
+      ..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));
+  Future<bool> deleteAllScoresForPlayerInMatch({
+    required String matchId,
+    required String playerId,
+  }) async {
+    final query = delete(scoreEntryTable)
+      ..where((s) => s.playerId.equals(playerId) & s.matchId.equals(matchId));
     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()]);
+  /// Gets the highest (latest) round number for a match.
+  /// Returns `null` if there are no scores for the match.
+  Future<int?> getLatestRoundNumber({required String matchId}) async {
+    final query = selectOnly(scoreEntryTable)
+      ..where(scoreEntryTable.matchId.equals(matchId))
+      ..addColumns([scoreEntryTable.roundNumber.max()]);
     final result = await query.getSingle();
-    return result.read(scoreTable.roundNumber.max()) ?? 0;
+    return result.read(scoreEntryTable.roundNumber.max());
   }
 
-  /// Gets the total score for a player in a match (sum of all changes).
+  /// Aggregates the total score for a player in a match by summing all their
+  /// score entry changes. Returns `0` if there are no scores for the player
+  /// in the match.
   Future<int> getTotalScoreForPlayer({
     required String playerId,
     required String matchId,
   }) async {
-    final scores = await getPlayerScoresInMatch(
+    final scores = await getAllPlayerScoresInMatch(
       playerId: playerId,
       matchId: matchId,
     );
     if (scores.isEmpty) return 0;
-    // Return the score from the latest round
-    return scores.last.score;
+    // Return the sum of all score changes
+    return scores.fold<int>(0, (sum, element) => sum + element.change);
+  }
+
+  Future<bool> hasWinner({required String matchId}) async {
+    return await getWinner(matchId: matchId) != null;
+  }
+
+  // Setting the winner for a game and clearing previous winner if exists.
+  Future<bool> setWinner({
+    required String matchId,
+    required String playerId,
+  }) async {
+    // Clear previous winner if exists
+    deleteAllScoresForMatch(matchId: matchId);
+
+    // Set the winner's score to 1
+    final rowsAffected = await into(scoreEntryTable).insert(
+      ScoreEntryTableCompanion.insert(
+        playerId: playerId,
+        matchId: matchId,
+        roundNumber: 0,
+        score: 1,
+        change: 0,
+      ),
+      mode: InsertMode.insertOrReplace,
+    );
+
+    return rowsAffected > 0;
+  }
+
+  // Retrieves the winner of a match based on the highest score.
+  Future<Player?> getWinner({required String matchId}) async {
+    final query = select(scoreEntryTable)
+      ..where((s) => s.matchId.equals(matchId))
+      ..orderBy([(s) => OrderingTerm.desc(s.score)])
+      ..limit(1);
+    final result = await query.getSingleOrNull();
+
+    if (result == null) return null;
+
+    final player = await db.playerDao.getPlayerById(playerId: result.playerId);
+    return Player(
+      id: player.id,
+      name: player.name,
+      createdAt: player.createdAt,
+      description: player.description,
+    );
+  }
+
+  /// Removes the winner of a match.
+  ///
+  /// Returns `true` if the winner was removed, `false` if there are multiple
+  /// scores or if the winner cannot be removed.
+  Future<bool> removeWinner({required String matchId}) async {
+    final scores = await getAllMatchScores(matchId: matchId);
+
+    if (scores.length > 1) {
+      return false;
+    } else {
+      return await deleteAllScoresForMatch(matchId: matchId);
+    }
+  }
+
+  Future<bool> hasLooser({required String matchId}) async {
+    return await getLooser(matchId: matchId) != null;
+  }
+
+  // Setting the looser for a game and clearing previous looser if exists.
+  Future<bool> setLooser({
+    required String matchId,
+    required String playerId,
+  }) async {
+    // Clear previous loosers if exists
+    deleteAllScoresForMatch(matchId: matchId);
+
+    // Set the loosers score to 0
+    final rowsAffected = await into(scoreEntryTable).insert(
+      ScoreEntryTableCompanion.insert(
+        playerId: playerId,
+        matchId: matchId,
+        roundNumber: 0,
+        score: 0,
+        change: 0,
+      ),
+      mode: InsertMode.insertOrReplace,
+    );
+
+    return rowsAffected > 0;
+  }
+
+  /// Retrieves the looser of a match based on the score 0.
+  Future<Player?> getLooser({required String matchId}) async {
+    final query = select(scoreEntryTable)
+      ..where((s) => s.matchId.equals(matchId) & s.score.equals(0));
+    final result = await query.getSingleOrNull();
+
+    if (result == null) return null;
+
+    final player = await db.playerDao.getPlayerById(playerId: result.playerId);
+    return Player(
+      id: player.id,
+      name: player.name,
+      createdAt: player.createdAt,
+      description: player.description,
+    );
+  }
+
+  /// Removes the looser of a match.
+  ///
+  /// Returns `true` if the looser was removed, `false` if there are multiple
+  /// scores or if the looser cannot be removed.
+  Future<bool> removeLooser({required String matchId}) async {
+    final scores = await getAllMatchScores(matchId: matchId);
+
+    if (scores.length > 1) {
+      return false;
+    } else {
+      return await deleteAllScoresForMatch(matchId: matchId);
+    }
   }
 }
-

lib/data/dao/score_dao.g.dart

@@ -8,5 +8,24 @@ mixin _$ScoreDaoMixin on DatabaseAccessor<AppDatabase> {
   $GameTableTable get gameTable => attachedDatabase.gameTable;
   $GroupTableTable get groupTable => attachedDatabase.groupTable;
   $MatchTableTable get matchTable => attachedDatabase.matchTable;
-  $ScoreTableTable get scoreTable => attachedDatabase.scoreTable;
+  $ScoreEntryTableTable get scoreEntryTable => attachedDatabase.scoreEntryTable;
+  ScoreDaoManager get managers => ScoreDaoManager(this);
+}
+
+class ScoreDaoManager {
+  final _$ScoreDaoMixin _db;
+  ScoreDaoManager(this._db);
+  $$PlayerTableTableTableManager get playerTable =>
+      $$PlayerTableTableTableManager(_db.attachedDatabase, _db.playerTable);
+  $$GameTableTableTableManager get gameTable =>
+      $$GameTableTableTableManager(_db.attachedDatabase, _db.gameTable);
+  $$GroupTableTableTableManager get groupTable =>
+      $$GroupTableTableTableManager(_db.attachedDatabase, _db.groupTable);
+  $$MatchTableTableTableManager get matchTable =>
+      $$MatchTableTableTableManager(_db.attachedDatabase, _db.matchTable);
+  $$ScoreEntryTableTableTableManager get scoreEntryTable =>
+      $$ScoreEntryTableTableTableManager(
+        _db.attachedDatabase,
+        _db.scoreEntryTable,
+      );
 }

lib/data/dao/team_dao.dart

@@ -1,8 +1,8 @@
 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';
+import 'package:tallee/data/models/player.dart';
+import 'package:tallee/data/models/team.dart';
 
 part 'team_dao.g.dart';
 
@@ -144,4 +144,3 @@ class TeamDao extends DatabaseAccessor<AppDatabase> with _$TeamDaoMixin {
     return rowsAffected > 0;
   }
 }
-

lib/data/dao/team_dao.g.dart

@@ -5,4 +5,12 @@ part of 'team_dao.dart';
 // ignore_for_file: type=lint
 mixin _$TeamDaoMixin on DatabaseAccessor<AppDatabase> {
   $TeamTableTable get teamTable => attachedDatabase.teamTable;
+  TeamDaoManager get managers => TeamDaoManager(this);
+}
+
+class TeamDaoManager {
+  final _$TeamDaoMixin _db;
+  TeamDaoManager(this._db);
+  $$TeamTableTableTableManager get teamTable =>
+      $$TeamTableTableTableManager(_db.attachedDatabase, _db.teamTable);
 }

lib/data/db/database.dart

@@ -15,7 +15,7 @@ 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/score_entry_table.dart';
 import 'package:tallee/data/db/tables/team_table.dart';
 
 part 'database.g.dart';
@@ -29,7 +29,7 @@ part 'database.g.dart';
     PlayerMatchTable,
     GameTable,
     TeamTable,
-    ScoreTable,
+    ScoreEntryTable,
   ],
   daos: [
     PlayerDao,
@@ -39,7 +39,7 @@ part 'database.g.dart';
     PlayerMatchDao,
     GameDao,
     ScoreDao,
-    TeamDao
+    TeamDao,
   ],
 )
 class AppDatabase extends _$AppDatabase {
@@ -60,7 +60,9 @@ 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/player_match_table.dart

@@ -8,9 +8,7 @@ class PlayerMatchTable extends Table {
       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()();
+  TextColumn get teamId => text().references(TeamTable, #id).nullable()();
 
   @override
   Set<Column<Object>> get primaryKey => {playerId, matchId};

lib/data/db/tables/score_entry_table.dart

@@ -2,7 +2,7 @@ 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 {
+class ScoreEntryTable extends Table {
   TextColumn get playerId =>
       text().references(PlayerTable, #id, onDelete: KeyAction.cascade)();
   TextColumn get matchId =>

lib/data/dto/match.dart

@@ -1,61 +0,0 @@
-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';
-
-class Match {
-  final String id;
-  final DateTime createdAt;
-  final DateTime? endedAt;
-  final String name;
-  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,
-    required this.game,
-    this.group,
-    this.players = const [],
-    String? notes,
-    this.winner,
-  }) : id = id ?? const Uuid().v4(),
-        createdAt = createdAt ?? clock.now(),
-        notes = notes ?? '';
-
-  @override
-  String toString() {
-    return 'Match{id: $id, name: $name, game: $game, group: $group, players: $players, notes: $notes, endedAt: $endedAt}';
-  }
-
-  /// 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'],
-        createdAt = DateTime.parse(json['createdAt']),
-        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 using normalized format (ID references only).
-  Map<String, dynamic> toJson() => {
-    'id': id,
-    'createdAt': createdAt.toIso8601String(),
-    'endedAt': endedAt?.toIso8601String(),
-    'name': name,
-    'gameId': game.id,
-    'groupId': group?.id,
-    'playerIds': players.map((player) => player.id).toList(),
-    'notes': notes,
-  };
-}

lib/data/models/group.dart

@@ -1,5 +1,5 @@
 import 'package:clock/clock.dart';
-import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/data/models/player.dart';
 import 'package:uuid/uuid.dart';
 
 class Group {

lib/data/models/match.dart

@@ -0,0 +1,77 @@
+import 'package:clock/clock.dart';
+import 'package:tallee/core/enums.dart';
+import 'package:tallee/data/models/game.dart';
+import 'package:tallee/data/models/group.dart';
+import 'package:tallee/data/models/player.dart';
+import 'package:tallee/data/models/score_entry.dart';
+import 'package:uuid/uuid.dart';
+
+class Match {
+  final String id;
+  final DateTime createdAt;
+  final DateTime? endedAt;
+  final String name;
+  final Game game;
+  final Group? group;
+  final List<Player> players;
+  final String notes;
+  Map<String, List<ScoreEntry>> scores;
+  Player? winner;
+
+  Match({
+    String? id,
+    DateTime? createdAt,
+    this.endedAt,
+    required this.name,
+    required this.game,
+    this.group,
+    this.players = const [],
+    this.notes = '',
+    Map<String, List<ScoreEntry>>? scores,
+    this.winner,
+  }) : id = id ?? const Uuid().v4(),
+       createdAt = createdAt ?? clock.now(),
+       scores = scores ?? {for (var player in players) player.id: []};
+
+  @override
+  String toString() {
+    return 'Match{id: $id, createdAt: $createdAt, endedAt: $endedAt, name: $name, game: $game, group: $group, players: $players, notes: $notes, scores: $scores, winner: $winner}';
+  }
+
+  /// 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'],
+      createdAt = DateTime.parse(json['createdAt']),
+      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
+      scores = json['scores'],
+      notes = json['notes'] ?? '';
+
+  /// 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,
+    'gameId': game.id,
+    'groupId': group?.id,
+    'playerIds': players.map((player) => player.id).toList(),
+    'scores': scores.map(
+      (playerId, scoreList) =>
+          MapEntry(playerId, scoreList.map((score) => score.toJson()).toList()),
+    ),
+    'notes': notes,
+  };
+}

lib/data/models/score_entry.dart

@@ -0,0 +1,22 @@
+class ScoreEntry {
+  int roundNumber = 0;
+  final int score;
+  final int change;
+
+  ScoreEntry({
+    required this.roundNumber,
+    required this.score,
+    required this.change,
+  });
+
+  ScoreEntry.fromJson(Map<String, dynamic> json)
+    : roundNumber = json['roundNumber'],
+      score = json['score'],
+      change = json['change'];
+
+  Map<String, dynamic> toJson() => {
+    'roundNumber': roundNumber,
+    'score': score,
+    'change': change,
+  };
+}

lib/data/models/team.dart

@@ -1,5 +1,5 @@
 import 'package:clock/clock.dart';
-import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/data/models/player.dart';
 import 'package:uuid/uuid.dart';
 
 class Team {
@@ -37,4 +37,3 @@ class Team {
     'memberIds': members.map((member) => member.id).toList(),
   };
 }
-

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

@@ -4,8 +4,8 @@ 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/group.dart';
-import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/data/models/group.dart';
+import 'package:tallee/data/models/player.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
 import 'package:tallee/presentation/widgets/buttons/custom_width_button.dart';
 import 'package:tallee/presentation/widgets/player_selection.dart';

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

@@ -4,9 +4,9 @@ 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/data/models/group.dart';
+import 'package:tallee/data/models/match.dart';
+import 'package:tallee/data/models/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';

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

@@ -4,8 +4,8 @@ import 'package:tallee/core/adaptive_page_route.dart';
 import 'package:tallee/core/constants.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/player.dart';
+import 'package:tallee/data/models/group.dart';
+import 'package:tallee/data/models/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';

lib/presentation/views/main_menu/home_view.dart

@@ -4,10 +4,10 @@ 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';
+import 'package:tallee/data/models/game.dart';
+import 'package:tallee/data/models/group.dart';
+import 'package:tallee/data/models/match.dart';
+import 'package:tallee/data/models/player.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
 import 'package:tallee/presentation/views/main_menu/match_view/match_result_view.dart';
 import 'package:tallee/presentation/widgets/app_skeleton.dart';
@@ -42,7 +42,13 @@ class _HomeViewState extends State<HomeView> {
     2,
     Match(
       name: 'Skeleton Match',
-      game: Game(name: '', ruleset: Ruleset.singleWinner, description: '', color: GameColor.blue, icon: ''),
+      game: Game(
+        name: '',
+        ruleset: Ruleset.singleWinner,
+        description: '',
+        color: GameColor.blue,
+        icon: '',
+      ),
       group: Group(
         name: 'Skeleton Group',
         description: '',
@@ -104,7 +110,9 @@ 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,
@@ -113,7 +121,8 @@ 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);
@@ -121,7 +130,10 @@ class _HomeViewState extends State<HomeView> {
                               ),
                             )
                         else
-                          Center(heightFactor: 5, child: Text(loc.no_recent_matches_available)),
+                          Center(
+                            heightFactor: 5,
+                            child: Text(loc.no_recent_matches_available),
+                          ),
                       ],
                     ),
                   ),
@@ -137,22 +149,40 @@ 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: () {},
+                            ),
                           ],
                         ),
                       ],
@@ -181,7 +211,9 @@ 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) {
@@ -195,7 +227,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 {
     final db = Provider.of<AppDatabase>(context, listen: false);
-    final winner = await db.matchDao.getWinner(matchId: matchId);
+    final winner = await db.scoreDao.getWinner(matchId: matchId);
     final matchIndex = recentMatches.indexWhere((match) => match.id == matchId);
     if (matchIndex != -1) {
       setState(() {

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

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/data/dto/group.dart';
+import 'package:tallee/data/models/group.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
 import 'package:tallee/presentation/widgets/text_input/custom_search_bar.dart';
 import 'package:tallee/presentation/widgets/tiles/group_tile.dart';

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

@@ -5,10 +5,10 @@ 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/data/models/game.dart';
+import 'package:tallee/data/models/group.dart';
+import 'package:tallee/data/models/match.dart';
+import 'package:tallee/data/models/player.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
 import 'package:tallee/presentation/views/main_menu/match_view/create_match/choose_game_view.dart';
 import 'package:tallee/presentation/views/main_menu/match_view/create_match/choose_group_view.dart';

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

@@ -5,7 +5,7 @@ import 'package:tallee/core/adaptive_page_route.dart';
 import 'package:tallee/core/common.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/models/match.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';

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

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.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/data/models/match.dart';
+import 'package:tallee/data/models/player.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
 import 'package:tallee/presentation/widgets/tiles/custom_radio_list_tile.dart';
 
@@ -139,11 +139,11 @@ class _MatchResultViewState extends State<MatchResultView> {
   /// based on the current selection.
   Future<void> _handleWinnerSaving() async {
     if (_selectedPlayer == null) {
-      await db.matchDao.removeWinner(matchId: widget.match.id);
+      await db.scoreDao.removeWinner(matchId: widget.match.id);
     } else {
-      await db.matchDao.setWinner(
+      await db.scoreDao.setWinner(
         matchId: widget.match.id,
-        winnerId: _selectedPlayer!.id,
+        playerId: _selectedPlayer!.id,
       );
     }
     widget.onWinnerChanged?.call();

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

@@ -6,10 +6,10 @@ 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/data/models/game.dart';
+import 'package:tallee/data/models/group.dart';
+import 'package:tallee/data/models/match.dart';
+import 'package:tallee/data/models/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';

lib/presentation/views/main_menu/statistics_view.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:tallee/core/constants.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/data/models/match.dart';
+import 'package:tallee/data/models/player.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
 import 'package:tallee/presentation/widgets/app_skeleton.dart';
 import 'package:tallee/presentation/widgets/tiles/statistics_tile.dart';
@@ -167,7 +167,8 @@ 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, description: ''),
+        orElse: () =>
+            Player(id: playerId, name: loc.not_available, description: ''),
       );
       winCounts[i] = (player.name, winCounts[i].$2);
     }
@@ -229,7 +230,8 @@ 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, description: ''),
+        orElse: () =>
+            Player(id: playerId, name: loc.not_available, description: ''),
       );
       matchCounts[i] = (player.name, matchCounts[i].$2);
     }

lib/presentation/widgets/player_selection.dart

@@ -3,7 +3,7 @@ import 'package:provider/provider.dart';
 import 'package:tallee/core/constants.dart';
 import 'package:tallee/core/custom_theme.dart';
 import 'package:tallee/data/db/database.dart';
-import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/data/models/player.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
 import 'package:tallee/presentation/widgets/app_skeleton.dart';
 import 'package:tallee/presentation/widgets/text_input/custom_search_bar.dart';

lib/presentation/widgets/tiles/group_tile.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/data/dto/group.dart';
+import 'package:tallee/data/models/group.dart';
 import 'package:tallee/presentation/widgets/tiles/text_icon_tile.dart';
 
 class GroupTile extends StatefulWidget {

lib/presentation/widgets/tiles/match_tile.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:tallee/core/common.dart';
 import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/data/dto/match.dart';
+import 'package:tallee/data/models/match.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
 import 'package:tallee/presentation/widgets/tiles/text_icon_tile.dart';
 

lib/services/data_transfer_service.dart

@@ -8,11 +8,11 @@ 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';
+import 'package:tallee/data/models/game.dart';
+import 'package:tallee/data/models/group.dart';
+import 'package:tallee/data/models/match.dart';
+import 'package:tallee/data/models/player.dart';
+import 'package:tallee/data/models/team.dart';
 
 class DataTransferService {
   /// Deletes all data from the database.
@@ -40,24 +40,29 @@ class DataTransferService {
       '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) => {
+          .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(),
@@ -65,8 +70,23 @@ class DataTransferService {
               'gameId': m.game.id,
               'groupId': m.group?.id,
               'playerIds': m.players.map((p) => p.id).toList(),
+              'scores': m.scores.map(
+                (playerId, scores) => MapEntry(
+                  playerId,
+                  scores
+                      .map(
+                        (s) => {
+                          'roundNumber': s.roundNumber,
+                          'score': s.score,
+                          'change': s.change,
+                        },
+                      )
+                      .toList(),
+                ),
+              ),
               'notes': m.notes,
-      })
+            },
+          )
           .toList(),
     };
 
@@ -80,7 +100,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));
@@ -94,7 +114,6 @@ class DataTransferService {
       } else {
         return ExportResult.success;
       }
-
     } catch (e, stack) {
       print('[exportData] $e');
       print(stack);
@@ -119,110 +138,12 @@ class DataTransferService {
       final jsonString = await _readFileContent(path.files.single);
       if (jsonString == null) return ImportResult.fileReadError;
 
-      final isValid = await _validateJsonSchema(jsonString);
+      final isValid = await validateJsonSchema(jsonString);
       if (!isValid) return ImportResult.invalidSchema;
 
-      final Map<String, dynamic> decoded = json.decode(jsonString) as Map<String, dynamic>;
+      final decoded = json.decode(jsonString) as Map<String, 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>?) ?? [];
-
-      // Import Players
-      final List<Player> importedPlayers = playersJson
-          .map((p) => Player.fromJson(p as Map<String, dynamic>))
-          .toList();
-
-      final Map<String, Player> playerById = {
-        for (final p in importedPlayers) p.id: p,
-      };
-
-      // 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 members = memberIds
-            .map((id) => playerById[id])
-            .whereType<Player>()
-            .toList();
-
-        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),
-        );
-      }).toList();
-
-      final Map<String, Group> groupById = {
-        for (final g in importedGroups) g.id: g,
-      };
-
-      // 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 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();
-
-        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),
-          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);
+      await importDataToDatabase(db, decoded);
 
       return ImportResult.success;
     } on FormatException catch (e, stack) {
@@ -238,6 +159,160 @@ class DataTransferService {
     }
   }
 
+  /// Imports parsed JSON data into the database.
+  @visibleForTesting
+  static Future<void> importDataToDatabase(
+    AppDatabase db,
+    Map<String, dynamic> decoded,
+  ) async {
+    final importedPlayers = parsePlayersFromJson(decoded);
+    final playerById = {for (final p in importedPlayers) p.id: p};
+
+    final importedGames = parseGamesFromJson(decoded);
+    final gameById = {for (final g in importedGames) g.id: g};
+
+    final importedGroups = parseGroupsFromJson(decoded, playerById);
+    final groupById = {for (final g in importedGroups) g.id: g};
+
+    final importedTeams = parseTeamsFromJson(decoded, playerById);
+
+    final importedMatches = parseMatchesFromJson(
+      decoded,
+      gameById,
+      groupById,
+      playerById,
+    );
+
+    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);
+  }
+
+  /// Parses players from JSON data.
+  @visibleForTesting
+  static List<Player> parsePlayersFromJson(Map<String, dynamic> decoded) {
+    final playersJson = (decoded['players'] as List<dynamic>?) ?? [];
+    return playersJson
+        .map((p) => Player.fromJson(p as Map<String, dynamic>))
+        .toList();
+  }
+
+  /// Parses games from JSON data.
+  @visibleForTesting
+  static List<Game> parseGamesFromJson(Map<String, dynamic> decoded) {
+    final gamesJson = (decoded['games'] as List<dynamic>?) ?? [];
+    return gamesJson
+        .map((g) => Game.fromJson(g as Map<String, dynamic>))
+        .toList();
+  }
+
+  /// Parses groups from JSON data.
+  @visibleForTesting
+  static List<Group> parseGroupsFromJson(
+    Map<String, dynamic> decoded,
+    Map<String, Player> playerById,
+  ) {
+    final groupsJson = (decoded['groups'] as List<dynamic>?) ?? [];
+    return groupsJson.map((g) {
+      final map = g as Map<String, dynamic>;
+      final memberIds = (map['memberIds'] as List<dynamic>? ?? [])
+          .cast<String>();
+
+      final members = memberIds
+          .map((id) => playerById[id])
+          .whereType<Player>()
+          .toList();
+
+      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),
+      );
+    }).toList();
+  }
+
+  /// Parses teams from JSON data.
+  @visibleForTesting
+  static List<Team> parseTeamsFromJson(
+    Map<String, dynamic> decoded,
+    Map<String, Player> playerById,
+  ) {
+    final teamsJson = (decoded['teams'] as List<dynamic>?) ?? [];
+    return 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();
+  }
+
+  /// Parses matches from JSON data.
+  @visibleForTesting
+  static List<Match> parseMatchesFromJson(
+    Map<String, dynamic> decoded,
+    Map<String, Game> gameById,
+    Map<String, Group> groupById,
+    Map<String, Player> playerById,
+  ) {
+    final matchesJson = (decoded['matches'] as List<dynamic>?) ?? [];
+    return matchesJson.map((m) {
+      final map = m as Map<String, dynamic>;
+
+      final gameId = map['gameId'] as String;
+      final groupId = map['groupId'] as String?;
+      final playerIds = (map['playerIds'] as List<dynamic>? ?? [])
+          .cast<String>();
+      final endedAt = map['endedAt'] != null
+          ? DateTime.parse(map['endedAt'] as String)
+          : null;
+
+      final game = gameById[gameId] ?? createUnknownGame();
+      final group = groupId != null ? groupById[groupId] : null;
+      final players = playerIds
+          .map((id) => playerById[id])
+          .whereType<Player>()
+          .toList();
+
+      return Match(
+        id: map['id'] as String,
+        name: map['name'] as String,
+        game: game,
+        group: group,
+        players: players,
+        createdAt: DateTime.parse(map['createdAt'] as String),
+        endedAt: endedAt,
+        notes: map['notes'] as String? ?? '',
+      );
+    }).toList();
+  }
+
+  /// Creates a fallback game when the referenced game is not found.
+  @visibleForTesting
+  static Game createUnknownGame() {
+    return Game(
+      name: 'Unknown',
+      ruleset: Ruleset.singleWinner,
+      description: '',
+      color: GameColor.blue,
+      icon: '',
+    );
+  }
+
   /// Helper method to read file content from either bytes or path
   static Future<String?> _readFileContent(PlatformFile file) async {
     if (file.bytes != null) return utf8.decode(file.bytes!);
@@ -246,7 +321,8 @@ class DataTransferService {
   }
 
   /// Validates the given JSON string against the predefined schema.
-  static Future<bool> _validateJsonSchema(String jsonString) async {
+  @visibleForTesting
+  static Future<bool> validateJsonSchema(String jsonString) async {
     final String schemaString;
 
     schemaString = await rootBundle.loadString('assets/schema.json');

test/db_tests/aggregates/group_test.dart

@@ -3,8 +3,8 @@ 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';
-import 'package:tallee/data/dto/group.dart';
-import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/data/models/group.dart';
+import 'package:tallee/data/models/player.dart';
 
 void main() {
   late AppDatabase database;
@@ -62,7 +62,6 @@ 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);
@@ -277,20 +276,20 @@ void main() {
     });
 
     // Verifies that updateGroupDescription returns false for a non-existent group.
-    test('updateGroupDescription returns false for 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],
-      );
+      await database.groupDao.addGroupsAsList(groups: [testGroup1, testGroup2]);
 
       final countBefore = await database.groupDao.getGroupCount();
       expect(countBefore, 2);

test/db_tests/aggregates/match_test.dart

@@ -4,10 +4,10 @@ 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/models/game.dart';
+import 'package:tallee/data/models/group.dart';
+import 'package:tallee/data/models/match.dart';
+import 'package:tallee/data/models/player.dart';
 
 void main() {
   late AppDatabase database;
@@ -296,9 +296,9 @@ void main() {
     test('Setting a winner works correctly', () async {
       await database.matchDao.addMatch(match: testMatch1);
 
-      await database.matchDao.setWinner(
+      await database.scoreDao.setWinner(
         matchId: testMatch1.id,
-        winnerId: testPlayer5.id,
+        playerId: testPlayer5.id,
       );
 
       final fetchedMatch = await database.matchDao.getMatchById(
@@ -360,7 +360,6 @@ void main() {
       expect(matches, isEmpty);
 
       await database.matchDao.addMatch(match: testMatch1);
-      print(await database.matchDao.getAllMatches());
 
       matches = await database.matchDao.getGroupMatches(groupId: testGroup1.id);
 

test/db_tests/aggregates/team_test.dart

@@ -2,12 +2,12 @@ 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';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/models/game.dart';
+import 'package:tallee/data/models/match.dart';
+import 'package:tallee/data/models/player.dart';
+import 'package:tallee/data/models/team.dart';
 
 void main() {
   late AppDatabase database;
@@ -37,20 +37,23 @@ void main() {
       testPlayer2 = Player(name: 'Bob', description: '');
       testPlayer3 = Player(name: 'Charlie', description: '');
       testPlayer4 = Player(name: 'Diana', description: '');
-      testTeam1 = Team(
-        name: 'Team Alpha',
-        members: [testPlayer1, testPlayer2],
+      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: '',
       );
-      testTeam2 = Team(
-        name: 'Team Beta',
-        members: [testPlayer3, testPlayer4],
+      testGame2 = Game(
+        name: 'Game 2',
+        ruleset: Ruleset.highestScore,
+        description: 'Test game 2',
+        color: GameColor.red,
+        icon: '',
       );
-      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(
@@ -65,7 +68,6 @@ void main() {
   });
 
   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);
@@ -285,10 +287,7 @@ void main() {
     test('Updating team name to empty string works', () async {
       await database.teamDao.addTeam(team: testTeam1);
 
-      await database.teamDao.updateTeamName(
-        teamId: testTeam1.id,
-        newName: '',
-      );
+      await database.teamDao.updateTeamName(teamId: testTeam1.id, newName: '');
 
       final updatedTeam = await database.teamDao.getTeamById(
         teamId: testTeam1.id,
@@ -350,9 +349,7 @@ void main() {
       await database.matchDao.addMatch(match: match2);
 
       // Add teams to database
-      await database.teamDao.addTeamsAsList(
-        teams: [testTeam1, testTeam3],
-      );
+      await database.teamDao.addTeamsAsList(teams: [testTeam1, testTeam3]);
 
       // Associate players with teams through match1
       // testTeam1: player1, player2
@@ -360,13 +357,11 @@ void main() {
         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
@@ -375,13 +370,11 @@ void main() {
         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);
@@ -420,10 +413,11 @@ void main() {
       final allTeams = await database.teamDao.getAllTeams();
 
       expect(allTeams.length, 3);
-      expect(
-        allTeams.map((t) => t.id).toSet(),
-        {testTeam1.id, testTeam2.id, testTeam3.id},
-      );
+      expect(allTeams.map((t) => t.id).toSet(), {
+        testTeam1.id,
+        testTeam2.id,
+        testTeam3.id,
+      });
     });
 
     // Verifies that teamExists returns false for deleted teams.
@@ -462,9 +456,7 @@ void main() {
 
     // Verifies that addTeam after deleteAllTeams works correctly.
     test('Adding team after deleteAllTeams works correctly', () async {
-      await database.teamDao.addTeamsAsList(
-        teams: [testTeam1, testTeam2],
-      );
+      await database.teamDao.addTeamsAsList(teams: [testTeam1, testTeam2]);
       expect(await database.teamDao.getTeamCount(), 2);
 
       await database.teamDao.deleteAllTeams();

test/db_tests/entities/game_test.dart

@@ -4,7 +4,7 @@ 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/models/game.dart';
 
 void main() {
   late AppDatabase database;
@@ -54,7 +54,6 @@ void main() {
   });
 
   group('Game Tests', () {
-
     // 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();
@@ -134,7 +133,13 @@ void main() {
 
     // Verifies that a game with empty 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 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);
 
@@ -419,9 +424,7 @@ void main() {
 
     // Verifies that getGameCount updates correctly after deleting a game.
     test('getGameCount updates correctly after deletion', () async {
-      await database.gameDao.addGamesAsList(
-        games: [testGame1, testGame2],
-      );
+      await database.gameDao.addGamesAsList(games: [testGame1, testGame2]);
 
       final countBefore = await database.gameDao.getGameCount();
       expect(countBefore, 2);

test/db_tests/entities/player_test.dart

@@ -3,7 +3,7 @@ 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';
-import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/data/models/player.dart';
 
 void main() {
   late AppDatabase database;
@@ -35,7 +35,6 @@ 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);
@@ -264,8 +263,13 @@ void main() {
     });
 
     // 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: '');
+    test(
+      'Player with special characters in name is stored correctly',
+      () async {
+        final specialPlayer = Player(
+          name: 'Test!@#\$%^&*()_+-=[]{}|;\':",.<>?/`~',
+          description: '',
+        );
 
         await database.playerDao.addPlayer(player: specialPlayer);
 
@@ -273,7 +277,8 @@ void main() {
           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 {
@@ -293,7 +298,10 @@ void main() {
 
     // 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: '');
+      final playerWithoutDescription = Player(
+        name: 'No Description Player',
+        description: '',
+      );
 
       await database.playerDao.addPlayer(player: playerWithoutDescription);
 

test/db_tests/relationships/player_group_test.dart

@@ -3,8 +3,8 @@ 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/group.dart';
-import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/data/models/group.dart';
+import 'package:tallee/data/models/player.dart';
 
 void main() {
   late AppDatabase database;
@@ -42,7 +42,6 @@ void main() {
   });
 
   group('Player-Group Tests', () {
-
     // 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);
@@ -127,7 +126,9 @@ void main() {
     });
 
     // Verifies that addPlayerToGroup returns false when player already in group.
-    test('addPlayerToGroup returns false when player already in group', () async {
+    test(
+      'addPlayerToGroup returns false when player already in group',
+      () async {
         await database.groupDao.addGroup(group: testGroup);
 
         // testPlayer1 is already in testGroup via group creation
@@ -137,10 +138,13 @@ void main() {
         );
 
         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 {
+    test(
+      'addPlayerToGroup adds player to player table if not exists',
+      () async {
         await database.groupDao.addGroup(group: testGroup);
 
         // testPlayer4 is not in the database yet
@@ -159,10 +163,13 @@ void main() {
           playerId: testPlayer4.id,
         );
         expect(playerExists, true);
-    });
+      },
+    );
 
     // Verifies that removePlayerFromGroup returns false for non-existent player.
-    test('removePlayerFromGroup returns false for non-existent player', () async {
+    test(
+      'removePlayerFromGroup returns false for non-existent player',
+      () async {
         await database.groupDao.addGroup(group: testGroup);
 
         final result = await database.playerGroupDao.removePlayerFromGroup(
@@ -171,10 +178,13 @@ void main() {
         );
 
         expect(result, false);
-    });
+      },
+    );
 
     // Verifies that removePlayerFromGroup returns false for non-existent group.
-    test('removePlayerFromGroup returns false for non-existent group', () async {
+    test(
+      'removePlayerFromGroup returns false for non-existent group',
+      () async {
         await database.playerDao.addPlayer(player: testPlayer1);
 
         final result = await database.playerGroupDao.removePlayerFromGroup(
@@ -183,11 +193,16 @@ void main() {
         );
 
         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: []);
+      final emptyGroup = Group(
+        name: 'Empty Group',
+        description: '',
+        members: [],
+      );
       await database.groupDao.addGroup(group: emptyGroup);
 
       final players = await database.playerGroupDao.getPlayersOfGroup(
@@ -198,13 +213,16 @@ void main() {
     });
 
     // Verifies that getPlayersOfGroup returns empty list for non-existent group.
-    test('getPlayersOfGroup returns empty list for non-existent group', () async {
+    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 {
@@ -231,7 +249,11 @@ void main() {
 
     // 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: []);
+      final secondGroup = Group(
+        name: 'Second Group',
+        description: '',
+        members: [],
+      );
       await database.groupDao.addGroup(group: testGroup);
       await database.groupDao.addGroup(group: secondGroup);
 
@@ -255,8 +277,14 @@ void main() {
     });
 
     // 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]);
+    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);
 
@@ -277,7 +305,8 @@ void main() {
 
         expect(inFirstGroup, false);
         expect(inSecondGroup, true);
-    });
+      },
+    );
 
     // Verifies that addPlayerToGroup returns true on successful addition.
     test('addPlayerToGroup returns true on successful addition', () async {
@@ -293,21 +322,26 @@ void main() {
     });
 
     // Verifies that removing the same player twice returns false on second attempt.
-    test('Removing same player twice returns false on second attempt', () async {
+    test(
+      'Removing same player twice returns false on second attempt',
+      () async {
         await database.groupDao.addGroup(group: testGroup);
 
-      final firstRemoval = await database.playerGroupDao.removePlayerFromGroup(
+        final firstRemoval = await database.playerGroupDao
+            .removePlayerFromGroup(
               playerId: testPlayer1.id,
               groupId: testGroup.id,
             );
         expect(firstRemoval, true);
 
-      final secondRemoval = await database.playerGroupDao.removePlayerFromGroup(
+        final secondRemoval = await database.playerGroupDao
+            .removePlayerFromGroup(
               playerId: testPlayer1.id,
               groupId: testGroup.id,
             );
         expect(secondRemoval, false);
-    });
+      },
+    );
 
     // Verifies that replaceGroupPlayers removes all existing players and replaces with new list.
     test('replaceGroupPlayers replaces all group members correctly', () async {

test/db_tests/relationships/player_match_test.dart

@@ -4,11 +4,11 @@ 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';
+import 'package:tallee/data/models/game.dart';
+import 'package:tallee/data/models/group.dart';
+import 'package:tallee/data/models/match.dart';
+import 'package:tallee/data/models/player.dart';
+import 'package:tallee/data/models/team.dart';
 
 void main() {
   late AppDatabase database;
@@ -48,7 +48,13 @@ void main() {
         description: '',
         members: [testPlayer1, testPlayer2, testPlayer3],
       );
-      testGame = Game(name: 'Test Game', ruleset: Ruleset.singleWinner, description: 'A test game', color: GameColor.blue, icon: '');
+      testGame = Game(
+        name: 'Test Game',
+        ruleset: Ruleset.singleWinner,
+        description: 'A test game',
+        color: GameColor.blue,
+        icon: '',
+      );
       testMatchOnlyGroup = Match(
         name: 'Test Match with Group',
         game: testGame,
@@ -61,14 +67,8 @@ void main() {
         players: [testPlayer4, testPlayer5, testPlayer6],
         notes: '',
       );
-      testTeam1 = Team(
-        name: 'Team Alpha',
-        members: [testPlayer1, testPlayer2],
-      );
-      testTeam2 = Team(
-        name: 'Team Beta',
-        members: [testPlayer3, testPlayer4],
-      );
+      testTeam1 = Team(name: 'Team Alpha', members: [testPlayer1, testPlayer2]);
+      testTeam2 = Team(name: 'Team Beta', members: [testPlayer3, testPlayer4]);
     });
     await database.playerDao.addPlayersAsList(
       players: [
@@ -88,8 +88,6 @@ void main() {
   });
 
   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);
@@ -112,7 +110,6 @@ 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);
@@ -136,7 +133,6 @@ 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);
 
@@ -153,30 +149,25 @@ void main() {
       );
       expect(result.players.length, testMatchOnlyPlayers.players.length - 1);
 
-      final playerExists = result.players.any(
-            (p) => p.id == playerToRemove.id,
-      );
+      final playerExists = result.players.any((p) => p.id == playerToRemove.id);
       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(
+      final players =
+          await database.playerMatchDao.getPlayersOfMatch(
             matchId: testMatchOnlyPlayers.id,
-      ) ?? [];
+          ) ??
+          [];
 
       for (int i = 0; i < players.length; i++) {
         expect(players[i].id, testMatchOnlyPlayers.players[i].id);
         expect(players[i].name, testMatchOnlyPlayers.players[i].name);
-        expect(
-          players[i].createdAt,
-          testMatchOnlyPlayers.players[i].createdAt,
-        );
+        expect(players[i].createdAt, testMatchOnlyPlayers.players[i].createdAt);
       }
     });
 
-    // Verifies that updatePlayersFromMatch replaces all existing players with new ones.
     test('Updating the match players works correctly', () async {
       await database.matchDao.addMatch(match: testMatchOnlyPlayers);
 
@@ -220,13 +211,22 @@ void main() {
       }
     });
 
-    // Verifies that the same player can be added to multiple different matches.
     test(
       'Adding the same player to separate matches works correctly',
       () async {
         final playersList = [testPlayer1, testPlayer2, testPlayer3];
-        final match1 = Match(name: 'Match 1', game: testGame, players: playersList, notes: '');
-        final match2 = Match(name: 'Match 2', game: testGame, players: playersList, notes: '');
+        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),
@@ -267,83 +267,6 @@ void main() {
       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);
@@ -363,7 +286,6 @@ void main() {
       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);
@@ -402,7 +324,6 @@ void main() {
       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);
@@ -430,8 +351,9 @@ void main() {
       expect(playersInTeam.isEmpty, true);
     });
 
-    // Verifies that updatePlayerTeam returns false for non-existent player-match.
-    test('updatePlayerTeam returns false for non-existent player-match', () async {
+    test(
+      'updatePlayerTeam returns false for non-existent player-match',
+      () async {
         await database.matchDao.addMatch(match: testMatchOnlyGroup);
 
         final updated = await database.playerMatchDao.updatePlayerTeam(
@@ -441,7 +363,8 @@ void main() {
         );
 
         expect(updated, false);
-    });
+      },
+    );
 
     // Verifies that getPlayersInTeam returns empty list for non-existent team.
     test('getPlayersInTeam returns empty list for non-existent team', () async {
@@ -455,7 +378,6 @@ void main() {
       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);
@@ -482,8 +404,9 @@ void main() {
       expect(playerIds.contains(testPlayer2.id), true);
     });
 
-    // Verifies that removePlayerFromMatch returns false for non-existent player.
-    test('removePlayerFromMatch returns false for non-existent player', () async {
+    test(
+      'removePlayerFromMatch returns false for non-existent player',
+      () async {
         await database.matchDao.addMatch(match: testMatchOnlyPlayers);
 
         final removed = await database.playerMatchDao.removePlayerFromMatch(
@@ -492,33 +415,23 @@ void main() {
         );
 
         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,
@@ -527,8 +440,9 @@ void main() {
       expect(players?.length, 1);
     });
 
-    // Verifies that updatePlayersFromMatch with empty list removes all players.
-    test('updatePlayersFromMatch with empty list removes all players', () async {
+    test(
+      'updatePlayersFromMatch with empty list removes all players',
+      () async {
         await database.matchDao.addMatch(match: testMatchOnlyPlayers);
 
         // Verify players exist initially
@@ -548,9 +462,9 @@ void main() {
           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);
 
@@ -572,7 +486,6 @@ void main() {
       }
     });
 
-    // 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',
@@ -581,7 +494,6 @@ void main() {
       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',
@@ -591,118 +503,10 @@ void main() {
       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 {
+    test(
+      'getPlayersInTeam returns empty list for non-existent match',
+      () async {
         await database.teamDao.addTeam(team: testTeam1);
 
         final players = await database.playerMatchDao.getPlayersInTeam(
@@ -711,7 +515,8 @@ void main() {
         );
 
         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 {
@@ -759,8 +564,18 @@ void main() {
     // 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: '');
+      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),
@@ -789,47 +604,10 @@ void main() {
       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 {
+    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(
@@ -838,7 +616,8 @@ void main() {
           ),
           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 {

test/services/data_transfer_service_test.dart

@@ -0,0 +1,868 @@
+import 'dart:convert';
+
+import 'package:clock/clock.dart';
+import 'package:drift/drift.dart' hide isNull, isNotNull;
+import 'package:drift/native.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:provider/provider.dart';
+import 'package:tallee/core/enums.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/models/game.dart';
+import 'package:tallee/data/models/group.dart';
+import 'package:tallee/data/models/match.dart';
+import 'package:tallee/data/models/player.dart';
+import 'package:tallee/data/models/score_entry.dart';
+import 'package:tallee/data/models/team.dart';
+import 'package:tallee/services/data_transfer_service.dart';
+
+void main() {
+  late AppDatabase database;
+  late Player testPlayer1;
+  late Player testPlayer2;
+  late Player testPlayer3;
+  late Game testGame;
+  late Group testGroup;
+  late Team testTeam;
+  late Match testMatch;
+  final fixedDate = DateTime(2025, 11, 19, 0, 11, 23);
+  final fakeClock = Clock(() => fixedDate);
+
+  setUp(() {
+    database = AppDatabase(
+      DatabaseConnection(
+        NativeDatabase.memory(),
+        closeStreamsSynchronously: true,
+      ),
+    );
+
+    withClock(fakeClock, () {
+      testPlayer1 = Player(name: 'Alice', description: 'First test player');
+      testPlayer2 = Player(name: 'Bob', description: 'Second test player');
+      testPlayer3 = Player(name: 'Charlie', description: 'Third player');
+
+      testGame = Game(
+        name: 'Chess',
+        ruleset: Ruleset.singleWinner,
+        description: 'Strategic board game',
+        color: GameColor.blue,
+        icon: 'chess_icon',
+      );
+
+      testGroup = Group(
+        name: 'Test Group',
+        description: 'Group for testing',
+        members: [testPlayer1, testPlayer2],
+      );
+
+      testTeam = Team(name: 'Test Team', members: [testPlayer1, testPlayer2]);
+
+      testMatch = Match(
+        name: 'Test Match',
+        game: testGame,
+        group: testGroup,
+        players: [testPlayer1, testPlayer2],
+        notes: 'Test notes',
+        scores: {
+          testPlayer1.id: [
+            ScoreEntry(roundNumber: 1, score: 10, change: 10),
+            ScoreEntry(roundNumber: 2, score: 20, change: 10),
+          ],
+          testPlayer2.id: [
+            ScoreEntry(roundNumber: 1, score: 15, change: 15),
+            ScoreEntry(roundNumber: 2, score: 25, change: 10),
+          ],
+        },
+      );
+    });
+  });
+
+  tearDown(() async {
+    await database.close();
+  });
+
+  // Helper for getting BuildContext
+  Future<BuildContext> getContext(WidgetTester tester) async {
+    // Minimal widget with Provider
+    await tester.pumpWidget(
+      Provider<AppDatabase>.value(
+        value: database,
+        child: MaterialApp(
+          home: Builder(
+            builder: (context) {
+              return Container();
+            },
+          ),
+        ),
+      ),
+    );
+    final BuildContext context = tester.element(find.byType(Container));
+    return context;
+  }
+
+  group('DataTransferService Tests', () {
+    testWidgets('deleteAllData()', (tester) async {
+      await database.playerDao.addPlayer(player: testPlayer1);
+      await database.gameDao.addGame(game: testGame);
+      await database.groupDao.addGroup(group: testGroup);
+      await database.teamDao.addTeam(team: testTeam);
+      await database.matchDao.addMatch(match: testMatch);
+
+      var playerCount = await database.playerDao.getPlayerCount();
+      var gameCount = await database.gameDao.getGameCount();
+      var groupCount = await database.groupDao.getGroupCount();
+      var teamCount = await database.teamDao.getTeamCount();
+      var matchCount = await database.matchDao.getMatchCount();
+
+      expect(playerCount, greaterThan(0));
+      expect(gameCount, greaterThan(0));
+      expect(groupCount, greaterThan(0));
+      expect(teamCount, greaterThan(0));
+      expect(matchCount, greaterThan(0));
+
+      final ctx = await getContext(tester);
+      await DataTransferService.deleteAllData(ctx);
+
+      playerCount = await database.playerDao.getPlayerCount();
+      gameCount = await database.gameDao.getGameCount();
+      groupCount = await database.groupDao.getGroupCount();
+      teamCount = await database.teamDao.getTeamCount();
+      matchCount = await database.matchDao.getMatchCount();
+
+      expect(playerCount, 0);
+      expect(gameCount, 0);
+      expect(groupCount, 0);
+      expect(teamCount, 0);
+      expect(matchCount, 0);
+    });
+
+    group('getAppDataAsJson()', () {
+      group('Whole export', () {
+        testWidgets('Exporting app data works correctly', (tester) async {
+          await database.playerDao.addPlayer(player: testPlayer1);
+          await database.playerDao.addPlayer(player: testPlayer2);
+          await database.gameDao.addGame(game: testGame);
+          await database.groupDao.addGroup(group: testGroup);
+          await database.teamDao.addTeam(team: testTeam);
+          await database.matchDao.addMatch(match: testMatch);
+
+          final ctx = await getContext(tester);
+          final jsonString = await DataTransferService.getAppDataAsJson(ctx);
+
+          expect(jsonString, isNotEmpty);
+
+          final decoded = json.decode(jsonString) as Map<String, dynamic>;
+
+          expect(decoded.containsKey('players'), true);
+          expect(decoded.containsKey('games'), true);
+          expect(decoded.containsKey('groups'), true);
+          expect(decoded.containsKey('teams'), true);
+          expect(decoded.containsKey('matches'), true);
+
+          final players = decoded['players'] as List<dynamic>;
+          final games = decoded['games'] as List<dynamic>;
+          final groups = decoded['groups'] as List<dynamic>;
+          final teams = decoded['teams'] as List<dynamic>;
+          final matches = decoded['matches'] as List<dynamic>;
+
+          expect(players.length, 2);
+          expect(games.length, 1);
+          expect(groups.length, 1);
+          expect(teams.length, 1);
+          expect(matches.length, 1);
+        });
+
+        testWidgets('Exporting empty data works correctly', (tester) async {
+          final ctx = await getContext(tester);
+          final jsonString = await DataTransferService.getAppDataAsJson(ctx);
+
+          final decoded = json.decode(jsonString) as Map<String, dynamic>;
+
+          final players = decoded['players'] as List<dynamic>;
+          final games = decoded['games'] as List<dynamic>;
+          final groups = decoded['groups'] as List<dynamic>;
+          final teams = decoded['teams'] as List<dynamic>;
+          final matches = decoded['matches'] as List<dynamic>;
+
+          expect(players, isEmpty);
+          expect(games, isEmpty);
+          expect(groups, isEmpty);
+          expect(teams, isEmpty);
+          expect(matches, isEmpty);
+        });
+      });
+
+      group('Checking specific data', () {
+        testWidgets('Player data is correct', (tester) async {
+          await database.playerDao.addPlayer(player: testPlayer1);
+
+          final ctx = await getContext(tester);
+          final jsonString = await DataTransferService.getAppDataAsJson(ctx);
+          final decoded = json.decode(jsonString) as Map<String, dynamic>;
+          final players = decoded['players'] as List<dynamic>;
+          final playerData = players[0] as Map<String, dynamic>;
+
+          expect(playerData['id'], testPlayer1.id);
+          expect(playerData['name'], testPlayer1.name);
+          expect(playerData['description'], testPlayer1.description);
+          expect(
+            playerData['createdAt'],
+            testPlayer1.createdAt.toIso8601String(),
+          );
+        });
+
+        testWidgets('Game data is correct', (tester) async {
+          await database.gameDao.addGame(game: testGame);
+
+          final ctx = await getContext(tester);
+          final jsonString = await DataTransferService.getAppDataAsJson(ctx);
+          final decoded = json.decode(jsonString) as Map<String, dynamic>;
+          final games = decoded['games'] as List<dynamic>;
+          final gameData = games[0] as Map<String, dynamic>;
+
+          expect(gameData['id'], testGame.id);
+          expect(gameData['name'], testGame.name);
+          expect(gameData['ruleset'], testGame.ruleset.name);
+          expect(gameData['description'], testGame.description);
+          expect(gameData['color'], testGame.color.name);
+          expect(gameData['icon'], testGame.icon);
+        });
+
+        testWidgets('Group data is correct', (tester) async {
+          await database.playerDao.addPlayer(player: testPlayer1);
+          await database.playerDao.addPlayer(player: testPlayer2);
+          await database.groupDao.addGroup(group: testGroup);
+
+          final ctx = await getContext(tester);
+          final jsonString = await DataTransferService.getAppDataAsJson(ctx);
+          final decoded = json.decode(jsonString) as Map<String, dynamic>;
+          final groups = decoded['groups'] as List<dynamic>;
+          final groupData = groups[0] as Map<String, dynamic>;
+
+          expect(groupData['id'], testGroup.id);
+          expect(groupData['name'], testGroup.name);
+          expect(groupData['description'], testGroup.description);
+          expect(groupData['memberIds'], isA<List>());
+
+          final memberIds = groupData['memberIds'] as List<dynamic>;
+          expect(memberIds.length, 2);
+          expect(memberIds, containsAll([testPlayer1.id, testPlayer2.id]));
+        });
+
+        testWidgets('Team data is correct', (tester) async {
+          await database.teamDao.addTeam(team: testTeam);
+
+          final ctx = await getContext(tester);
+          final jsonString = await DataTransferService.getAppDataAsJson(ctx);
+          final decoded = json.decode(jsonString) as Map<String, dynamic>;
+          final teams = decoded['teams'] as List<dynamic>;
+
+          expect(teams.length, 1);
+
+          final teamData = teams[0] as Map<String, dynamic>;
+
+          expect(teamData['id'], testTeam.id);
+          expect(teamData['name'], testTeam.name);
+          expect(teamData['memberIds'], isA<List>());
+
+          // Note: In this system, teams don't have independent members.
+          // Team members are only tracked through matches via PlayerMatchTable.
+          // Therefore, memberIds will be empty for standalone teams.
+          final memberIds = teamData['memberIds'] as List<dynamic>;
+          expect(memberIds, isEmpty);
+        });
+
+        testWidgets('Match data is correct', (tester) async {
+          await database.playerDao.addPlayersAsList(
+            players: [testPlayer1, testPlayer2],
+          );
+          await database.gameDao.addGame(game: testGame);
+          await database.groupDao.addGroup(group: testGroup);
+          await database.matchDao.addMatch(match: testMatch);
+
+          final ctx = await getContext(tester);
+          final jsonString = await DataTransferService.getAppDataAsJson(ctx);
+          final decoded = json.decode(jsonString) as Map<String, dynamic>;
+          final matches = decoded['matches'] as List<dynamic>;
+          final matchData = matches[0] as Map<String, dynamic>;
+
+          expect(matchData['id'], testMatch.id);
+          expect(matchData['name'], testMatch.name);
+          expect(matchData['gameId'], testGame.id);
+          expect(matchData['groupId'], testGroup.id);
+          expect(matchData['playerIds'], isA<List>());
+          expect(matchData['notes'], testMatch.notes);
+
+          // Check player ids
+          final playerIds = matchData['playerIds'] as List<dynamic>;
+          expect(playerIds.length, 2);
+          expect(playerIds, containsAll([testPlayer1.id, testPlayer2.id]));
+
+          // Check scores structure
+          final scoresJson = matchData['scores'] as Map<String, dynamic>;
+          expect(scoresJson, isA<Map<String, dynamic>>());
+
+          final scores = scoresJson.map(
+            (playerId, scoreList) => MapEntry(
+              playerId,
+              (scoreList as List)
+                  .map((s) => ScoreEntry.fromJson(s as Map<String, dynamic>))
+                  .toList(),
+            ),
+          );
+
+          expect(scores, isA<Map<String, List<ScoreEntry>>>());
+
+          /* Player 1 scores */
+          // General structure
+          expect(scores[testPlayer1.id], isNotNull);
+          expect(scores[testPlayer1.id]!.length, 2);
+
+          // Round 1
+          expect(scores[testPlayer1.id]![0].roundNumber, 1);
+          expect(scores[testPlayer1.id]![0].score, 10);
+          expect(scores[testPlayer1.id]![0].change, 10);
+
+          // Round 2
+          expect(scores[testPlayer1.id]![1].roundNumber, 2);
+          expect(scores[testPlayer1.id]![1].score, 20);
+          expect(scores[testPlayer1.id]![1].change, 10);
+
+          /* Player 2 scores */
+          // General structure
+          expect(scores[testPlayer2.id], isNotNull);
+          expect(scores[testPlayer2.id]!.length, 2);
+
+          // Round 1
+          expect(scores[testPlayer2.id]![0].roundNumber, 1);
+          expect(scores[testPlayer2.id]![0].score, 15);
+          expect(scores[testPlayer2.id]![0].change, 15);
+
+          // Round 2
+          expect(scores[testPlayer2.id]![1].roundNumber, 2);
+          expect(scores[testPlayer2.id]![1].score, 25);
+          expect(scores[testPlayer2.id]![1].change, 10);
+        });
+
+        testWidgets('Match without group is handled correctly', (tester) async {
+          final matchWithoutGroup = Match(
+            name: 'No Group Match',
+            game: testGame,
+            group: null,
+            players: [testPlayer1],
+            notes: 'No group',
+          );
+
+          await database.playerDao.addPlayer(player: testPlayer1);
+          await database.gameDao.addGame(game: testGame);
+          await database.matchDao.addMatch(match: matchWithoutGroup);
+
+          final ctx = await getContext(tester);
+          final jsonString = await DataTransferService.getAppDataAsJson(ctx);
+          final decoded = json.decode(jsonString) as Map<String, dynamic>;
+          final matches = decoded['matches'] as List<dynamic>;
+          final matchData = matches[0] as Map<String, dynamic>;
+
+          expect(matchData['groupId'], isNull);
+        });
+
+        testWidgets('Match with endedAt is handled correctly', (tester) async {
+          final endedDate = DateTime(2025, 12, 1, 10, 0, 0);
+          final endedMatch = Match(
+            name: 'Ended Match',
+            game: testGame,
+            players: [testPlayer1],
+            endedAt: endedDate,
+            notes: 'Finished',
+          );
+
+          await database.playerDao.addPlayer(player: testPlayer1);
+          await database.gameDao.addGame(game: testGame);
+          await database.matchDao.addMatch(match: endedMatch);
+
+          final ctx = await getContext(tester);
+          final jsonString = await DataTransferService.getAppDataAsJson(ctx);
+          final decoded = json.decode(jsonString) as Map<String, dynamic>;
+          final matches = decoded['matches'] as List<dynamic>;
+          final matchData = matches[0] as Map<String, dynamic>;
+
+          expect(matchData['endedAt'], endedDate.toIso8601String());
+        });
+
+        testWidgets('Structure is consistent', (tester) async {
+          await database.playerDao.addPlayer(player: testPlayer1);
+          await database.gameDao.addGame(game: testGame);
+
+          final ctx = await getContext(tester);
+          final jsonString1 = await DataTransferService.getAppDataAsJson(ctx);
+          final jsonString2 = await DataTransferService.getAppDataAsJson(ctx);
+
+          expect(jsonString1, equals(jsonString2));
+        });
+
+        testWidgets('Empty match notes is handled correctly', (tester) async {
+          final matchWithEmptyNotes = Match(
+            name: 'Empty Notes Match',
+            game: testGame,
+            players: [testPlayer1],
+            notes: '',
+          );
+
+          await database.playerDao.addPlayer(player: testPlayer1);
+          await database.gameDao.addGame(game: testGame);
+          await database.matchDao.addMatch(match: matchWithEmptyNotes);
+
+          final ctx = await getContext(tester);
+          final jsonString = await DataTransferService.getAppDataAsJson(ctx);
+          final decoded = json.decode(jsonString) as Map<String, dynamic>;
+          final matches = decoded['matches'] as List<dynamic>;
+          final matchData = matches[0] as Map<String, dynamic>;
+
+          expect(matchData['notes'], '');
+        });
+
+        testWidgets('Multiple players in match is handled correctly', (
+          tester,
+        ) async {
+          final multiPlayerMatch = Match(
+            name: 'Multi Player Match',
+            game: testGame,
+            players: [testPlayer1, testPlayer2, testPlayer3],
+            notes: 'Three players',
+          );
+
+          await database.playerDao.addPlayersAsList(
+            players: [testPlayer1, testPlayer2, testPlayer3],
+          );
+          await database.gameDao.addGame(game: testGame);
+          await database.matchDao.addMatch(match: multiPlayerMatch);
+
+          final ctx = await getContext(tester);
+          final jsonString = await DataTransferService.getAppDataAsJson(ctx);
+          final decoded = json.decode(jsonString) as Map<String, dynamic>;
+          final matches = decoded['matches'] as List<dynamic>;
+          final matchData = matches[0] as Map<String, dynamic>;
+
+          final playerIds = matchData['playerIds'] as List<dynamic>;
+          expect(playerIds.length, 3);
+          expect(
+            playerIds,
+            containsAll([testPlayer1.id, testPlayer2.id, testPlayer3.id]),
+          );
+        });
+
+        testWidgets('All game colors are handled correctly', (tester) async {
+          final games = [
+            Game(
+              name: 'Red Game',
+              ruleset: Ruleset.singleWinner,
+              color: GameColor.red,
+              icon: 'icon',
+            ),
+            Game(
+              name: 'Blue Game',
+              ruleset: Ruleset.singleWinner,
+              color: GameColor.blue,
+              icon: 'icon',
+            ),
+            Game(
+              name: 'Green Game',
+              ruleset: Ruleset.singleWinner,
+              color: GameColor.green,
+              icon: 'icon',
+            ),
+          ];
+
+          await database.gameDao.addGamesAsList(games: games);
+
+          final ctx = await getContext(tester);
+          final jsonString = await DataTransferService.getAppDataAsJson(ctx);
+          final decoded = json.decode(jsonString) as Map<String, dynamic>;
+          final gamesJson = decoded['games'] as List<dynamic>;
+
+          expect(gamesJson.length, 3);
+          expect(
+            gamesJson.map((g) => g['color']),
+            containsAll(['red', 'blue', 'green']),
+          );
+        });
+
+        testWidgets('All rulesets are handled correctly', (tester) async {
+          final games = [
+            Game(
+              name: 'Highest Score Game',
+              ruleset: Ruleset.highestScore,
+              color: GameColor.blue,
+              icon: 'icon',
+            ),
+            Game(
+              name: 'Lowest Score Game',
+              ruleset: Ruleset.lowestScore,
+              color: GameColor.blue,
+              icon: 'icon',
+            ),
+            Game(
+              name: 'Single Winner',
+              ruleset: Ruleset.singleWinner,
+              color: GameColor.blue,
+              icon: 'icon',
+            ),
+          ];
+
+          await database.gameDao.addGamesAsList(games: games);
+
+          final ctx = await getContext(tester);
+          final jsonString = await DataTransferService.getAppDataAsJson(ctx);
+          final decoded = json.decode(jsonString) as Map<String, dynamic>;
+          final gamesJson = decoded['games'] as List<dynamic>;
+
+          expect(gamesJson.length, 3);
+          expect(
+            gamesJson.map((g) => g['ruleset']),
+            containsAll(['highestScore', 'lowestScore', 'singleWinner']),
+          );
+        });
+      });
+    });
+
+    group('Parse Methods', () {
+      test('parsePlayersFromJson()', () {
+        final jsonMap = {
+          'players': [
+            {
+              'id': testPlayer1.id,
+              'name': testPlayer1.name,
+              'description': testPlayer1.description,
+              'createdAt': testPlayer1.createdAt.toIso8601String(),
+            },
+            {
+              'id': testPlayer2.id,
+              'name': testPlayer2.name,
+              'description': testPlayer2.description,
+              'createdAt': testPlayer2.createdAt.toIso8601String(),
+            },
+          ],
+        };
+
+        final players = DataTransferService.parsePlayersFromJson(jsonMap);
+
+        expect(players.length, 2);
+        expect(players[0].id, testPlayer1.id);
+        expect(players[0].name, testPlayer1.name);
+        expect(players[1].id, testPlayer2.id);
+        expect(players[1].name, testPlayer2.name);
+      });
+
+      test('parsePlayersFromJson() empty list', () {
+        final jsonMap = {'players': []};
+        final players = DataTransferService.parsePlayersFromJson(jsonMap);
+        expect(players, isEmpty);
+      });
+
+      test('parsePlayersFromJson() missing key', () {
+        final jsonMap = <String, dynamic>{};
+        final players = DataTransferService.parsePlayersFromJson(jsonMap);
+        expect(players, isEmpty);
+      });
+
+      test('parseGamesFromJson()', () {
+        final jsonMap = {
+          'games': [
+            {
+              'id': testGame.id,
+              'name': testGame.name,
+              'ruleset': testGame.ruleset.name,
+              'description': testGame.description,
+              'color': testGame.color.name,
+              'icon': testGame.icon,
+              'createdAt': testGame.createdAt.toIso8601String(),
+            },
+          ],
+        };
+
+        final games = DataTransferService.parseGamesFromJson(jsonMap);
+
+        expect(games.length, 1);
+        expect(games[0].id, testGame.id);
+        expect(games[0].name, testGame.name);
+        expect(games[0].ruleset, testGame.ruleset);
+      });
+
+      test('parseGroupsFromJson()', () {
+        final playerById = {
+          testPlayer1.id: testPlayer1,
+          testPlayer2.id: testPlayer2,
+        };
+
+        final jsonMap = {
+          'groups': [
+            {
+              'id': testGroup.id,
+              'name': testGroup.name,
+              'description': testGroup.description,
+              'memberIds': [testPlayer1.id, testPlayer2.id],
+              'createdAt': testGroup.createdAt.toIso8601String(),
+            },
+          ],
+        };
+
+        final groups = DataTransferService.parseGroupsFromJson(
+          jsonMap,
+          playerById,
+        );
+
+        expect(groups.length, 1);
+        expect(groups[0].id, testGroup.id);
+        expect(groups[0].name, testGroup.name);
+        expect(groups[0].members.length, 2);
+        expect(groups[0].members[0].id, testPlayer1.id);
+        expect(groups[0].members[1].id, testPlayer2.id);
+      });
+
+      test('parseGroupsFromJson() ignores invalid player ids', () {
+        final playerById = {testPlayer1.id: testPlayer1};
+
+        final jsonMap = {
+          'groups': [
+            {
+              'id': testGroup.id,
+              'name': testGroup.name,
+              'description': testGroup.description,
+              'memberIds': [testPlayer1.id, 'invalid-id'],
+              'createdAt': testGroup.createdAt.toIso8601String(),
+            },
+          ],
+        };
+
+        final groups = DataTransferService.parseGroupsFromJson(
+          jsonMap,
+          playerById,
+        );
+
+        expect(groups.length, 1);
+        expect(groups[0].members.length, 1);
+        expect(groups[0].members[0].id, testPlayer1.id);
+      });
+
+      test('parseTeamsFromJson()', () {
+        final playerById = {testPlayer1.id: testPlayer1};
+
+        final jsonMap = {
+          'teams': [
+            {
+              'id': testTeam.id,
+              'name': testTeam.name,
+              'memberIds': [testPlayer1.id],
+              'createdAt': testTeam.createdAt.toIso8601String(),
+            },
+          ],
+        };
+
+        final teams = DataTransferService.parseTeamsFromJson(
+          jsonMap,
+          playerById,
+        );
+
+        expect(teams.length, 1);
+        expect(teams[0].id, testTeam.id);
+        expect(teams[0].name, testTeam.name);
+        expect(teams[0].members.length, 1);
+        expect(teams[0].members[0].id, testPlayer1.id);
+      });
+
+      test('parseMatchesFromJson()', () {
+        final playerById = {
+          testPlayer1.id: testPlayer1,
+          testPlayer2.id: testPlayer2,
+        };
+        final gameById = {testGame.id: testGame};
+        final groupById = {testGroup.id: testGroup};
+
+        final jsonMap = {
+          'matches': [
+            {
+              'id': testMatch.id,
+              'name': testMatch.name,
+              'gameId': testGame.id,
+              'groupId': testGroup.id,
+              'playerIds': [testPlayer1.id, testPlayer2.id],
+              'notes': testMatch.notes,
+              'createdAt': testMatch.createdAt.toIso8601String(),
+            },
+          ],
+        };
+
+        final matches = DataTransferService.parseMatchesFromJson(
+          jsonMap,
+          gameById,
+          groupById,
+          playerById,
+        );
+
+        expect(matches.length, 1);
+        expect(matches[0].id, testMatch.id);
+        expect(matches[0].name, testMatch.name);
+        expect(matches[0].game.id, testGame.id);
+        expect(matches[0].group?.id, testGroup.id);
+        expect(matches[0].players.length, 2);
+      });
+
+      test('parseMatchesFromJson() creates unknown game for missing game', () {
+        final playerById = {testPlayer1.id: testPlayer1};
+        final gameById = <String, Game>{};
+        final groupById = <String, Group>{};
+
+        final jsonMap = {
+          'matches': [
+            {
+              'id': testMatch.id,
+              'name': testMatch.name,
+              'gameId': 'non-existent-game-id',
+              'playerIds': [testPlayer1.id],
+              'notes': '',
+              'createdAt': testMatch.createdAt.toIso8601String(),
+            },
+          ],
+        };
+
+        final matches = DataTransferService.parseMatchesFromJson(
+          jsonMap,
+          gameById,
+          groupById,
+          playerById,
+        );
+
+        expect(matches.length, 1);
+        expect(matches[0].game.name, 'Unknown');
+        expect(matches[0].game.ruleset, Ruleset.singleWinner);
+      });
+
+      test('parseMatchesFromJson() handles null group', () {
+        final playerById = {testPlayer1.id: testPlayer1};
+        final gameById = {testGame.id: testGame};
+        final groupById = <String, Group>{};
+
+        final jsonMap = {
+          'matches': [
+            {
+              'id': testMatch.id,
+              'name': testMatch.name,
+              'gameId': testGame.id,
+              'groupId': null,
+              'playerIds': [testPlayer1.id],
+              'notes': '',
+              'createdAt': testMatch.createdAt.toIso8601String(),
+            },
+          ],
+        };
+
+        final matches = DataTransferService.parseMatchesFromJson(
+          jsonMap,
+          gameById,
+          groupById,
+          playerById,
+        );
+
+        expect(matches.length, 1);
+        expect(matches[0].group, isNull);
+      });
+
+      test('parseMatchesFromJson() handles endedAt', () {
+        final playerById = {testPlayer1.id: testPlayer1};
+        final gameById = {testGame.id: testGame};
+        final groupById = <String, Group>{};
+        final endedDate = DateTime(2025, 12, 1, 10, 0, 0);
+
+        final jsonMap = {
+          'matches': [
+            {
+              'id': testMatch.id,
+              'name': testMatch.name,
+              'gameId': testGame.id,
+              'playerIds': [testPlayer1.id],
+              'notes': '',
+              'createdAt': testMatch.createdAt.toIso8601String(),
+              'endedAt': endedDate.toIso8601String(),
+            },
+          ],
+        };
+
+        final matches = DataTransferService.parseMatchesFromJson(
+          jsonMap,
+          gameById,
+          groupById,
+          playerById,
+        );
+
+        expect(matches.length, 1);
+        expect(matches[0].endedAt, endedDate);
+      });
+    });
+
+    test('validateJsonSchema()', () async {
+      final validJson = json.encode({
+        'players': [
+          {
+            'id': testPlayer1.id,
+            'name': testPlayer1.name,
+            'description': testPlayer1.description,
+            'createdAt': testPlayer1.createdAt.toIso8601String(),
+          },
+        ],
+        'games': [
+          {
+            'id': testGame.id,
+            'name': testGame.name,
+            'ruleset': testGame.ruleset.name,
+            'description': testGame.description,
+            'color': testGame.color.name,
+            'icon': testGame.icon,
+            'createdAt': testGame.createdAt.toIso8601String(),
+          },
+        ],
+        'groups': [
+          {
+            'id': testGroup.id,
+            'name': testGroup.name,
+            'description': testGroup.description,
+            'memberIds': [testPlayer1.id, testPlayer2.id],
+            'createdAt': testGroup.createdAt.toIso8601String(),
+          },
+        ],
+        'teams': [
+          {
+            'id': testTeam.id,
+            'name': testTeam.name,
+            'memberIds': [testPlayer1.id, testPlayer2.id],
+            'createdAt': testTeam.createdAt.toIso8601String(),
+          },
+        ],
+        'matches': [
+          {
+            'id': testMatch.id,
+            'name': testMatch.name,
+            'gameId': testGame.id,
+            'groupId': testGroup.id,
+            'playerIds': [testPlayer1.id, testPlayer2.id],
+            'notes': testMatch.notes,
+            'scores': {
+              testPlayer1.id: [
+                {'roundNumber': 1, 'score': 10, 'change': 10},
+                {'roundNumber': 2, 'score': 20, 'change': 10},
+              ],
+              testPlayer2.id: [
+                {'roundNumber': 1, 'score': 15, 'change': 15},
+                {'roundNumber': 2, 'score': 25, 'change': 10},
+              ],
+            },
+            'createdAt': testMatch.createdAt.toIso8601String(),
+            'endedAt': null,
+          },
+        ],
+      });
+
+      final isValid = await DataTransferService.validateJsonSchema(validJson);
+      expect(isValid, true);
+    });
+  });
+}