diff --git a/lib/data/dao/score_dao.dart b/lib/data/dao/score_dao.dart index 29452e2..feae146 100644 --- a/lib/data/dao/score_dao.dart +++ b/lib/data/dao/score_dao.dart @@ -2,7 +2,7 @@ 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/models/player.dart'; -import 'package:tallee/data/models/score_entry.dart'; +import 'package:tallee/data/models/score.dart'; part 'score_dao.g.dart'; @@ -31,7 +31,7 @@ class ScoreDao extends DatabaseAccessor with _$ScoreDaoMixin { } /// Retrieves the score for a specific round. - Future getScore({ + Future getScore({ required String playerId, required String matchId, int roundNumber = 0, @@ -47,7 +47,7 @@ class ScoreDao extends DatabaseAccessor with _$ScoreDaoMixin { final result = await query.getSingleOrNull(); if (result == null) return null; - return ScoreEntry( + return Score( playerId: result.playerId, matchId: result.matchId, roundNumber: result.roundNumber, @@ -57,12 +57,12 @@ class ScoreDao extends DatabaseAccessor with _$ScoreDaoMixin { } /// Retrieves all scores for a specific match. - Future> getAllMatchScores({required String matchId}) async { + Future> getAllMatchScores({required String matchId}) async { final query = select(scoreTable)..where((s) => s.matchId.equals(matchId)); final result = await query.get(); return result .map( - (row) => ScoreEntry( + (row) => Score( playerId: row.playerId, matchId: row.matchId, roundNumber: row.roundNumber, @@ -74,7 +74,7 @@ class ScoreDao extends DatabaseAccessor with _$ScoreDaoMixin { } /// Retrieves all scores for a specific player in a match. - Future> getAllPlayerScoresInMatch({ + Future> getAllPlayerScoresInMatch({ required String playerId, required String matchId, }) async { @@ -84,7 +84,7 @@ class ScoreDao extends DatabaseAccessor with _$ScoreDaoMixin { final result = await query.get(); return result .map( - (row) => ScoreEntry( + (row) => Score( playerId: row.playerId, matchId: row.matchId, roundNumber: row.roundNumber, diff --git a/lib/data/models/match.dart b/lib/data/models/match.dart index 6d2d033..ad7f2e3 100644 --- a/lib/data/models/match.dart +++ b/lib/data/models/match.dart @@ -3,7 +3,7 @@ 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:tallee/data/models/score.dart'; import 'package:uuid/uuid.dart'; class Match { @@ -15,7 +15,7 @@ class Match { final Group? group; final List players; final String notes; - List scores; + List scores; Player? winner; Match({ diff --git a/lib/data/models/score_entry.dart b/lib/data/models/score.dart similarity index 87% rename from lib/data/models/score_entry.dart rename to lib/data/models/score.dart index 9e6b8a9..20782b1 100644 --- a/lib/data/models/score_entry.dart +++ b/lib/data/models/score.dart @@ -1,11 +1,11 @@ -class ScoreEntry { +class Score { final String playerId; final String matchId; final int roundNumber; int score = 0; int change = 0; - ScoreEntry({ + Score({ required this.playerId, required this.matchId, required this.roundNumber, @@ -13,7 +13,7 @@ class ScoreEntry { required this.change, }); - ScoreEntry.fromJson(Map json) + Score.fromJson(Map json) : playerId = json['playerId'], matchId = json['matchId'], roundNumber = json['roundNumber'],