From e1426810f284d44da94ac00134fcf51bdcc750f0 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Sat, 8 Nov 2025 16:14:02 +0000 Subject: [PATCH 01/21] .gitea/PULL_REQUEST_TEMPLATE.md aktualisiert --- .gitea/PULL_REQUEST_TEMPLATE.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitea/PULL_REQUEST_TEMPLATE.md b/.gitea/PULL_REQUEST_TEMPLATE.md index d174324..7ae0f8a 100644 --- a/.gitea/PULL_REQUEST_TEMPLATE.md +++ b/.gitea/PULL_REQUEST_TEMPLATE.md @@ -1,16 +1,16 @@ -# [PR Title] +# [PR Titel] -**Related Issue(s):** +**Zugehörige Issue(s):** Closes `` -## Description -*A clear and concise overview of the changes made. Explain the "why" behind the PR, not just the "what".* +## Beschreibung +*Eine klare und prägnante Übersicht über die vorgenommenen Änderungen. Erläutere nicht nur das was gemacht wurde, sondern auch warum.* -## Changes Made -- [ ] Added new feature X -- [ ] Fixed bug in component Y -- [ ] Refactored module Z for better performance -- [ ] Updated dependencies +## Änderungen +- [ ] Neue Funktion X hinzugefügt +- [ ] Bug in Komponente Y behoben +- [ ] Modul Z für bessere Leistung refactored +- [ ] Dependencies aktualisiert -## Additional Notes -*Any extra context, limitations, or decisions that reviewers should know about?* +## Zusätzliche Anmerkungen +*Gibt es zusätzlichen Kontext, Einschränkungen oder Informationen, die Reviewer wissen sollten?* From 4c1d91ae99fd60093e7c7b3049a8c580f7202fe8 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Mon, 10 Nov 2025 12:52:56 +0000 Subject: [PATCH 02/21] .gitea/ISSUE_TEMPLATE/FEATURE.md aktualisiert --- .gitea/ISSUE_TEMPLATE/FEATURE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/ISSUE_TEMPLATE/FEATURE.md b/.gitea/ISSUE_TEMPLATE/FEATURE.md index 809509b..d7ff58e 100644 --- a/.gitea/ISSUE_TEMPLATE/FEATURE.md +++ b/.gitea/ISSUE_TEMPLATE/FEATURE.md @@ -7,7 +7,7 @@ assignees: '' --- -# 🚀 Feature +# Feature ## Description [Detailed explanation of the proposed feature] From e61f9e5e64dd7979f111f49045e601b4913c5cfa Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Mon, 10 Nov 2025 12:59:16 +0000 Subject: [PATCH 03/21] .gitea/ISSUE_TEMPLATE/FEATURE.md aktualisiert --- .gitea/ISSUE_TEMPLATE/FEATURE.md | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitea/ISSUE_TEMPLATE/FEATURE.md b/.gitea/ISSUE_TEMPLATE/FEATURE.md index d7ff58e..01e7a5f 100644 --- a/.gitea/ISSUE_TEMPLATE/FEATURE.md +++ b/.gitea/ISSUE_TEMPLATE/FEATURE.md @@ -1,6 +1,6 @@ --- name: Feature -about: New feature for the app +about: Neues Feature für die App title: '' labels: 'Task\Feature' assignees: '' @@ -9,14 +9,11 @@ assignees: '' # Feature -## Description -[Detailed explanation of the proposed feature] +## Beschreibung +[Ausführliche Erläuterung der vorgeschlagenen Funktion] -## Why is this feature needed? -[Explain the problem or use case this feature would solve] +## Vorgeschlagene Lösung +[Beschreibe, wie die Feature funktionieren soll] -## Proposed Solution -[Describe how the feature should work] - -## Related Issues (Optional) -[Links to related discussions or requests] \ No newline at end of file +## Zugehörige Issues +[Links zu verwandten oder blockierenden Issues] \ No newline at end of file From 2c0e9967952b86e9f57a28a9945e9a0a7051d2aa Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Mon, 10 Nov 2025 13:02:21 +0000 Subject: [PATCH 04/21] .gitea/ISSUE_TEMPLATE/BUG_REPORT.md aktualisiert --- .gitea/ISSUE_TEMPLATE/BUG_REPORT.md | 37 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/.gitea/ISSUE_TEMPLATE/BUG_REPORT.md b/.gitea/ISSUE_TEMPLATE/BUG_REPORT.md index a8a1efe..10f8648 100644 --- a/.gitea/ISSUE_TEMPLATE/BUG_REPORT.md +++ b/.gitea/ISSUE_TEMPLATE/BUG_REPORT.md @@ -1,6 +1,6 @@ --- name: Bug report -about: Create a report for something does not work as it should +about: Erstelle eine Meldung für etwas, das nicht Funktioniert, wie es soll. title: '' labels: 'Task/Bug' assignees: '' @@ -9,28 +9,27 @@ assignees: '' # Bug Report -## Description -[A clear and concise description of the bug] +## Beschreibung +[Eine klare und prägnante Beschreibung des Bugs] -## Steps to Reproduce -1. Step 1 -2. Step 2 +## Schritte zur Reproduktion +1. Schritt 1 +2. Schritt 2 3. ... -## Expected Behavior -[What should have happened] +## Erwartetes Verhalten +[Was hätte passieren sollen] -## Actual Behavior -[What actually happened] +## Tatsächliches Verhalten +[Was tatsächlich passiert ist] -## Screenshots/Logs -[If applicable, add screenshots, error logs, or stack traces] +## Screenshots/Protokolle +[Falls zutreffend, füge Screenshots, Error Logs oder Stack Traces hinzu] -## Environment -- OS: [e.g., iOS 18.5, Android 14] +## Umgebung +- Plattform: Android, iOS, Web +- OS: [z. B. iOS 18.5, Android 14] +- Flutter Version: [z.B. 3.35.6] -## Possible Fix (Optional) -[Any suggestions on how to resolve the issue] - -## Related Issues (Optional) -[Reference similar issues or PRs] +## Verwandte Issues +[Verweisen Sie auf ähnliche Issues oder PRs] \ No newline at end of file From 55e5e3cbeb7667c582f0b3a293cadd3a51643d23 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Mon, 10 Nov 2025 13:04:10 +0000 Subject: [PATCH 05/21] .gitea/ISSUE_TEMPLATE/ENHANCEMENT.md aktualisiert --- .gitea/ISSUE_TEMPLATE/ENHANCEMENT.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitea/ISSUE_TEMPLATE/ENHANCEMENT.md b/.gitea/ISSUE_TEMPLATE/ENHANCEMENT.md index 5e40dd9..49442d1 100644 --- a/.gitea/ISSUE_TEMPLATE/ENHANCEMENT.md +++ b/.gitea/ISSUE_TEMPLATE/ENHANCEMENT.md @@ -9,14 +9,14 @@ assignees: '' # Enhancement -## Current Behavior -[Describe the existing functionality] +## Aktuelles Verhalten +[Beschreibe die bestehende Funktionalität] -## Limitations/Problems -[What are the current shortcomings?] +## Einschränkungen/Probleme +[Was sind die aktuellen Mängel?] -## Suggested Improvement -[How can this be enhanced? Be specific.] +## Vorgeschlagene Verbesserung +[Wie kann das Problem bzw. die Einschränkung verbessert werden?] -## Benefits -[How will this improve the product?] \ No newline at end of file +## Zugehörige Issues +[Links zu verwandten oder blockierenden Issues] \ No newline at end of file From b83fe03f35e87fd9ba2c6beda361bf434deaca2d Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 12 Nov 2025 10:54:05 +0100 Subject: [PATCH 06/21] Renamed app --- lib/main.dart | 6 +++--- test/widget_test.dart | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 22f94c7..98c40f8 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -8,14 +8,14 @@ void main() { runApp( Provider( create: (context) => AppDatabase(), - child: const MyApp(), + child: const GameTracker(), dispose: (context, db) => db.close(), ), ); } -class MyApp extends StatelessWidget { - const MyApp({super.key}); +class GameTracker extends StatelessWidget { + const GameTracker({super.key}); @override Widget build(BuildContext context) { diff --git a/test/widget_test.dart b/test/widget_test.dart index 25cbc0e..cb44eec 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -7,13 +7,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:game_tracker/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { // Build our app and trigger a frame. - await tester.pumpWidget(const MyApp()); + await tester.pumpWidget(const GameTracker()); // Verify that our counter starts at 0. expect(find.text('0'), findsOneWidget); From 25c7b37df3bc18d87bf964348765eaafed4bf57d Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 12 Nov 2025 10:57:46 +0100 Subject: [PATCH 07/21] updated userId to playerId --- lib/data/dao/player_group_dao.dart | 14 +-- lib/data/db/database.g.dart | 128 +++++++++++---------- lib/data/db/tables/player_group_table.dart | 4 +- 3 files changed, 74 insertions(+), 72 deletions(-) diff --git a/lib/data/dao/player_group_dao.dart b/lib/data/dao/player_group_dao.dart index b68ed09..e51c325 100644 --- a/lib/data/dao/player_group_dao.dart +++ b/lib/data/dao/player_group_dao.dart @@ -19,26 +19,26 @@ class PlayerGroupDao extends DatabaseAccessor List groupMembers = []; for (var entry in result) { - final player = await db.playerDao.getPlayerById(entry.userId); + final player = await db.playerDao.getPlayerById(entry.playerId); groupMembers.add(player); } return groupMembers; } - /// Removes a player from a group based on [userId] and [groupId]. + /// Removes a player from a group based on [playerId] and [groupId]. /// Returns `true` if more than 0 rows were affected, otherwise `false`. - Future removePlayerFromGroup(String userId, String groupId) async { + Future removePlayerFromGroup(String playerId, String groupId) async { final query = delete(playerGroupTable) - ..where((p) => p.userId.equals(userId) & p.groupId.equals(groupId)); + ..where((p) => p.playerId.equals(playerId) & p.groupId.equals(groupId)); final rowsAffected = await query.go(); return rowsAffected > 0; } - /// Adds a player to a group with the given [userId] and [groupId]. - Future addPlayerToGroup(String userId, String groupId) async { + /// Adds a player to a group with the given [playerId] and [groupId]. + Future addPlayerToGroup(String playerId, String groupId) async { await into(playerGroupTable).insert( - PlayerGroupTableCompanion.insert(userId: userId, groupId: groupId), + PlayerGroupTableCompanion.insert(playerId: playerId, groupId: groupId), ); } } diff --git a/lib/data/db/database.g.dart b/lib/data/db/database.g.dart index 4075912..d4e9e94 100644 --- a/lib/data/db/database.g.dart +++ b/lib/data/db/database.g.dart @@ -419,10 +419,12 @@ class $PlayerGroupTableTable extends PlayerGroupTable final GeneratedDatabase attachedDatabase; final String? _alias; $PlayerGroupTableTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _userIdMeta = const VerificationMeta('userId'); + static const VerificationMeta _playerIdMeta = const VerificationMeta( + 'playerId', + ); @override - late final GeneratedColumn userId = GeneratedColumn( - 'user_id', + late final GeneratedColumn playerId = GeneratedColumn( + 'player_id', aliasedName, false, type: DriftSqlType.string, @@ -446,7 +448,7 @@ class $PlayerGroupTableTable extends PlayerGroupTable ), ); @override - List get $columns => [userId, groupId]; + List get $columns => [playerId, groupId]; @override String get aliasedName => _alias ?? actualTableName; @override @@ -459,13 +461,13 @@ class $PlayerGroupTableTable extends PlayerGroupTable }) { final context = VerificationContext(); final data = instance.toColumns(true); - if (data.containsKey('user_id')) { + if (data.containsKey('player_id')) { context.handle( - _userIdMeta, - userId.isAcceptableOrUnknown(data['user_id']!, _userIdMeta), + _playerIdMeta, + playerId.isAcceptableOrUnknown(data['player_id']!, _playerIdMeta), ); } else if (isInserting) { - context.missing(_userIdMeta); + context.missing(_playerIdMeta); } if (data.containsKey('group_id')) { context.handle( @@ -479,14 +481,14 @@ class $PlayerGroupTableTable extends PlayerGroupTable } @override - Set get $primaryKey => {userId, groupId}; + Set get $primaryKey => {playerId, groupId}; @override PlayerGroupTableData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return PlayerGroupTableData( - userId: attachedDatabase.typeMapping.read( + playerId: attachedDatabase.typeMapping.read( DriftSqlType.string, - data['${effectivePrefix}user_id'], + data['${effectivePrefix}player_id'], )!, groupId: attachedDatabase.typeMapping.read( DriftSqlType.string, @@ -503,20 +505,20 @@ class $PlayerGroupTableTable extends PlayerGroupTable class PlayerGroupTableData extends DataClass implements Insertable { - final String userId; + final String playerId; final String groupId; - const PlayerGroupTableData({required this.userId, required this.groupId}); + const PlayerGroupTableData({required this.playerId, required this.groupId}); @override Map toColumns(bool nullToAbsent) { final map = {}; - map['user_id'] = Variable(userId); + map['player_id'] = Variable(playerId); map['group_id'] = Variable(groupId); return map; } PlayerGroupTableCompanion toCompanion(bool nullToAbsent) { return PlayerGroupTableCompanion( - userId: Value(userId), + playerId: Value(playerId), groupId: Value(groupId), ); } @@ -527,7 +529,7 @@ class PlayerGroupTableData extends DataClass }) { serializer ??= driftRuntimeOptions.defaultSerializer; return PlayerGroupTableData( - userId: serializer.fromJson(json['userId']), + playerId: serializer.fromJson(json['playerId']), groupId: serializer.fromJson(json['groupId']), ); } @@ -535,19 +537,19 @@ class PlayerGroupTableData extends DataClass Map toJson({ValueSerializer? serializer}) { serializer ??= driftRuntimeOptions.defaultSerializer; return { - 'userId': serializer.toJson(userId), + 'playerId': serializer.toJson(playerId), 'groupId': serializer.toJson(groupId), }; } - PlayerGroupTableData copyWith({String? userId, String? groupId}) => + PlayerGroupTableData copyWith({String? playerId, String? groupId}) => PlayerGroupTableData( - userId: userId ?? this.userId, + playerId: playerId ?? this.playerId, groupId: groupId ?? this.groupId, ); PlayerGroupTableData copyWithCompanion(PlayerGroupTableCompanion data) { return PlayerGroupTableData( - userId: data.userId.present ? data.userId.value : this.userId, + playerId: data.playerId.present ? data.playerId.value : this.playerId, groupId: data.groupId.present ? data.groupId.value : this.groupId, ); } @@ -555,56 +557,56 @@ class PlayerGroupTableData extends DataClass @override String toString() { return (StringBuffer('PlayerGroupTableData(') - ..write('userId: $userId, ') + ..write('playerId: $playerId, ') ..write('groupId: $groupId') ..write(')')) .toString(); } @override - int get hashCode => Object.hash(userId, groupId); + int get hashCode => Object.hash(playerId, groupId); @override bool operator ==(Object other) => identical(this, other) || (other is PlayerGroupTableData && - other.userId == this.userId && + other.playerId == this.playerId && other.groupId == this.groupId); } class PlayerGroupTableCompanion extends UpdateCompanion { - final Value userId; + final Value playerId; final Value groupId; final Value rowid; const PlayerGroupTableCompanion({ - this.userId = const Value.absent(), + this.playerId = const Value.absent(), this.groupId = const Value.absent(), this.rowid = const Value.absent(), }); PlayerGroupTableCompanion.insert({ - required String userId, + required String playerId, required String groupId, this.rowid = const Value.absent(), - }) : userId = Value(userId), + }) : playerId = Value(playerId), groupId = Value(groupId); static Insertable custom({ - Expression? userId, + Expression? playerId, Expression? groupId, Expression? rowid, }) { return RawValuesInsertable({ - if (userId != null) 'user_id': userId, + if (playerId != null) 'player_id': playerId, if (groupId != null) 'group_id': groupId, if (rowid != null) 'rowid': rowid, }); } PlayerGroupTableCompanion copyWith({ - Value? userId, + Value? playerId, Value? groupId, Value? rowid, }) { return PlayerGroupTableCompanion( - userId: userId ?? this.userId, + playerId: playerId ?? this.playerId, groupId: groupId ?? this.groupId, rowid: rowid ?? this.rowid, ); @@ -613,8 +615,8 @@ class PlayerGroupTableCompanion extends UpdateCompanion { @override Map toColumns(bool nullToAbsent) { final map = {}; - if (userId.present) { - map['user_id'] = Variable(userId.value); + if (playerId.present) { + map['player_id'] = Variable(playerId.value); } if (groupId.present) { map['group_id'] = Variable(groupId.value); @@ -628,7 +630,7 @@ class PlayerGroupTableCompanion extends UpdateCompanion { @override String toString() { return (StringBuffer('PlayerGroupTableCompanion(') - ..write('userId: $userId, ') + ..write('playerId: $playerId, ') ..write('groupId: $groupId, ') ..write('rowid: $rowid') ..write(')')) @@ -890,7 +892,7 @@ final class $$PlayerTableTableReferences db.playerGroupTable, aliasName: $_aliasNameGenerator( db.playerTable.id, - db.playerGroupTable.userId, + db.playerGroupTable.playerId, ), ); @@ -898,7 +900,7 @@ final class $$PlayerTableTableReferences final manager = $$PlayerGroupTableTableTableManager( $_db, $_db.playerGroupTable, - ).filter((f) => f.userId.id.sqlEquals($_itemColumn('id')!)); + ).filter((f) => f.playerId.id.sqlEquals($_itemColumn('id')!)); final cache = $_typedResult.readTableOrNull( _playerGroupTableRefsTable($_db), @@ -935,7 +937,7 @@ class $$PlayerTableTableFilterComposer composer: this, getCurrentColumn: (t) => t.id, referencedTable: $db.playerGroupTable, - getReferencedColumn: (t) => t.userId, + getReferencedColumn: (t) => t.playerId, builder: ( joinBuilder, { @@ -996,7 +998,7 @@ class $$PlayerTableTableAnnotationComposer composer: this, getCurrentColumn: (t) => t.id, referencedTable: $db.playerGroupTable, - getReferencedColumn: (t) => t.userId, + getReferencedColumn: (t) => t.playerId, builder: ( joinBuilder, { @@ -1087,7 +1089,7 @@ class $$PlayerTableTableTableManager p0, ).playerGroupTableRefs, referencedItemsForCurrentItem: (item, referencedItems) => - referencedItems.where((e) => e.userId == item.id), + referencedItems.where((e) => e.playerId == item.id), typedResults: items, ), ]; @@ -1358,13 +1360,13 @@ typedef $$GroupTableTableProcessedTableManager = >; typedef $$PlayerGroupTableTableCreateCompanionBuilder = PlayerGroupTableCompanion Function({ - required String userId, + required String playerId, required String groupId, Value rowid, }); typedef $$PlayerGroupTableTableUpdateCompanionBuilder = PlayerGroupTableCompanion Function({ - Value userId, + Value playerId, Value groupId, Value rowid, }); @@ -1382,19 +1384,19 @@ final class $$PlayerGroupTableTableReferences super.$_typedResult, ); - static $PlayerTableTable _userIdTable(_$AppDatabase db) => + static $PlayerTableTable _playerIdTable(_$AppDatabase db) => db.playerTable.createAlias( - $_aliasNameGenerator(db.playerGroupTable.userId, db.playerTable.id), + $_aliasNameGenerator(db.playerGroupTable.playerId, db.playerTable.id), ); - $$PlayerTableTableProcessedTableManager get userId { - final $_column = $_itemColumn('user_id')!; + $$PlayerTableTableProcessedTableManager get playerId { + final $_column = $_itemColumn('player_id')!; final manager = $$PlayerTableTableTableManager( $_db, $_db.playerTable, ).filter((f) => f.id.sqlEquals($_column)); - final item = $_typedResult.readTableOrNull(_userIdTable($_db)); + final item = $_typedResult.readTableOrNull(_playerIdTable($_db)); if (item == null) return manager; return ProcessedTableManager( manager.$state.copyWith(prefetchedData: [item]), @@ -1430,10 +1432,10 @@ class $$PlayerGroupTableTableFilterComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - $$PlayerTableTableFilterComposer get userId { + $$PlayerTableTableFilterComposer get playerId { final $$PlayerTableTableFilterComposer composer = $composerBuilder( composer: this, - getCurrentColumn: (t) => t.userId, + getCurrentColumn: (t) => t.playerId, referencedTable: $db.playerTable, getReferencedColumn: (t) => t.id, builder: @@ -1486,10 +1488,10 @@ class $$PlayerGroupTableTableOrderingComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - $$PlayerTableTableOrderingComposer get userId { + $$PlayerTableTableOrderingComposer get playerId { final $$PlayerTableTableOrderingComposer composer = $composerBuilder( composer: this, - getCurrentColumn: (t) => t.userId, + getCurrentColumn: (t) => t.playerId, referencedTable: $db.playerTable, getReferencedColumn: (t) => t.id, builder: @@ -1542,10 +1544,10 @@ class $$PlayerGroupTableTableAnnotationComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - $$PlayerTableTableAnnotationComposer get userId { + $$PlayerTableTableAnnotationComposer get playerId { final $$PlayerTableTableAnnotationComposer composer = $composerBuilder( composer: this, - getCurrentColumn: (t) => t.userId, + getCurrentColumn: (t) => t.playerId, referencedTable: $db.playerTable, getReferencedColumn: (t) => t.id, builder: @@ -1602,7 +1604,7 @@ class $$PlayerGroupTableTableTableManager $$PlayerGroupTableTableUpdateCompanionBuilder, (PlayerGroupTableData, $$PlayerGroupTableTableReferences), PlayerGroupTableData, - PrefetchHooks Function({bool userId, bool groupId}) + PrefetchHooks Function({bool playerId, bool groupId}) > { $$PlayerGroupTableTableTableManager( _$AppDatabase db, @@ -1619,21 +1621,21 @@ class $$PlayerGroupTableTableTableManager $$PlayerGroupTableTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ - Value userId = const Value.absent(), + Value playerId = const Value.absent(), Value groupId = const Value.absent(), Value rowid = const Value.absent(), }) => PlayerGroupTableCompanion( - userId: userId, + playerId: playerId, groupId: groupId, rowid: rowid, ), createCompanionCallback: ({ - required String userId, + required String playerId, required String groupId, Value rowid = const Value.absent(), }) => PlayerGroupTableCompanion.insert( - userId: userId, + playerId: playerId, groupId: groupId, rowid: rowid, ), @@ -1645,7 +1647,7 @@ class $$PlayerGroupTableTableTableManager ), ) .toList(), - prefetchHooksCallback: ({userId = false, groupId = false}) { + prefetchHooksCallback: ({playerId = false, groupId = false}) { return PrefetchHooks( db: db, explicitlyWatchedTables: [], @@ -1665,17 +1667,17 @@ class $$PlayerGroupTableTableTableManager dynamic > >(state) { - if (userId) { + if (playerId) { state = state.withJoin( currentTable: table, - currentColumn: table.userId, + currentColumn: table.playerId, referencedTable: $$PlayerGroupTableTableReferences - ._userIdTable(db), + ._playerIdTable(db), referencedColumn: $$PlayerGroupTableTableReferences - ._userIdTable(db) + ._playerIdTable(db) .id, ) as T; @@ -1719,7 +1721,7 @@ typedef $$PlayerGroupTableTableProcessedTableManager = $$PlayerGroupTableTableUpdateCompanionBuilder, (PlayerGroupTableData, $$PlayerGroupTableTableReferences), PlayerGroupTableData, - PrefetchHooks Function({bool userId, bool groupId}) + PrefetchHooks Function({bool playerId, bool groupId}) >; typedef $$GameTableTableCreateCompanionBuilder = GameTableCompanion Function({ diff --git a/lib/data/db/tables/player_group_table.dart b/lib/data/db/tables/player_group_table.dart index 096a981..61e2ed8 100644 --- a/lib/data/db/tables/player_group_table.dart +++ b/lib/data/db/tables/player_group_table.dart @@ -3,9 +3,9 @@ import 'package:game_tracker/data/db/tables/group_table.dart'; import 'package:game_tracker/data/db/tables/player_table.dart'; class PlayerGroupTable extends Table { - TextColumn get userId => text().references(PlayerTable, #id)(); + TextColumn get playerId => text().references(PlayerTable, #id)(); TextColumn get groupId => text().references(GroupTable, #id)(); @override - Set> get primaryKey => {userId, groupId}; + Set> get primaryKey => {playerId, groupId}; } From a922f24150318995b4bfa4b090cd5e1f6dca977f Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 12 Nov 2025 11:41:06 +0100 Subject: [PATCH 08/21] Added basic structure for game implementation --- lib/data/dao/game_dao.dart | 26 +- lib/data/dao/group_dao.dart | 12 +- lib/data/dao/group_game_dao.dart | 33 + lib/data/dao/group_game_dao.g.dart | 10 + lib/data/dao/player_game_dao.dart | 40 + lib/data/dao/player_game_dao.g.dart | 10 + lib/data/db/database.dart | 22 +- lib/data/db/database.g.dart | 1824 ++++++++++++++++++++- lib/data/db/tables/game_table.dart | 1 + lib/data/db/tables/group_game_table.dart | 11 + lib/data/db/tables/player_game_table.dart | 11 + lib/data/dto/game.dart | 14 +- 12 files changed, 1924 insertions(+), 90 deletions(-) create mode 100644 lib/data/dao/group_game_dao.dart create mode 100644 lib/data/dao/group_game_dao.g.dart create mode 100644 lib/data/dao/player_game_dao.dart create mode 100644 lib/data/dao/player_game_dao.g.dart create mode 100644 lib/data/db/tables/group_game_table.dart create mode 100644 lib/data/db/tables/player_game_table.dart diff --git a/lib/data/dao/game_dao.dart b/lib/data/dao/game_dao.dart index 3b6529a..5894ed5 100644 --- a/lib/data/dao/game_dao.dart +++ b/lib/data/dao/game_dao.dart @@ -2,6 +2,8 @@ import 'package:drift/drift.dart'; import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/db/tables/game_table.dart'; import 'package:game_tracker/data/dto/game.dart'; +import 'package:game_tracker/data/dto/group.dart'; +import 'package:game_tracker/data/dto/player.dart'; part 'game_dao.g.dart'; @@ -16,11 +18,27 @@ class GameDao extends DatabaseAccessor with _$GameDaoMixin { return result.map((row) => Game(id: row.id, name: row.name)).toList(); } - /// Retrieves a [Game] by its [id]. - Future getGameById(String id) async { - final query = select(gameTable)..where((g) => g.id.equals(id)); + /// Retrieves a [Game] by its [gameId]. + Future getGameById(String gameId) async { + final query = select(gameTable)..where((g) => g.id.equals(gameId)); final result = await query.getSingle(); - return Game(id: result.id, name: result.name); + + List? players; + if (await db.playerGameDao.hasGamePlayers(gameId)) { + players = await db.playerGameDao.getPlayersByGameId(gameId); + } + Group? group; + if (await db.groupGameDao.hasGameGroup(gameId)) { + group = await db.groupGameDao.getGroupByGameId(gameId); + } + + return Game( + id: result.id, + name: result.name, + players: players, + group: group, + winner: result.winnerId, + ); } /// Retrieves the number of games in the database. diff --git a/lib/data/dao/group_dao.dart b/lib/data/dao/group_dao.dart index 7dc144d..a92247a 100644 --- a/lib/data/dao/group_dao.dart +++ b/lib/data/dao/group_dao.dart @@ -19,14 +19,14 @@ class GroupDao extends DatabaseAccessor with _$GroupDaoMixin { .toList(); } - /// Retrieves a [Group] by its [id], including its members. - Future getGroupById(String id) async { - final query = select(groupTable)..where((g) => g.id.equals(id)); + /// Retrieves a [Group] by its [groupId], including its members. + Future getGroupById(String groupId) async { + final query = select(groupTable)..where((g) => g.id.equals(groupId)); final result = await query.getSingle(); - List members = []; - - members = await db.playerGroupDao.getPlayersOfGroupById(id); + List members = await db.playerGroupDao.getPlayersOfGroupById( + groupId, + ); return Group(id: result.id, name: result.name, members: members); } diff --git a/lib/data/dao/group_game_dao.dart b/lib/data/dao/group_game_dao.dart new file mode 100644 index 0000000..851e032 --- /dev/null +++ b/lib/data/dao/group_game_dao.dart @@ -0,0 +1,33 @@ +import 'package:drift/drift.dart'; +import 'package:game_tracker/data/db/database.dart'; +import 'package:game_tracker/data/db/tables/group_game_table.dart'; +import 'package:game_tracker/data/dto/group.dart'; + +part 'group_game_dao.g.dart'; + +@DriftAccessor(tables: [GroupGameTable]) +class GroupGameDao extends DatabaseAccessor + with _$GroupGameDaoMixin { + GroupGameDao(super.db); + + /// Checks if there is a group associated with the given [gameId]. + /// Returns `true` if there is a group, otherwise `false`. + Future hasGameGroup(String gameId) async { + final count = + await (selectOnly(groupGameTable) + ..where(groupGameTable.gameId.equals(gameId)) + ..addColumns([groupGameTable.groupId.count()])) + .map((row) => row.read(groupGameTable.groupId.count())) + .getSingle(); + return (count ?? 0) > 0; + } + + Future getGroupByGameId(String gameId) async { + final result = await (select( + groupGameTable, + )..where((g) => g.gameId.equals(gameId))).getSingle(); + + final group = await db.groupDao.getGroupById(result.groupId); + return group; + } +} diff --git a/lib/data/dao/group_game_dao.g.dart b/lib/data/dao/group_game_dao.g.dart new file mode 100644 index 0000000..f1aa46f --- /dev/null +++ b/lib/data/dao/group_game_dao.g.dart @@ -0,0 +1,10 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'group_game_dao.dart'; + +// ignore_for_file: type=lint +mixin _$GroupGameDaoMixin on DatabaseAccessor { + $PlayerTableTable get playerTable => attachedDatabase.playerTable; + $GroupTableTable get groupTable => attachedDatabase.groupTable; + $GroupGameTableTable get groupGameTable => attachedDatabase.groupGameTable; +} diff --git a/lib/data/dao/player_game_dao.dart b/lib/data/dao/player_game_dao.dart new file mode 100644 index 0000000..c05edd1 --- /dev/null +++ b/lib/data/dao/player_game_dao.dart @@ -0,0 +1,40 @@ +import 'package:drift/drift.dart'; +import 'package:game_tracker/data/db/database.dart'; +import 'package:game_tracker/data/db/tables/player_game_table.dart'; +import 'package:game_tracker/data/dto/player.dart'; + +part 'player_game_dao.g.dart'; + +@DriftAccessor(tables: [PlayerGameTable]) +class PlayerGameDao extends DatabaseAccessor + with _$PlayerGameDaoMixin { + PlayerGameDao(super.db); + + /// Checks if there are any players associated with the given [gameId]. + /// Returns `true` if there are players, otherwise `false`. + Future hasGamePlayers(String gameId) async { + final count = + await (selectOnly(playerGameTable) + ..where(playerGameTable.gameId.equals(gameId)) + ..addColumns([playerGameTable.playerId.count()])) + .map((row) => row.read(playerGameTable.playerId.count())) + .getSingle(); + return (count ?? 0) > 0; + } + + /// Retrieves a list of [Player]s associated with the given [gameId]. + /// Returns an empty list if no players are found. + Future> getPlayersByGameId(String gameId) async { + final result = await (select( + playerGameTable, + )..where((p) => p.gameId.equals(gameId))).get(); + + if (result.isEmpty) return []; + + final futures = result.map( + (row) => db.playerDao.getPlayerById(row.playerId), + ); + final players = await Future.wait(futures); + return players.whereType().toList(); + } +} diff --git a/lib/data/dao/player_game_dao.g.dart b/lib/data/dao/player_game_dao.g.dart new file mode 100644 index 0000000..0d5f5e1 --- /dev/null +++ b/lib/data/dao/player_game_dao.g.dart @@ -0,0 +1,10 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'player_game_dao.dart'; + +// ignore_for_file: type=lint +mixin _$PlayerGameDaoMixin on DatabaseAccessor { + $PlayerTableTable get playerTable => attachedDatabase.playerTable; + $GroupTableTable get groupTable => attachedDatabase.groupTable; + $PlayerGameTableTable get playerGameTable => attachedDatabase.playerGameTable; +} diff --git a/lib/data/db/database.dart b/lib/data/db/database.dart index e35513e..b0662aa 100644 --- a/lib/data/db/database.dart +++ b/lib/data/db/database.dart @@ -2,10 +2,14 @@ import 'package:drift/drift.dart'; import 'package:drift_flutter/drift_flutter.dart'; import 'package:game_tracker/data/dao/game_dao.dart'; import 'package:game_tracker/data/dao/group_dao.dart'; +import 'package:game_tracker/data/dao/group_game_dao.dart'; import 'package:game_tracker/data/dao/player_dao.dart'; +import 'package:game_tracker/data/dao/player_game_dao.dart'; import 'package:game_tracker/data/dao/player_group_dao.dart'; import 'package:game_tracker/data/db/tables/game_table.dart'; +import 'package:game_tracker/data/db/tables/group_game_table.dart'; import 'package:game_tracker/data/db/tables/group_table.dart'; +import 'package:game_tracker/data/db/tables/player_game_table.dart'; import 'package:game_tracker/data/db/tables/player_group_table.dart'; import 'package:game_tracker/data/db/tables/player_table.dart'; import 'package:path_provider/path_provider.dart'; @@ -13,8 +17,22 @@ import 'package:path_provider/path_provider.dart'; part 'database.g.dart'; @DriftDatabase( - tables: [PlayerTable, GroupTable, PlayerGroupTable, GameTable], - daos: [GroupDao, PlayerDao, PlayerGroupDao, GameDao], + tables: [ + PlayerTable, + GroupTable, + PlayerGroupTable, + PlayerGameTable, + GroupGameTable, + GameTable, + ], + daos: [ + GroupDao, + PlayerDao, + GameDao, + PlayerGroupDao, + PlayerGameDao, + GroupGameDao, + ], ) class AppDatabase extends _$AppDatabase { AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection()); diff --git a/lib/data/db/database.g.dart b/lib/data/db/database.g.dart index d4e9e94..74efba1 100644 --- a/lib/data/db/database.g.dart +++ b/lib/data/db/database.g.dart @@ -638,6 +638,452 @@ class PlayerGroupTableCompanion extends UpdateCompanion { } } +class $PlayerGameTableTable extends PlayerGameTable + with TableInfo<$PlayerGameTableTable, PlayerGameTableData> { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + $PlayerGameTableTable(this.attachedDatabase, [this._alias]); + static const VerificationMeta _playerIdMeta = const VerificationMeta( + 'playerId', + ); + @override + late final GeneratedColumn playerId = GeneratedColumn( + 'player_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'REFERENCES player_table (id)', + ), + ); + static const VerificationMeta _gameIdMeta = const VerificationMeta('gameId'); + @override + late final GeneratedColumn gameId = GeneratedColumn( + 'game_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'REFERENCES group_table (id)', + ), + ); + @override + List get $columns => [playerId, gameId]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'player_game_table'; + @override + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { + final context = VerificationContext(); + final data = instance.toColumns(true); + if (data.containsKey('player_id')) { + context.handle( + _playerIdMeta, + playerId.isAcceptableOrUnknown(data['player_id']!, _playerIdMeta), + ); + } else if (isInserting) { + context.missing(_playerIdMeta); + } + if (data.containsKey('game_id')) { + context.handle( + _gameIdMeta, + gameId.isAcceptableOrUnknown(data['game_id']!, _gameIdMeta), + ); + } else if (isInserting) { + context.missing(_gameIdMeta); + } + return context; + } + + @override + Set get $primaryKey => {playerId, gameId}; + @override + PlayerGameTableData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return PlayerGameTableData( + playerId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}player_id'], + )!, + gameId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}game_id'], + )!, + ); + } + + @override + $PlayerGameTableTable createAlias(String alias) { + return $PlayerGameTableTable(attachedDatabase, alias); + } +} + +class PlayerGameTableData extends DataClass + implements Insertable { + final String playerId; + final String gameId; + const PlayerGameTableData({required this.playerId, required this.gameId}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['player_id'] = Variable(playerId); + map['game_id'] = Variable(gameId); + return map; + } + + PlayerGameTableCompanion toCompanion(bool nullToAbsent) { + return PlayerGameTableCompanion( + playerId: Value(playerId), + gameId: Value(gameId), + ); + } + + factory PlayerGameTableData.fromJson( + Map json, { + ValueSerializer? serializer, + }) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return PlayerGameTableData( + playerId: serializer.fromJson(json['playerId']), + gameId: serializer.fromJson(json['gameId']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'playerId': serializer.toJson(playerId), + 'gameId': serializer.toJson(gameId), + }; + } + + PlayerGameTableData copyWith({String? playerId, String? gameId}) => + PlayerGameTableData( + playerId: playerId ?? this.playerId, + gameId: gameId ?? this.gameId, + ); + PlayerGameTableData copyWithCompanion(PlayerGameTableCompanion data) { + return PlayerGameTableData( + playerId: data.playerId.present ? data.playerId.value : this.playerId, + gameId: data.gameId.present ? data.gameId.value : this.gameId, + ); + } + + @override + String toString() { + return (StringBuffer('PlayerGameTableData(') + ..write('playerId: $playerId, ') + ..write('gameId: $gameId') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash(playerId, gameId); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is PlayerGameTableData && + other.playerId == this.playerId && + other.gameId == this.gameId); +} + +class PlayerGameTableCompanion extends UpdateCompanion { + final Value playerId; + final Value gameId; + final Value rowid; + const PlayerGameTableCompanion({ + this.playerId = const Value.absent(), + this.gameId = const Value.absent(), + this.rowid = const Value.absent(), + }); + PlayerGameTableCompanion.insert({ + required String playerId, + required String gameId, + this.rowid = const Value.absent(), + }) : playerId = Value(playerId), + gameId = Value(gameId); + static Insertable custom({ + Expression? playerId, + Expression? gameId, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (playerId != null) 'player_id': playerId, + if (gameId != null) 'game_id': gameId, + if (rowid != null) 'rowid': rowid, + }); + } + + PlayerGameTableCompanion copyWith({ + Value? playerId, + Value? gameId, + Value? rowid, + }) { + return PlayerGameTableCompanion( + playerId: playerId ?? this.playerId, + gameId: gameId ?? this.gameId, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (playerId.present) { + map['player_id'] = Variable(playerId.value); + } + if (gameId.present) { + map['game_id'] = Variable(gameId.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('PlayerGameTableCompanion(') + ..write('playerId: $playerId, ') + ..write('gameId: $gameId, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + +class $GroupGameTableTable extends GroupGameTable + with TableInfo<$GroupGameTableTable, GroupGameTableData> { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + $GroupGameTableTable(this.attachedDatabase, [this._alias]); + static const VerificationMeta _groupIdMeta = const VerificationMeta( + 'groupId', + ); + @override + late final GeneratedColumn groupId = GeneratedColumn( + 'group_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'REFERENCES player_table (id)', + ), + ); + static const VerificationMeta _gameIdMeta = const VerificationMeta('gameId'); + @override + late final GeneratedColumn gameId = GeneratedColumn( + 'game_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'REFERENCES group_table (id)', + ), + ); + @override + List get $columns => [groupId, gameId]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'group_game_table'; + @override + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { + final context = VerificationContext(); + final data = instance.toColumns(true); + if (data.containsKey('group_id')) { + context.handle( + _groupIdMeta, + groupId.isAcceptableOrUnknown(data['group_id']!, _groupIdMeta), + ); + } else if (isInserting) { + context.missing(_groupIdMeta); + } + if (data.containsKey('game_id')) { + context.handle( + _gameIdMeta, + gameId.isAcceptableOrUnknown(data['game_id']!, _gameIdMeta), + ); + } else if (isInserting) { + context.missing(_gameIdMeta); + } + return context; + } + + @override + Set get $primaryKey => {groupId, gameId}; + @override + GroupGameTableData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return GroupGameTableData( + groupId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}group_id'], + )!, + gameId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}game_id'], + )!, + ); + } + + @override + $GroupGameTableTable createAlias(String alias) { + return $GroupGameTableTable(attachedDatabase, alias); + } +} + +class GroupGameTableData extends DataClass + implements Insertable { + final String groupId; + final String gameId; + const GroupGameTableData({required this.groupId, required this.gameId}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['group_id'] = Variable(groupId); + map['game_id'] = Variable(gameId); + return map; + } + + GroupGameTableCompanion toCompanion(bool nullToAbsent) { + return GroupGameTableCompanion( + groupId: Value(groupId), + gameId: Value(gameId), + ); + } + + factory GroupGameTableData.fromJson( + Map json, { + ValueSerializer? serializer, + }) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return GroupGameTableData( + groupId: serializer.fromJson(json['groupId']), + gameId: serializer.fromJson(json['gameId']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'groupId': serializer.toJson(groupId), + 'gameId': serializer.toJson(gameId), + }; + } + + GroupGameTableData copyWith({String? groupId, String? gameId}) => + GroupGameTableData( + groupId: groupId ?? this.groupId, + gameId: gameId ?? this.gameId, + ); + GroupGameTableData copyWithCompanion(GroupGameTableCompanion data) { + return GroupGameTableData( + groupId: data.groupId.present ? data.groupId.value : this.groupId, + gameId: data.gameId.present ? data.gameId.value : this.gameId, + ); + } + + @override + String toString() { + return (StringBuffer('GroupGameTableData(') + ..write('groupId: $groupId, ') + ..write('gameId: $gameId') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash(groupId, gameId); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is GroupGameTableData && + other.groupId == this.groupId && + other.gameId == this.gameId); +} + +class GroupGameTableCompanion extends UpdateCompanion { + final Value groupId; + final Value gameId; + final Value rowid; + const GroupGameTableCompanion({ + this.groupId = const Value.absent(), + this.gameId = const Value.absent(), + this.rowid = const Value.absent(), + }); + GroupGameTableCompanion.insert({ + required String groupId, + required String gameId, + this.rowid = const Value.absent(), + }) : groupId = Value(groupId), + gameId = Value(gameId); + static Insertable custom({ + Expression? groupId, + Expression? gameId, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (groupId != null) 'group_id': groupId, + if (gameId != null) 'game_id': gameId, + if (rowid != null) 'rowid': rowid, + }); + } + + GroupGameTableCompanion copyWith({ + Value? groupId, + Value? gameId, + Value? rowid, + }) { + return GroupGameTableCompanion( + groupId: groupId ?? this.groupId, + gameId: gameId ?? this.gameId, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (groupId.present) { + map['group_id'] = Variable(groupId.value); + } + if (gameId.present) { + map['game_id'] = Variable(gameId.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('GroupGameTableCompanion(') + ..write('groupId: $groupId, ') + ..write('gameId: $gameId, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + class $GameTableTable extends GameTable with TableInfo<$GameTableTable, GameTableData> { @override @@ -662,8 +1108,19 @@ class $GameTableTable extends GameTable type: DriftSqlType.string, requiredDuringInsert: true, ); + static const VerificationMeta _winnerIdMeta = const VerificationMeta( + 'winnerId', + ); @override - List get $columns => [id, name]; + late final GeneratedColumn winnerId = GeneratedColumn( + 'winner_id', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ); + @override + List get $columns => [id, name, winnerId]; @override String get aliasedName => _alias ?? actualTableName; @override @@ -689,6 +1146,12 @@ class $GameTableTable extends GameTable } else if (isInserting) { context.missing(_nameMeta); } + if (data.containsKey('winner_id')) { + context.handle( + _winnerIdMeta, + winnerId.isAcceptableOrUnknown(data['winner_id']!, _winnerIdMeta), + ); + } return context; } @@ -706,6 +1169,10 @@ class $GameTableTable extends GameTable DriftSqlType.string, data['${effectivePrefix}name'], )!, + winnerId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}winner_id'], + ), ); } @@ -718,17 +1185,27 @@ class $GameTableTable extends GameTable class GameTableData extends DataClass implements Insertable { final String id; final String name; - const GameTableData({required this.id, required this.name}); + final String? winnerId; + const GameTableData({required this.id, required this.name, this.winnerId}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['id'] = Variable(id); map['name'] = Variable(name); + if (!nullToAbsent || winnerId != null) { + map['winner_id'] = Variable(winnerId); + } return map; } GameTableCompanion toCompanion(bool nullToAbsent) { - return GameTableCompanion(id: Value(id), name: Value(name)); + return GameTableCompanion( + id: Value(id), + name: Value(name), + winnerId: winnerId == null && nullToAbsent + ? const Value.absent() + : Value(winnerId), + ); } factory GameTableData.fromJson( @@ -739,6 +1216,7 @@ class GameTableData extends DataClass implements Insertable { return GameTableData( id: serializer.fromJson(json['id']), name: serializer.fromJson(json['name']), + winnerId: serializer.fromJson(json['winnerId']), ); } @override @@ -747,15 +1225,24 @@ class GameTableData extends DataClass implements Insertable { return { 'id': serializer.toJson(id), 'name': serializer.toJson(name), + 'winnerId': serializer.toJson(winnerId), }; } - GameTableData copyWith({String? id, String? name}) => - GameTableData(id: id ?? this.id, name: name ?? this.name); + GameTableData copyWith({ + String? id, + String? name, + Value winnerId = const Value.absent(), + }) => GameTableData( + id: id ?? this.id, + name: name ?? this.name, + winnerId: winnerId.present ? winnerId.value : this.winnerId, + ); GameTableData copyWithCompanion(GameTableCompanion data) { return GameTableData( id: data.id.present ? data.id.value : this.id, name: data.name.present ? data.name.value : this.name, + winnerId: data.winnerId.present ? data.winnerId.value : this.winnerId, ); } @@ -763,44 +1250,51 @@ class GameTableData extends DataClass implements Insertable { String toString() { return (StringBuffer('GameTableData(') ..write('id: $id, ') - ..write('name: $name') + ..write('name: $name, ') + ..write('winnerId: $winnerId') ..write(')')) .toString(); } @override - int get hashCode => Object.hash(id, name); + int get hashCode => Object.hash(id, name, winnerId); @override bool operator ==(Object other) => identical(this, other) || (other is GameTableData && other.id == this.id && - other.name == this.name); + other.name == this.name && + other.winnerId == this.winnerId); } class GameTableCompanion extends UpdateCompanion { final Value id; final Value name; + final Value winnerId; final Value rowid; const GameTableCompanion({ this.id = const Value.absent(), this.name = const Value.absent(), + this.winnerId = const Value.absent(), this.rowid = const Value.absent(), }); GameTableCompanion.insert({ required String id, required String name, + this.winnerId = const Value.absent(), this.rowid = const Value.absent(), }) : id = Value(id), name = Value(name); static Insertable custom({ Expression? id, Expression? name, + Expression? winnerId, Expression? rowid, }) { return RawValuesInsertable({ if (id != null) 'id': id, if (name != null) 'name': name, + if (winnerId != null) 'winner_id': winnerId, if (rowid != null) 'rowid': rowid, }); } @@ -808,11 +1302,13 @@ class GameTableCompanion extends UpdateCompanion { GameTableCompanion copyWith({ Value? id, Value? name, + Value? winnerId, Value? rowid, }) { return GameTableCompanion( id: id ?? this.id, name: name ?? this.name, + winnerId: winnerId ?? this.winnerId, rowid: rowid ?? this.rowid, ); } @@ -826,6 +1322,9 @@ class GameTableCompanion extends UpdateCompanion { if (name.present) { map['name'] = Variable(name.value); } + if (winnerId.present) { + map['winner_id'] = Variable(winnerId.value); + } if (rowid.present) { map['rowid'] = Variable(rowid.value); } @@ -837,6 +1336,7 @@ class GameTableCompanion extends UpdateCompanion { return (StringBuffer('GameTableCompanion(') ..write('id: $id, ') ..write('name: $name, ') + ..write('winnerId: $winnerId, ') ..write('rowid: $rowid') ..write(')')) .toString(); @@ -851,13 +1351,19 @@ abstract class _$AppDatabase extends GeneratedDatabase { late final $PlayerGroupTableTable playerGroupTable = $PlayerGroupTableTable( this, ); + late final $PlayerGameTableTable playerGameTable = $PlayerGameTableTable( + this, + ); + late final $GroupGameTableTable groupGameTable = $GroupGameTableTable(this); late final $GameTableTable gameTable = $GameTableTable(this); late final GroupDao groupDao = GroupDao(this as AppDatabase); late final PlayerDao playerDao = PlayerDao(this as AppDatabase); + late final GameDao gameDao = GameDao(this as AppDatabase); late final PlayerGroupDao playerGroupDao = PlayerGroupDao( this as AppDatabase, ); - late final GameDao gameDao = GameDao(this as AppDatabase); + late final PlayerGameDao playerGameDao = PlayerGameDao(this as AppDatabase); + late final GroupGameDao groupGameDao = GroupGameDao(this as AppDatabase); @override Iterable> get allTables => allSchemaEntities.whereType>(); @@ -866,6 +1372,8 @@ abstract class _$AppDatabase extends GeneratedDatabase { playerTable, groupTable, playerGroupTable, + playerGameTable, + groupGameTable, gameTable, ]; } @@ -909,6 +1417,50 @@ final class $$PlayerTableTableReferences manager.$state.copyWith(prefetchedData: cache), ); } + + static MultiTypedResultKey<$PlayerGameTableTable, List> + _playerGameTableRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( + db.playerGameTable, + aliasName: $_aliasNameGenerator( + db.playerTable.id, + db.playerGameTable.playerId, + ), + ); + + $$PlayerGameTableTableProcessedTableManager get playerGameTableRefs { + final manager = $$PlayerGameTableTableTableManager( + $_db, + $_db.playerGameTable, + ).filter((f) => f.playerId.id.sqlEquals($_itemColumn('id')!)); + + final cache = $_typedResult.readTableOrNull( + _playerGameTableRefsTable($_db), + ); + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: cache), + ); + } + + static MultiTypedResultKey<$GroupGameTableTable, List> + _groupGameTableRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( + db.groupGameTable, + aliasName: $_aliasNameGenerator( + db.playerTable.id, + db.groupGameTable.groupId, + ), + ); + + $$GroupGameTableTableProcessedTableManager get groupGameTableRefs { + final manager = $$GroupGameTableTableTableManager( + $_db, + $_db.groupGameTable, + ).filter((f) => f.groupId.id.sqlEquals($_itemColumn('id')!)); + + final cache = $_typedResult.readTableOrNull(_groupGameTableRefsTable($_db)); + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: cache), + ); + } } class $$PlayerTableTableFilterComposer @@ -954,6 +1506,56 @@ class $$PlayerTableTableFilterComposer ); return f(composer); } + + Expression playerGameTableRefs( + Expression Function($$PlayerGameTableTableFilterComposer f) f, + ) { + final $$PlayerGameTableTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.playerGameTable, + getReferencedColumn: (t) => t.playerId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerGameTableTableFilterComposer( + $db: $db, + $table: $db.playerGameTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } + + Expression groupGameTableRefs( + Expression Function($$GroupGameTableTableFilterComposer f) f, + ) { + final $$GroupGameTableTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.groupGameTable, + getReferencedColumn: (t) => t.groupId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupGameTableTableFilterComposer( + $db: $db, + $table: $db.groupGameTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } } class $$PlayerTableTableOrderingComposer @@ -1015,6 +1617,56 @@ class $$PlayerTableTableAnnotationComposer ); return f(composer); } + + Expression playerGameTableRefs( + Expression Function($$PlayerGameTableTableAnnotationComposer a) f, + ) { + final $$PlayerGameTableTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.playerGameTable, + getReferencedColumn: (t) => t.playerId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerGameTableTableAnnotationComposer( + $db: $db, + $table: $db.playerGameTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } + + Expression groupGameTableRefs( + Expression Function($$GroupGameTableTableAnnotationComposer a) f, + ) { + final $$GroupGameTableTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.groupGameTable, + getReferencedColumn: (t) => t.groupId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupGameTableTableAnnotationComposer( + $db: $db, + $table: $db.groupGameTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } } class $$PlayerTableTableTableManager @@ -1030,7 +1682,11 @@ class $$PlayerTableTableTableManager $$PlayerTableTableUpdateCompanionBuilder, (PlayerTableData, $$PlayerTableTableReferences), PlayerTableData, - PrefetchHooks Function({bool playerGroupTableRefs}) + PrefetchHooks Function({ + bool playerGroupTableRefs, + bool playerGameTableRefs, + bool groupGameTableRefs, + }) > { $$PlayerTableTableTableManager(_$AppDatabase db, $PlayerTableTable table) : super( @@ -1064,38 +1720,89 @@ class $$PlayerTableTableTableManager ), ) .toList(), - prefetchHooksCallback: ({playerGroupTableRefs = false}) { - return PrefetchHooks( - db: db, - explicitlyWatchedTables: [ - if (playerGroupTableRefs) db.playerGroupTable, - ], - addJoins: null, - getPrefetchedDataCallback: (items) async { - return [ - if (playerGroupTableRefs) - await $_getPrefetchedData< - PlayerTableData, - $PlayerTableTable, - PlayerGroupTableData - >( - currentTable: table, - referencedTable: $$PlayerTableTableReferences - ._playerGroupTableRefsTable(db), - managerFromTypedResult: (p0) => - $$PlayerTableTableReferences( - db, - table, - p0, - ).playerGroupTableRefs, - referencedItemsForCurrentItem: (item, referencedItems) => - referencedItems.where((e) => e.playerId == item.id), - typedResults: items, - ), - ]; + prefetchHooksCallback: + ({ + playerGroupTableRefs = false, + playerGameTableRefs = false, + groupGameTableRefs = false, + }) { + return PrefetchHooks( + db: db, + explicitlyWatchedTables: [ + if (playerGroupTableRefs) db.playerGroupTable, + if (playerGameTableRefs) db.playerGameTable, + if (groupGameTableRefs) db.groupGameTable, + ], + addJoins: null, + getPrefetchedDataCallback: (items) async { + return [ + if (playerGroupTableRefs) + await $_getPrefetchedData< + PlayerTableData, + $PlayerTableTable, + PlayerGroupTableData + >( + currentTable: table, + referencedTable: $$PlayerTableTableReferences + ._playerGroupTableRefsTable(db), + managerFromTypedResult: (p0) => + $$PlayerTableTableReferences( + db, + table, + p0, + ).playerGroupTableRefs, + referencedItemsForCurrentItem: + (item, referencedItems) => referencedItems.where( + (e) => e.playerId == item.id, + ), + typedResults: items, + ), + if (playerGameTableRefs) + await $_getPrefetchedData< + PlayerTableData, + $PlayerTableTable, + PlayerGameTableData + >( + currentTable: table, + referencedTable: $$PlayerTableTableReferences + ._playerGameTableRefsTable(db), + managerFromTypedResult: (p0) => + $$PlayerTableTableReferences( + db, + table, + p0, + ).playerGameTableRefs, + referencedItemsForCurrentItem: + (item, referencedItems) => referencedItems.where( + (e) => e.playerId == item.id, + ), + typedResults: items, + ), + if (groupGameTableRefs) + await $_getPrefetchedData< + PlayerTableData, + $PlayerTableTable, + GroupGameTableData + >( + currentTable: table, + referencedTable: $$PlayerTableTableReferences + ._groupGameTableRefsTable(db), + managerFromTypedResult: (p0) => + $$PlayerTableTableReferences( + db, + table, + p0, + ).groupGameTableRefs, + referencedItemsForCurrentItem: + (item, referencedItems) => referencedItems.where( + (e) => e.groupId == item.id, + ), + typedResults: items, + ), + ]; + }, + ); }, - ); - }, ), ); } @@ -1112,7 +1819,11 @@ typedef $$PlayerTableTableProcessedTableManager = $$PlayerTableTableUpdateCompanionBuilder, (PlayerTableData, $$PlayerTableTableReferences), PlayerTableData, - PrefetchHooks Function({bool playerGroupTableRefs}) + PrefetchHooks Function({ + bool playerGroupTableRefs, + bool playerGameTableRefs, + bool groupGameTableRefs, + }) >; typedef $$GroupTableTableCreateCompanionBuilder = GroupTableCompanion Function({ @@ -1153,6 +1864,47 @@ final class $$GroupTableTableReferences manager.$state.copyWith(prefetchedData: cache), ); } + + static MultiTypedResultKey<$PlayerGameTableTable, List> + _playerGameTableRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( + db.playerGameTable, + aliasName: $_aliasNameGenerator( + db.groupTable.id, + db.playerGameTable.gameId, + ), + ); + + $$PlayerGameTableTableProcessedTableManager get playerGameTableRefs { + final manager = $$PlayerGameTableTableTableManager( + $_db, + $_db.playerGameTable, + ).filter((f) => f.gameId.id.sqlEquals($_itemColumn('id')!)); + + final cache = $_typedResult.readTableOrNull( + _playerGameTableRefsTable($_db), + ); + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: cache), + ); + } + + static MultiTypedResultKey<$GroupGameTableTable, List> + _groupGameTableRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( + db.groupGameTable, + aliasName: $_aliasNameGenerator(db.groupTable.id, db.groupGameTable.gameId), + ); + + $$GroupGameTableTableProcessedTableManager get groupGameTableRefs { + final manager = $$GroupGameTableTableTableManager( + $_db, + $_db.groupGameTable, + ).filter((f) => f.gameId.id.sqlEquals($_itemColumn('id')!)); + + final cache = $_typedResult.readTableOrNull(_groupGameTableRefsTable($_db)); + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: cache), + ); + } } class $$GroupTableTableFilterComposer @@ -1198,6 +1950,56 @@ class $$GroupTableTableFilterComposer ); return f(composer); } + + Expression playerGameTableRefs( + Expression Function($$PlayerGameTableTableFilterComposer f) f, + ) { + final $$PlayerGameTableTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.playerGameTable, + getReferencedColumn: (t) => t.gameId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerGameTableTableFilterComposer( + $db: $db, + $table: $db.playerGameTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } + + Expression groupGameTableRefs( + Expression Function($$GroupGameTableTableFilterComposer f) f, + ) { + final $$GroupGameTableTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.groupGameTable, + getReferencedColumn: (t) => t.gameId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupGameTableTableFilterComposer( + $db: $db, + $table: $db.groupGameTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } } class $$GroupTableTableOrderingComposer @@ -1259,6 +2061,56 @@ class $$GroupTableTableAnnotationComposer ); return f(composer); } + + Expression playerGameTableRefs( + Expression Function($$PlayerGameTableTableAnnotationComposer a) f, + ) { + final $$PlayerGameTableTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.playerGameTable, + getReferencedColumn: (t) => t.gameId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerGameTableTableAnnotationComposer( + $db: $db, + $table: $db.playerGameTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } + + Expression groupGameTableRefs( + Expression Function($$GroupGameTableTableAnnotationComposer a) f, + ) { + final $$GroupGameTableTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.groupGameTable, + getReferencedColumn: (t) => t.gameId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupGameTableTableAnnotationComposer( + $db: $db, + $table: $db.groupGameTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } } class $$GroupTableTableTableManager @@ -1274,7 +2126,11 @@ class $$GroupTableTableTableManager $$GroupTableTableUpdateCompanionBuilder, (GroupTableData, $$GroupTableTableReferences), GroupTableData, - PrefetchHooks Function({bool playerGroupTableRefs}) + PrefetchHooks Function({ + bool playerGroupTableRefs, + bool playerGameTableRefs, + bool groupGameTableRefs, + }) > { $$GroupTableTableTableManager(_$AppDatabase db, $GroupTableTable table) : super( @@ -1308,38 +2164,89 @@ class $$GroupTableTableTableManager ), ) .toList(), - prefetchHooksCallback: ({playerGroupTableRefs = false}) { - return PrefetchHooks( - db: db, - explicitlyWatchedTables: [ - if (playerGroupTableRefs) db.playerGroupTable, - ], - addJoins: null, - getPrefetchedDataCallback: (items) async { - return [ - if (playerGroupTableRefs) - await $_getPrefetchedData< - GroupTableData, - $GroupTableTable, - PlayerGroupTableData - >( - currentTable: table, - referencedTable: $$GroupTableTableReferences - ._playerGroupTableRefsTable(db), - managerFromTypedResult: (p0) => - $$GroupTableTableReferences( - db, - table, - p0, - ).playerGroupTableRefs, - referencedItemsForCurrentItem: (item, referencedItems) => - referencedItems.where((e) => e.groupId == item.id), - typedResults: items, - ), - ]; + prefetchHooksCallback: + ({ + playerGroupTableRefs = false, + playerGameTableRefs = false, + groupGameTableRefs = false, + }) { + return PrefetchHooks( + db: db, + explicitlyWatchedTables: [ + if (playerGroupTableRefs) db.playerGroupTable, + if (playerGameTableRefs) db.playerGameTable, + if (groupGameTableRefs) db.groupGameTable, + ], + addJoins: null, + getPrefetchedDataCallback: (items) async { + return [ + if (playerGroupTableRefs) + await $_getPrefetchedData< + GroupTableData, + $GroupTableTable, + PlayerGroupTableData + >( + currentTable: table, + referencedTable: $$GroupTableTableReferences + ._playerGroupTableRefsTable(db), + managerFromTypedResult: (p0) => + $$GroupTableTableReferences( + db, + table, + p0, + ).playerGroupTableRefs, + referencedItemsForCurrentItem: + (item, referencedItems) => referencedItems.where( + (e) => e.groupId == item.id, + ), + typedResults: items, + ), + if (playerGameTableRefs) + await $_getPrefetchedData< + GroupTableData, + $GroupTableTable, + PlayerGameTableData + >( + currentTable: table, + referencedTable: $$GroupTableTableReferences + ._playerGameTableRefsTable(db), + managerFromTypedResult: (p0) => + $$GroupTableTableReferences( + db, + table, + p0, + ).playerGameTableRefs, + referencedItemsForCurrentItem: + (item, referencedItems) => referencedItems.where( + (e) => e.gameId == item.id, + ), + typedResults: items, + ), + if (groupGameTableRefs) + await $_getPrefetchedData< + GroupTableData, + $GroupTableTable, + GroupGameTableData + >( + currentTable: table, + referencedTable: $$GroupTableTableReferences + ._groupGameTableRefsTable(db), + managerFromTypedResult: (p0) => + $$GroupTableTableReferences( + db, + table, + p0, + ).groupGameTableRefs, + referencedItemsForCurrentItem: + (item, referencedItems) => referencedItems.where( + (e) => e.gameId == item.id, + ), + typedResults: items, + ), + ]; + }, + ); }, - ); - }, ), ); } @@ -1356,7 +2263,11 @@ typedef $$GroupTableTableProcessedTableManager = $$GroupTableTableUpdateCompanionBuilder, (GroupTableData, $$GroupTableTableReferences), GroupTableData, - PrefetchHooks Function({bool playerGroupTableRefs}) + PrefetchHooks Function({ + bool playerGroupTableRefs, + bool playerGameTableRefs, + bool groupGameTableRefs, + }) >; typedef $$PlayerGroupTableTableCreateCompanionBuilder = PlayerGroupTableCompanion Function({ @@ -1723,16 +2634,746 @@ typedef $$PlayerGroupTableTableProcessedTableManager = PlayerGroupTableData, PrefetchHooks Function({bool playerId, bool groupId}) >; +typedef $$PlayerGameTableTableCreateCompanionBuilder = + PlayerGameTableCompanion Function({ + required String playerId, + required String gameId, + Value rowid, + }); +typedef $$PlayerGameTableTableUpdateCompanionBuilder = + PlayerGameTableCompanion Function({ + Value playerId, + Value gameId, + Value rowid, + }); + +final class $$PlayerGameTableTableReferences + extends + BaseReferences< + _$AppDatabase, + $PlayerGameTableTable, + PlayerGameTableData + > { + $$PlayerGameTableTableReferences( + super.$_db, + super.$_table, + super.$_typedResult, + ); + + static $PlayerTableTable _playerIdTable(_$AppDatabase db) => + db.playerTable.createAlias( + $_aliasNameGenerator(db.playerGameTable.playerId, db.playerTable.id), + ); + + $$PlayerTableTableProcessedTableManager get playerId { + final $_column = $_itemColumn('player_id')!; + + final manager = $$PlayerTableTableTableManager( + $_db, + $_db.playerTable, + ).filter((f) => f.id.sqlEquals($_column)); + final item = $_typedResult.readTableOrNull(_playerIdTable($_db)); + if (item == null) return manager; + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: [item]), + ); + } + + static $GroupTableTable _gameIdTable(_$AppDatabase db) => + db.groupTable.createAlias( + $_aliasNameGenerator(db.playerGameTable.gameId, db.groupTable.id), + ); + + $$GroupTableTableProcessedTableManager get gameId { + final $_column = $_itemColumn('game_id')!; + + final manager = $$GroupTableTableTableManager( + $_db, + $_db.groupTable, + ).filter((f) => f.id.sqlEquals($_column)); + final item = $_typedResult.readTableOrNull(_gameIdTable($_db)); + if (item == null) return manager; + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: [item]), + ); + } +} + +class $$PlayerGameTableTableFilterComposer + extends Composer<_$AppDatabase, $PlayerGameTableTable> { + $$PlayerGameTableTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + $$PlayerTableTableFilterComposer get playerId { + final $$PlayerTableTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.playerId, + referencedTable: $db.playerTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerTableTableFilterComposer( + $db: $db, + $table: $db.playerTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } + + $$GroupTableTableFilterComposer get gameId { + final $$GroupTableTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.gameId, + referencedTable: $db.groupTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupTableTableFilterComposer( + $db: $db, + $table: $db.groupTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } +} + +class $$PlayerGameTableTableOrderingComposer + extends Composer<_$AppDatabase, $PlayerGameTableTable> { + $$PlayerGameTableTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + $$PlayerTableTableOrderingComposer get playerId { + final $$PlayerTableTableOrderingComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.playerId, + referencedTable: $db.playerTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerTableTableOrderingComposer( + $db: $db, + $table: $db.playerTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } + + $$GroupTableTableOrderingComposer get gameId { + final $$GroupTableTableOrderingComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.gameId, + referencedTable: $db.groupTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupTableTableOrderingComposer( + $db: $db, + $table: $db.groupTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } +} + +class $$PlayerGameTableTableAnnotationComposer + extends Composer<_$AppDatabase, $PlayerGameTableTable> { + $$PlayerGameTableTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + $$PlayerTableTableAnnotationComposer get playerId { + final $$PlayerTableTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.playerId, + referencedTable: $db.playerTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerTableTableAnnotationComposer( + $db: $db, + $table: $db.playerTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } + + $$GroupTableTableAnnotationComposer get gameId { + final $$GroupTableTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.gameId, + referencedTable: $db.groupTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupTableTableAnnotationComposer( + $db: $db, + $table: $db.groupTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } +} + +class $$PlayerGameTableTableTableManager + extends + RootTableManager< + _$AppDatabase, + $PlayerGameTableTable, + PlayerGameTableData, + $$PlayerGameTableTableFilterComposer, + $$PlayerGameTableTableOrderingComposer, + $$PlayerGameTableTableAnnotationComposer, + $$PlayerGameTableTableCreateCompanionBuilder, + $$PlayerGameTableTableUpdateCompanionBuilder, + (PlayerGameTableData, $$PlayerGameTableTableReferences), + PlayerGameTableData, + PrefetchHooks Function({bool playerId, bool gameId}) + > { + $$PlayerGameTableTableTableManager( + _$AppDatabase db, + $PlayerGameTableTable table, + ) : super( + TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$PlayerGameTableTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$PlayerGameTableTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$PlayerGameTableTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: + ({ + Value playerId = const Value.absent(), + Value gameId = const Value.absent(), + Value rowid = const Value.absent(), + }) => PlayerGameTableCompanion( + playerId: playerId, + gameId: gameId, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String playerId, + required String gameId, + Value rowid = const Value.absent(), + }) => PlayerGameTableCompanion.insert( + playerId: playerId, + gameId: gameId, + rowid: rowid, + ), + withReferenceMapper: (p0) => p0 + .map( + (e) => ( + e.readTable(table), + $$PlayerGameTableTableReferences(db, table, e), + ), + ) + .toList(), + prefetchHooksCallback: ({playerId = false, gameId = false}) { + return PrefetchHooks( + db: db, + explicitlyWatchedTables: [], + addJoins: + < + T extends TableManagerState< + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic + > + >(state) { + if (playerId) { + state = + state.withJoin( + currentTable: table, + currentColumn: table.playerId, + referencedTable: + $$PlayerGameTableTableReferences + ._playerIdTable(db), + referencedColumn: + $$PlayerGameTableTableReferences + ._playerIdTable(db) + .id, + ) + as T; + } + if (gameId) { + state = + state.withJoin( + currentTable: table, + currentColumn: table.gameId, + referencedTable: + $$PlayerGameTableTableReferences + ._gameIdTable(db), + referencedColumn: + $$PlayerGameTableTableReferences + ._gameIdTable(db) + .id, + ) + as T; + } + + return state; + }, + getPrefetchedDataCallback: (items) async { + return []; + }, + ); + }, + ), + ); +} + +typedef $$PlayerGameTableTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $PlayerGameTableTable, + PlayerGameTableData, + $$PlayerGameTableTableFilterComposer, + $$PlayerGameTableTableOrderingComposer, + $$PlayerGameTableTableAnnotationComposer, + $$PlayerGameTableTableCreateCompanionBuilder, + $$PlayerGameTableTableUpdateCompanionBuilder, + (PlayerGameTableData, $$PlayerGameTableTableReferences), + PlayerGameTableData, + PrefetchHooks Function({bool playerId, bool gameId}) + >; +typedef $$GroupGameTableTableCreateCompanionBuilder = + GroupGameTableCompanion Function({ + required String groupId, + required String gameId, + Value rowid, + }); +typedef $$GroupGameTableTableUpdateCompanionBuilder = + GroupGameTableCompanion Function({ + Value groupId, + Value gameId, + Value rowid, + }); + +final class $$GroupGameTableTableReferences + extends + BaseReferences< + _$AppDatabase, + $GroupGameTableTable, + GroupGameTableData + > { + $$GroupGameTableTableReferences( + super.$_db, + super.$_table, + super.$_typedResult, + ); + + static $PlayerTableTable _groupIdTable(_$AppDatabase db) => + db.playerTable.createAlias( + $_aliasNameGenerator(db.groupGameTable.groupId, db.playerTable.id), + ); + + $$PlayerTableTableProcessedTableManager get groupId { + final $_column = $_itemColumn('group_id')!; + + final manager = $$PlayerTableTableTableManager( + $_db, + $_db.playerTable, + ).filter((f) => f.id.sqlEquals($_column)); + final item = $_typedResult.readTableOrNull(_groupIdTable($_db)); + if (item == null) return manager; + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: [item]), + ); + } + + static $GroupTableTable _gameIdTable(_$AppDatabase db) => + db.groupTable.createAlias( + $_aliasNameGenerator(db.groupGameTable.gameId, db.groupTable.id), + ); + + $$GroupTableTableProcessedTableManager get gameId { + final $_column = $_itemColumn('game_id')!; + + final manager = $$GroupTableTableTableManager( + $_db, + $_db.groupTable, + ).filter((f) => f.id.sqlEquals($_column)); + final item = $_typedResult.readTableOrNull(_gameIdTable($_db)); + if (item == null) return manager; + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: [item]), + ); + } +} + +class $$GroupGameTableTableFilterComposer + extends Composer<_$AppDatabase, $GroupGameTableTable> { + $$GroupGameTableTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + $$PlayerTableTableFilterComposer get groupId { + final $$PlayerTableTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.groupId, + referencedTable: $db.playerTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerTableTableFilterComposer( + $db: $db, + $table: $db.playerTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } + + $$GroupTableTableFilterComposer get gameId { + final $$GroupTableTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.gameId, + referencedTable: $db.groupTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupTableTableFilterComposer( + $db: $db, + $table: $db.groupTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } +} + +class $$GroupGameTableTableOrderingComposer + extends Composer<_$AppDatabase, $GroupGameTableTable> { + $$GroupGameTableTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + $$PlayerTableTableOrderingComposer get groupId { + final $$PlayerTableTableOrderingComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.groupId, + referencedTable: $db.playerTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerTableTableOrderingComposer( + $db: $db, + $table: $db.playerTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } + + $$GroupTableTableOrderingComposer get gameId { + final $$GroupTableTableOrderingComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.gameId, + referencedTable: $db.groupTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupTableTableOrderingComposer( + $db: $db, + $table: $db.groupTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } +} + +class $$GroupGameTableTableAnnotationComposer + extends Composer<_$AppDatabase, $GroupGameTableTable> { + $$GroupGameTableTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + $$PlayerTableTableAnnotationComposer get groupId { + final $$PlayerTableTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.groupId, + referencedTable: $db.playerTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerTableTableAnnotationComposer( + $db: $db, + $table: $db.playerTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } + + $$GroupTableTableAnnotationComposer get gameId { + final $$GroupTableTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.gameId, + referencedTable: $db.groupTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupTableTableAnnotationComposer( + $db: $db, + $table: $db.groupTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } +} + +class $$GroupGameTableTableTableManager + extends + RootTableManager< + _$AppDatabase, + $GroupGameTableTable, + GroupGameTableData, + $$GroupGameTableTableFilterComposer, + $$GroupGameTableTableOrderingComposer, + $$GroupGameTableTableAnnotationComposer, + $$GroupGameTableTableCreateCompanionBuilder, + $$GroupGameTableTableUpdateCompanionBuilder, + (GroupGameTableData, $$GroupGameTableTableReferences), + GroupGameTableData, + PrefetchHooks Function({bool groupId, bool gameId}) + > { + $$GroupGameTableTableTableManager( + _$AppDatabase db, + $GroupGameTableTable table, + ) : super( + TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$GroupGameTableTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$GroupGameTableTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$GroupGameTableTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: + ({ + Value groupId = const Value.absent(), + Value gameId = const Value.absent(), + Value rowid = const Value.absent(), + }) => GroupGameTableCompanion( + groupId: groupId, + gameId: gameId, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String groupId, + required String gameId, + Value rowid = const Value.absent(), + }) => GroupGameTableCompanion.insert( + groupId: groupId, + gameId: gameId, + rowid: rowid, + ), + withReferenceMapper: (p0) => p0 + .map( + (e) => ( + e.readTable(table), + $$GroupGameTableTableReferences(db, table, e), + ), + ) + .toList(), + prefetchHooksCallback: ({groupId = false, gameId = false}) { + return PrefetchHooks( + db: db, + explicitlyWatchedTables: [], + addJoins: + < + T extends TableManagerState< + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic + > + >(state) { + if (groupId) { + state = + state.withJoin( + currentTable: table, + currentColumn: table.groupId, + referencedTable: $$GroupGameTableTableReferences + ._groupIdTable(db), + referencedColumn: + $$GroupGameTableTableReferences + ._groupIdTable(db) + .id, + ) + as T; + } + if (gameId) { + state = + state.withJoin( + currentTable: table, + currentColumn: table.gameId, + referencedTable: $$GroupGameTableTableReferences + ._gameIdTable(db), + referencedColumn: + $$GroupGameTableTableReferences + ._gameIdTable(db) + .id, + ) + as T; + } + + return state; + }, + getPrefetchedDataCallback: (items) async { + return []; + }, + ); + }, + ), + ); +} + +typedef $$GroupGameTableTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $GroupGameTableTable, + GroupGameTableData, + $$GroupGameTableTableFilterComposer, + $$GroupGameTableTableOrderingComposer, + $$GroupGameTableTableAnnotationComposer, + $$GroupGameTableTableCreateCompanionBuilder, + $$GroupGameTableTableUpdateCompanionBuilder, + (GroupGameTableData, $$GroupGameTableTableReferences), + GroupGameTableData, + PrefetchHooks Function({bool groupId, bool gameId}) + >; typedef $$GameTableTableCreateCompanionBuilder = GameTableCompanion Function({ required String id, required String name, + Value winnerId, Value rowid, }); typedef $$GameTableTableUpdateCompanionBuilder = GameTableCompanion Function({ Value id, Value name, + Value winnerId, Value rowid, }); @@ -1754,6 +3395,11 @@ class $$GameTableTableFilterComposer column: $table.name, builder: (column) => ColumnFilters(column), ); + + ColumnFilters get winnerId => $composableBuilder( + column: $table.winnerId, + builder: (column) => ColumnFilters(column), + ); } class $$GameTableTableOrderingComposer @@ -1774,6 +3420,11 @@ class $$GameTableTableOrderingComposer column: $table.name, builder: (column) => ColumnOrderings(column), ); + + ColumnOrderings get winnerId => $composableBuilder( + column: $table.winnerId, + builder: (column) => ColumnOrderings(column), + ); } class $$GameTableTableAnnotationComposer @@ -1790,6 +3441,9 @@ class $$GameTableTableAnnotationComposer GeneratedColumn get name => $composableBuilder(column: $table.name, builder: (column) => column); + + GeneratedColumn get winnerId => + $composableBuilder(column: $table.winnerId, builder: (column) => column); } class $$GameTableTableTableManager @@ -1825,14 +3479,26 @@ class $$GameTableTableTableManager ({ Value id = const Value.absent(), Value name = const Value.absent(), + Value winnerId = const Value.absent(), Value rowid = const Value.absent(), - }) => GameTableCompanion(id: id, name: name, rowid: rowid), + }) => GameTableCompanion( + id: id, + name: name, + winnerId: winnerId, + rowid: rowid, + ), createCompanionCallback: ({ required String id, required String name, + Value winnerId = const Value.absent(), Value rowid = const Value.absent(), - }) => GameTableCompanion.insert(id: id, name: name, rowid: rowid), + }) => GameTableCompanion.insert( + id: id, + name: name, + winnerId: winnerId, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), BaseReferences(db, table, e))) .toList(), @@ -1868,6 +3534,10 @@ class $AppDatabaseManager { $$GroupTableTableTableManager(_db, _db.groupTable); $$PlayerGroupTableTableTableManager get playerGroupTable => $$PlayerGroupTableTableTableManager(_db, _db.playerGroupTable); + $$PlayerGameTableTableTableManager get playerGameTable => + $$PlayerGameTableTableTableManager(_db, _db.playerGameTable); + $$GroupGameTableTableTableManager get groupGameTable => + $$GroupGameTableTableTableManager(_db, _db.groupGameTable); $$GameTableTableTableManager get gameTable => $$GameTableTableTableManager(_db, _db.gameTable); } diff --git a/lib/data/db/tables/game_table.dart b/lib/data/db/tables/game_table.dart index 45bfb20..0772647 100644 --- a/lib/data/db/tables/game_table.dart +++ b/lib/data/db/tables/game_table.dart @@ -3,6 +3,7 @@ import 'package:drift/drift.dart'; class GameTable extends Table { TextColumn get id => text()(); TextColumn get name => text()(); + TextColumn get winnerId => text().nullable()(); @override Set> get primaryKey => {id}; diff --git a/lib/data/db/tables/group_game_table.dart b/lib/data/db/tables/group_game_table.dart new file mode 100644 index 0000000..f70206f --- /dev/null +++ b/lib/data/db/tables/group_game_table.dart @@ -0,0 +1,11 @@ +import 'package:drift/drift.dart'; +import 'package:game_tracker/data/db/tables/group_table.dart'; +import 'package:game_tracker/data/db/tables/player_table.dart'; + +class GroupGameTable extends Table { + TextColumn get groupId => text().references(PlayerTable, #id)(); + TextColumn get gameId => text().references(GroupTable, #id)(); + + @override + Set> get primaryKey => {groupId, gameId}; +} diff --git a/lib/data/db/tables/player_game_table.dart b/lib/data/db/tables/player_game_table.dart new file mode 100644 index 0000000..95ef4db --- /dev/null +++ b/lib/data/db/tables/player_game_table.dart @@ -0,0 +1,11 @@ +import 'package:drift/drift.dart'; +import 'package:game_tracker/data/db/tables/group_table.dart'; +import 'package:game_tracker/data/db/tables/player_table.dart'; + +class PlayerGameTable extends Table { + TextColumn get playerId => text().references(PlayerTable, #id)(); + TextColumn get gameId => text().references(GroupTable, #id)(); + + @override + Set> get primaryKey => {playerId, gameId}; +} diff --git a/lib/data/dto/game.dart b/lib/data/dto/game.dart index 7457b54..2c09851 100644 --- a/lib/data/dto/game.dart +++ b/lib/data/dto/game.dart @@ -1,6 +1,18 @@ +import 'package:game_tracker/data/dto/group.dart'; +import 'package:game_tracker/data/dto/player.dart'; + class Game { final String id; final String name; + final List? players; + final Group? group; + final String? winner; - Game({required this.id, required this.name}); + Game({ + this.players, + this.group, + this.winner, + required this.id, + required this.name, + }); } From b6700bafd9c7441de21eae4c98ba17248b742dd0 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 12 Nov 2025 12:03:08 +0100 Subject: [PATCH 09/21] Added on delete cascade --- lib/data/db/tables/group_game_table.dart | 6 ++++-- lib/data/db/tables/player_game_table.dart | 6 ++++-- lib/data/db/tables/player_group_table.dart | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/data/db/tables/group_game_table.dart b/lib/data/db/tables/group_game_table.dart index f70206f..6be12bc 100644 --- a/lib/data/db/tables/group_game_table.dart +++ b/lib/data/db/tables/group_game_table.dart @@ -3,8 +3,10 @@ import 'package:game_tracker/data/db/tables/group_table.dart'; import 'package:game_tracker/data/db/tables/player_table.dart'; class GroupGameTable extends Table { - TextColumn get groupId => text().references(PlayerTable, #id)(); - TextColumn get gameId => text().references(GroupTable, #id)(); + TextColumn get groupId => + text().references(PlayerTable, #id, onDelete: KeyAction.cascade)(); + TextColumn get gameId => + text().references(GroupTable, #id, onDelete: KeyAction.cascade)(); @override Set> get primaryKey => {groupId, gameId}; diff --git a/lib/data/db/tables/player_game_table.dart b/lib/data/db/tables/player_game_table.dart index 95ef4db..79b6df2 100644 --- a/lib/data/db/tables/player_game_table.dart +++ b/lib/data/db/tables/player_game_table.dart @@ -3,8 +3,10 @@ import 'package:game_tracker/data/db/tables/group_table.dart'; import 'package:game_tracker/data/db/tables/player_table.dart'; class PlayerGameTable extends Table { - TextColumn get playerId => text().references(PlayerTable, #id)(); - TextColumn get gameId => text().references(GroupTable, #id)(); + TextColumn get playerId => + text().references(PlayerTable, #id, onDelete: KeyAction.cascade)(); + TextColumn get gameId => + text().references(GroupTable, #id, onDelete: KeyAction.cascade)(); @override Set> get primaryKey => {playerId, gameId}; diff --git a/lib/data/db/tables/player_group_table.dart b/lib/data/db/tables/player_group_table.dart index 61e2ed8..da2521b 100644 --- a/lib/data/db/tables/player_group_table.dart +++ b/lib/data/db/tables/player_group_table.dart @@ -3,8 +3,10 @@ import 'package:game_tracker/data/db/tables/group_table.dart'; import 'package:game_tracker/data/db/tables/player_table.dart'; class PlayerGroupTable extends Table { - TextColumn get playerId => text().references(PlayerTable, #id)(); - TextColumn get groupId => text().references(GroupTable, #id)(); + TextColumn get playerId => + text().references(PlayerTable, #id, onDelete: KeyAction.cascade)(); + TextColumn get groupId => + text().references(GroupTable, #id, onDelete: KeyAction.cascade)(); @override Set> get primaryKey => {playerId, groupId}; From d07943add9ed0146f6ff611c4026cbf114052ca0 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 12 Nov 2025 12:04:33 +0100 Subject: [PATCH 10/21] Added methods for inserting games and groups into the db --- lib/data/dao/game_dao.dart | 21 +++++++++++++++++++++ lib/data/dao/group_dao.dart | 25 ++++++++++++++++++++----- lib/data/dao/group_game_dao.dart | 8 ++++++++ lib/data/dao/player_game_dao.dart | 8 ++++++++ lib/data/db/tables/game_table.dart | 1 + 5 files changed, 58 insertions(+), 5 deletions(-) diff --git a/lib/data/dao/game_dao.dart b/lib/data/dao/game_dao.dart index 5894ed5..ba9c7df 100644 --- a/lib/data/dao/game_dao.dart +++ b/lib/data/dao/game_dao.dart @@ -41,6 +41,27 @@ class GameDao extends DatabaseAccessor with _$GameDaoMixin { ); } + Future addGame(Game game) async { + await db.transaction(() async { + for (final p in game.players ?? []) { + await db.playerDao.addPlayer(p); + await db.playerGameDao.addPlayerToGame(game.id, p.id); + } + if (game.group != null) { + await db.groupDao.addGroup(game.group!); + await db.groupGameDao.addGroupToGame(game.id, game.group!.id); + } + await into(gameTable).insert( + GameTableCompanion.insert( + id: game.id, + name: game.name, + winnerId: Value(game.winner), + ), + mode: InsertMode.insertOrReplace, + ); + }); + } + /// Retrieves the number of games in the database. Future getGameCount() async { final count = diff --git a/lib/data/dao/group_dao.dart b/lib/data/dao/group_dao.dart index a92247a..ace60c4 100644 --- a/lib/data/dao/group_dao.dart +++ b/lib/data/dao/group_dao.dart @@ -32,11 +32,26 @@ class GroupDao extends DatabaseAccessor with _$GroupDaoMixin { } /// Adds a new group with the given [id] and [name] to the database. - /// Returns `true` if more than 0 rows were affected, otherwise `false`. - Future addGroup(String id, String name) async { - await into( - groupTable, - ).insert(GroupTableCompanion.insert(id: id, name: name)); + /// This method also adds the group's members to the [PlayerGroupTable]. + Future addGroup(Group group) async { + await db.transaction(() async { + await into( + groupTable, + ).insert(GroupTableCompanion.insert(id: group.id, name: group.name)); + await db.batch( + (b) => b.insertAll( + db.playerGroupTable, + group.members + .map( + (member) => PlayerGroupTableCompanion.insert( + playerId: member.id, + groupId: group.id, + ), + ) + .toList(), + ), + ); + }); } /// Deletes the group with the given [id] from the database. diff --git a/lib/data/dao/group_game_dao.dart b/lib/data/dao/group_game_dao.dart index 851e032..b29db1c 100644 --- a/lib/data/dao/group_game_dao.dart +++ b/lib/data/dao/group_game_dao.dart @@ -30,4 +30,12 @@ class GroupGameDao extends DatabaseAccessor final group = await db.groupDao.getGroupById(result.groupId); return group; } + + /// Associates a group with a game by inserting a record into the + /// [GroupGameTable]. + Future addGroupToGame(String gameId, String groupId) async { + await into( + groupGameTable, + ).insert(GroupGameTableCompanion.insert(groupId: groupId, gameId: gameId)); + } } diff --git a/lib/data/dao/player_game_dao.dart b/lib/data/dao/player_game_dao.dart index c05edd1..e597462 100644 --- a/lib/data/dao/player_game_dao.dart +++ b/lib/data/dao/player_game_dao.dart @@ -37,4 +37,12 @@ class PlayerGameDao extends DatabaseAccessor final players = await Future.wait(futures); return players.whereType().toList(); } + + /// Associates a player with a game by inserting a record into the + /// [PlayerGameTable]. + Future addPlayerToGame(String gameId, String playerId) async { + await into(playerGameTable).insert( + PlayerGameTableCompanion.insert(playerId: playerId, gameId: gameId), + ); + } } diff --git a/lib/data/db/tables/game_table.dart b/lib/data/db/tables/game_table.dart index 0772647..2c42213 100644 --- a/lib/data/db/tables/game_table.dart +++ b/lib/data/db/tables/game_table.dart @@ -3,6 +3,7 @@ import 'package:drift/drift.dart'; class GameTable extends Table { TextColumn get id => text()(); TextColumn get name => text()(); + // todo: winner id needs to be deleted when corresponding player gets deleted TextColumn get winnerId => text().nullable()(); @override From ca40ae668dc2f4e5a32d1c0b3e0d9c950d8280d3 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 12 Nov 2025 13:11:48 +0100 Subject: [PATCH 11/21] Updated methods with named parameters --- lib/data/dao/game_dao.dart | 20 +++++++++-------- lib/data/dao/group_dao.dart | 15 ++++++++----- lib/data/dao/group_game_dao.dart | 6 ++--- lib/data/dao/player_dao.dart | 35 +++++++++++++++++++----------- lib/data/dao/player_game_dao.dart | 11 ++++++---- lib/data/dao/player_group_dao.dart | 14 ++++++++---- 6 files changed, 62 insertions(+), 39 deletions(-) diff --git a/lib/data/dao/game_dao.dart b/lib/data/dao/game_dao.dart index ba9c7df..775c509 100644 --- a/lib/data/dao/game_dao.dart +++ b/lib/data/dao/game_dao.dart @@ -19,17 +19,17 @@ class GameDao extends DatabaseAccessor with _$GameDaoMixin { } /// Retrieves a [Game] by its [gameId]. - Future getGameById(String gameId) async { + Future getGameById({required String gameId}) async { final query = select(gameTable)..where((g) => g.id.equals(gameId)); final result = await query.getSingle(); List? players; - if (await db.playerGameDao.hasGamePlayers(gameId)) { - players = await db.playerGameDao.getPlayersByGameId(gameId); + if (await db.playerGameDao.hasGamePlayers(gameId: gameId)) { + players = await db.playerGameDao.getPlayersByGameId(gameId: gameId); } Group? group; - if (await db.groupGameDao.hasGameGroup(gameId)) { - group = await db.groupGameDao.getGroupByGameId(gameId); + if (await db.groupGameDao.hasGameGroup(gameId: gameId)) { + group = await db.groupGameDao.getGroupByGameId(gameId: gameId); } return Game( @@ -41,14 +41,16 @@ class GameDao extends DatabaseAccessor with _$GameDaoMixin { ); } - Future addGame(Game game) async { + /// Adds a new [Game] to the database. + /// Also adds associated players and group if they exist. + Future addGame({required Game game}) async { await db.transaction(() async { for (final p in game.players ?? []) { - await db.playerDao.addPlayer(p); - await db.playerGameDao.addPlayerToGame(game.id, p.id); + await db.playerDao.addPlayer(player: p); + await db.playerGameDao.addPlayerToGame(gameId: game.id, playerId: p.id); } if (game.group != null) { - await db.groupDao.addGroup(game.group!); + await db.groupDao.addGroup(group: game.group!); await db.groupGameDao.addGroupToGame(game.id, game.group!.id); } await into(gameTable).insert( diff --git a/lib/data/dao/group_dao.dart b/lib/data/dao/group_dao.dart index ace60c4..d449326 100644 --- a/lib/data/dao/group_dao.dart +++ b/lib/data/dao/group_dao.dart @@ -20,12 +20,12 @@ class GroupDao extends DatabaseAccessor with _$GroupDaoMixin { } /// Retrieves a [Group] by its [groupId], including its members. - Future getGroupById(String groupId) async { + Future getGroupById({required String groupId}) async { final query = select(groupTable)..where((g) => g.id.equals(groupId)); final result = await query.getSingle(); List members = await db.playerGroupDao.getPlayersOfGroupById( - groupId, + groupId: groupId, ); return Group(id: result.id, name: result.name, members: members); @@ -33,7 +33,7 @@ class GroupDao extends DatabaseAccessor with _$GroupDaoMixin { /// Adds a new group with the given [id] and [name] to the database. /// This method also adds the group's members to the [PlayerGroupTable]. - Future addGroup(Group group) async { + Future addGroup({required Group group}) async { await db.transaction(() async { await into( groupTable, @@ -56,15 +56,18 @@ class GroupDao extends DatabaseAccessor with _$GroupDaoMixin { /// Deletes the group with the given [id] from the database. /// Returns `true` if more than 0 rows were affected, otherwise `false`. - Future deleteGroup(String id) async { - final query = (delete(groupTable)..where((g) => g.id.equals(id))); + Future deleteGroup({required String groupId}) async { + final query = (delete(groupTable)..where((g) => g.id.equals(groupId))); final rowsAffected = await query.go(); return rowsAffected > 0; } /// Updates the name of the group with the given [id] to [newName]. /// Returns `true` if more than 0 rows were affected, otherwise `false`. - Future updateGroupname(String id, String newName) async { + Future updateGroupname({ + required String id, + required String newName, + }) async { final rowsAffected = await (update(groupTable)..where((g) => g.id.equals(id))).write( GroupTableCompanion(name: Value(newName)), diff --git a/lib/data/dao/group_game_dao.dart b/lib/data/dao/group_game_dao.dart index b29db1c..88b8fad 100644 --- a/lib/data/dao/group_game_dao.dart +++ b/lib/data/dao/group_game_dao.dart @@ -12,7 +12,7 @@ class GroupGameDao extends DatabaseAccessor /// Checks if there is a group associated with the given [gameId]. /// Returns `true` if there is a group, otherwise `false`. - Future hasGameGroup(String gameId) async { + Future hasGameGroup({required String gameId}) async { final count = await (selectOnly(groupGameTable) ..where(groupGameTable.gameId.equals(gameId)) @@ -22,12 +22,12 @@ class GroupGameDao extends DatabaseAccessor return (count ?? 0) > 0; } - Future getGroupByGameId(String gameId) async { + Future getGroupByGameId({required String gameId}) async { final result = await (select( groupGameTable, )..where((g) => g.gameId.equals(gameId))).getSingle(); - final group = await db.groupDao.getGroupById(result.groupId); + final group = await db.groupDao.getGroupById(groupId: result.groupId); return group; } diff --git a/lib/data/dao/player_dao.dart b/lib/data/dao/player_dao.dart index 2d3c0ab..01e7163 100644 --- a/lib/data/dao/player_dao.dart +++ b/lib/data/dao/player_dao.dart @@ -17,38 +17,47 @@ class PlayerDao extends DatabaseAccessor with _$PlayerDaoMixin { } /// Retrieves a [Player] by their [id]. - Future getPlayerById(String id) async { - final query = select(playerTable)..where((p) => p.id.equals(id)); + Future getPlayerById({required String playerId}) async { + final query = select(playerTable)..where((p) => p.id.equals(playerId)); final result = await query.getSingle(); return Player(id: result.id, name: result.name); } /// Adds a new [player] to the database. - Future addPlayer(Player player) async { - await into( - playerTable, - ).insert(PlayerTableCompanion.insert(id: player.id, name: player.name)); + /// If a player with the same ID already exists, updates their name to + /// the new one. + Future addPlayer({required Player player}) async { + if (!await playerExists(playerId: player.id)) { + await into( + playerTable, + ).insert(PlayerTableCompanion.insert(id: player.id, name: player.name)); + } else { + await updatePlayername(playerId: player.id, newName: player.name); + } } /// Deletes the player with the given [id] from the database. /// Returns `true` if the player was deleted, `false` if the player did not exist. - Future deletePlayer(String id) async { - final query = delete(playerTable)..where((p) => p.id.equals(id)); + Future deletePlayer({required String playerId}) async { + final query = delete(playerTable)..where((p) => p.id.equals(playerId)); final rowsAffected = await query.go(); return rowsAffected > 0; } /// Checks if a player with the given [id] exists in the database. /// Returns `true` if the player exists, `false` otherwise. - Future playerExists(String id) async { - final query = select(playerTable)..where((p) => p.id.equals(id)); + Future playerExists({required String playerId}) async { + final query = select(playerTable)..where((p) => p.id.equals(playerId)); final result = await query.getSingleOrNull(); return result != null; } - /// Updates the name of the player with the given [id] to [newName]. - Future updatePlayername(String id, String newName) async { - await (update(playerTable)..where((p) => p.id.equals(id))).write( + /// Updates the name of the player with the given [playerId] to [newName]. + Future updatePlayername({ + required String playerId, + required String newName, + }) async { + await (update(playerTable)..where((p) => p.id.equals(playerId))).write( PlayerTableCompanion(name: Value(newName)), ); } diff --git a/lib/data/dao/player_game_dao.dart b/lib/data/dao/player_game_dao.dart index e597462..333dc28 100644 --- a/lib/data/dao/player_game_dao.dart +++ b/lib/data/dao/player_game_dao.dart @@ -12,7 +12,7 @@ class PlayerGameDao extends DatabaseAccessor /// Checks if there are any players associated with the given [gameId]. /// Returns `true` if there are players, otherwise `false`. - Future hasGamePlayers(String gameId) async { + Future hasGamePlayers({required String gameId}) async { final count = await (selectOnly(playerGameTable) ..where(playerGameTable.gameId.equals(gameId)) @@ -24,7 +24,7 @@ class PlayerGameDao extends DatabaseAccessor /// Retrieves a list of [Player]s associated with the given [gameId]. /// Returns an empty list if no players are found. - Future> getPlayersByGameId(String gameId) async { + Future> getPlayersByGameId({required String gameId}) async { final result = await (select( playerGameTable, )..where((p) => p.gameId.equals(gameId))).get(); @@ -32,7 +32,7 @@ class PlayerGameDao extends DatabaseAccessor if (result.isEmpty) return []; final futures = result.map( - (row) => db.playerDao.getPlayerById(row.playerId), + (row) => db.playerDao.getPlayerById(playerId: row.playerId), ); final players = await Future.wait(futures); return players.whereType().toList(); @@ -40,7 +40,10 @@ class PlayerGameDao extends DatabaseAccessor /// Associates a player with a game by inserting a record into the /// [PlayerGameTable]. - Future addPlayerToGame(String gameId, String playerId) async { + Future addPlayerToGame({ + required String gameId, + required String playerId, + }) async { await into(playerGameTable).insert( PlayerGameTableCompanion.insert(playerId: playerId, gameId: gameId), ); diff --git a/lib/data/dao/player_group_dao.dart b/lib/data/dao/player_group_dao.dart index e51c325..5b2a095 100644 --- a/lib/data/dao/player_group_dao.dart +++ b/lib/data/dao/player_group_dao.dart @@ -11,7 +11,7 @@ class PlayerGroupDao extends DatabaseAccessor PlayerGroupDao(super.db); /// Retrieves all players belonging to a specific group by [groupId]. - Future> getPlayersOfGroupById(String groupId) async { + Future> getPlayersOfGroupById({required String groupId}) async { final query = select(playerGroupTable) ..where((pG) => pG.groupId.equals(groupId)); final result = await query.get(); @@ -19,7 +19,7 @@ class PlayerGroupDao extends DatabaseAccessor List groupMembers = []; for (var entry in result) { - final player = await db.playerDao.getPlayerById(entry.playerId); + final player = await db.playerDao.getPlayerById(playerId: entry.playerId); groupMembers.add(player); } @@ -28,7 +28,10 @@ class PlayerGroupDao extends DatabaseAccessor /// Removes a player from a group based on [playerId] and [groupId]. /// Returns `true` if more than 0 rows were affected, otherwise `false`. - Future removePlayerFromGroup(String playerId, String groupId) async { + Future removePlayerFromGroup({ + required String playerId, + required String groupId, + }) async { final query = delete(playerGroupTable) ..where((p) => p.playerId.equals(playerId) & p.groupId.equals(groupId)); final rowsAffected = await query.go(); @@ -36,7 +39,10 @@ class PlayerGroupDao extends DatabaseAccessor } /// Adds a player to a group with the given [playerId] and [groupId]. - Future addPlayerToGroup(String playerId, String groupId) async { + Future addPlayerToGroup({ + required String playerId, + required String groupId, + }) async { await into(playerGroupTable).insert( PlayerGroupTableCompanion.insert(playerId: playerId, groupId: groupId), ); From ac99217b72f8c7cba43bf68bf58f6a7b9c52f776 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 12 Nov 2025 13:12:26 +0100 Subject: [PATCH 12/21] Added reference on winner --- lib/data/db/tables/game_table.dart | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/data/db/tables/game_table.dart b/lib/data/db/tables/game_table.dart index 2c42213..9651a79 100644 --- a/lib/data/db/tables/game_table.dart +++ b/lib/data/db/tables/game_table.dart @@ -1,10 +1,11 @@ import 'package:drift/drift.dart'; +import 'package:game_tracker/data/db/tables/player_table.dart'; class GameTable extends Table { TextColumn get id => text()(); TextColumn get name => text()(); - // todo: winner id needs to be deleted when corresponding player gets deleted - TextColumn get winnerId => text().nullable()(); + TextColumn get winnerId => + text().references(PlayerTable, #id, onDelete: KeyAction.cascade)(); @override Set> get primaryKey => {id}; From 67d5f7e8919cf1c60c5c770005300166dac89bc8 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 12 Nov 2025 20:01:31 +0100 Subject: [PATCH 13/21] Updated order --- lib/data/db/database.dart | 4 +- lib/data/db/database.g.dart | 1369 +++++++++++++++++++++-------------- 2 files changed, 817 insertions(+), 556 deletions(-) diff --git a/lib/data/db/database.dart b/lib/data/db/database.dart index b0662aa..73ad73e 100644 --- a/lib/data/db/database.dart +++ b/lib/data/db/database.dart @@ -20,14 +20,14 @@ part 'database.g.dart'; tables: [ PlayerTable, GroupTable, + GameTable, PlayerGroupTable, PlayerGameTable, GroupGameTable, - GameTable, ], daos: [ - GroupDao, PlayerDao, + GroupDao, GameDao, PlayerGroupDao, PlayerGameDao, diff --git a/lib/data/db/database.g.dart b/lib/data/db/database.g.dart index 74efba1..453fcb0 100644 --- a/lib/data/db/database.g.dart +++ b/lib/data/db/database.g.dart @@ -413,6 +413,268 @@ class GroupTableCompanion extends UpdateCompanion { } } +class $GameTableTable extends GameTable + with TableInfo<$GameTableTable, GameTableData> { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + $GameTableTable(this.attachedDatabase, [this._alias]); + static const VerificationMeta _idMeta = const VerificationMeta('id'); + @override + late final GeneratedColumn id = GeneratedColumn( + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _nameMeta = const VerificationMeta('name'); + @override + late final GeneratedColumn name = GeneratedColumn( + 'name', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _winnerIdMeta = const VerificationMeta( + 'winnerId', + ); + @override + late final GeneratedColumn winnerId = GeneratedColumn( + 'winner_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'REFERENCES player_table (id) ON DELETE CASCADE', + ), + ); + @override + List get $columns => [id, name, winnerId]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'game_table'; + @override + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { + final context = VerificationContext(); + final data = instance.toColumns(true); + if (data.containsKey('id')) { + context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); + } else if (isInserting) { + context.missing(_idMeta); + } + if (data.containsKey('name')) { + context.handle( + _nameMeta, + name.isAcceptableOrUnknown(data['name']!, _nameMeta), + ); + } else if (isInserting) { + context.missing(_nameMeta); + } + if (data.containsKey('winner_id')) { + context.handle( + _winnerIdMeta, + winnerId.isAcceptableOrUnknown(data['winner_id']!, _winnerIdMeta), + ); + } else if (isInserting) { + context.missing(_winnerIdMeta); + } + return context; + } + + @override + Set get $primaryKey => {id}; + @override + GameTableData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return GameTableData( + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + name: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}name'], + )!, + winnerId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}winner_id'], + )!, + ); + } + + @override + $GameTableTable createAlias(String alias) { + return $GameTableTable(attachedDatabase, alias); + } +} + +class GameTableData extends DataClass implements Insertable { + final String id; + final String name; + final String winnerId; + const GameTableData({ + required this.id, + required this.name, + required this.winnerId, + }); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['id'] = Variable(id); + map['name'] = Variable(name); + map['winner_id'] = Variable(winnerId); + return map; + } + + GameTableCompanion toCompanion(bool nullToAbsent) { + return GameTableCompanion( + id: Value(id), + name: Value(name), + winnerId: Value(winnerId), + ); + } + + factory GameTableData.fromJson( + Map json, { + ValueSerializer? serializer, + }) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return GameTableData( + id: serializer.fromJson(json['id']), + name: serializer.fromJson(json['name']), + winnerId: serializer.fromJson(json['winnerId']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'id': serializer.toJson(id), + 'name': serializer.toJson(name), + 'winnerId': serializer.toJson(winnerId), + }; + } + + GameTableData copyWith({String? id, String? name, String? winnerId}) => + GameTableData( + id: id ?? this.id, + name: name ?? this.name, + winnerId: winnerId ?? this.winnerId, + ); + GameTableData copyWithCompanion(GameTableCompanion data) { + return GameTableData( + id: data.id.present ? data.id.value : this.id, + name: data.name.present ? data.name.value : this.name, + winnerId: data.winnerId.present ? data.winnerId.value : this.winnerId, + ); + } + + @override + String toString() { + return (StringBuffer('GameTableData(') + ..write('id: $id, ') + ..write('name: $name, ') + ..write('winnerId: $winnerId') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash(id, name, winnerId); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is GameTableData && + other.id == this.id && + other.name == this.name && + other.winnerId == this.winnerId); +} + +class GameTableCompanion extends UpdateCompanion { + final Value id; + final Value name; + final Value winnerId; + final Value rowid; + const GameTableCompanion({ + this.id = const Value.absent(), + this.name = const Value.absent(), + this.winnerId = const Value.absent(), + this.rowid = const Value.absent(), + }); + GameTableCompanion.insert({ + required String id, + required String name, + required String winnerId, + this.rowid = const Value.absent(), + }) : id = Value(id), + name = Value(name), + winnerId = Value(winnerId); + static Insertable custom({ + Expression? id, + Expression? name, + Expression? winnerId, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (id != null) 'id': id, + if (name != null) 'name': name, + if (winnerId != null) 'winner_id': winnerId, + if (rowid != null) 'rowid': rowid, + }); + } + + GameTableCompanion copyWith({ + Value? id, + Value? name, + Value? winnerId, + Value? rowid, + }) { + return GameTableCompanion( + id: id ?? this.id, + name: name ?? this.name, + winnerId: winnerId ?? this.winnerId, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (id.present) { + map['id'] = Variable(id.value); + } + if (name.present) { + map['name'] = Variable(name.value); + } + if (winnerId.present) { + map['winner_id'] = Variable(winnerId.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('GameTableCompanion(') + ..write('id: $id, ') + ..write('name: $name, ') + ..write('winnerId: $winnerId, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + class $PlayerGroupTableTable extends PlayerGroupTable with TableInfo<$PlayerGroupTableTable, PlayerGroupTableData> { @override @@ -430,7 +692,7 @@ class $PlayerGroupTableTable extends PlayerGroupTable type: DriftSqlType.string, requiredDuringInsert: true, defaultConstraints: GeneratedColumn.constraintIsAlways( - 'REFERENCES player_table (id)', + 'REFERENCES player_table (id) ON DELETE CASCADE', ), ); static const VerificationMeta _groupIdMeta = const VerificationMeta( @@ -444,7 +706,7 @@ class $PlayerGroupTableTable extends PlayerGroupTable type: DriftSqlType.string, requiredDuringInsert: true, defaultConstraints: GeneratedColumn.constraintIsAlways( - 'REFERENCES group_table (id)', + 'REFERENCES group_table (id) ON DELETE CASCADE', ), ); @override @@ -655,7 +917,7 @@ class $PlayerGameTableTable extends PlayerGameTable type: DriftSqlType.string, requiredDuringInsert: true, defaultConstraints: GeneratedColumn.constraintIsAlways( - 'REFERENCES player_table (id)', + 'REFERENCES player_table (id) ON DELETE CASCADE', ), ); static const VerificationMeta _gameIdMeta = const VerificationMeta('gameId'); @@ -667,7 +929,7 @@ class $PlayerGameTableTable extends PlayerGameTable type: DriftSqlType.string, requiredDuringInsert: true, defaultConstraints: GeneratedColumn.constraintIsAlways( - 'REFERENCES group_table (id)', + 'REFERENCES game_table (id) ON DELETE CASCADE', ), ); @override @@ -878,7 +1140,7 @@ class $GroupGameTableTable extends GroupGameTable type: DriftSqlType.string, requiredDuringInsert: true, defaultConstraints: GeneratedColumn.constraintIsAlways( - 'REFERENCES player_table (id)', + 'REFERENCES player_table (id) ON DELETE CASCADE', ), ); static const VerificationMeta _gameIdMeta = const VerificationMeta('gameId'); @@ -890,7 +1152,7 @@ class $GroupGameTableTable extends GroupGameTable type: DriftSqlType.string, requiredDuringInsert: true, defaultConstraints: GeneratedColumn.constraintIsAlways( - 'REFERENCES group_table (id)', + 'REFERENCES group_table (id) ON DELETE CASCADE', ), ); @override @@ -1084,270 +1346,12 @@ class GroupGameTableCompanion extends UpdateCompanion { } } -class $GameTableTable extends GameTable - with TableInfo<$GameTableTable, GameTableData> { - @override - final GeneratedDatabase attachedDatabase; - final String? _alias; - $GameTableTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _idMeta = const VerificationMeta('id'); - @override - late final GeneratedColumn id = GeneratedColumn( - 'id', - aliasedName, - false, - type: DriftSqlType.string, - requiredDuringInsert: true, - ); - static const VerificationMeta _nameMeta = const VerificationMeta('name'); - @override - late final GeneratedColumn name = GeneratedColumn( - 'name', - aliasedName, - false, - type: DriftSqlType.string, - requiredDuringInsert: true, - ); - static const VerificationMeta _winnerIdMeta = const VerificationMeta( - 'winnerId', - ); - @override - late final GeneratedColumn winnerId = GeneratedColumn( - 'winner_id', - aliasedName, - true, - type: DriftSqlType.string, - requiredDuringInsert: false, - ); - @override - List get $columns => [id, name, winnerId]; - @override - String get aliasedName => _alias ?? actualTableName; - @override - String get actualTableName => $name; - static const String $name = 'game_table'; - @override - VerificationContext validateIntegrity( - Insertable instance, { - bool isInserting = false, - }) { - final context = VerificationContext(); - final data = instance.toColumns(true); - if (data.containsKey('id')) { - context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); - } else if (isInserting) { - context.missing(_idMeta); - } - if (data.containsKey('name')) { - context.handle( - _nameMeta, - name.isAcceptableOrUnknown(data['name']!, _nameMeta), - ); - } else if (isInserting) { - context.missing(_nameMeta); - } - if (data.containsKey('winner_id')) { - context.handle( - _winnerIdMeta, - winnerId.isAcceptableOrUnknown(data['winner_id']!, _winnerIdMeta), - ); - } - return context; - } - - @override - Set get $primaryKey => {id}; - @override - GameTableData map(Map data, {String? tablePrefix}) { - final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; - return GameTableData( - id: attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}id'], - )!, - name: attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}name'], - )!, - winnerId: attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}winner_id'], - ), - ); - } - - @override - $GameTableTable createAlias(String alias) { - return $GameTableTable(attachedDatabase, alias); - } -} - -class GameTableData extends DataClass implements Insertable { - final String id; - final String name; - final String? winnerId; - const GameTableData({required this.id, required this.name, this.winnerId}); - @override - Map toColumns(bool nullToAbsent) { - final map = {}; - map['id'] = Variable(id); - map['name'] = Variable(name); - if (!nullToAbsent || winnerId != null) { - map['winner_id'] = Variable(winnerId); - } - return map; - } - - GameTableCompanion toCompanion(bool nullToAbsent) { - return GameTableCompanion( - id: Value(id), - name: Value(name), - winnerId: winnerId == null && nullToAbsent - ? const Value.absent() - : Value(winnerId), - ); - } - - factory GameTableData.fromJson( - Map json, { - ValueSerializer? serializer, - }) { - serializer ??= driftRuntimeOptions.defaultSerializer; - return GameTableData( - id: serializer.fromJson(json['id']), - name: serializer.fromJson(json['name']), - winnerId: serializer.fromJson(json['winnerId']), - ); - } - @override - Map toJson({ValueSerializer? serializer}) { - serializer ??= driftRuntimeOptions.defaultSerializer; - return { - 'id': serializer.toJson(id), - 'name': serializer.toJson(name), - 'winnerId': serializer.toJson(winnerId), - }; - } - - GameTableData copyWith({ - String? id, - String? name, - Value winnerId = const Value.absent(), - }) => GameTableData( - id: id ?? this.id, - name: name ?? this.name, - winnerId: winnerId.present ? winnerId.value : this.winnerId, - ); - GameTableData copyWithCompanion(GameTableCompanion data) { - return GameTableData( - id: data.id.present ? data.id.value : this.id, - name: data.name.present ? data.name.value : this.name, - winnerId: data.winnerId.present ? data.winnerId.value : this.winnerId, - ); - } - - @override - String toString() { - return (StringBuffer('GameTableData(') - ..write('id: $id, ') - ..write('name: $name, ') - ..write('winnerId: $winnerId') - ..write(')')) - .toString(); - } - - @override - int get hashCode => Object.hash(id, name, winnerId); - @override - bool operator ==(Object other) => - identical(this, other) || - (other is GameTableData && - other.id == this.id && - other.name == this.name && - other.winnerId == this.winnerId); -} - -class GameTableCompanion extends UpdateCompanion { - final Value id; - final Value name; - final Value winnerId; - final Value rowid; - const GameTableCompanion({ - this.id = const Value.absent(), - this.name = const Value.absent(), - this.winnerId = const Value.absent(), - this.rowid = const Value.absent(), - }); - GameTableCompanion.insert({ - required String id, - required String name, - this.winnerId = const Value.absent(), - this.rowid = const Value.absent(), - }) : id = Value(id), - name = Value(name); - static Insertable custom({ - Expression? id, - Expression? name, - Expression? winnerId, - Expression? rowid, - }) { - return RawValuesInsertable({ - if (id != null) 'id': id, - if (name != null) 'name': name, - if (winnerId != null) 'winner_id': winnerId, - if (rowid != null) 'rowid': rowid, - }); - } - - GameTableCompanion copyWith({ - Value? id, - Value? name, - Value? winnerId, - Value? rowid, - }) { - return GameTableCompanion( - id: id ?? this.id, - name: name ?? this.name, - winnerId: winnerId ?? this.winnerId, - rowid: rowid ?? this.rowid, - ); - } - - @override - Map toColumns(bool nullToAbsent) { - final map = {}; - if (id.present) { - map['id'] = Variable(id.value); - } - if (name.present) { - map['name'] = Variable(name.value); - } - if (winnerId.present) { - map['winner_id'] = Variable(winnerId.value); - } - if (rowid.present) { - map['rowid'] = Variable(rowid.value); - } - return map; - } - - @override - String toString() { - return (StringBuffer('GameTableCompanion(') - ..write('id: $id, ') - ..write('name: $name, ') - ..write('winnerId: $winnerId, ') - ..write('rowid: $rowid') - ..write(')')) - .toString(); - } -} - abstract class _$AppDatabase extends GeneratedDatabase { _$AppDatabase(QueryExecutor e) : super(e); $AppDatabaseManager get managers => $AppDatabaseManager(this); late final $PlayerTableTable playerTable = $PlayerTableTable(this); late final $GroupTableTable groupTable = $GroupTableTable(this); + late final $GameTableTable gameTable = $GameTableTable(this); late final $PlayerGroupTableTable playerGroupTable = $PlayerGroupTableTable( this, ); @@ -1355,7 +1359,6 @@ abstract class _$AppDatabase extends GeneratedDatabase { this, ); late final $GroupGameTableTable groupGameTable = $GroupGameTableTable(this); - late final $GameTableTable gameTable = $GameTableTable(this); late final GroupDao groupDao = GroupDao(this as AppDatabase); late final PlayerDao playerDao = PlayerDao(this as AppDatabase); late final GameDao gameDao = GameDao(this as AppDatabase); @@ -1371,11 +1374,63 @@ abstract class _$AppDatabase extends GeneratedDatabase { List get allSchemaEntities => [ playerTable, groupTable, + gameTable, playerGroupTable, playerGameTable, groupGameTable, - gameTable, ]; + @override + StreamQueryUpdateRules get streamUpdateRules => const StreamQueryUpdateRules([ + WritePropagation( + on: TableUpdateQuery.onTableName( + 'player_table', + limitUpdateKind: UpdateKind.delete, + ), + result: [TableUpdate('game_table', kind: UpdateKind.delete)], + ), + WritePropagation( + on: TableUpdateQuery.onTableName( + 'player_table', + limitUpdateKind: UpdateKind.delete, + ), + result: [TableUpdate('player_group_table', kind: UpdateKind.delete)], + ), + WritePropagation( + on: TableUpdateQuery.onTableName( + 'group_table', + limitUpdateKind: UpdateKind.delete, + ), + result: [TableUpdate('player_group_table', kind: UpdateKind.delete)], + ), + WritePropagation( + on: TableUpdateQuery.onTableName( + 'player_table', + limitUpdateKind: UpdateKind.delete, + ), + result: [TableUpdate('player_game_table', kind: UpdateKind.delete)], + ), + WritePropagation( + on: TableUpdateQuery.onTableName( + 'game_table', + limitUpdateKind: UpdateKind.delete, + ), + result: [TableUpdate('player_game_table', kind: UpdateKind.delete)], + ), + WritePropagation( + on: TableUpdateQuery.onTableName( + 'player_table', + limitUpdateKind: UpdateKind.delete, + ), + result: [TableUpdate('group_game_table', kind: UpdateKind.delete)], + ), + WritePropagation( + on: TableUpdateQuery.onTableName( + 'group_table', + limitUpdateKind: UpdateKind.delete, + ), + result: [TableUpdate('group_game_table', kind: UpdateKind.delete)], + ), + ]); } typedef $$PlayerTableTableCreateCompanionBuilder = @@ -1395,6 +1450,24 @@ final class $$PlayerTableTableReferences extends BaseReferences<_$AppDatabase, $PlayerTableTable, PlayerTableData> { $$PlayerTableTableReferences(super.$_db, super.$_table, super.$_typedResult); + static MultiTypedResultKey<$GameTableTable, List> + _gameTableRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( + db.gameTable, + aliasName: $_aliasNameGenerator(db.playerTable.id, db.gameTable.winnerId), + ); + + $$GameTableTableProcessedTableManager get gameTableRefs { + final manager = $$GameTableTableTableManager( + $_db, + $_db.gameTable, + ).filter((f) => f.winnerId.id.sqlEquals($_itemColumn('id')!)); + + final cache = $_typedResult.readTableOrNull(_gameTableRefsTable($_db)); + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: cache), + ); + } + static MultiTypedResultKey<$PlayerGroupTableTable, List> _playerGroupTableRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( db.playerGroupTable, @@ -1482,6 +1555,31 @@ class $$PlayerTableTableFilterComposer builder: (column) => ColumnFilters(column), ); + Expression gameTableRefs( + Expression Function($$GameTableTableFilterComposer f) f, + ) { + final $$GameTableTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.gameTable, + getReferencedColumn: (t) => t.winnerId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GameTableTableFilterComposer( + $db: $db, + $table: $db.gameTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } + Expression playerGroupTableRefs( Expression Function($$PlayerGroupTableTableFilterComposer f) f, ) { @@ -1593,6 +1691,31 @@ class $$PlayerTableTableAnnotationComposer GeneratedColumn get name => $composableBuilder(column: $table.name, builder: (column) => column); + Expression gameTableRefs( + Expression Function($$GameTableTableAnnotationComposer a) f, + ) { + final $$GameTableTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.gameTable, + getReferencedColumn: (t) => t.winnerId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GameTableTableAnnotationComposer( + $db: $db, + $table: $db.gameTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } + Expression playerGroupTableRefs( Expression Function($$PlayerGroupTableTableAnnotationComposer a) f, ) { @@ -1683,6 +1806,7 @@ class $$PlayerTableTableTableManager (PlayerTableData, $$PlayerTableTableReferences), PlayerTableData, PrefetchHooks Function({ + bool gameTableRefs, bool playerGroupTableRefs, bool playerGameTableRefs, bool groupGameTableRefs, @@ -1722,6 +1846,7 @@ class $$PlayerTableTableTableManager .toList(), prefetchHooksCallback: ({ + gameTableRefs = false, playerGroupTableRefs = false, playerGameTableRefs = false, groupGameTableRefs = false, @@ -1729,6 +1854,7 @@ class $$PlayerTableTableTableManager return PrefetchHooks( db: db, explicitlyWatchedTables: [ + if (gameTableRefs) db.gameTable, if (playerGroupTableRefs) db.playerGroupTable, if (playerGameTableRefs) db.playerGameTable, if (groupGameTableRefs) db.groupGameTable, @@ -1736,6 +1862,27 @@ class $$PlayerTableTableTableManager addJoins: null, getPrefetchedDataCallback: (items) async { return [ + if (gameTableRefs) + await $_getPrefetchedData< + PlayerTableData, + $PlayerTableTable, + GameTableData + >( + currentTable: table, + referencedTable: $$PlayerTableTableReferences + ._gameTableRefsTable(db), + managerFromTypedResult: (p0) => + $$PlayerTableTableReferences( + db, + table, + p0, + ).gameTableRefs, + referencedItemsForCurrentItem: + (item, referencedItems) => referencedItems.where( + (e) => e.winnerId == item.id, + ), + typedResults: items, + ), if (playerGroupTableRefs) await $_getPrefetchedData< PlayerTableData, @@ -1820,6 +1967,7 @@ typedef $$PlayerTableTableProcessedTableManager = (PlayerTableData, $$PlayerTableTableReferences), PlayerTableData, PrefetchHooks Function({ + bool gameTableRefs, bool playerGroupTableRefs, bool playerGameTableRefs, bool groupGameTableRefs, @@ -1865,29 +2013,6 @@ final class $$GroupTableTableReferences ); } - static MultiTypedResultKey<$PlayerGameTableTable, List> - _playerGameTableRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( - db.playerGameTable, - aliasName: $_aliasNameGenerator( - db.groupTable.id, - db.playerGameTable.gameId, - ), - ); - - $$PlayerGameTableTableProcessedTableManager get playerGameTableRefs { - final manager = $$PlayerGameTableTableTableManager( - $_db, - $_db.playerGameTable, - ).filter((f) => f.gameId.id.sqlEquals($_itemColumn('id')!)); - - final cache = $_typedResult.readTableOrNull( - _playerGameTableRefsTable($_db), - ); - return ProcessedTableManager( - manager.$state.copyWith(prefetchedData: cache), - ); - } - static MultiTypedResultKey<$GroupGameTableTable, List> _groupGameTableRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( db.groupGameTable, @@ -1951,31 +2076,6 @@ class $$GroupTableTableFilterComposer return f(composer); } - Expression playerGameTableRefs( - Expression Function($$PlayerGameTableTableFilterComposer f) f, - ) { - final $$PlayerGameTableTableFilterComposer composer = $composerBuilder( - composer: this, - getCurrentColumn: (t) => t.id, - referencedTable: $db.playerGameTable, - getReferencedColumn: (t) => t.gameId, - builder: - ( - joinBuilder, { - $addJoinBuilderToRootComposer, - $removeJoinBuilderFromRootComposer, - }) => $$PlayerGameTableTableFilterComposer( - $db: $db, - $table: $db.playerGameTable, - $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, - joinBuilder: joinBuilder, - $removeJoinBuilderFromRootComposer: - $removeJoinBuilderFromRootComposer, - ), - ); - return f(composer); - } - Expression groupGameTableRefs( Expression Function($$GroupGameTableTableFilterComposer f) f, ) { @@ -2062,31 +2162,6 @@ class $$GroupTableTableAnnotationComposer return f(composer); } - Expression playerGameTableRefs( - Expression Function($$PlayerGameTableTableAnnotationComposer a) f, - ) { - final $$PlayerGameTableTableAnnotationComposer composer = $composerBuilder( - composer: this, - getCurrentColumn: (t) => t.id, - referencedTable: $db.playerGameTable, - getReferencedColumn: (t) => t.gameId, - builder: - ( - joinBuilder, { - $addJoinBuilderToRootComposer, - $removeJoinBuilderFromRootComposer, - }) => $$PlayerGameTableTableAnnotationComposer( - $db: $db, - $table: $db.playerGameTable, - $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, - joinBuilder: joinBuilder, - $removeJoinBuilderFromRootComposer: - $removeJoinBuilderFromRootComposer, - ), - ); - return f(composer); - } - Expression groupGameTableRefs( Expression Function($$GroupGameTableTableAnnotationComposer a) f, ) { @@ -2128,7 +2203,6 @@ class $$GroupTableTableTableManager GroupTableData, PrefetchHooks Function({ bool playerGroupTableRefs, - bool playerGameTableRefs, bool groupGameTableRefs, }) > { @@ -2165,16 +2239,11 @@ class $$GroupTableTableTableManager ) .toList(), prefetchHooksCallback: - ({ - playerGroupTableRefs = false, - playerGameTableRefs = false, - groupGameTableRefs = false, - }) { + ({playerGroupTableRefs = false, groupGameTableRefs = false}) { return PrefetchHooks( db: db, explicitlyWatchedTables: [ if (playerGroupTableRefs) db.playerGroupTable, - if (playerGameTableRefs) db.playerGameTable, if (groupGameTableRefs) db.groupGameTable, ], addJoins: null, @@ -2201,27 +2270,6 @@ class $$GroupTableTableTableManager ), typedResults: items, ), - if (playerGameTableRefs) - await $_getPrefetchedData< - GroupTableData, - $GroupTableTable, - PlayerGameTableData - >( - currentTable: table, - referencedTable: $$GroupTableTableReferences - ._playerGameTableRefsTable(db), - managerFromTypedResult: (p0) => - $$GroupTableTableReferences( - db, - table, - p0, - ).playerGameTableRefs, - referencedItemsForCurrentItem: - (item, referencedItems) => referencedItems.where( - (e) => e.gameId == item.id, - ), - typedResults: items, - ), if (groupGameTableRefs) await $_getPrefetchedData< GroupTableData, @@ -2265,10 +2313,385 @@ typedef $$GroupTableTableProcessedTableManager = GroupTableData, PrefetchHooks Function({ bool playerGroupTableRefs, - bool playerGameTableRefs, bool groupGameTableRefs, }) >; +typedef $$GameTableTableCreateCompanionBuilder = + GameTableCompanion Function({ + required String id, + required String name, + required String winnerId, + Value rowid, + }); +typedef $$GameTableTableUpdateCompanionBuilder = + GameTableCompanion Function({ + Value id, + Value name, + Value winnerId, + Value rowid, + }); + +final class $$GameTableTableReferences + extends BaseReferences<_$AppDatabase, $GameTableTable, GameTableData> { + $$GameTableTableReferences(super.$_db, super.$_table, super.$_typedResult); + + static $PlayerTableTable _winnerIdTable(_$AppDatabase db) => + db.playerTable.createAlias( + $_aliasNameGenerator(db.gameTable.winnerId, db.playerTable.id), + ); + + $$PlayerTableTableProcessedTableManager get winnerId { + final $_column = $_itemColumn('winner_id')!; + + final manager = $$PlayerTableTableTableManager( + $_db, + $_db.playerTable, + ).filter((f) => f.id.sqlEquals($_column)); + final item = $_typedResult.readTableOrNull(_winnerIdTable($_db)); + if (item == null) return manager; + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: [item]), + ); + } + + static MultiTypedResultKey<$PlayerGameTableTable, List> + _playerGameTableRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( + db.playerGameTable, + aliasName: $_aliasNameGenerator(db.gameTable.id, db.playerGameTable.gameId), + ); + + $$PlayerGameTableTableProcessedTableManager get playerGameTableRefs { + final manager = $$PlayerGameTableTableTableManager( + $_db, + $_db.playerGameTable, + ).filter((f) => f.gameId.id.sqlEquals($_itemColumn('id')!)); + + final cache = $_typedResult.readTableOrNull( + _playerGameTableRefsTable($_db), + ); + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: cache), + ); + } +} + +class $$GameTableTableFilterComposer + extends Composer<_$AppDatabase, $GameTableTable> { + $$GameTableTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnFilters(column), + ); + + ColumnFilters get name => $composableBuilder( + column: $table.name, + builder: (column) => ColumnFilters(column), + ); + + $$PlayerTableTableFilterComposer get winnerId { + final $$PlayerTableTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.winnerId, + referencedTable: $db.playerTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerTableTableFilterComposer( + $db: $db, + $table: $db.playerTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } + + Expression playerGameTableRefs( + Expression Function($$PlayerGameTableTableFilterComposer f) f, + ) { + final $$PlayerGameTableTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.playerGameTable, + getReferencedColumn: (t) => t.gameId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerGameTableTableFilterComposer( + $db: $db, + $table: $db.playerGameTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } +} + +class $$GameTableTableOrderingComposer + extends Composer<_$AppDatabase, $GameTableTable> { + $$GameTableTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); + + ColumnOrderings get name => $composableBuilder( + column: $table.name, + builder: (column) => ColumnOrderings(column), + ); + + $$PlayerTableTableOrderingComposer get winnerId { + final $$PlayerTableTableOrderingComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.winnerId, + referencedTable: $db.playerTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerTableTableOrderingComposer( + $db: $db, + $table: $db.playerTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } +} + +class $$GameTableTableAnnotationComposer + extends Composer<_$AppDatabase, $GameTableTable> { + $$GameTableTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get name => + $composableBuilder(column: $table.name, builder: (column) => column); + + $$PlayerTableTableAnnotationComposer get winnerId { + final $$PlayerTableTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.winnerId, + referencedTable: $db.playerTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerTableTableAnnotationComposer( + $db: $db, + $table: $db.playerTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } + + Expression playerGameTableRefs( + Expression Function($$PlayerGameTableTableAnnotationComposer a) f, + ) { + final $$PlayerGameTableTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.playerGameTable, + getReferencedColumn: (t) => t.gameId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerGameTableTableAnnotationComposer( + $db: $db, + $table: $db.playerGameTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } +} + +class $$GameTableTableTableManager + extends + RootTableManager< + _$AppDatabase, + $GameTableTable, + GameTableData, + $$GameTableTableFilterComposer, + $$GameTableTableOrderingComposer, + $$GameTableTableAnnotationComposer, + $$GameTableTableCreateCompanionBuilder, + $$GameTableTableUpdateCompanionBuilder, + (GameTableData, $$GameTableTableReferences), + GameTableData, + PrefetchHooks Function({bool winnerId, bool playerGameTableRefs}) + > { + $$GameTableTableTableManager(_$AppDatabase db, $GameTableTable table) + : super( + TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$GameTableTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$GameTableTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$GameTableTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value name = const Value.absent(), + Value winnerId = const Value.absent(), + Value rowid = const Value.absent(), + }) => GameTableCompanion( + id: id, + name: name, + winnerId: winnerId, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String id, + required String name, + required String winnerId, + Value rowid = const Value.absent(), + }) => GameTableCompanion.insert( + id: id, + name: name, + winnerId: winnerId, + rowid: rowid, + ), + withReferenceMapper: (p0) => p0 + .map( + (e) => ( + e.readTable(table), + $$GameTableTableReferences(db, table, e), + ), + ) + .toList(), + prefetchHooksCallback: + ({winnerId = false, playerGameTableRefs = false}) { + return PrefetchHooks( + db: db, + explicitlyWatchedTables: [ + if (playerGameTableRefs) db.playerGameTable, + ], + addJoins: + < + T extends TableManagerState< + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic + > + >(state) { + if (winnerId) { + state = + state.withJoin( + currentTable: table, + currentColumn: table.winnerId, + referencedTable: $$GameTableTableReferences + ._winnerIdTable(db), + referencedColumn: $$GameTableTableReferences + ._winnerIdTable(db) + .id, + ) + as T; + } + + return state; + }, + getPrefetchedDataCallback: (items) async { + return [ + if (playerGameTableRefs) + await $_getPrefetchedData< + GameTableData, + $GameTableTable, + PlayerGameTableData + >( + currentTable: table, + referencedTable: $$GameTableTableReferences + ._playerGameTableRefsTable(db), + managerFromTypedResult: (p0) => + $$GameTableTableReferences( + db, + table, + p0, + ).playerGameTableRefs, + referencedItemsForCurrentItem: + (item, referencedItems) => referencedItems.where( + (e) => e.gameId == item.id, + ), + typedResults: items, + ), + ]; + }, + ); + }, + ), + ); +} + +typedef $$GameTableTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $GameTableTable, + GameTableData, + $$GameTableTableFilterComposer, + $$GameTableTableOrderingComposer, + $$GameTableTableAnnotationComposer, + $$GameTableTableCreateCompanionBuilder, + $$GameTableTableUpdateCompanionBuilder, + (GameTableData, $$GameTableTableReferences), + GameTableData, + PrefetchHooks Function({bool winnerId, bool playerGameTableRefs}) + >; typedef $$PlayerGroupTableTableCreateCompanionBuilder = PlayerGroupTableCompanion Function({ required String playerId, @@ -2679,17 +3102,17 @@ final class $$PlayerGameTableTableReferences ); } - static $GroupTableTable _gameIdTable(_$AppDatabase db) => - db.groupTable.createAlias( - $_aliasNameGenerator(db.playerGameTable.gameId, db.groupTable.id), + static $GameTableTable _gameIdTable(_$AppDatabase db) => + db.gameTable.createAlias( + $_aliasNameGenerator(db.playerGameTable.gameId, db.gameTable.id), ); - $$GroupTableTableProcessedTableManager get gameId { + $$GameTableTableProcessedTableManager get gameId { final $_column = $_itemColumn('game_id')!; - final manager = $$GroupTableTableTableManager( + final manager = $$GameTableTableTableManager( $_db, - $_db.groupTable, + $_db.gameTable, ).filter((f) => f.id.sqlEquals($_column)); final item = $_typedResult.readTableOrNull(_gameIdTable($_db)); if (item == null) return manager; @@ -2731,20 +3154,20 @@ class $$PlayerGameTableTableFilterComposer return composer; } - $$GroupTableTableFilterComposer get gameId { - final $$GroupTableTableFilterComposer composer = $composerBuilder( + $$GameTableTableFilterComposer get gameId { + final $$GameTableTableFilterComposer composer = $composerBuilder( composer: this, getCurrentColumn: (t) => t.gameId, - referencedTable: $db.groupTable, + referencedTable: $db.gameTable, getReferencedColumn: (t) => t.id, builder: ( joinBuilder, { $addJoinBuilderToRootComposer, $removeJoinBuilderFromRootComposer, - }) => $$GroupTableTableFilterComposer( + }) => $$GameTableTableFilterComposer( $db: $db, - $table: $db.groupTable, + $table: $db.gameTable, $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, joinBuilder: joinBuilder, $removeJoinBuilderFromRootComposer: @@ -2787,20 +3210,20 @@ class $$PlayerGameTableTableOrderingComposer return composer; } - $$GroupTableTableOrderingComposer get gameId { - final $$GroupTableTableOrderingComposer composer = $composerBuilder( + $$GameTableTableOrderingComposer get gameId { + final $$GameTableTableOrderingComposer composer = $composerBuilder( composer: this, getCurrentColumn: (t) => t.gameId, - referencedTable: $db.groupTable, + referencedTable: $db.gameTable, getReferencedColumn: (t) => t.id, builder: ( joinBuilder, { $addJoinBuilderToRootComposer, $removeJoinBuilderFromRootComposer, - }) => $$GroupTableTableOrderingComposer( + }) => $$GameTableTableOrderingComposer( $db: $db, - $table: $db.groupTable, + $table: $db.gameTable, $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, joinBuilder: joinBuilder, $removeJoinBuilderFromRootComposer: @@ -2843,20 +3266,20 @@ class $$PlayerGameTableTableAnnotationComposer return composer; } - $$GroupTableTableAnnotationComposer get gameId { - final $$GroupTableTableAnnotationComposer composer = $composerBuilder( + $$GameTableTableAnnotationComposer get gameId { + final $$GameTableTableAnnotationComposer composer = $composerBuilder( composer: this, getCurrentColumn: (t) => t.gameId, - referencedTable: $db.groupTable, + referencedTable: $db.gameTable, getReferencedColumn: (t) => t.id, builder: ( joinBuilder, { $addJoinBuilderToRootComposer, $removeJoinBuilderFromRootComposer, - }) => $$GroupTableTableAnnotationComposer( + }) => $$GameTableTableAnnotationComposer( $db: $db, - $table: $db.groupTable, + $table: $db.gameTable, $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, joinBuilder: joinBuilder, $removeJoinBuilderFromRootComposer: @@ -3362,168 +3785,6 @@ typedef $$GroupGameTableTableProcessedTableManager = GroupGameTableData, PrefetchHooks Function({bool groupId, bool gameId}) >; -typedef $$GameTableTableCreateCompanionBuilder = - GameTableCompanion Function({ - required String id, - required String name, - Value winnerId, - Value rowid, - }); -typedef $$GameTableTableUpdateCompanionBuilder = - GameTableCompanion Function({ - Value id, - Value name, - Value winnerId, - Value rowid, - }); - -class $$GameTableTableFilterComposer - extends Composer<_$AppDatabase, $GameTableTable> { - $$GameTableTableFilterComposer({ - required super.$db, - required super.$table, - super.joinBuilder, - super.$addJoinBuilderToRootComposer, - super.$removeJoinBuilderFromRootComposer, - }); - ColumnFilters get id => $composableBuilder( - column: $table.id, - builder: (column) => ColumnFilters(column), - ); - - ColumnFilters get name => $composableBuilder( - column: $table.name, - builder: (column) => ColumnFilters(column), - ); - - ColumnFilters get winnerId => $composableBuilder( - column: $table.winnerId, - builder: (column) => ColumnFilters(column), - ); -} - -class $$GameTableTableOrderingComposer - extends Composer<_$AppDatabase, $GameTableTable> { - $$GameTableTableOrderingComposer({ - required super.$db, - required super.$table, - super.joinBuilder, - super.$addJoinBuilderToRootComposer, - super.$removeJoinBuilderFromRootComposer, - }); - ColumnOrderings get id => $composableBuilder( - column: $table.id, - builder: (column) => ColumnOrderings(column), - ); - - ColumnOrderings get name => $composableBuilder( - column: $table.name, - builder: (column) => ColumnOrderings(column), - ); - - ColumnOrderings get winnerId => $composableBuilder( - column: $table.winnerId, - builder: (column) => ColumnOrderings(column), - ); -} - -class $$GameTableTableAnnotationComposer - extends Composer<_$AppDatabase, $GameTableTable> { - $$GameTableTableAnnotationComposer({ - required super.$db, - required super.$table, - super.joinBuilder, - super.$addJoinBuilderToRootComposer, - super.$removeJoinBuilderFromRootComposer, - }); - GeneratedColumn get id => - $composableBuilder(column: $table.id, builder: (column) => column); - - GeneratedColumn get name => - $composableBuilder(column: $table.name, builder: (column) => column); - - GeneratedColumn get winnerId => - $composableBuilder(column: $table.winnerId, builder: (column) => column); -} - -class $$GameTableTableTableManager - extends - RootTableManager< - _$AppDatabase, - $GameTableTable, - GameTableData, - $$GameTableTableFilterComposer, - $$GameTableTableOrderingComposer, - $$GameTableTableAnnotationComposer, - $$GameTableTableCreateCompanionBuilder, - $$GameTableTableUpdateCompanionBuilder, - ( - GameTableData, - BaseReferences<_$AppDatabase, $GameTableTable, GameTableData>, - ), - GameTableData, - PrefetchHooks Function() - > { - $$GameTableTableTableManager(_$AppDatabase db, $GameTableTable table) - : super( - TableManagerState( - db: db, - table: table, - createFilteringComposer: () => - $$GameTableTableFilterComposer($db: db, $table: table), - createOrderingComposer: () => - $$GameTableTableOrderingComposer($db: db, $table: table), - createComputedFieldComposer: () => - $$GameTableTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: - ({ - Value id = const Value.absent(), - Value name = const Value.absent(), - Value winnerId = const Value.absent(), - Value rowid = const Value.absent(), - }) => GameTableCompanion( - id: id, - name: name, - winnerId: winnerId, - rowid: rowid, - ), - createCompanionCallback: - ({ - required String id, - required String name, - Value winnerId = const Value.absent(), - Value rowid = const Value.absent(), - }) => GameTableCompanion.insert( - id: id, - name: name, - winnerId: winnerId, - rowid: rowid, - ), - withReferenceMapper: (p0) => p0 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) - .toList(), - prefetchHooksCallback: null, - ), - ); -} - -typedef $$GameTableTableProcessedTableManager = - ProcessedTableManager< - _$AppDatabase, - $GameTableTable, - GameTableData, - $$GameTableTableFilterComposer, - $$GameTableTableOrderingComposer, - $$GameTableTableAnnotationComposer, - $$GameTableTableCreateCompanionBuilder, - $$GameTableTableUpdateCompanionBuilder, - ( - GameTableData, - BaseReferences<_$AppDatabase, $GameTableTable, GameTableData>, - ), - GameTableData, - PrefetchHooks Function() - >; class $AppDatabaseManager { final _$AppDatabase _db; @@ -3532,12 +3793,12 @@ class $AppDatabaseManager { $$PlayerTableTableTableManager(_db, _db.playerTable); $$GroupTableTableTableManager get groupTable => $$GroupTableTableTableManager(_db, _db.groupTable); + $$GameTableTableTableManager get gameTable => + $$GameTableTableTableManager(_db, _db.gameTable); $$PlayerGroupTableTableTableManager get playerGroupTable => $$PlayerGroupTableTableTableManager(_db, _db.playerGroupTable); $$PlayerGameTableTableTableManager get playerGameTable => $$PlayerGameTableTableTableManager(_db, _db.playerGameTable); $$GroupGameTableTableTableManager get groupGameTable => $$GroupGameTableTableTableManager(_db, _db.groupGameTable); - $$GameTableTableTableManager get gameTable => - $$GameTableTableTableManager(_db, _db.gameTable); } From 3f5a8406753867a8564fefbb7b771ecbbeb53b85 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 12 Nov 2025 20:01:44 +0100 Subject: [PATCH 14/21] Added toString methods --- lib/data/dto/game.dart | 9 +++++++-- lib/data/dto/group.dart | 5 +++++ lib/data/dto/player.dart | 5 +++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/data/dto/game.dart b/lib/data/dto/game.dart index 2c09851..125af48 100644 --- a/lib/data/dto/game.dart +++ b/lib/data/dto/game.dart @@ -6,13 +6,18 @@ class Game { final String name; final List? players; final Group? group; - final String? winner; + final String winner; Game({ this.players, this.group, - this.winner, + this.winner = '', required this.id, required this.name, }); + + @override + String toString() { + return 'Game{\n\tid: $id,\n\tname: $name,\n\tplayers: $players,\n\tgroup: $group,\n\twinner: $winner\n}'; + } } diff --git a/lib/data/dto/group.dart b/lib/data/dto/group.dart index 6f12fe9..427a52b 100644 --- a/lib/data/dto/group.dart +++ b/lib/data/dto/group.dart @@ -6,4 +6,9 @@ class Group { final List members; Group({required this.id, required this.name, required this.members}); + + @override + String toString() { + return 'Group{id: $id, name: $name,members: $members}'; + } } diff --git a/lib/data/dto/player.dart b/lib/data/dto/player.dart index d5e84e8..631a51f 100644 --- a/lib/data/dto/player.dart +++ b/lib/data/dto/player.dart @@ -3,4 +3,9 @@ class Player { final String name; Player({required this.id, required this.name}); + + @override + String toString() { + return 'Player{id: $id,name: $name}'; + } } From 93a4ccaee0d924d3c933715f0229d46440805505 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 12 Nov 2025 20:02:01 +0100 Subject: [PATCH 15/21] Added missing methods and implemented tests --- lib/data/dao/game_dao.dart | 18 ++- lib/data/dao/game_dao.g.dart | 1 + lib/data/dao/group_dao.dart | 15 ++- lib/data/dao/player_game_dao.g.dart | 2 +- lib/data/dao/player_group_dao.dart | 37 +++++- lib/data/db/tables/player_game_table.dart | 4 +- lib/main.dart | 30 +++++ test/db_tests/game_test.dart | 111 ++++++++++++++++++ test/db_tests/group_test.dart | 130 ++++++++++++++++++++++ test/db_tests/player_test.dart | 66 +++++++++++ test/widget_test.dart | 29 ----- 11 files changed, 402 insertions(+), 41 deletions(-) create mode 100644 test/db_tests/game_test.dart create mode 100644 test/db_tests/group_test.dart create mode 100644 test/db_tests/player_test.dart delete mode 100644 test/widget_test.dart diff --git a/lib/data/dao/game_dao.dart b/lib/data/dao/game_dao.dart index 775c509..9379623 100644 --- a/lib/data/dao/game_dao.dart +++ b/lib/data/dao/game_dao.dart @@ -57,13 +57,21 @@ class GameDao extends DatabaseAccessor with _$GameDaoMixin { GameTableCompanion.insert( id: game.id, name: game.name, - winnerId: Value(game.winner), + winnerId: game.winner, ), mode: InsertMode.insertOrReplace, ); }); } + /// Deletes the game with the given [gameId] from the database. + /// Returns `true` if more than 0 rows were affected, otherwise `false`. + Future deleteGame({required String gameId}) async { + final query = delete(gameTable)..where((g) => g.id.equals(gameId)); + final rowsAffected = await query.go(); + return rowsAffected > 0; + } + /// Retrieves the number of games in the database. Future getGameCount() async { final count = @@ -72,4 +80,12 @@ class GameDao extends DatabaseAccessor with _$GameDaoMixin { .getSingle(); return count ?? 0; } + + /// Checks if a game with the given [gameId] exists in the database. + /// Returns `true` if the game exists, otherwise `false`. + Future gameExists({required String gameId}) async { + final query = select(gameTable)..where((g) => g.id.equals(gameId)); + final result = await query.getSingleOrNull(); + return result != null; + } } diff --git a/lib/data/dao/game_dao.g.dart b/lib/data/dao/game_dao.g.dart index b5a29fe..ebf5524 100644 --- a/lib/data/dao/game_dao.g.dart +++ b/lib/data/dao/game_dao.g.dart @@ -4,5 +4,6 @@ part of 'game_dao.dart'; // ignore_for_file: type=lint mixin _$GameDaoMixin on DatabaseAccessor { + $PlayerTableTable get playerTable => attachedDatabase.playerTable; $GameTableTable get gameTable => attachedDatabase.gameTable; } diff --git a/lib/data/dao/group_dao.dart b/lib/data/dao/group_dao.dart index d449326..1f0e2c8 100644 --- a/lib/data/dao/group_dao.dart +++ b/lib/data/dao/group_dao.dart @@ -51,6 +51,9 @@ class GroupDao extends DatabaseAccessor with _$GroupDaoMixin { .toList(), ), ); + await Future.wait( + group.members.map((player) => db.playerDao.addPlayer(player: player)), + ); }); } @@ -65,11 +68,11 @@ class GroupDao extends DatabaseAccessor with _$GroupDaoMixin { /// Updates the name of the group with the given [id] to [newName]. /// Returns `true` if more than 0 rows were affected, otherwise `false`. Future updateGroupname({ - required String id, + required String groupId, required String newName, }) async { final rowsAffected = - await (update(groupTable)..where((g) => g.id.equals(id))).write( + await (update(groupTable)..where((g) => g.id.equals(groupId))).write( GroupTableCompanion(name: Value(newName)), ); return rowsAffected > 0; @@ -83,4 +86,12 @@ class GroupDao extends DatabaseAccessor with _$GroupDaoMixin { .getSingle(); return count ?? 0; } + + /// Checks if a group with the given [groupId] exists in the database. + /// Returns `true` if the group exists, `false` otherwise. + Future groupExists({required String groupId}) async { + final query = select(groupTable)..where((g) => g.id.equals(groupId)); + final result = await query.getSingleOrNull(); + return result != null; + } } diff --git a/lib/data/dao/player_game_dao.g.dart b/lib/data/dao/player_game_dao.g.dart index 0d5f5e1..4d0a192 100644 --- a/lib/data/dao/player_game_dao.g.dart +++ b/lib/data/dao/player_game_dao.g.dart @@ -5,6 +5,6 @@ part of 'player_game_dao.dart'; // ignore_for_file: type=lint mixin _$PlayerGameDaoMixin on DatabaseAccessor { $PlayerTableTable get playerTable => attachedDatabase.playerTable; - $GroupTableTable get groupTable => attachedDatabase.groupTable; + $GameTableTable get gameTable => attachedDatabase.gameTable; $PlayerGameTableTable get playerGameTable => attachedDatabase.playerGameTable; } diff --git a/lib/data/dao/player_group_dao.dart b/lib/data/dao/player_group_dao.dart index 5b2a095..fe067ae 100644 --- a/lib/data/dao/player_group_dao.dart +++ b/lib/data/dao/player_group_dao.dart @@ -16,7 +16,7 @@ class PlayerGroupDao extends DatabaseAccessor ..where((pG) => pG.groupId.equals(groupId)); final result = await query.get(); - List groupMembers = []; + List groupMembers = List.empty(growable: true); for (var entry in result) { final player = await db.playerDao.getPlayerById(playerId: entry.playerId); @@ -38,13 +38,38 @@ class PlayerGroupDao extends DatabaseAccessor return rowsAffected > 0; } - /// Adds a player to a group with the given [playerId] and [groupId]. - Future addPlayerToGroup({ + /// Adds a [player] to a group with the given [groupId]. + /// If the player is already in the group, no action is taken. + /// If the player does not exist in the player table, they are added. + /// Returns `true` if the player was added, otherwise `false`. + Future addPlayerToGroup({ + required Player player, + required String groupId, + }) async { + if (await isPlayerInGroup(playerId: player.id, groupId: groupId)) { + return false; + } + + if (await db.playerDao.playerExists(playerId: player.id) == false) { + db.playerDao.addPlayer(player: player); + } + + await into(playerGroupTable).insert( + PlayerGroupTableCompanion.insert(playerId: player.id, groupId: groupId), + ); + + return true; + } + + /// Checks if a player with [playerId] is in the group with [groupId]. + /// Returns `true` if the player is in the group, otherwise `false`. + Future isPlayerInGroup({ required String playerId, required String groupId, }) async { - await into(playerGroupTable).insert( - PlayerGroupTableCompanion.insert(playerId: playerId, groupId: groupId), - ); + final query = select(playerGroupTable) + ..where((p) => p.playerId.equals(playerId) & p.groupId.equals(groupId)); + final result = await query.getSingleOrNull(); + return result != null; } } diff --git a/lib/data/db/tables/player_game_table.dart b/lib/data/db/tables/player_game_table.dart index 79b6df2..74c36fe 100644 --- a/lib/data/db/tables/player_game_table.dart +++ b/lib/data/db/tables/player_game_table.dart @@ -1,12 +1,12 @@ import 'package:drift/drift.dart'; -import 'package:game_tracker/data/db/tables/group_table.dart'; +import 'package:game_tracker/data/db/tables/game_table.dart'; import 'package:game_tracker/data/db/tables/player_table.dart'; class PlayerGameTable extends Table { TextColumn get playerId => text().references(PlayerTable, #id, onDelete: KeyAction.cascade)(); TextColumn get gameId => - text().references(GroupTable, #id, onDelete: KeyAction.cascade)(); + text().references(GameTable, #id, onDelete: KeyAction.cascade)(); @override Set> get primaryKey => {playerId, gameId}; diff --git a/lib/main.dart b/lib/main.dart index 98c40f8..5aa9cfc 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,6 +1,9 @@ import 'package:flutter/material.dart'; import 'package:game_tracker/core/custom_theme.dart'; import 'package:game_tracker/data/db/database.dart'; +import 'package:game_tracker/data/dto/game.dart'; +import 'package:game_tracker/data/dto/group.dart'; +import 'package:game_tracker/data/dto/player.dart'; import 'package:game_tracker/presentation/views/main_menu/custom_navigation_bar.dart'; import 'package:provider/provider.dart'; @@ -19,6 +22,8 @@ class GameTracker extends StatelessWidget { @override Widget build(BuildContext context) { + dbCheck(context); + return MaterialApp( debugShowCheckedModeBanner: false, title: 'Game Tracker', @@ -39,4 +44,29 @@ class GameTracker extends StatelessWidget { home: const CustomNavigationBar(), ); } + + Future dbCheck(BuildContext context) async { + Player player1 = Player(id: 'p1', name: 'Alice'); + Player player2 = Player(id: 'p2', name: 'Bob'); + Player player3 = Player(id: 'p3', name: 'Charlie'); + Player player4 = Player(id: 'p4', name: 'Diana'); + Group testgroup = Group( + id: 'gr1', + name: 'Test Group', + members: [player1, player2, player3], + ); + Game testgame = Game( + id: 'ga1', + name: 'Test Game', + winner: player1.id, + players: [player4], + group: testgroup, + ); + + final db = Provider.of(context, listen: false); + //await db.gameDao.addGame(game: testgame); + print('Game added: ${testgame.name}'); + final game = await db.gameDao.getGameById(gameId: testgame.id); + print(game.toString()); + } } diff --git a/test/db_tests/game_test.dart b/test/db_tests/game_test.dart new file mode 100644 index 0000000..fae8fc5 --- /dev/null +++ b/test/db_tests/game_test.dart @@ -0,0 +1,111 @@ +import 'package:drift/drift.dart'; +import 'package:drift/native.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:game_tracker/data/db/database.dart'; +import 'package:game_tracker/data/dto/game.dart'; +import 'package:game_tracker/data/dto/group.dart'; +import 'package:game_tracker/data/dto/player.dart'; + +void main() { + late AppDatabase database; + late Player testPlayer; + late Player player1; + late Player player2; + late Player player3; + late Player player4; + late Group testgroup; + late Game testgame; + + setUp(() { + database = AppDatabase( + DatabaseConnection( + NativeDatabase.memory(), + // Recommended for widget tests to avoid test errors. + closeStreamsSynchronously: true, + ), + ); + + testPlayer = Player(id: 'test_id', name: 'Test Player'); + player1 = Player(id: 'p1', name: 'Alice'); + player2 = Player(id: 'p2', name: 'Bob'); + player3 = Player(id: 'p3', name: 'Charlie'); + player4 = Player(id: 'p4', name: 'Diana'); + testgroup = Group( + id: 'gr1', + name: 'Test Group', + members: [player1, player2, player3], + ); + testgame = Game( + id: 'ga1', + name: 'Test Game', + group: testgroup, + players: [player4], + ); + }); + tearDown(() async { + await database.close(); + }); + + group('game tests', () { + test('game is added correctly', () async { + await database.gameDao.addGame(game: testgame); + + final result = await database.gameDao.getGameById(gameId: testgame.id); + + expect(result.id, testgame.id); + expect(result.name, testgame.name); + expect(result.winner, testgame.winner); + + if (result.group != null) { + expect(result.group!.members.length, testgroup.members.length); + + for (int i = 0; i < testgroup.members.length; i++) { + expect(result.group!.members[i].id, testgroup.members[i].id); + expect(result.group!.members[i].name, testgroup.members[i].name); + } + } else { + fail('Group is null'); + } + if (result.players != null) { + expect(result.players!.length, testgame.players!.length); + + for (int i = 0; i < testgame.players!.length; i++) { + expect(result.players![i].id, testgame.players![i].id); + expect(result.players![i].name, testgame.players![i].name); + } + } else { + fail('Players is null'); + } + }); + + test('game is deleted correctly', () async { + await database.gameDao.addGame(game: testgame); + + final gameDeleted = await database.gameDao.deleteGame( + gameId: testgame.id, + ); + expect(gameDeleted, true); + + final gameExists = await database.gameDao.gameExists(gameId: testgame.id); + expect(gameExists, false); + }); + + test('get game count works correctly', () async { + final initialCount = await database.gameDao.getGameCount(); + expect(initialCount, 0); + + await database.gameDao.addGame(game: testgame); + + final gameAdded = await database.gameDao.getGameCount(); + expect(gameAdded, 1); + + final gameRemoved = await database.gameDao.deleteGame( + gameId: testgame.id, + ); + expect(gameRemoved, true); + + final finalCount = await database.gameDao.getGameCount(); + expect(finalCount, 0); + }); + }); +} diff --git a/test/db_tests/group_test.dart b/test/db_tests/group_test.dart new file mode 100644 index 0000000..cdf514f --- /dev/null +++ b/test/db_tests/group_test.dart @@ -0,0 +1,130 @@ +import 'package:drift/drift.dart'; +import 'package:drift/native.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:game_tracker/data/db/database.dart'; +import 'package:game_tracker/data/dto/group.dart'; +import 'package:game_tracker/data/dto/player.dart'; + +void main() { + late AppDatabase database; + late Player player1; + late Player player2; + late Player player3; + late Player player4; + late Group testgroup; + + setUp(() { + database = AppDatabase( + DatabaseConnection( + NativeDatabase.memory(), + // Recommended for widget tests to avoid test errors. + closeStreamsSynchronously: true, + ), + ); + + player1 = Player(id: 'p1', name: 'Alice'); + player2 = Player(id: 'p2', name: 'Bob'); + player3 = Player(id: 'p3', name: 'Charlie'); + player4 = Player(id: 'p4', name: 'Diana'); + testgroup = Group( + id: 'gr1', + name: 'Test Group', + members: [player1, player2, player3], + ); + }); + tearDown(() async { + await database.close(); + }); + + test('group and group members gets added correctly', () async { + await database.groupDao.addGroup(group: testgroup); + + final result = await database.groupDao.getGroupById(groupId: testgroup.id); + + expect(result.id, testgroup.id); + expect(result.name, testgroup.name); + + expect(result.members.length, testgroup.members.length); + for (int i = 0; i < testgroup.members.length; i++) { + expect(result.members[i].id, testgroup.members[i].id); + expect(result.members[i].name, testgroup.members[i].name); + } + }); + + test('group gets deleted correctly', () async { + await database.groupDao.addGroup(group: testgroup); + + final groupDeleted = await database.groupDao.deleteGroup( + groupId: testgroup.id, + ); + expect(groupDeleted, true); + + final groupExists = await database.groupDao.groupExists( + groupId: testgroup.id, + ); + expect(groupExists, false); + }); + + test('group name gets updated correcly ', () async { + await database.groupDao.addGroup(group: testgroup); + + const newGroupName = 'new group name'; + + await database.groupDao.updateGroupname( + groupId: testgroup.id, + newName: newGroupName, + ); + + final result = await database.groupDao.getGroupById(groupId: testgroup.id); + expect(result.name, newGroupName); + }); + + test('Adding player to group works correctly', () async { + await database.groupDao.addGroup(group: testgroup); + + await database.playerGroupDao.addPlayerToGroup( + player: player4, + groupId: testgroup.id, + ); + + final playerAdded = await database.playerGroupDao.isPlayerInGroup( + playerId: player4.id, + groupId: testgroup.id, + ); + + expect(playerAdded, true); + + final playerAdded2 = await database.playerGroupDao.isPlayerInGroup( + playerId: 'a', + groupId: testgroup.id, + ); + + expect(playerAdded2, false); + + expect(playerAdded, true); + + final result = await database.groupDao.getGroupById(groupId: testgroup.id); + expect(result.members.length, testgroup.members.length + 1); + + final addedPlayer = result.members.firstWhere((p) => p.id == player4.id); + expect(addedPlayer.name, player4.name); + }); + + test('Removing player from group works correctly', () async { + await database.groupDao.addGroup(group: testgroup); + + final playerToRemove = testgroup.members[0]; + + final removed = await database.playerGroupDao.removePlayerFromGroup( + playerId: playerToRemove.id, + groupId: testgroup.id, + ); + expect(removed, true); + + final result = await database.groupDao.getGroupById(groupId: testgroup.id); + expect(result.members.length, testgroup.members.length - 1); + + final playerExists = result.members.any((p) => p.id == playerToRemove.id); + expect(playerExists, false); + }); +} diff --git a/test/db_tests/player_test.dart b/test/db_tests/player_test.dart new file mode 100644 index 0000000..a53f2cc --- /dev/null +++ b/test/db_tests/player_test.dart @@ -0,0 +1,66 @@ +import 'package:drift/drift.dart'; +import 'package:drift/native.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:game_tracker/data/db/database.dart'; +import 'package:game_tracker/data/dto/player.dart'; + +void main() { + late AppDatabase database; + late Player testPlayer; + + setUp(() { + database = AppDatabase( + DatabaseConnection( + NativeDatabase.memory(), + // Recommended for widget tests to avoid test errors. + closeStreamsSynchronously: true, + ), + ); + + testPlayer = Player(id: 'test_id', name: 'Test Player'); + }); + tearDown(() async { + await database.close(); + }); + + group('player tests', () { + test('players get inserted correcly ', () async { + await database.playerDao.addPlayer(player: testPlayer); + final result = await database.playerDao.getPlayerById( + playerId: testPlayer.id, + ); + + expect(result.id, testPlayer.id); + expect(result.name, testPlayer.name); + }); + + test('players get deleted correcly ', () async { + await database.playerDao.addPlayer(player: testPlayer); + final playerDeleted = await database.playerDao.deletePlayer( + playerId: testPlayer.id, + ); + expect(playerDeleted, true); + + final playerExists = await database.playerDao.playerExists( + playerId: testPlayer.id, + ); + expect(playerExists, false); + }); + + test('player name gets updated correcly ', () async { + await database.playerDao.addPlayer(player: testPlayer); + + const newPlayerName = 'new player name'; + + await database.playerDao.updatePlayername( + playerId: testPlayer.id, + newName: newPlayerName, + ); + + final result = await database.playerDao.getPlayerById( + playerId: testPlayer.id, + ); + expect(result.name, newPlayerName); + }); + }); +} diff --git a/test/widget_test.dart b/test/widget_test.dart deleted file mode 100644 index cb44eec..0000000 --- a/test/widget_test.dart +++ /dev/null @@ -1,29 +0,0 @@ -// This is a basic Flutter widget test. -// -// To perform an interaction with a widget in your test, use the WidgetTester -// utility in the flutter_test package. For example, you can send tap and scroll -// gestures. You can also use WidgetTester to find child widgets in the widget -// tree, read text, and verify that the values of widget properties are correct. - -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:game_tracker/main.dart'; - -void main() { - testWidgets('Counter increments smoke test', (WidgetTester tester) async { - // Build our app and trigger a frame. - await tester.pumpWidget(const GameTracker()); - - // Verify that our counter starts at 0. - expect(find.text('0'), findsOneWidget); - expect(find.text('1'), findsNothing); - - // Tap the '+' icon and trigger a frame. - await tester.tap(find.byIcon(Icons.add)); - await tester.pump(); - - // Verify that our counter has incremented. - expect(find.text('0'), findsNothing); - expect(find.text('1'), findsOneWidget); - }); -} From 39b20681216ac3224795395c35cabce0f91d0040 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 12 Nov 2025 20:02:18 +0100 Subject: [PATCH 16/21] Removed unused var --- test/db_tests/game_test.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/db_tests/game_test.dart b/test/db_tests/game_test.dart index fae8fc5..bee3ff8 100644 --- a/test/db_tests/game_test.dart +++ b/test/db_tests/game_test.dart @@ -8,7 +8,6 @@ import 'package:game_tracker/data/dto/player.dart'; void main() { late AppDatabase database; - late Player testPlayer; late Player player1; late Player player2; late Player player3; @@ -25,7 +24,6 @@ void main() { ), ); - testPlayer = Player(id: 'test_id', name: 'Test Player'); player1 = Player(id: 'p1', name: 'Alice'); player2 = Player(id: 'p2', name: 'Bob'); player3 = Player(id: 'p3', name: 'Charlie'); From 9229f1f0a5b2a86772c4a8d1734c1695b1a23601 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 12 Nov 2025 20:09:17 +0100 Subject: [PATCH 17/21] Added counting methods + testing those --- lib/data/dao/player_dao.dart | 9 +++++++++ test/db_tests/group_test.dart | 18 ++++++++++++++++++ test/db_tests/player_test.dart | 18 ++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/lib/data/dao/player_dao.dart b/lib/data/dao/player_dao.dart index 01e7163..976d4b0 100644 --- a/lib/data/dao/player_dao.dart +++ b/lib/data/dao/player_dao.dart @@ -61,4 +61,13 @@ class PlayerDao extends DatabaseAccessor with _$PlayerDaoMixin { PlayerTableCompanion(name: Value(newName)), ); } + + /// Retrieves the total count of players in the database. + Future getPlayerCount() async { + final count = + await (selectOnly(playerTable)..addColumns([playerTable.id.count()])) + .map((row) => row.read(playerTable.id.count())) + .getSingle(); + return count ?? 0; + } } diff --git a/test/db_tests/group_test.dart b/test/db_tests/group_test.dart index cdf514f..a8fbcd5 100644 --- a/test/db_tests/group_test.dart +++ b/test/db_tests/group_test.dart @@ -127,4 +127,22 @@ void main() { final playerExists = result.members.any((p) => p.id == playerToRemove.id); expect(playerExists, false); }); + + test('get group count works correctly', () async { + final initialCount = await database.groupDao.getGroupCount(); + expect(initialCount, 0); + + await database.groupDao.addGroup(group: testgroup); + + final groupAdded = await database.groupDao.getGroupCount(); + expect(groupAdded, 1); + + final groupRemoved = await database.groupDao.deleteGroup( + groupId: testgroup.id, + ); + expect(groupRemoved, true); + + final finalCount = await database.groupDao.getGroupCount(); + expect(finalCount, 0); + }); } diff --git a/test/db_tests/player_test.dart b/test/db_tests/player_test.dart index a53f2cc..7fb9152 100644 --- a/test/db_tests/player_test.dart +++ b/test/db_tests/player_test.dart @@ -62,5 +62,23 @@ void main() { ); expect(result.name, newPlayerName); }); + + test('get player count works correctly', () async { + final initialCount = await database.playerDao.getPlayerCount(); + expect(initialCount, 0); + + await database.playerDao.addPlayer(player: testPlayer); + + final playerAdded = await database.playerDao.getPlayerCount(); + expect(playerAdded, 1); + + final playerRemoved = await database.playerDao.deletePlayer( + playerId: testPlayer.id, + ); + expect(playerRemoved, true); + + final finalCount = await database.playerDao.getPlayerCount(); + expect(finalCount, 0); + }); }); } From 2179331455c2b08b4b451d016cac61fec06bba68 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Fri, 14 Nov 2025 09:01:19 +0100 Subject: [PATCH 18/21] Removed test code --- lib/main.dart | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 5aa9cfc..98c40f8 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,9 +1,6 @@ import 'package:flutter/material.dart'; import 'package:game_tracker/core/custom_theme.dart'; import 'package:game_tracker/data/db/database.dart'; -import 'package:game_tracker/data/dto/game.dart'; -import 'package:game_tracker/data/dto/group.dart'; -import 'package:game_tracker/data/dto/player.dart'; import 'package:game_tracker/presentation/views/main_menu/custom_navigation_bar.dart'; import 'package:provider/provider.dart'; @@ -22,8 +19,6 @@ class GameTracker extends StatelessWidget { @override Widget build(BuildContext context) { - dbCheck(context); - return MaterialApp( debugShowCheckedModeBanner: false, title: 'Game Tracker', @@ -44,29 +39,4 @@ class GameTracker extends StatelessWidget { home: const CustomNavigationBar(), ); } - - Future dbCheck(BuildContext context) async { - Player player1 = Player(id: 'p1', name: 'Alice'); - Player player2 = Player(id: 'p2', name: 'Bob'); - Player player3 = Player(id: 'p3', name: 'Charlie'); - Player player4 = Player(id: 'p4', name: 'Diana'); - Group testgroup = Group( - id: 'gr1', - name: 'Test Group', - members: [player1, player2, player3], - ); - Game testgame = Game( - id: 'ga1', - name: 'Test Game', - winner: player1.id, - players: [player4], - group: testgroup, - ); - - final db = Provider.of(context, listen: false); - //await db.gameDao.addGame(game: testgame); - print('Game added: ${testgame.name}'); - final game = await db.gameDao.getGameById(gameId: testgame.id); - print(game.toString()); - } } From cbd5e1d0ba0a7a3b9fce2691e558ba974f706b53 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Fri, 14 Nov 2025 22:30:56 +0100 Subject: [PATCH 19/21] Added documentation --- lib/data/dao/group_game_dao.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/data/dao/group_game_dao.dart b/lib/data/dao/group_game_dao.dart index 88b8fad..d3b30ca 100644 --- a/lib/data/dao/group_game_dao.dart +++ b/lib/data/dao/group_game_dao.dart @@ -22,6 +22,7 @@ class GroupGameDao extends DatabaseAccessor return (count ?? 0) > 0; } + /// Retrieves the [Group] associated with the given [gameId]. Future getGroupByGameId({required String gameId}) async { final result = await (select( groupGameTable, From 7be86b3d9e77b1b3f1cbfb570ff0db33d99553e0 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Fri, 14 Nov 2025 22:31:30 +0100 Subject: [PATCH 20/21] Changed method name --- lib/data/dao/game_dao.dart | 2 +- lib/data/dao/player_game_dao.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/data/dao/game_dao.dart b/lib/data/dao/game_dao.dart index 9379623..fc931ad 100644 --- a/lib/data/dao/game_dao.dart +++ b/lib/data/dao/game_dao.dart @@ -24,7 +24,7 @@ class GameDao extends DatabaseAccessor with _$GameDaoMixin { final result = await query.getSingle(); List? players; - if (await db.playerGameDao.hasGamePlayers(gameId: gameId)) { + if (await db.playerGameDao.gameHasPlayers(gameId: gameId)) { players = await db.playerGameDao.getPlayersByGameId(gameId: gameId); } Group? group; diff --git a/lib/data/dao/player_game_dao.dart b/lib/data/dao/player_game_dao.dart index 333dc28..8f367f8 100644 --- a/lib/data/dao/player_game_dao.dart +++ b/lib/data/dao/player_game_dao.dart @@ -12,7 +12,7 @@ class PlayerGameDao extends DatabaseAccessor /// Checks if there are any players associated with the given [gameId]. /// Returns `true` if there are players, otherwise `false`. - Future hasGamePlayers({required String gameId}) async { + Future gameHasPlayers({required String gameId}) async { final count = await (selectOnly(playerGameTable) ..where(playerGameTable.gameId.equals(gameId)) From 34bf6740adce09c4b8f7019193471f26555f3251 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Fri, 14 Nov 2025 22:33:22 +0100 Subject: [PATCH 21/21] Corrected GroupGameTable attributes --- lib/data/dao/group_game_dao.g.dart | 3 +- lib/data/db/database.g.dart | 401 ++++++++++++----------- lib/data/db/tables/group_game_table.dart | 6 +- 3 files changed, 210 insertions(+), 200 deletions(-) diff --git a/lib/data/dao/group_game_dao.g.dart b/lib/data/dao/group_game_dao.g.dart index f1aa46f..426f192 100644 --- a/lib/data/dao/group_game_dao.g.dart +++ b/lib/data/dao/group_game_dao.g.dart @@ -4,7 +4,8 @@ part of 'group_game_dao.dart'; // ignore_for_file: type=lint mixin _$GroupGameDaoMixin on DatabaseAccessor { - $PlayerTableTable get playerTable => attachedDatabase.playerTable; $GroupTableTable get groupTable => attachedDatabase.groupTable; + $PlayerTableTable get playerTable => attachedDatabase.playerTable; + $GameTableTable get gameTable => attachedDatabase.gameTable; $GroupGameTableTable get groupGameTable => attachedDatabase.groupGameTable; } diff --git a/lib/data/db/database.g.dart b/lib/data/db/database.g.dart index 453fcb0..03b7a10 100644 --- a/lib/data/db/database.g.dart +++ b/lib/data/db/database.g.dart @@ -1140,7 +1140,7 @@ class $GroupGameTableTable extends GroupGameTable type: DriftSqlType.string, requiredDuringInsert: true, defaultConstraints: GeneratedColumn.constraintIsAlways( - 'REFERENCES player_table (id) ON DELETE CASCADE', + 'REFERENCES group_table (id) ON DELETE CASCADE', ), ); static const VerificationMeta _gameIdMeta = const VerificationMeta('gameId'); @@ -1152,7 +1152,7 @@ class $GroupGameTableTable extends GroupGameTable type: DriftSqlType.string, requiredDuringInsert: true, defaultConstraints: GeneratedColumn.constraintIsAlways( - 'REFERENCES group_table (id) ON DELETE CASCADE', + 'REFERENCES game_table (id) ON DELETE CASCADE', ), ); @override @@ -1359,8 +1359,8 @@ abstract class _$AppDatabase extends GeneratedDatabase { this, ); late final $GroupGameTableTable groupGameTable = $GroupGameTableTable(this); - late final GroupDao groupDao = GroupDao(this as AppDatabase); late final PlayerDao playerDao = PlayerDao(this as AppDatabase); + late final GroupDao groupDao = GroupDao(this as AppDatabase); late final GameDao gameDao = GameDao(this as AppDatabase); late final PlayerGroupDao playerGroupDao = PlayerGroupDao( this as AppDatabase, @@ -1418,14 +1418,14 @@ abstract class _$AppDatabase extends GeneratedDatabase { ), WritePropagation( on: TableUpdateQuery.onTableName( - 'player_table', + 'group_table', limitUpdateKind: UpdateKind.delete, ), result: [TableUpdate('group_game_table', kind: UpdateKind.delete)], ), WritePropagation( on: TableUpdateQuery.onTableName( - 'group_table', + 'game_table', limitUpdateKind: UpdateKind.delete, ), result: [TableUpdate('group_game_table', kind: UpdateKind.delete)], @@ -1513,27 +1513,6 @@ final class $$PlayerTableTableReferences manager.$state.copyWith(prefetchedData: cache), ); } - - static MultiTypedResultKey<$GroupGameTableTable, List> - _groupGameTableRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( - db.groupGameTable, - aliasName: $_aliasNameGenerator( - db.playerTable.id, - db.groupGameTable.groupId, - ), - ); - - $$GroupGameTableTableProcessedTableManager get groupGameTableRefs { - final manager = $$GroupGameTableTableTableManager( - $_db, - $_db.groupGameTable, - ).filter((f) => f.groupId.id.sqlEquals($_itemColumn('id')!)); - - final cache = $_typedResult.readTableOrNull(_groupGameTableRefsTable($_db)); - return ProcessedTableManager( - manager.$state.copyWith(prefetchedData: cache), - ); - } } class $$PlayerTableTableFilterComposer @@ -1629,31 +1608,6 @@ class $$PlayerTableTableFilterComposer ); return f(composer); } - - Expression groupGameTableRefs( - Expression Function($$GroupGameTableTableFilterComposer f) f, - ) { - final $$GroupGameTableTableFilterComposer composer = $composerBuilder( - composer: this, - getCurrentColumn: (t) => t.id, - referencedTable: $db.groupGameTable, - getReferencedColumn: (t) => t.groupId, - builder: - ( - joinBuilder, { - $addJoinBuilderToRootComposer, - $removeJoinBuilderFromRootComposer, - }) => $$GroupGameTableTableFilterComposer( - $db: $db, - $table: $db.groupGameTable, - $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, - joinBuilder: joinBuilder, - $removeJoinBuilderFromRootComposer: - $removeJoinBuilderFromRootComposer, - ), - ); - return f(composer); - } } class $$PlayerTableTableOrderingComposer @@ -1765,31 +1719,6 @@ class $$PlayerTableTableAnnotationComposer ); return f(composer); } - - Expression groupGameTableRefs( - Expression Function($$GroupGameTableTableAnnotationComposer a) f, - ) { - final $$GroupGameTableTableAnnotationComposer composer = $composerBuilder( - composer: this, - getCurrentColumn: (t) => t.id, - referencedTable: $db.groupGameTable, - getReferencedColumn: (t) => t.groupId, - builder: - ( - joinBuilder, { - $addJoinBuilderToRootComposer, - $removeJoinBuilderFromRootComposer, - }) => $$GroupGameTableTableAnnotationComposer( - $db: $db, - $table: $db.groupGameTable, - $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, - joinBuilder: joinBuilder, - $removeJoinBuilderFromRootComposer: - $removeJoinBuilderFromRootComposer, - ), - ); - return f(composer); - } } class $$PlayerTableTableTableManager @@ -1809,7 +1738,6 @@ class $$PlayerTableTableTableManager bool gameTableRefs, bool playerGroupTableRefs, bool playerGameTableRefs, - bool groupGameTableRefs, }) > { $$PlayerTableTableTableManager(_$AppDatabase db, $PlayerTableTable table) @@ -1849,7 +1777,6 @@ class $$PlayerTableTableTableManager gameTableRefs = false, playerGroupTableRefs = false, playerGameTableRefs = false, - groupGameTableRefs = false, }) { return PrefetchHooks( db: db, @@ -1857,7 +1784,6 @@ class $$PlayerTableTableTableManager if (gameTableRefs) db.gameTable, if (playerGroupTableRefs) db.playerGroupTable, if (playerGameTableRefs) db.playerGameTable, - if (groupGameTableRefs) db.groupGameTable, ], addJoins: null, getPrefetchedDataCallback: (items) async { @@ -1925,27 +1851,6 @@ class $$PlayerTableTableTableManager ), typedResults: items, ), - if (groupGameTableRefs) - await $_getPrefetchedData< - PlayerTableData, - $PlayerTableTable, - GroupGameTableData - >( - currentTable: table, - referencedTable: $$PlayerTableTableReferences - ._groupGameTableRefsTable(db), - managerFromTypedResult: (p0) => - $$PlayerTableTableReferences( - db, - table, - p0, - ).groupGameTableRefs, - referencedItemsForCurrentItem: - (item, referencedItems) => referencedItems.where( - (e) => e.groupId == item.id, - ), - typedResults: items, - ), ]; }, ); @@ -1970,7 +1875,6 @@ typedef $$PlayerTableTableProcessedTableManager = bool gameTableRefs, bool playerGroupTableRefs, bool playerGameTableRefs, - bool groupGameTableRefs, }) >; typedef $$GroupTableTableCreateCompanionBuilder = @@ -2016,14 +1920,17 @@ final class $$GroupTableTableReferences static MultiTypedResultKey<$GroupGameTableTable, List> _groupGameTableRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( db.groupGameTable, - aliasName: $_aliasNameGenerator(db.groupTable.id, db.groupGameTable.gameId), + aliasName: $_aliasNameGenerator( + db.groupTable.id, + db.groupGameTable.groupId, + ), ); $$GroupGameTableTableProcessedTableManager get groupGameTableRefs { final manager = $$GroupGameTableTableTableManager( $_db, $_db.groupGameTable, - ).filter((f) => f.gameId.id.sqlEquals($_itemColumn('id')!)); + ).filter((f) => f.groupId.id.sqlEquals($_itemColumn('id')!)); final cache = $_typedResult.readTableOrNull(_groupGameTableRefsTable($_db)); return ProcessedTableManager( @@ -2083,7 +1990,7 @@ class $$GroupTableTableFilterComposer composer: this, getCurrentColumn: (t) => t.id, referencedTable: $db.groupGameTable, - getReferencedColumn: (t) => t.gameId, + getReferencedColumn: (t) => t.groupId, builder: ( joinBuilder, { @@ -2169,7 +2076,7 @@ class $$GroupTableTableAnnotationComposer composer: this, getCurrentColumn: (t) => t.id, referencedTable: $db.groupGameTable, - getReferencedColumn: (t) => t.gameId, + getReferencedColumn: (t) => t.groupId, builder: ( joinBuilder, { @@ -2287,7 +2194,7 @@ class $$GroupTableTableTableManager ).groupGameTableRefs, referencedItemsForCurrentItem: (item, referencedItems) => referencedItems.where( - (e) => e.gameId == item.id, + (e) => e.groupId == item.id, ), typedResults: items, ), @@ -2373,6 +2280,24 @@ final class $$GameTableTableReferences manager.$state.copyWith(prefetchedData: cache), ); } + + static MultiTypedResultKey<$GroupGameTableTable, List> + _groupGameTableRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( + db.groupGameTable, + aliasName: $_aliasNameGenerator(db.gameTable.id, db.groupGameTable.gameId), + ); + + $$GroupGameTableTableProcessedTableManager get groupGameTableRefs { + final manager = $$GroupGameTableTableTableManager( + $_db, + $_db.groupGameTable, + ).filter((f) => f.gameId.id.sqlEquals($_itemColumn('id')!)); + + final cache = $_typedResult.readTableOrNull(_groupGameTableRefsTable($_db)); + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: cache), + ); + } } class $$GameTableTableFilterComposer @@ -2441,6 +2366,31 @@ class $$GameTableTableFilterComposer ); return f(composer); } + + Expression groupGameTableRefs( + Expression Function($$GroupGameTableTableFilterComposer f) f, + ) { + final $$GroupGameTableTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.groupGameTable, + getReferencedColumn: (t) => t.gameId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupGameTableTableFilterComposer( + $db: $db, + $table: $db.groupGameTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } } class $$GameTableTableOrderingComposer @@ -2548,6 +2498,31 @@ class $$GameTableTableAnnotationComposer ); return f(composer); } + + Expression groupGameTableRefs( + Expression Function($$GroupGameTableTableAnnotationComposer a) f, + ) { + final $$GroupGameTableTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.groupGameTable, + getReferencedColumn: (t) => t.gameId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupGameTableTableAnnotationComposer( + $db: $db, + $table: $db.groupGameTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } } class $$GameTableTableTableManager @@ -2563,7 +2538,11 @@ class $$GameTableTableTableManager $$GameTableTableUpdateCompanionBuilder, (GameTableData, $$GameTableTableReferences), GameTableData, - PrefetchHooks Function({bool winnerId, bool playerGameTableRefs}) + PrefetchHooks Function({ + bool winnerId, + bool playerGameTableRefs, + bool groupGameTableRefs, + }) > { $$GameTableTableTableManager(_$AppDatabase db, $GameTableTable table) : super( @@ -2609,11 +2588,16 @@ class $$GameTableTableTableManager ) .toList(), prefetchHooksCallback: - ({winnerId = false, playerGameTableRefs = false}) { + ({ + winnerId = false, + playerGameTableRefs = false, + groupGameTableRefs = false, + }) { return PrefetchHooks( db: db, explicitlyWatchedTables: [ if (playerGameTableRefs) db.playerGameTable, + if (groupGameTableRefs) db.groupGameTable, ], addJoins: < @@ -2670,6 +2654,27 @@ class $$GameTableTableTableManager ), typedResults: items, ), + if (groupGameTableRefs) + await $_getPrefetchedData< + GameTableData, + $GameTableTable, + GroupGameTableData + >( + currentTable: table, + referencedTable: $$GameTableTableReferences + ._groupGameTableRefsTable(db), + managerFromTypedResult: (p0) => + $$GameTableTableReferences( + db, + table, + p0, + ).groupGameTableRefs, + referencedItemsForCurrentItem: + (item, referencedItems) => referencedItems.where( + (e) => e.gameId == item.id, + ), + typedResults: items, + ), ]; }, ); @@ -2690,7 +2695,11 @@ typedef $$GameTableTableProcessedTableManager = $$GameTableTableUpdateCompanionBuilder, (GameTableData, $$GameTableTableReferences), GameTableData, - PrefetchHooks Function({bool winnerId, bool playerGameTableRefs}) + PrefetchHooks Function({ + bool winnerId, + bool playerGameTableRefs, + bool groupGameTableRefs, + }) >; typedef $$PlayerGroupTableTableCreateCompanionBuilder = PlayerGroupTableCompanion Function({ @@ -3448,17 +3457,17 @@ final class $$GroupGameTableTableReferences super.$_typedResult, ); - static $PlayerTableTable _groupIdTable(_$AppDatabase db) => - db.playerTable.createAlias( - $_aliasNameGenerator(db.groupGameTable.groupId, db.playerTable.id), + static $GroupTableTable _groupIdTable(_$AppDatabase db) => + db.groupTable.createAlias( + $_aliasNameGenerator(db.groupGameTable.groupId, db.groupTable.id), ); - $$PlayerTableTableProcessedTableManager get groupId { + $$GroupTableTableProcessedTableManager get groupId { final $_column = $_itemColumn('group_id')!; - final manager = $$PlayerTableTableTableManager( + final manager = $$GroupTableTableTableManager( $_db, - $_db.playerTable, + $_db.groupTable, ).filter((f) => f.id.sqlEquals($_column)); final item = $_typedResult.readTableOrNull(_groupIdTable($_db)); if (item == null) return manager; @@ -3467,17 +3476,17 @@ final class $$GroupGameTableTableReferences ); } - static $GroupTableTable _gameIdTable(_$AppDatabase db) => - db.groupTable.createAlias( - $_aliasNameGenerator(db.groupGameTable.gameId, db.groupTable.id), + static $GameTableTable _gameIdTable(_$AppDatabase db) => + db.gameTable.createAlias( + $_aliasNameGenerator(db.groupGameTable.gameId, db.gameTable.id), ); - $$GroupTableTableProcessedTableManager get gameId { + $$GameTableTableProcessedTableManager get gameId { final $_column = $_itemColumn('game_id')!; - final manager = $$GroupTableTableTableManager( + final manager = $$GameTableTableTableManager( $_db, - $_db.groupTable, + $_db.gameTable, ).filter((f) => f.id.sqlEquals($_column)); final item = $_typedResult.readTableOrNull(_gameIdTable($_db)); if (item == null) return manager; @@ -3496,33 +3505,10 @@ class $$GroupGameTableTableFilterComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - $$PlayerTableTableFilterComposer get groupId { - final $$PlayerTableTableFilterComposer composer = $composerBuilder( - composer: this, - getCurrentColumn: (t) => t.groupId, - referencedTable: $db.playerTable, - getReferencedColumn: (t) => t.id, - builder: - ( - joinBuilder, { - $addJoinBuilderToRootComposer, - $removeJoinBuilderFromRootComposer, - }) => $$PlayerTableTableFilterComposer( - $db: $db, - $table: $db.playerTable, - $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, - joinBuilder: joinBuilder, - $removeJoinBuilderFromRootComposer: - $removeJoinBuilderFromRootComposer, - ), - ); - return composer; - } - - $$GroupTableTableFilterComposer get gameId { + $$GroupTableTableFilterComposer get groupId { final $$GroupTableTableFilterComposer composer = $composerBuilder( composer: this, - getCurrentColumn: (t) => t.gameId, + getCurrentColumn: (t) => t.groupId, referencedTable: $db.groupTable, getReferencedColumn: (t) => t.id, builder: @@ -3541,6 +3527,29 @@ class $$GroupGameTableTableFilterComposer ); return composer; } + + $$GameTableTableFilterComposer get gameId { + final $$GameTableTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.gameId, + referencedTable: $db.gameTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GameTableTableFilterComposer( + $db: $db, + $table: $db.gameTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } } class $$GroupGameTableTableOrderingComposer @@ -3552,33 +3561,10 @@ class $$GroupGameTableTableOrderingComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - $$PlayerTableTableOrderingComposer get groupId { - final $$PlayerTableTableOrderingComposer composer = $composerBuilder( - composer: this, - getCurrentColumn: (t) => t.groupId, - referencedTable: $db.playerTable, - getReferencedColumn: (t) => t.id, - builder: - ( - joinBuilder, { - $addJoinBuilderToRootComposer, - $removeJoinBuilderFromRootComposer, - }) => $$PlayerTableTableOrderingComposer( - $db: $db, - $table: $db.playerTable, - $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, - joinBuilder: joinBuilder, - $removeJoinBuilderFromRootComposer: - $removeJoinBuilderFromRootComposer, - ), - ); - return composer; - } - - $$GroupTableTableOrderingComposer get gameId { + $$GroupTableTableOrderingComposer get groupId { final $$GroupTableTableOrderingComposer composer = $composerBuilder( composer: this, - getCurrentColumn: (t) => t.gameId, + getCurrentColumn: (t) => t.groupId, referencedTable: $db.groupTable, getReferencedColumn: (t) => t.id, builder: @@ -3597,6 +3583,29 @@ class $$GroupGameTableTableOrderingComposer ); return composer; } + + $$GameTableTableOrderingComposer get gameId { + final $$GameTableTableOrderingComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.gameId, + referencedTable: $db.gameTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GameTableTableOrderingComposer( + $db: $db, + $table: $db.gameTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } } class $$GroupGameTableTableAnnotationComposer @@ -3608,33 +3617,10 @@ class $$GroupGameTableTableAnnotationComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - $$PlayerTableTableAnnotationComposer get groupId { - final $$PlayerTableTableAnnotationComposer composer = $composerBuilder( - composer: this, - getCurrentColumn: (t) => t.groupId, - referencedTable: $db.playerTable, - getReferencedColumn: (t) => t.id, - builder: - ( - joinBuilder, { - $addJoinBuilderToRootComposer, - $removeJoinBuilderFromRootComposer, - }) => $$PlayerTableTableAnnotationComposer( - $db: $db, - $table: $db.playerTable, - $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, - joinBuilder: joinBuilder, - $removeJoinBuilderFromRootComposer: - $removeJoinBuilderFromRootComposer, - ), - ); - return composer; - } - - $$GroupTableTableAnnotationComposer get gameId { + $$GroupTableTableAnnotationComposer get groupId { final $$GroupTableTableAnnotationComposer composer = $composerBuilder( composer: this, - getCurrentColumn: (t) => t.gameId, + getCurrentColumn: (t) => t.groupId, referencedTable: $db.groupTable, getReferencedColumn: (t) => t.id, builder: @@ -3653,6 +3639,29 @@ class $$GroupGameTableTableAnnotationComposer ); return composer; } + + $$GameTableTableAnnotationComposer get gameId { + final $$GameTableTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.gameId, + referencedTable: $db.gameTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GameTableTableAnnotationComposer( + $db: $db, + $table: $db.gameTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } } class $$GroupGameTableTableTableManager diff --git a/lib/data/db/tables/group_game_table.dart b/lib/data/db/tables/group_game_table.dart index 6be12bc..a16672e 100644 --- a/lib/data/db/tables/group_game_table.dart +++ b/lib/data/db/tables/group_game_table.dart @@ -1,12 +1,12 @@ import 'package:drift/drift.dart'; +import 'package:game_tracker/data/db/tables/game_table.dart'; import 'package:game_tracker/data/db/tables/group_table.dart'; -import 'package:game_tracker/data/db/tables/player_table.dart'; class GroupGameTable extends Table { TextColumn get groupId => - text().references(PlayerTable, #id, onDelete: KeyAction.cascade)(); - TextColumn get gameId => text().references(GroupTable, #id, onDelete: KeyAction.cascade)(); + TextColumn get gameId => + text().references(GameTable, #id, onDelete: KeyAction.cascade)(); @override Set> get primaryKey => {groupId, gameId};