diff --git a/lib/data/dao/group_dao.dart b/lib/data/dao/group_dao.dart index ffcb84a..8eb3a1a 100644 --- a/lib/data/dao/group_dao.dart +++ b/lib/data/dao/group_dao.dart @@ -38,28 +38,32 @@ 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({required 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(), - ), - ); - await Future.wait( - group.members.map((player) => db.playerDao.addPlayer(player: player)), - ); - }); + Future addGroup({required Group group}) async { + if (!await groupExists(groupId: group.id)) { + 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(), + ), + ); + await Future.wait( + group.members.map((player) => db.playerDao.addPlayer(player: player)), + ); + return true; + }); + } + return false; } /// Deletes the group with the given [id] from the database. diff --git a/lib/data/dao/player_dao.dart b/lib/data/dao/player_dao.dart index 976d4b0..591634c 100644 --- a/lib/data/dao/player_dao.dart +++ b/lib/data/dao/player_dao.dart @@ -26,14 +26,14 @@ class PlayerDao extends DatabaseAccessor with _$PlayerDaoMixin { /// Adds a new [player] to the database. /// If a player with the same ID already exists, updates their name to /// the new one. - Future addPlayer({required Player player}) async { + 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); + return true; } + return false; } /// Deletes the player with the given [id] from the database. diff --git a/test/db_tests/group_test.dart b/test/db_tests/group_test.dart index d9e2c32..d8d6ce2 100644 --- a/test/db_tests/group_test.dart +++ b/test/db_tests/group_test.dart @@ -35,115 +35,146 @@ void main() { tearDown(() async { await database.close(); }); + group('group tests', () { + test('all groups get fetched correctly', () async { + final testgroup2 = Group( + id: 'gr2', + name: 'Second Group', + members: [player2, player3, player4], + ); + await database.groupDao.addGroup(group: testgroup); + await database.groupDao.addGroup(group: testgroup2); - //TODO: test getAllGroups method - test('group and group members gets added correctly', () async { - await database.groupDao.addGroup(group: testgroup); + final allGroups = await database.groupDao.getAllGroups(); + expect(allGroups.length, 2); - final result = await database.groupDao.getGroupById(groupId: testgroup.id); + final fetchedGroup1 = allGroups.firstWhere((g) => g.id == testgroup.id); + expect(fetchedGroup1.name, testgroup.name); + expect(fetchedGroup1.members.length, testgroup.members.length); + expect(fetchedGroup1.members.elementAt(0).id, player1.id); - expect(result.id, testgroup.id); - expect(result.name, testgroup.name); + final fetchedGroup2 = allGroups.firstWhere((g) => g.id == testgroup2.id); + expect(fetchedGroup2.name, testgroup2.name); + expect(fetchedGroup2.members.length, testgroup2.members.length); + expect(fetchedGroup2.members.elementAt(0).id, player2.id); + }); - 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 and group members gets added correctly', () async { + await database.groupDao.addGroup(group: testgroup); - test('group gets deleted correctly', () async { - await database.groupDao.addGroup(group: testgroup); + final result = await database.groupDao.getGroupById( + groupId: testgroup.id, + ); - final groupDeleted = await database.groupDao.deleteGroup( - groupId: testgroup.id, - ); - expect(groupDeleted, true); + expect(result.id, testgroup.id); + expect(result.name, testgroup.name); - final groupExists = await database.groupDao.groupExists( - groupId: testgroup.id, - ); - expect(groupExists, false); - }); + 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 name gets updated correcly ', () async { - await database.groupDao.addGroup(group: testgroup); + test('group gets deleted correctly', () async { + await database.groupDao.addGroup(group: testgroup); - const newGroupName = 'new group name'; + final groupDeleted = await database.groupDao.deleteGroup( + groupId: testgroup.id, + ); + expect(groupDeleted, true); - await database.groupDao.updateGroupname( - groupId: testgroup.id, - newName: newGroupName, - ); + final groupExists = await database.groupDao.groupExists( + groupId: testgroup.id, + ); + expect(groupExists, false); + }); - final result = await database.groupDao.getGroupById(groupId: testgroup.id); - expect(result.name, newGroupName); - }); + test('group name gets updated correcly ', () async { + await database.groupDao.addGroup(group: testgroup); - test('Adding player to group works correctly', () async { - await database.groupDao.addGroup(group: testgroup); + const newGroupName = 'new group name'; - await database.playerGroupDao.addPlayerToGroup( - player: player4, - groupId: testgroup.id, - ); + await database.groupDao.updateGroupname( + groupId: testgroup.id, + newName: newGroupName, + ); - final playerAdded = await database.playerGroupDao.isPlayerInGroup( - playerId: player4.id, - groupId: testgroup.id, - ); + final result = await database.groupDao.getGroupById( + groupId: testgroup.id, + ); + expect(result.name, newGroupName); + }); - expect(playerAdded, true); + test('Adding player to group works correctly', () async { + await database.groupDao.addGroup(group: testgroup); - final playerAdded2 = await database.playerGroupDao.isPlayerInGroup( - playerId: 'a', - groupId: testgroup.id, - ); + await database.playerGroupDao.addPlayerToGroup( + player: player4, + groupId: testgroup.id, + ); - expect(playerAdded2, false); + final playerAdded = await database.playerGroupDao.isPlayerInGroup( + playerId: player4.id, + groupId: testgroup.id, + ); - expect(playerAdded, true); + expect(playerAdded, true); - final result = await database.groupDao.getGroupById(groupId: testgroup.id); - expect(result.members.length, testgroup.members.length + 1); + final playerAdded2 = await database.playerGroupDao.isPlayerInGroup( + playerId: 'a', + groupId: testgroup.id, + ); - final addedPlayer = result.members.firstWhere((p) => p.id == player4.id); - expect(addedPlayer.name, player4.name); - }); + expect(playerAdded2, false); - test('Removing player from group works correctly', () async { - await database.groupDao.addGroup(group: testgroup); + expect(playerAdded, true); - final playerToRemove = testgroup.members[0]; + final result = await database.groupDao.getGroupById( + groupId: testgroup.id, + ); + expect(result.members.length, testgroup.members.length + 1); - final removed = await database.playerGroupDao.removePlayerFromGroup( - playerId: playerToRemove.id, - groupId: testgroup.id, - ); - expect(removed, true); + final addedPlayer = result.members.firstWhere((p) => p.id == player4.id); + expect(addedPlayer.name, player4.name); + }); - final result = await database.groupDao.getGroupById(groupId: testgroup.id); - expect(result.members.length, testgroup.members.length - 1); + test('Removing player from group works correctly', () async { + await database.groupDao.addGroup(group: testgroup); - final playerExists = result.members.any((p) => p.id == playerToRemove.id); - expect(playerExists, false); - }); + final playerToRemove = testgroup.members[0]; - test('get group count works correctly', () async { - final initialCount = await database.groupDao.getGroupCount(); - expect(initialCount, 0); + final removed = await database.playerGroupDao.removePlayerFromGroup( + playerId: playerToRemove.id, + groupId: testgroup.id, + ); + expect(removed, true); - await database.groupDao.addGroup(group: testgroup); + final result = await database.groupDao.getGroupById( + groupId: testgroup.id, + ); + expect(result.members.length, testgroup.members.length - 1); - final groupAdded = await database.groupDao.getGroupCount(); - expect(groupAdded, 1); + final playerExists = result.members.any((p) => p.id == playerToRemove.id); + expect(playerExists, false); + }); - final groupRemoved = await database.groupDao.deleteGroup( - groupId: testgroup.id, - ); - expect(groupRemoved, true); + test('get group count works correctly', () async { + final initialCount = await database.groupDao.getGroupCount(); + expect(initialCount, 0); - final finalCount = await database.groupDao.getGroupCount(); - expect(finalCount, 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 7fb9152..5258c66 100644 --- a/test/db_tests/player_test.dart +++ b/test/db_tests/player_test.dart @@ -24,6 +24,25 @@ void main() { }); group('player tests', () { + test('all players get fetched correctly', () async { + final testPlayer2 = Player(id: 'gr2', name: 'Second Group'); + await database.playerDao.addPlayer(player: testPlayer); + await database.playerDao.addPlayer(player: testPlayer2); + + final allPlayers = await database.playerDao.getAllPlayers(); + expect(allPlayers.length, 2); + + final fetchedPlayer1 = allPlayers.firstWhere( + (g) => g.id == testPlayer.id, + ); + expect(fetchedPlayer1.name, testPlayer.name); + + final fetchedPlayer2 = allPlayers.firstWhere( + (g) => g.id == testPlayer2.id, + ); + expect(fetchedPlayer2.name, testPlayer2.name); + }); + test('players get inserted correcly ', () async { await database.playerDao.addPlayer(player: testPlayer); final result = await database.playerDao.getPlayerById(