From 4901e27b905ddfa1d09af32dae1125296d1c0002 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Thu, 21 Aug 2025 19:40:34 +0200 Subject: [PATCH] Updated folder structure --- lib/data/db/database.dart | 2 +- lib/data/db/database.g.dart | 22 +++++++++---------- ...r_scores.dart => player_scores_table.dart} | 0 lib/data/db/tables/players_table.dart | 3 ++- lib/data/db/tables/rounds_table.dart | 4 ++-- lib/data/{models => dto}/game_manager.dart | 2 +- lib/data/{models => dto}/game_session.dart | 2 +- lib/data/{models => dto}/round.dart | 2 -- .../home/active_game/active_game_view.dart | 4 ++-- .../views/home/active_game/graph_view.dart | 2 +- .../views/home/active_game/points_view.dart | 2 +- .../views/home/active_game/round_view.dart | 2 +- .../views/home/create_game_view.dart | 4 ++-- .../views/home/main_menu_view.dart | 4 ++-- lib/services/local_storage_service.dart | 4 ++-- test/data/game_session_test.dart | 2 +- test/data/round_test.dart | 2 +- 17 files changed, 31 insertions(+), 32 deletions(-) rename lib/data/db/tables/{player_scores.dart => player_scores_table.dart} (100%) rename lib/data/{models => dto}/game_manager.dart (98%) rename lib/data/{models => dto}/game_session.dart (99%) rename lib/data/{models => dto}/round.dart (96%) diff --git a/lib/data/db/database.dart b/lib/data/db/database.dart index ff145bb..38b1514 100644 --- a/lib/data/db/database.dart +++ b/lib/data/db/database.dart @@ -1,5 +1,5 @@ import 'package:cabo_counter/data/db/tables/game_session_table.dart'; -import 'package:cabo_counter/data/db/tables/player_scores.dart'; +import 'package:cabo_counter/data/db/tables/player_scores_table.dart'; import 'package:cabo_counter/data/db/tables/players_table.dart'; import 'package:cabo_counter/data/db/tables/round_scores_table.dart'; import 'package:cabo_counter/data/db/tables/rounds_table.dart'; diff --git a/lib/data/db/database.g.dart b/lib/data/db/database.g.dart index 76a996e..f37b311 100644 --- a/lib/data/db/database.g.dart +++ b/lib/data/db/database.g.dart @@ -505,7 +505,7 @@ class $PlayersTableTable extends PlayersTable $PlayersTableTable(this.attachedDatabase, [this._alias]); static const VerificationMeta _idMeta = const VerificationMeta('id'); @override - late final GeneratedColumn id = GeneratedColumn( + late final GeneratedColumn playerId = GeneratedColumn( 'id', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true, @@ -517,7 +517,7 @@ class $PlayersTableTable extends PlayersTable 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); @override - List get $columns => [id, name]; + List get $columns => [playerId, name]; @override String get aliasedName => _alias ?? actualTableName; @override @@ -529,7 +529,7 @@ class $PlayersTableTable extends PlayersTable final context = VerificationContext(); final data = instance.toColumns(true); if (data.containsKey('id')) { - context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); + context.handle(_idMeta, playerId.isAcceptableOrUnknown(data['id']!, _idMeta)); } else if (isInserting) { context.missing(_idMeta); } @@ -1599,7 +1599,7 @@ final class $$GameSessionTableTableReferences extends BaseReferences< _playersTableRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( db.playersTable, aliasName: - $_aliasNameGenerator(db.gameSessionTable.id, db.playersTable.id)); + $_aliasNameGenerator(db.gameSessionTable.id, db.playersTable.playerId)); $$PlayersTableTableProcessedTableManager get playersTableRefs { final manager = $$PlayersTableTableTableManager($_db, $_db.playersTable) @@ -1688,7 +1688,7 @@ class $$GameSessionTableTableFilterComposer composer: this, getCurrentColumn: (t) => t.id, referencedTable: $db.playersTable, - getReferencedColumn: (t) => t.id, + getReferencedColumn: (t) => t.playerId, builder: (joinBuilder, {$addJoinBuilderToRootComposer, $removeJoinBuilderFromRootComposer}) => @@ -1827,7 +1827,7 @@ class $$GameSessionTableTableAnnotationComposer composer: this, getCurrentColumn: (t) => t.id, referencedTable: $db.playersTable, - getReferencedColumn: (t) => t.id, + getReferencedColumn: (t) => t.playerId, builder: (joinBuilder, {$addJoinBuilderToRootComposer, $removeJoinBuilderFromRootComposer}) => @@ -2060,7 +2060,7 @@ final class $$PlayersTableTableReferences extends BaseReferences<_$AppDatabase, static $GameSessionTableTable _idTable(_$AppDatabase db) => db.gameSessionTable.createAlias( - $_aliasNameGenerator(db.playersTable.id, db.gameSessionTable.id)); + $_aliasNameGenerator(db.playersTable.playerId, db.gameSessionTable.id)); $$GameSessionTableTableProcessedTableManager get id { final $_column = $_itemColumn('id')!; @@ -2109,7 +2109,7 @@ class $$PlayersTableTableFilterComposer $$GameSessionTableTableFilterComposer get id { final $$GameSessionTableTableFilterComposer composer = $composerBuilder( composer: this, - getCurrentColumn: (t) => t.id, + getCurrentColumn: (t) => t.playerId, referencedTable: $db.gameSessionTable, getReferencedColumn: (t) => t.id, builder: (joinBuilder, @@ -2163,7 +2163,7 @@ class $$PlayersTableTableOrderingComposer $$GameSessionTableTableOrderingComposer get id { final $$GameSessionTableTableOrderingComposer composer = $composerBuilder( composer: this, - getCurrentColumn: (t) => t.id, + getCurrentColumn: (t) => t.playerId, referencedTable: $db.gameSessionTable, getReferencedColumn: (t) => t.id, builder: (joinBuilder, @@ -2196,7 +2196,7 @@ class $$PlayersTableTableAnnotationComposer $$GameSessionTableTableAnnotationComposer get id { final $$GameSessionTableTableAnnotationComposer composer = $composerBuilder( composer: this, - getCurrentColumn: (t) => t.id, + getCurrentColumn: (t) => t.playerId, referencedTable: $db.gameSessionTable, getReferencedColumn: (t) => t.id, builder: (joinBuilder, @@ -2306,7 +2306,7 @@ class $$PlayersTableTableTableManager extends RootTableManager< if (id) { state = state.withJoin( currentTable: table, - currentColumn: table.id, + currentColumn: table.playerId, referencedTable: $$PlayersTableTableReferences._idTable(db), referencedColumn: $$PlayersTableTableReferences._idTable(db).id, diff --git a/lib/data/db/tables/player_scores.dart b/lib/data/db/tables/player_scores_table.dart similarity index 100% rename from lib/data/db/tables/player_scores.dart rename to lib/data/db/tables/player_scores_table.dart diff --git a/lib/data/db/tables/players_table.dart b/lib/data/db/tables/players_table.dart index fb40cfc..d402562 100644 --- a/lib/data/db/tables/players_table.dart +++ b/lib/data/db/tables/players_table.dart @@ -2,7 +2,8 @@ import 'package:cabo_counter/data/db/tables/game_session_table.dart'; import 'package:drift/drift.dart'; class PlayersTable extends Table { - TextColumn get id => + TextColumn get playerId => text().references(GameSessionTable, #id, onDelete: KeyAction.cascade)(); + IntColumn get position => integer()(); TextColumn get name => text()(); } diff --git a/lib/data/db/tables/rounds_table.dart b/lib/data/db/tables/rounds_table.dart index c0c5773..3269b7a 100644 --- a/lib/data/db/tables/rounds_table.dart +++ b/lib/data/db/tables/rounds_table.dart @@ -2,12 +2,12 @@ import 'package:cabo_counter/data/db/tables/game_session_table.dart'; import 'package:drift/drift.dart'; class RoundsTable extends Table { - TextColumn get id => text()(); + TextColumn get roundId => text()(); TextColumn get gameId => text().references(GameSessionTable, #id, onDelete: KeyAction.cascade)(); IntColumn get roundNumber => integer()(); TextColumn get kamikazePlayer => text().nullable()(); @override - Set> get primaryKey => {id}; + Set> get primaryKey => {roundId}; } diff --git a/lib/data/models/game_manager.dart b/lib/data/dto/game_manager.dart similarity index 98% rename from lib/data/models/game_manager.dart rename to lib/data/dto/game_manager.dart index 6ec54c6..cec7db9 100644 --- a/lib/data/models/game_manager.dart +++ b/lib/data/dto/game_manager.dart @@ -1,4 +1,4 @@ -import 'package:cabo_counter/data/models/game_session.dart'; +import 'package:cabo_counter/data/dto/game_session.dart'; import 'package:cabo_counter/services/local_storage_service.dart'; import 'package:collection/collection.dart'; import 'package:flutter/foundation.dart'; diff --git a/lib/data/models/game_session.dart b/lib/data/dto/game_session.dart similarity index 99% rename from lib/data/models/game_session.dart rename to lib/data/dto/game_session.dart index 2c0f601..1f79cec 100644 --- a/lib/data/models/game_session.dart +++ b/lib/data/dto/game_session.dart @@ -1,4 +1,4 @@ -import 'package:cabo_counter/data/models/round.dart'; +import 'package:cabo_counter/data/dto/round.dart'; import 'package:flutter/cupertino.dart'; import 'package:uuid/uuid.dart'; diff --git a/lib/data/models/round.dart b/lib/data/dto/round.dart similarity index 96% rename from lib/data/models/round.dart rename to lib/data/dto/round.dart index 5695f8f..d29dc19 100644 --- a/lib/data/models/round.dart +++ b/lib/data/dto/round.dart @@ -1,5 +1,3 @@ -import 'package:cabo_counter/data/models/game_session.dart'; - /// This class represents a single round in the game. /// It is stored within the [GameSession] class. /// [roundNum] is the number of the round its reppresenting. diff --git a/lib/presentation/views/home/active_game/active_game_view.dart b/lib/presentation/views/home/active_game/active_game_view.dart index 3a4c0e5..6c4e76f 100644 --- a/lib/presentation/views/home/active_game/active_game_view.dart +++ b/lib/presentation/views/home/active_game/active_game_view.dart @@ -1,7 +1,7 @@ import 'package:cabo_counter/core/constants.dart'; import 'package:cabo_counter/core/custom_theme.dart'; -import 'package:cabo_counter/data/game_manager.dart'; -import 'package:cabo_counter/data/game_session.dart'; +import 'package:cabo_counter/data/dto/game_manager.dart'; +import 'package:cabo_counter/data/dto/game_session.dart'; import 'package:cabo_counter/l10n/generated/app_localizations.dart'; import 'package:cabo_counter/presentation/views/home/active_game/graph_view.dart'; import 'package:cabo_counter/presentation/views/home/active_game/mode_selection_view.dart'; diff --git a/lib/presentation/views/home/active_game/graph_view.dart b/lib/presentation/views/home/active_game/graph_view.dart index b7251d6..599326f 100644 --- a/lib/presentation/views/home/active_game/graph_view.dart +++ b/lib/presentation/views/home/active_game/graph_view.dart @@ -1,5 +1,5 @@ import 'package:cabo_counter/core/custom_theme.dart'; -import 'package:cabo_counter/data/game_session.dart'; +import 'package:cabo_counter/data/dto/game_session.dart'; import 'package:cabo_counter/l10n/generated/app_localizations.dart'; import 'package:flutter/cupertino.dart'; import 'package:syncfusion_flutter_charts/charts.dart'; diff --git a/lib/presentation/views/home/active_game/points_view.dart b/lib/presentation/views/home/active_game/points_view.dart index eb541e8..5d9501e 100644 --- a/lib/presentation/views/home/active_game/points_view.dart +++ b/lib/presentation/views/home/active_game/points_view.dart @@ -1,5 +1,5 @@ import 'package:cabo_counter/core/custom_theme.dart'; -import 'package:cabo_counter/data/game_session.dart'; +import 'package:cabo_counter/data/dto/game_session.dart'; import 'package:cabo_counter/l10n/generated/app_localizations.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/presentation/views/home/active_game/round_view.dart b/lib/presentation/views/home/active_game/round_view.dart index 35b85d6..41f634d 100644 --- a/lib/presentation/views/home/active_game/round_view.dart +++ b/lib/presentation/views/home/active_game/round_view.dart @@ -1,5 +1,5 @@ import 'package:cabo_counter/core/custom_theme.dart'; -import 'package:cabo_counter/data/game_session.dart'; +import 'package:cabo_counter/data/dto/game_session.dart'; import 'package:cabo_counter/l10n/generated/app_localizations.dart'; import 'package:cabo_counter/presentation/widgets/custom_button.dart'; import 'package:cabo_counter/services/local_storage_service.dart'; diff --git a/lib/presentation/views/home/create_game_view.dart b/lib/presentation/views/home/create_game_view.dart index f181721..b2148f1 100644 --- a/lib/presentation/views/home/create_game_view.dart +++ b/lib/presentation/views/home/create_game_view.dart @@ -1,7 +1,7 @@ import 'package:cabo_counter/core/constants.dart'; import 'package:cabo_counter/core/custom_theme.dart'; -import 'package:cabo_counter/data/game_manager.dart'; -import 'package:cabo_counter/data/game_session.dart'; +import 'package:cabo_counter/data/dto/game_manager.dart'; +import 'package:cabo_counter/data/dto/game_session.dart'; import 'package:cabo_counter/l10n/generated/app_localizations.dart'; import 'package:cabo_counter/presentation/views/home/active_game/active_game_view.dart'; import 'package:cabo_counter/presentation/views/home/active_game/mode_selection_view.dart'; diff --git a/lib/presentation/views/home/main_menu_view.dart b/lib/presentation/views/home/main_menu_view.dart index 240783a..ce616c0 100644 --- a/lib/presentation/views/home/main_menu_view.dart +++ b/lib/presentation/views/home/main_menu_view.dart @@ -1,7 +1,7 @@ import 'package:cabo_counter/core/constants.dart'; import 'package:cabo_counter/core/custom_theme.dart'; -import 'package:cabo_counter/data/game_manager.dart'; -import 'package:cabo_counter/data/game_session.dart'; +import 'package:cabo_counter/data/dto/game_manager.dart'; +import 'package:cabo_counter/data/dto/game_session.dart'; import 'package:cabo_counter/l10n/generated/app_localizations.dart'; import 'package:cabo_counter/presentation/views/home/active_game/active_game_view.dart'; import 'package:cabo_counter/presentation/views/home/create_game_view.dart'; diff --git a/lib/services/local_storage_service.dart b/lib/services/local_storage_service.dart index 520f5ca..044b7b0 100644 --- a/lib/services/local_storage_service.dart +++ b/lib/services/local_storage_service.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'dart:io'; -import 'package:cabo_counter/data/models/game_manager.dart'; -import 'package:cabo_counter/data/models/game_session.dart'; +import 'package:cabo_counter/data/dto/game_manager.dart'; +import 'package:cabo_counter/data/dto/game_session.dart'; import 'package:file_picker/file_picker.dart'; import 'package:file_saver/file_saver.dart'; import 'package:flutter/services.dart'; diff --git a/test/data/game_session_test.dart b/test/data/game_session_test.dart index 89c78ad..d69b62e 100644 --- a/test/data/game_session_test.dart +++ b/test/data/game_session_test.dart @@ -1,4 +1,4 @@ -import 'package:cabo_counter/data/models/game_session.dart'; +import 'package:cabo_counter/data/dto/game_session.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/data/round_test.dart b/test/data/round_test.dart index c80f0dc..fd824c2 100644 --- a/test/data/round_test.dart +++ b/test/data/round_test.dart @@ -1,4 +1,4 @@ -import 'package:cabo_counter/data/models/round.dart'; +import 'package:cabo_counter/data/dto/round.dart'; import 'package:test/test.dart'; void main() {