Revert "Merge branch 'feature/193-statisticsview-rework' into development"

This reverts commit 24f49e17b9, reversing
changes made to dba6c218d6.

# Conflicts:
#	pubspec.yaml

lib/data/dao/match_dao.dart

@@ -258,15 +258,15 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
   /// Returns `true` if the match exists, otherwise `false`.
   Future<bool> matchExists({required String matchId}) async {
     final query = select(matchTable)..where((g) => g.id.equals(matchId));
-    final row = await query.getSingleOrNull();
-    return row != null;
+    final result = await query.getSingleOrNull();
+    return result != null;
   }
 
   /// Retrieves the number of matches in the database.
   Future<int> getMatchCount() async {
     final count =
         await (selectOnly(matchTable)..addColumns([matchTable.id.count()]))
-            .map((tbl) => tbl.read(matchTable.id.count()))
+            .map((row) => row.read(matchTable.id.count()))
             .getSingle();
     return count ?? 0;
   }
@@ -279,12 +279,10 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     return Future.wait(
       result.map((row) async {
         final game = await db.gameDao.getGameById(gameId: row.gameId);
-
         Group? group;
         if (row.groupId != null) {
           group = await db.groupDao.getGroupById(groupId: row.groupId!);
         }
-
         final players = await db.playerMatchDao.getPlayersOfMatch(
           matchId: row.id,
         );
@@ -314,13 +312,13 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
   /// Retrieves a [Match] by its [matchId].
   Future<Match> getMatchById({required String matchId}) async {
     final query = select(matchTable)..where((g) => g.id.equals(matchId));
-    final row = await query.getSingle();
+    final result = await query.getSingle();
 
-    final game = await db.gameDao.getGameById(gameId: row.gameId);
+    final game = await db.gameDao.getGameById(gameId: result.gameId);
 
     Group? group;
-    if (row.groupId != null) {
-      group = await db.groupDao.getGroupById(groupId: row.groupId!);
+    if (result.groupId != null) {
+      group = await db.groupDao.getGroupById(groupId: result.groupId!);
     }
 
     final players = await db.playerMatchDao.getPlayersOfMatch(matchId: matchId);
@@ -330,15 +328,15 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     final teams = await _getMatchTeams(matchId: matchId);
 
     return Match(
-      id: row.id,
-      name: row.name,
+      id: result.id,
+      name: result.name,
       game: game,
       group: group,
       players: players,
       teams: teams.isEmpty ? null : teams,
-      notes: row.notes,
-      createdAt: row.createdAt,
-      endedAt: row.endedAt,
+      notes: result.notes,
+      createdAt: result.createdAt,
+      endedAt: result.endedAt,
       scores: scores,
     );
   }
@@ -349,73 +347,25 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
         await (selectOnly(matchTable)
               ..where(matchTable.gameId.equals(gameId))
               ..addColumns([matchTable.id.count()]))
-            .map((tbl) => tbl.read(matchTable.id.count()))
+            .map((row) => row.read(matchTable.id.count()))
             .getSingle();
     return count ?? 0;
   }
 
-  Future<List<Match>> getMatchesByPlayer({required String playerId}) async {
-    final playerMatches = await (select(
-      playerMatchTable,
-    )..where((tbl) => tbl.playerId.equals(playerId))).get();
-
-    if (playerMatches.isEmpty) return [];
-
-    final matchIds = playerMatches.map((tbl) => tbl.matchId).toSet().toList();
-    final result =
-        await (select(matchTable)
-              ..where((tbl) => tbl.id.isIn(matchIds))
-              ..orderBy([(tbl) => OrderingTerm.desc(tbl.createdAt)]))
-            .get();
-
-    return Future.wait(
-      result.map((row) async {
-        final game = await db.gameDao.getGameById(gameId: row.gameId);
-
-        Group? group;
-        if (row.groupId != null) {
-          group = await db.groupDao.getGroupById(groupId: row.groupId!);
-        }
-
-        final players = await db.playerMatchDao.getPlayersOfMatch(
-          matchId: row.id,
-        );
-        final scores = await db.scoreEntryDao.getAllMatchScores(
-          matchId: row.id,
-        );
-        final teams = await _getMatchTeams(matchId: row.id);
-
-        return Match(
-          id: row.id,
-          name: row.name,
-          game: game,
-          group: group,
-          players: players,
-          teams: teams.isEmpty ? null : teams,
-          notes: row.notes,
-          createdAt: row.createdAt,
-          endedAt: row.endedAt,
-          scores: scores,
-        );
-      }),
-    );
-  }
-
   /// Retrieves all matches associated with the given [groupId].
   /// Queries the database directly, filtering by [groupId].
   Future<List<Match>> getMatchesByGroup({required String groupId}) async {
     final query = select(matchTable)..where((m) => m.groupId.equals(groupId));
-    final result = await query.get();
+    final rows = await query.get();
 
     return Future.wait(
-      result.map((row) async {
+      rows.map((row) async {
         final game = await db.gameDao.getGameById(gameId: row.gameId);
         final group = await db.groupDao.getGroupById(groupId: groupId);
         final players = await db.playerMatchDao.getPlayersOfMatch(
           matchId: row.id,
         );
         final teams = await _getMatchTeams(matchId: row.id);
-
         return Match(
           id: row.id,
           name: row.name,
@@ -435,7 +385,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
   Future<List<Team>> _getMatchTeams({required String matchId}) async {
     // Get all unique team IDs from PlayerMatchTable for this match
     final playerMatchQuery = select(db.playerMatchTable)
-      ..where((tbl) => tbl.matchId.equals(matchId) & tbl.teamId.isNotNull());
+      ..where((pm) => pm.matchId.equals(matchId) & pm.teamId.isNotNull());
     final playerMatches = await playerMatchQuery.get();
 
     if (playerMatches.isEmpty) return [];
@@ -462,7 +412,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     required String matchId,
     required String name,
   }) async {
-    final query = update(matchTable)..where((tbl) => tbl.id.equals(matchId));
+    final query = update(matchTable)..where((g) => g.id.equals(matchId));
     final rowsAffected = await query.write(
       MatchTableCompanion(name: Value(name)),
     );
@@ -477,7 +427,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     required String matchId,
     required String? groupId,
   }) async {
-    final query = update(matchTable)..where((tbl) => tbl.id.equals(matchId));
+    final query = update(matchTable)..where((g) => g.id.equals(matchId));
     final rowsAffected = await query.write(
       MatchTableCompanion(groupId: Value(groupId)),
     );
@@ -490,7 +440,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     required String matchId,
     required String notes,
   }) async {
-    final query = update(matchTable)..where((tbl) => tbl.id.equals(matchId));
+    final query = update(matchTable)..where((g) => g.id.equals(matchId));
     final rowsAffected = await query.write(
       MatchTableCompanion(notes: Value(notes)),
     );
@@ -501,7 +451,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
   /// Sets the groupId to null.
   /// Returns `true` if more than 0 rows were affected, otherwise `false`.
   Future<bool> removeMatchGroup({required String matchId}) async {
-    final query = update(matchTable)..where((tbl) => tbl.id.equals(matchId));
+    final query = update(matchTable)..where((g) => g.id.equals(matchId));
     final rowsAffected = await query.write(
       const MatchTableCompanion(groupId: Value(null)),
     );
@@ -515,7 +465,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     required String matchId,
     required DateTime endedAt,
   }) async {
-    final query = update(matchTable)..where((tbl) => tbl.id.equals(matchId));
+    final query = update(matchTable)..where((g) => g.id.equals(matchId));
     final rowsAffected = await query.write(
       MatchTableCompanion(endedAt: Value(endedAt)),
     );
@@ -527,7 +477,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
   /// Deletes the match with the given [matchId] from the database.
   /// Returns `true` if more than 0 rows were affected, otherwise `false`.
   Future<bool> deleteMatch({required String matchId}) async {
-    final query = delete(matchTable)..where((tbl) => tbl.id.equals(matchId));
+    final query = delete(matchTable)..where((g) => g.id.equals(matchId));
     final rowsAffected = await query.go();
     return rowsAffected > 0;
   }
@@ -543,7 +493,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
   /// Deletes all matches associated with a specific game.
   /// Returns the number of matches deleted.
   Future<int> deleteMatchesByGame({required String gameId}) async {
-    final query = delete(matchTable)..where((tbl) => tbl.gameId.equals(gameId));
+    final query = delete(matchTable)..where((m) => m.gameId.equals(gameId));
     final rowsAffected = await query.go();
     return rowsAffected;
   }