diff --git a/Sources/bowlin_project/lib/model/Guest.dart b/Sources/bowlin_project/lib/model/Guest.dart index 5248bf7..081bea0 100644 --- a/Sources/bowlin_project/lib/model/Guest.dart +++ b/Sources/bowlin_project/lib/model/Guest.dart @@ -1,5 +1,3 @@ -import 'package:uuid/uuid.dart'; -import 'package:uuid/uuid_util.dart'; import 'Player.dart'; class Guest extends Player { diff --git a/Sources/bowlin_project/lib/model/IAuthManager.dart b/Sources/bowlin_project/lib/model/IAuthManager.dart index ffacd82..dd0f856 100644 --- a/Sources/bowlin_project/lib/model/IAuthManager.dart +++ b/Sources/bowlin_project/lib/model/IAuthManager.dart @@ -1,5 +1,5 @@ abstract class IAuthManager { // Methods - bool verifiedUser(String name, String password); + bool verifiedUser(String mail, String password); } diff --git a/Sources/bowlin_project/lib/model/IGameManager.dart b/Sources/bowlin_project/lib/model/IGameManager.dart index e84a682..e761719 100644 --- a/Sources/bowlin_project/lib/model/IGameManager.dart +++ b/Sources/bowlin_project/lib/model/IGameManager.dart @@ -8,6 +8,6 @@ abstract class IGameManager { List getGamesByPlayerId(int id); List getGamesByPlayer(Player user); List getGamesByPlayers(List users); - List getPlayersByIdGame(int id); + List getPlayersByIdGame(int id); Map getRankByIdGame(int id); } diff --git a/Sources/bowlin_project/lib/model/IUserManager.dart b/Sources/bowlin_project/lib/model/IUserManager.dart index 883c548..249da14 100644 --- a/Sources/bowlin_project/lib/model/IUserManager.dart +++ b/Sources/bowlin_project/lib/model/IUserManager.dart @@ -1,4 +1,3 @@ -import 'package:uuid/uuid.dart'; import 'Player.dart'; import 'User.dart'; import 'IAuthManager.dart'; diff --git a/Sources/bowlin_project/lib/model/StubManager/AuthManager.dart b/Sources/bowlin_project/lib/model/StubManager/AuthManager.dart index 694a88d..fc93912 100644 --- a/Sources/bowlin_project/lib/model/StubManager/AuthManager.dart +++ b/Sources/bowlin_project/lib/model/StubManager/AuthManager.dart @@ -1,5 +1,6 @@ library StubLib; import '../IAuthManager.dart'; +import '../User.dart'; import 'StubData.dart'; class AuthManager extends IAuthManager { @@ -8,7 +9,13 @@ class AuthManager extends IAuthManager { // Constructor AuthManager(this.parent); // Methods - bool verifiedUser(String name, String password) { - return false; + bool verifiedUser(String mail, String password) { + for (var user in parent.players) { + if (user is User && user.mail == mail) { + parent.userCurrent = user as User; + return true; + } + } + return false; } } \ No newline at end of file diff --git a/Sources/bowlin_project/lib/model/StubManager/GameManager.dart b/Sources/bowlin_project/lib/model/StubManager/GameManager.dart index c679ef7..2a0efff 100644 --- a/Sources/bowlin_project/lib/model/StubManager/GameManager.dart +++ b/Sources/bowlin_project/lib/model/StubManager/GameManager.dart @@ -60,11 +60,25 @@ class GameManager extends IGameManager { return games; } - List getPlayersByIdGame(int id) { - return []; + List getPlayersByIdGame(int id) { + List players = []; + for (var element in parent.gameDetails) { + if (element.id == id) { + for (var player in element.players) { + players.add(player); + } + return players; + } + } + throw Exception("Game not found."); } Map getRankByIdGame(int id) { - return {}; + for (var game in parent.gameDetails) { + if (game.id == id) { + return game.getRank(); + } + } + throw Exception("Game not found."); } } diff --git a/Sources/bowlin_project/lib/model/StubManager/StubData.dart b/Sources/bowlin_project/lib/model/StubManager/StubData.dart index 22b06cc..1950c50 100644 --- a/Sources/bowlin_project/lib/model/StubManager/StubData.dart +++ b/Sources/bowlin_project/lib/model/StubManager/StubData.dart @@ -1,8 +1,7 @@ library StubLib; -import 'package:bowl_in/model/Game.dart'; - import '../IManager.dart'; +import '../Game.dart'; import '../IUserManager.dart'; import '../IGameManager.dart'; import '../Player.dart'; @@ -70,18 +69,22 @@ class StubData extends IManager { void _initGameDetails() { gameDetails.add(GameDetail(1, DateTime.now(), players[7].id, 123, true, null, players[7].id, rounds, [players[0], players[1]])); - gameDetails.add(GameDetail(2, DateTime.now(), players[8].id, 113, true, - null, players[8].id, rounds, [players[0], players[1], players[2]])); + gameDetails.add(GameDetail(2, DateTime.now(), players[0].id, 113, true, + null, players[7].id, rounds, [players[0], players[1], players[7]])); + gameDetails.add(GameDetail(3, DateTime.now(), players[7].id, 93, true, + null, players[7].id, [], [players[0], players[7]])); + gameDetails.add(GameDetail(4, DateTime.now(), players[7].id, 93, true, + null, players[7].id, [], [players[1], players[7]])); } List get gameDetails => _gameDetails; List _rounds = []; void _initRounds() { - rounds.add(Round(4, 5, 9, players[7])); + rounds.add(Round(4, 5, 9, players[1])); rounds.add(Round(4, 1, 5, players[8])); rounds.add(Round(4, 5, 9, players[7])); - rounds.add(Round(4, 1, 5, players[8])); + rounds.add(Round(4, 1, 5, players[1])); rounds.add(Round(4, 5, 9, players[7])); rounds.add(Round(1, 5, 6, players[8])); rounds.add(Round(4, 1, 5, players[7])); @@ -90,6 +93,12 @@ class StubData extends IManager { rounds.add(Round(9, 0, 9, players[8])); rounds.add(Round(4, 5, 9, players[7])); rounds.add(Round(4, 5, 9, players[8])); + rounds.add(Round(4, 2, 6, players[0])); + rounds.add(Round(3, 5, 8, players[1])); + rounds.add(Round(4, 5, 9, players[2])); + rounds.add(Round(4, 5, 9, players[4])); + rounds.add(Round(1, 5, 6, players[6])); + rounds.add(Round(4, 5, 9, players[8])); rounds.add(Round(4, 2, 6, players[7])); rounds.add(Round(3, 5, 8, players[8])); rounds.add(Round(4, 5, 9, players[7])); diff --git a/Sources/bowlin_project/test/model_test.dart b/Sources/bowlin_project/test/model_test.dart index 82daad9..bcadd90 100644 --- a/Sources/bowlin_project/test/model_test.dart +++ b/Sources/bowlin_project/test/model_test.dart @@ -177,14 +177,14 @@ void main() { displayGameDetail(gd,2); print("\tgetGamesByPlayerId function with id: 2"); - List gds = mgr.gameMgr.getGamesByPlayerId(3); + List gds = mgr.gameMgr.getGamesByPlayerId(8); for (var game in gds) { displayGameDetail(game,2); } print("\tgetGamesByPlayer function:"); - var player = mgr.userMgr.getUserById(3); + var player = mgr.userMgr.getUserById(8); List gdsPlayer = mgr.gameMgr.getGamesByPlayer(player); for (var game in gdsPlayer) { @@ -199,6 +199,21 @@ void main() { { displayGameDetail(game,2); } + + print("\tgetPlayersByIdGame:"); + var playersIntoGame = mgr.gameMgr.getPlayersByIdGame(2); + for (var player in playersIntoGame) + { + displayPlayer(player,2); + } + + print("\tgetRankByIdGame:"); + var ranksPlayers = mgr.gameMgr.getRankByIdGame(2); + ranksPlayers.forEach((id, rank) { + displayPlayer(mgr.userMgr.getUserById(id),2); + print('\t\tRank $rank'); + }); + }