Refactoring

lib/data/dao/player_group_dao.dart

@@ -46,15 +46,15 @@ class PlayerGroupDao extends DatabaseAccessor<AppDatabase>
       ),
     ])..where(playerGroupTable.groupId.equals(groupId));
 
-    final results = await query.map((row) => row.readTable(playerTable)).get();
-    return results
+    final result = await query.map((row) => row.readTable(playerTable)).get();
+    return result
         .map(
-          (result) => Player(
-            id: result.id,
-            createdAt: result.createdAt,
-            name: result.name,
-            nameCount: result.nameCount,
-            description: result.description,
+          (row) => Player(
+            id: row.id,
+            createdAt: row.createdAt,
+            name: row.name,
+            nameCount: row.nameCount,
+            description: row.description,
           ),
         )
         .toList();
@@ -67,7 +67,9 @@ class PlayerGroupDao extends DatabaseAccessor<AppDatabase>
     required String groupId,
   }) async {
     final query = select(playerGroupTable)
-      ..where((p) => p.playerId.equals(playerId) & p.groupId.equals(groupId));
+      ..where(
+        (tbl) => tbl.playerId.equals(playerId) & tbl.groupId.equals(groupId),
+      );
     final result = await query.getSingleOrNull();
     return result != null;
   }
@@ -88,7 +90,7 @@ class PlayerGroupDao extends DatabaseAccessor<AppDatabase>
     await db.transaction(() async {
       // Remove all existing players from the group
       final deleteQuery = delete(db.playerGroupTable)
-        ..where((p) => p.groupId.equals(groupId));
+        ..where((tbl) => tbl.groupId.equals(groupId));
       await deleteQuery.go();
 
       // Add new players to the player table if they don't exist
@@ -128,7 +130,9 @@ class PlayerGroupDao extends DatabaseAccessor<AppDatabase>
     required String groupId,
   }) async {
     final query = delete(playerGroupTable)
-      ..where((p) => p.playerId.equals(playerId) & p.groupId.equals(groupId));
+      ..where(
+        (tbl) => tbl.playerId.equals(playerId) & tbl.groupId.equals(groupId),
+      );
     final rowsAffected = await query.go();
     return rowsAffected > 0;
   }