add soft delete parameter

2026-04-19 12:39:14 +02:00
20 changed files with 102 additions and 554 deletions
--- a/lib/core/common.dart
+++ b/lib/core/common.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:tallee/core/enums.dart';
 import 'package:tallee/data/models/match.dart';
-import 'package:tallee/data/models/player.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';

 /// Translates a [Ruleset] enum value to its corresponding localized string.
@@ -44,10 +43,3 @@ String getExtraPlayerCount(Match match) {
  }
  return ' + ${count.toString()}';
 }
-
-String getNameCountText(Player player) {
-  if (player.nameCount >= 1) {
-    return ' #${player.nameCount}';
-  }
-  return '';
-}
--- a/lib/data/dao/player_dao.dart
+++ b/lib/data/dao/player_dao.dart
@@ -1,5 +1,4 @@
 import 'package:drift/drift.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:tallee/data/db/database.dart';
 import 'package:tallee/data/db/tables/player_table.dart';
 import 'package:tallee/data/models/player.dart';
@@ -21,7 +20,6 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
            name: row.name,
            description: row.description,
            createdAt: row.createdAt,
-            nameCount: row.nameCount,
          ),
        )
        .toList();
@@ -36,7 +34,6 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
      name: result.name,
      description: result.description,
      createdAt: result.createdAt,
-      nameCount: result.nameCount,
    );
  }

@@ -45,15 +42,12 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
  /// the new one.
  Future<bool> addPlayer({required Player player}) async {
    if (!await playerExists(playerId: player.id)) {
-      final int nameCount = await calculateNameCount(name: player.name);
-
      await into(playerTable).insert(
        PlayerTableCompanion.insert(
          id: player.id,
          name: player.name,
          description: player.description,
          createdAt: player.createdAt,
-          nameCount: Value(nameCount),
        ),
        mode: InsertMode.insertOrReplace,
      );
@@ -68,67 +62,20 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
  Future<bool> addPlayersAsList({required List<Player> players}) async {
    if (players.isEmpty) return false;

-    // Filter out players that already exist
-    final newPlayers = <Player>[];
-    for (final player in players) {
-      if (!await playerExists(playerId: player.id)) {
-        newPlayers.add(player);
-      }
-    }
-
-    if (newPlayers.isEmpty) return false;
-
-    // Group players by name
-    final nameGroups = <String, List<Player>>{};
-    for (final player in newPlayers) {
-      nameGroups.putIfAbsent(player.name, () => []).add(player);
-    }
-
-    final playersToInsert = <PlayerTableCompanion>[];
-
-    // Process each group of players with the same name
-    for (final entry in nameGroups.entries) {
-      final name = entry.key;
-      final playersWithName = entry.value;
-
-      // Get the current nameCount
-      var nameCount = await calculateNameCount(name: name);
-
-      // One player with the same name
-      if (playersWithName.length == 1) {
-        final player = playersWithName[0];
-        playersToInsert.add(
-          PlayerTableCompanion.insert(
-            id: player.id,
-            name: player.name,
-            description: player.description,
-            createdAt: player.createdAt,
-            nameCount: Value(nameCount),
-          ),
-        );
-      } else {
-        if (nameCount == 0) nameCount++;
-        // Multiple players with the same name
-        for (var i = 0; i < playersWithName.length; i++) {
-          final player = playersWithName[i];
-          playersToInsert.add(
-            PlayerTableCompanion.insert(
-              id: player.id,
-              name: player.name,
-              description: player.description,
-              createdAt: player.createdAt,
-              nameCount: Value(nameCount + i),
-            ),
-          );
-        }
-      }
-    }
-
    await db.batch(
      (b) => b.insertAll(
        playerTable,
-        playersToInsert,
-        mode: InsertMode.insertOrReplace,
+        players
+            .map(
+              (player) => PlayerTableCompanion.insert(
+                id: player.id,
+                name: player.name,
+                description: player.description,
+                createdAt: player.createdAt,
+              ),
+            )
+            .toList(),
+        mode: InsertMode.insertOrIgnore,
      ),
    );

@@ -143,7 +90,7 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
    return rowsAffected > 0;
  }

-  /// Checks if a player with the given [playerId] exists in the database.
+  /// Checks if a player with the given [id] exists in the database.
  /// Returns `true` if the player exists, `false` otherwise.
  Future<bool> playerExists({required String playerId}) async {
    final query = select(playerTable)..where((p) => p.id.equals(playerId));
@@ -156,38 +103,9 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
    required String playerId,
    required String newName,
  }) async {
-    // Get previous name and name count for the player before updating
-    final previousPlayerName =
-        await (select(playerTable)..where((p) => p.id.equals(playerId)))
-            .map((row) => row.name)
-            .getSingleOrNull() ??
-        '';
-    final previousNameCount = await getNameCount(name: previousPlayerName);
-
    await (update(playerTable)..where((p) => p.id.equals(playerId))).write(
      PlayerTableCompanion(name: Value(newName)),
    );
-
-    // Update name count for the new name
-    final count = await calculateNameCount(name: newName);
-    if (count > 0) {
-      await (update(playerTable)..where((p) => p.name.equals(newName))).write(
-        PlayerTableCompanion(nameCount: Value(count)),
-      );
-    }
-
-    if (previousNameCount > 0) {
-      // Get the player with that name and the hightest nameCount, and update their nameCount to previousNameCount
-      final player = await getPlayerWithHighestNameCount(
-        name: previousPlayerName,
-      );
-      if (player != null) {
-        await updateNameCount(
-          playerId: player.id,
-          nameCount: previousNameCount,
-        );
-      }
-    }
  }

  /// Retrieves the total count of players in the database.
@@ -199,76 +117,6 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
    return count ?? 0;
  }

-  /// Retrieves the count of players with the given [name].
-  Future<int> getNameCount({required String name}) async {
-    final query = select(playerTable)..where((p) => p.name.equals(name));
-    final result = await query.get();
-    return result.length;
-  }
-
-  /// Updates the nameCount for the player with the given [playerId] to [nameCount].
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> updateNameCount({
-    required String playerId,
-    required int nameCount,
-  }) async {
-    final query = update(playerTable)..where((p) => p.id.equals(playerId));
-    final rowsAffected = await query.write(
-      PlayerTableCompanion(nameCount: Value(nameCount)),
-    );
-    return rowsAffected > 0;
-  }
-
-  @visibleForTesting
-  Future<Player?> getPlayerWithHighestNameCount({required String name}) async {
-    final query = select(playerTable)
-      ..where((p) => p.name.equals(name))
-      ..orderBy([(p) => OrderingTerm.desc(p.nameCount)])
-      ..limit(1);
-    final result = await query.getSingleOrNull();
-    if (result != null) {
-      return Player(
-        id: result.id,
-        name: result.name,
-        description: result.description,
-        createdAt: result.createdAt,
-        nameCount: result.nameCount,
-      );
-    }
-    return null;
-  }
-
-  @visibleForTesting
-  Future<int> calculateNameCount({required String name}) async {
-    final count = await getNameCount(name: name);
-    final int nameCount;
-
-    if (count == 1) {
-      // If one other player exists with the same name, initialize the nameCount
-      await initializeNameCount(name: name);
-      // And for the new player, set nameCount to 2
-      nameCount = 2;
-    } else if (count > 1) {
-      // If more than one player exists with the same name, just increment
-      // the nameCount for the new player
-      nameCount = count + 1;
-    } else {
-      // If no other players exist with the same name, set nameCount to 0
-      nameCount = 0;
-    }
-
-    return nameCount;
-  }
-
-  @visibleForTesting
-  Future<bool> initializeNameCount({required String name}) async {
-    final rowsAffected =
-        await (update(playerTable)..where((p) => p.name.equals(name))).write(
-          const PlayerTableCompanion(nameCount: Value(1)),
-        );
-    return rowsAffected > 0;
-  }
-
  /// Deletes all players from the database.
  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
  Future<bool> deleteAllPlayers() async {
--- a/lib/data/db/database.g.dart
+++ b/lib/data/db/database.g.dart
@@ -18,17 +18,6 @@ class $PlayerTableTable extends PlayerTable
    type: DriftSqlType.string,
    requiredDuringInsert: true,
  );
-  static const VerificationMeta _createdAtMeta = const VerificationMeta(
-    'createdAt',
-  );
-  @override
-  late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
-    'created_at',
-    aliasedName,
-    false,
-    type: DriftSqlType.dateTime,
-    requiredDuringInsert: true,
-  );
  static const VerificationMeta _nameMeta = const VerificationMeta('name');
  @override
  late final GeneratedColumn<String> name = GeneratedColumn<String>(
@@ -38,18 +27,6 @@ class $PlayerTableTable extends PlayerTable
    type: DriftSqlType.string,
    requiredDuringInsert: true,
  );
-  static const VerificationMeta _nameCountMeta = const VerificationMeta(
-    'nameCount',
-  );
-  @override
-  late final GeneratedColumn<int> nameCount = GeneratedColumn<int>(
-    'name_count',
-    aliasedName,
-    false,
-    type: DriftSqlType.int,
-    requiredDuringInsert: false,
-    defaultValue: const Constant(0),
-  );
  static const VerificationMeta _descriptionMeta = const VerificationMeta(
    'description',
  );
@@ -61,14 +38,19 @@ class $PlayerTableTable extends PlayerTable
    type: DriftSqlType.string,
    requiredDuringInsert: true,
  );
+  static const VerificationMeta _createdAtMeta = const VerificationMeta(
+    'createdAt',
+  );
  @override
-  List<GeneratedColumn> get $columns => [
-    id,
-    createdAt,
-    name,
-    nameCount,
-    description,
-  ];
+  late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: true,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [id, name, description, createdAt];
  @override
  String get aliasedName => _alias ?? actualTableName;
  @override
@@ -86,14 +68,6 @@ class $PlayerTableTable extends PlayerTable
    } else if (isInserting) {
      context.missing(_idMeta);
    }
-    if (data.containsKey('created_at')) {
-      context.handle(
-        _createdAtMeta,
-        createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta),
-      );
-    } else if (isInserting) {
-      context.missing(_createdAtMeta);
-    }
    if (data.containsKey('name')) {
      context.handle(
        _nameMeta,
@@ -102,12 +76,6 @@ class $PlayerTableTable extends PlayerTable
    } else if (isInserting) {
      context.missing(_nameMeta);
    }
-    if (data.containsKey('name_count')) {
-      context.handle(
-        _nameCountMeta,
-        nameCount.isAcceptableOrUnknown(data['name_count']!, _nameCountMeta),
-      );
-    }
    if (data.containsKey('description')) {
      context.handle(
        _descriptionMeta,
@@ -119,6 +87,14 @@ class $PlayerTableTable extends PlayerTable
    } else if (isInserting) {
      context.missing(_descriptionMeta);
    }
+    if (data.containsKey('created_at')) {
+      context.handle(
+        _createdAtMeta,
+        createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_createdAtMeta);
+    }
    return context;
  }

@@ -132,22 +108,18 @@ class $PlayerTableTable extends PlayerTable
        DriftSqlType.string,
        data['${effectivePrefix}id'],
      )!,
-      createdAt: attachedDatabase.typeMapping.read(
-        DriftSqlType.dateTime,
-        data['${effectivePrefix}created_at'],
-      )!,
      name: attachedDatabase.typeMapping.read(
        DriftSqlType.string,
        data['${effectivePrefix}name'],
      )!,
-      nameCount: attachedDatabase.typeMapping.read(
-        DriftSqlType.int,
-        data['${effectivePrefix}name_count'],
-      )!,
      description: attachedDatabase.typeMapping.read(
        DriftSqlType.string,
        data['${effectivePrefix}description'],
      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}created_at'],
+      )!,
    );
  }

@@ -159,35 +131,31 @@ class $PlayerTableTable extends PlayerTable

 class PlayerTableData extends DataClass implements Insertable<PlayerTableData> {
  final String id;
-  final DateTime createdAt;
  final String name;
-  final int nameCount;
  final String description;
+  final DateTime createdAt;
  const PlayerTableData({
    required this.id,
-    required this.createdAt,
    required this.name,
-    required this.nameCount,
    required this.description,
+    required this.createdAt,
  });
  @override
  Map<String, Expression> toColumns(bool nullToAbsent) {
    final map = <String, Expression>{};
    map['id'] = Variable<String>(id);
-    map['created_at'] = Variable<DateTime>(createdAt);
    map['name'] = Variable<String>(name);
-    map['name_count'] = Variable<int>(nameCount);
    map['description'] = Variable<String>(description);
+    map['created_at'] = Variable<DateTime>(createdAt);
    return map;
  }

  PlayerTableCompanion toCompanion(bool nullToAbsent) {
    return PlayerTableCompanion(
      id: Value(id),
-      createdAt: Value(createdAt),
      name: Value(name),
-      nameCount: Value(nameCount),
      description: Value(description),
+      createdAt: Value(createdAt),
    );
  }

@@ -198,10 +166,9 @@ class PlayerTableData extends DataClass implements Insertable<PlayerTableData> {
    serializer ??= driftRuntimeOptions.defaultSerializer;
    return PlayerTableData(
      id: serializer.fromJson<String>(json['id']),
-      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
      name: serializer.fromJson<String>(json['name']),
-      nameCount: serializer.fromJson<int>(json['nameCount']),
      description: serializer.fromJson<String>(json['description']),
+      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
    );
  }
  @override
@@ -209,35 +176,31 @@ class PlayerTableData extends DataClass implements Insertable<PlayerTableData> {
    serializer ??= driftRuntimeOptions.defaultSerializer;
    return <String, dynamic>{
      'id': serializer.toJson<String>(id),
-      'createdAt': serializer.toJson<DateTime>(createdAt),
      'name': serializer.toJson<String>(name),
-      'nameCount': serializer.toJson<int>(nameCount),
      'description': serializer.toJson<String>(description),
+      'createdAt': serializer.toJson<DateTime>(createdAt),
    };
  }

  PlayerTableData copyWith({
    String? id,
-    DateTime? createdAt,
    String? name,
-    int? nameCount,
    String? description,
+    DateTime? createdAt,
  }) => PlayerTableData(
    id: id ?? this.id,
-    createdAt: createdAt ?? this.createdAt,
    name: name ?? this.name,
-    nameCount: nameCount ?? this.nameCount,
    description: description ?? this.description,
+    createdAt: createdAt ?? this.createdAt,
  );
  PlayerTableData copyWithCompanion(PlayerTableCompanion data) {
    return PlayerTableData(
      id: data.id.present ? data.id.value : this.id,
-      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
      name: data.name.present ? data.name.value : this.name,
-      nameCount: data.nameCount.present ? data.nameCount.value : this.nameCount,
      description: data.description.present
          ? data.description.value
          : this.description,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
    );
  }

@@ -245,85 +208,76 @@ class PlayerTableData extends DataClass implements Insertable<PlayerTableData> {
  String toString() {
    return (StringBuffer('PlayerTableData(')
          ..write('id: $id, ')
-          ..write('createdAt: $createdAt, ')
          ..write('name: $name, ')
-          ..write('nameCount: $nameCount, ')
-          ..write('description: $description')
+          ..write('description: $description, ')
+          ..write('createdAt: $createdAt')
          ..write(')'))
        .toString();
  }

  @override
-  int get hashCode => Object.hash(id, createdAt, name, nameCount, description);
+  int get hashCode => Object.hash(id, name, description, createdAt);
  @override
  bool operator ==(Object other) =>
      identical(this, other) ||
      (other is PlayerTableData &&
          other.id == this.id &&
-          other.createdAt == this.createdAt &&
          other.name == this.name &&
-          other.nameCount == this.nameCount &&
-          other.description == this.description);
+          other.description == this.description &&
+          other.createdAt == this.createdAt);
 }

 class PlayerTableCompanion extends UpdateCompanion<PlayerTableData> {
  final Value<String> id;
-  final Value<DateTime> createdAt;
  final Value<String> name;
-  final Value<int> nameCount;
  final Value<String> description;
+  final Value<DateTime> createdAt;
  final Value<int> rowid;
  const PlayerTableCompanion({
    this.id = const Value.absent(),
-    this.createdAt = const Value.absent(),
    this.name = const Value.absent(),
-    this.nameCount = const Value.absent(),
    this.description = const Value.absent(),
+    this.createdAt = const Value.absent(),
    this.rowid = const Value.absent(),
  });
  PlayerTableCompanion.insert({
    required String id,
-    required DateTime createdAt,
    required String name,
-    this.nameCount = const Value.absent(),
    required String description,
+    required DateTime createdAt,
    this.rowid = const Value.absent(),
  }) : id = Value(id),
-       createdAt = Value(createdAt),
       name = Value(name),
-       description = Value(description);
+       description = Value(description),
+       createdAt = Value(createdAt);
  static Insertable<PlayerTableData> custom({
    Expression<String>? id,
-    Expression<DateTime>? createdAt,
    Expression<String>? name,
-    Expression<int>? nameCount,
    Expression<String>? description,
+    Expression<DateTime>? createdAt,
    Expression<int>? rowid,
  }) {
    return RawValuesInsertable({
      if (id != null) 'id': id,
-      if (createdAt != null) 'created_at': createdAt,
      if (name != null) 'name': name,
-      if (nameCount != null) 'name_count': nameCount,
      if (description != null) 'description': description,
+      if (createdAt != null) 'created_at': createdAt,
      if (rowid != null) 'rowid': rowid,
    });
  }

  PlayerTableCompanion copyWith({
    Value<String>? id,
-    Value<DateTime>? createdAt,
    Value<String>? name,
-    Value<int>? nameCount,
    Value<String>? description,
+    Value<DateTime>? createdAt,
    Value<int>? rowid,
  }) {
    return PlayerTableCompanion(
      id: id ?? this.id,
-      createdAt: createdAt ?? this.createdAt,
      name: name ?? this.name,
-      nameCount: nameCount ?? this.nameCount,
      description: description ?? this.description,
+      createdAt: createdAt ?? this.createdAt,
      rowid: rowid ?? this.rowid,
    );
  }
@@ -334,18 +288,15 @@ class PlayerTableCompanion extends UpdateCompanion<PlayerTableData> {
    if (id.present) {
      map['id'] = Variable<String>(id.value);
    }
-    if (createdAt.present) {
-      map['created_at'] = Variable<DateTime>(createdAt.value);
-    }
    if (name.present) {
      map['name'] = Variable<String>(name.value);
    }
-    if (nameCount.present) {
-      map['name_count'] = Variable<int>(nameCount.value);
-    }
    if (description.present) {
      map['description'] = Variable<String>(description.value);
    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<DateTime>(createdAt.value);
+    }
    if (rowid.present) {
      map['rowid'] = Variable<int>(rowid.value);
    }
@@ -356,10 +307,9 @@ class PlayerTableCompanion extends UpdateCompanion<PlayerTableData> {
  String toString() {
    return (StringBuffer('PlayerTableCompanion(')
          ..write('id: $id, ')
-          ..write('createdAt: $createdAt, ')
          ..write('name: $name, ')
-          ..write('nameCount: $nameCount, ')
          ..write('description: $description, ')
+          ..write('createdAt: $createdAt, ')
          ..write('rowid: $rowid')
          ..write(')'))
        .toString();
@@ -2840,19 +2790,17 @@ abstract class _$AppDatabase extends GeneratedDatabase {
 typedef $$PlayerTableTableCreateCompanionBuilder =
    PlayerTableCompanion Function({
      required String id,
-      required DateTime createdAt,
      required String name,
-      Value<int> nameCount,
      required String description,
+      required DateTime createdAt,
      Value<int> rowid,
    });
 typedef $$PlayerTableTableUpdateCompanionBuilder =
    PlayerTableCompanion Function({
      Value<String> id,
-      Value<DateTime> createdAt,
      Value<String> name,
-      Value<int> nameCount,
      Value<String> description,
+      Value<DateTime> createdAt,
      Value<int> rowid,
    });

@@ -2944,23 +2892,18 @@ class $$PlayerTableTableFilterComposer
    builder: (column) => ColumnFilters(column),
  );

-  ColumnFilters<DateTime> get createdAt => $composableBuilder(
-    column: $table.createdAt,
-    builder: (column) => ColumnFilters(column),
-  );
-
  ColumnFilters<String> get name => $composableBuilder(
    column: $table.name,
    builder: (column) => ColumnFilters(column),
  );

-  ColumnFilters<int> get nameCount => $composableBuilder(
-    column: $table.nameCount,
+  ColumnFilters<String> get description => $composableBuilder(
+    column: $table.description,
    builder: (column) => ColumnFilters(column),
  );

-  ColumnFilters<String> get description => $composableBuilder(
-    column: $table.description,
+  ColumnFilters<DateTime> get createdAt => $composableBuilder(
+    column: $table.createdAt,
    builder: (column) => ColumnFilters(column),
  );

@@ -3054,23 +2997,18 @@ class $$PlayerTableTableOrderingComposer
    builder: (column) => ColumnOrderings(column),
  );

-  ColumnOrderings<DateTime> get createdAt => $composableBuilder(
-    column: $table.createdAt,
-    builder: (column) => ColumnOrderings(column),
-  );
-
  ColumnOrderings<String> get name => $composableBuilder(
    column: $table.name,
    builder: (column) => ColumnOrderings(column),
  );

-  ColumnOrderings<int> get nameCount => $composableBuilder(
-    column: $table.nameCount,
+  ColumnOrderings<String> get description => $composableBuilder(
+    column: $table.description,
    builder: (column) => ColumnOrderings(column),
  );

-  ColumnOrderings<String> get description => $composableBuilder(
-    column: $table.description,
+  ColumnOrderings<DateTime> get createdAt => $composableBuilder(
+    column: $table.createdAt,
    builder: (column) => ColumnOrderings(column),
  );
 }
@@ -3087,20 +3025,17 @@ class $$PlayerTableTableAnnotationComposer
  GeneratedColumn<String> get id =>
      $composableBuilder(column: $table.id, builder: (column) => column);

-  GeneratedColumn<DateTime> get createdAt =>
-      $composableBuilder(column: $table.createdAt, builder: (column) => column);
-
  GeneratedColumn<String> get name =>
      $composableBuilder(column: $table.name, builder: (column) => column);

-  GeneratedColumn<int> get nameCount =>
-      $composableBuilder(column: $table.nameCount, builder: (column) => column);
-
  GeneratedColumn<String> get description => $composableBuilder(
    column: $table.description,
    builder: (column) => column,
  );

+  GeneratedColumn<DateTime> get createdAt =>
+      $composableBuilder(column: $table.createdAt, builder: (column) => column);
+
  Expression<T> playerGroupTableRefs<T extends Object>(
    Expression<T> Function($$PlayerGroupTableTableAnnotationComposer a) f,
  ) {
@@ -3210,33 +3145,29 @@ class $$PlayerTableTableTableManager
          updateCompanionCallback:
              ({
                Value<String> id = const Value.absent(),
-                Value<DateTime> createdAt = const Value.absent(),
                Value<String> name = const Value.absent(),
-                Value<int> nameCount = const Value.absent(),
                Value<String> description = const Value.absent(),
+                Value<DateTime> createdAt = const Value.absent(),
                Value<int> rowid = const Value.absent(),
              }) => PlayerTableCompanion(
                id: id,
-                createdAt: createdAt,
                name: name,
-                nameCount: nameCount,
                description: description,
+                createdAt: createdAt,
                rowid: rowid,
              ),
          createCompanionCallback:
              ({
                required String id,
-                required DateTime createdAt,
                required String name,
-                Value<int> nameCount = const Value.absent(),
                required String description,
+                required DateTime createdAt,
                Value<int> rowid = const Value.absent(),
              }) => PlayerTableCompanion.insert(
                id: id,
-                createdAt: createdAt,
                name: name,
-                nameCount: nameCount,
                description: description,
+                createdAt: createdAt,
                rowid: rowid,
              ),
          withReferenceMapper: (p0) => p0
--- a/lib/data/db/tables/game_table.dart
+++ b/lib/data/db/tables/game_table.dart
@@ -8,6 +8,7 @@ class GameTable extends Table {
  TextColumn get color => text()();
  TextColumn get icon => text()();
  DateTimeColumn get createdAt => dateTime()();
+  BoolColumn get deleted => boolean().withDefault(const Constant(false))();

  @override
  Set<Column<Object>> get primaryKey => {id};
--- a/lib/data/db/tables/group_table.dart
+++ b/lib/data/db/tables/group_table.dart
@@ -5,6 +5,7 @@ class GroupTable extends Table {
  TextColumn get name => text()();
  TextColumn get description => text()();
  DateTimeColumn get createdAt => dateTime()();
+  BoolColumn get deleted => boolean().withDefault(const Constant(false))();

  @override
  Set<Column<Object>> get primaryKey => {id};
--- a/lib/data/db/tables/match_table.dart
+++ b/lib/data/db/tables/match_table.dart
@@ -15,6 +15,7 @@ class MatchTable extends Table {
  TextColumn get notes => text().nullable()();
  DateTimeColumn get createdAt => dateTime()();
  DateTimeColumn get endedAt => dateTime().nullable()();
+  BoolColumn get deleted => boolean().withDefault(const Constant(false))();

  @override
  Set<Column<Object>> get primaryKey => {id};
--- a/lib/data/db/tables/player_group_table.dart
+++ b/lib/data/db/tables/player_group_table.dart
@@ -7,6 +7,7 @@ class PlayerGroupTable extends Table {
      text().references(PlayerTable, #id, onDelete: KeyAction.cascade)();
  TextColumn get groupId =>
      text().references(GroupTable, #id, onDelete: KeyAction.cascade)();
+  BoolColumn get deleted => boolean().withDefault(const Constant(false))();

  @override
  Set<Column<Object>> get primaryKey => {playerId, groupId};
--- a/lib/data/db/tables/player_match_table.dart
+++ b/lib/data/db/tables/player_match_table.dart
@@ -9,6 +9,7 @@ class PlayerMatchTable extends Table {
  TextColumn get matchId =>
      text().references(MatchTable, #id, onDelete: KeyAction.cascade)();
  TextColumn get teamId => text().references(TeamTable, #id).nullable()();
+  BoolColumn get deleted => boolean().withDefault(const Constant(false))();

  @override
  Set<Column<Object>> get primaryKey => {playerId, matchId};
--- a/lib/data/db/tables/player_table.dart
+++ b/lib/data/db/tables/player_table.dart
@@ -2,10 +2,10 @@ import 'package:drift/drift.dart';

 class PlayerTable extends Table {
  TextColumn get id => text()();
-  DateTimeColumn get createdAt => dateTime()();
  TextColumn get name => text()();
-  IntColumn get nameCount => integer().withDefault(const Constant(0))();
  TextColumn get description => text()();
+  DateTimeColumn get createdAt => dateTime()();
+  BoolColumn get deleted => boolean().withDefault(const Constant(false))();

  @override
  Set<Column<Object>> get primaryKey => {id};
--- a/lib/data/db/tables/score_entry_table.dart
+++ b/lib/data/db/tables/score_entry_table.dart
@@ -10,6 +10,7 @@ class ScoreEntryTable extends Table {
  IntColumn get roundNumber => integer()();
  IntColumn get score => integer()();
  IntColumn get change => integer()();
+  BoolColumn get deleted => boolean().withDefault(const Constant(false))();

  @override
  Set<Column<Object>> get primaryKey => {playerId, matchId, roundNumber};
--- a/lib/data/db/tables/team_table.dart
+++ b/lib/data/db/tables/team_table.dart
@@ -4,6 +4,7 @@ class TeamTable extends Table {
  TextColumn get id => text()();
  TextColumn get name => text()();
  DateTimeColumn get createdAt => dateTime()();
+  BoolColumn get deleted => boolean().withDefault(const Constant(false))();

  @override
  Set<Column<Object>> get primaryKey => {id};
--- a/lib/data/models/player.dart
+++ b/lib/data/models/player.dart
@@ -5,14 +5,12 @@ class Player {
  final String id;
  final DateTime createdAt;
  final String name;
-  int nameCount;
  final String description;

  Player({
    String? id,
    DateTime? createdAt,
    required this.name,
-    this.nameCount = 0,
    String? description,
  }) : id = id ?? const Uuid().v4(),
       createdAt = createdAt ?? clock.now(),
@@ -20,7 +18,7 @@ class Player {

  @override
  String toString() {
-    return 'Player{id: $id, createdAt: $createdAt, name: $name, nameCount: $nameCount, description: $description}';
+    return 'Player{id: $id, name: $name, description: $description}';
  }

  /// Creates a Player instance from a JSON object.
@@ -28,7 +26,6 @@ class Player {
    : id = json['id'],
      createdAt = DateTime.parse(json['createdAt']),
      name = json['name'],
-      nameCount = 0,
      description = json['description'];

  /// Converts the Player instance to a JSON object.
--- a/lib/presentation/views/main_menu/group_view/group_detail_view.dart
+++ b/lib/presentation/views/main_menu/group_view/group_detail_view.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:tallee/core/adaptive_page_route.dart';
-import 'package:tallee/core/common.dart';
 import 'package:tallee/core/custom_theme.dart';
 import 'package:tallee/data/db/database.dart';
 import 'package:tallee/data/models/group.dart';
@@ -154,7 +153,6 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                    children: _group.members.map((member) {
                      return TextIconTile(
                        text: member.name,
-                        suffixText: getNameCountText(member),
                        iconEnabled: false,
                      );
                    }).toList(),
--- a/lib/presentation/views/main_menu/match_view/match_detail_view.dart
+++ b/lib/presentation/views/main_menu/match_view/match_detail_view.dart
@@ -161,7 +161,6 @@ class _MatchDetailViewState extends State<MatchDetailView> {
                    children: match.players.map((player) {
                      return TextIconTile(
                        text: player.name,
-                        suffixText: getNameCountText(player),
                        iconEnabled: false,
                      );
                    }).toList(),
--- a/lib/presentation/widgets/player_selection.dart
+++ b/lib/presentation/widgets/player_selection.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:tallee/core/common.dart';
 import 'package:tallee/core/constants.dart';
 import 'package:tallee/core/custom_theme.dart';
 import 'package:tallee/data/db/database.dart';
@@ -141,7 +140,6 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                              padding: const EdgeInsets.only(right: 8.0),
                              child: TextIconTile(
                                text: player.name,
-                                suffixText: getNameCountText(player),
                                onIconTap: () {
                                  setState(() {
                                    // Removes the player from the selection and notifies the parent.
@@ -195,7 +193,6 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                  itemBuilder: (BuildContext context, int index) {
                    return TextIconListTile(
                      text: suggestedPlayers[index].name,
-                      suffixText: getNameCountText(suggestedPlayers[index]),
                      onPressed: () {
                        setState(() {
                          // If the player is not already selected
@@ -285,8 +282,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
    final loc = AppLocalizations.of(context);
    final playerName = _searchBarController.text.trim();

-    int nameCount = _calculateNameCount(playerName);
-    final createdPlayer = Player(name: playerName, nameCount: nameCount);
+    final createdPlayer = Player(name: playerName, description: '');
    final success = await db.playerDao.addPlayer(player: createdPlayer);

    if (!context.mounted) return;
@@ -299,22 +295,6 @@ class _PlayerSelectionState extends State<PlayerSelection> {
    }
  }

-  int _calculateNameCount(String playerName) {
-    final playersWithSameName =
-        allPlayers.where((player) => player.name == playerName).toList()
-          ..sort((a, b) => a.nameCount.compareTo(b.nameCount));
-
-    if (playersWithSameName.isEmpty) {
-      return 0;
-    } else if (playersWithSameName.length == 1) {
-      // Initialize nameCount
-      playersWithSameName[0].nameCount = 1;
-    }
-
-    // Return following count
-    return playersWithSameName.length + 1;
-  }
-
  /// Updates the state after successfully adding a new player.
  void _handleSuccessfulPlayerCreation(Player player) {
    selectedPlayers.insert(0, player);
--- a/lib/presentation/widgets/tiles/group_tile.dart
+++ b/lib/presentation/widgets/tiles/group_tile.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:tallee/core/common.dart';
 import 'package:tallee/core/custom_theme.dart';
 import 'package:tallee/data/models/group.dart';
 import 'package:tallee/presentation/widgets/tiles/text_icon_tile.dart';
@@ -82,11 +81,7 @@ class _GroupTileState extends State<GroupTile> {
                for (var member in [
                  ...widget.group.members,
                ]..sort((a, b) => a.name.compareTo(b.name)))
-                  TextIconTile(
-                    text: member.name,
-                    suffixText: getNameCountText(member),
-                    iconEnabled: false,
-                  ),
+                  TextIconTile(text: member.name, iconEnabled: false),
              ],
            ),
            const SizedBox(height: 2.5),
--- a/lib/presentation/widgets/tiles/match_tile.dart
+++ b/lib/presentation/widgets/tiles/match_tile.dart
@@ -203,11 +203,7 @@ class _MatchTileState extends State<MatchTile> {
                spacing: 6,
                runSpacing: 6,
                children: players.map((player) {
-                  return TextIconTile(
-                    text: player.name,
-                    suffixText: getNameCountText(player),
-                    iconEnabled: false,
-                  );
+                  return TextIconTile(text: player.name, iconEnabled: false);
                }).toList(),
              ),
            ],
--- a/lib/presentation/widgets/tiles/text_icon_list_tile.dart
+++ b/lib/presentation/widgets/tiles/text_icon_list_tile.dart
@@ -9,7 +9,6 @@ class TextIconListTile extends StatelessWidget {
  const TextIconListTile({
    super.key,
    required this.text,
-    this.suffixText = '',
    this.iconEnabled = true,
    this.onPressed,
  });
@@ -17,9 +16,6 @@ class TextIconListTile extends StatelessWidget {
  /// The text to display in the tile.
  final String text;

-  /// An optional suffix text to display after the main text.
-  final String suffixText;
-
  /// A boolean to determine if the icon should be displayed.
  final bool iconEnabled;

@@ -39,27 +35,12 @@ class TextIconListTile extends StatelessWidget {
          Flexible(
            child: Container(
              padding: const EdgeInsets.symmetric(vertical: 12.5),
-              child: RichText(
+              child: Text(
+                text,
                overflow: TextOverflow.ellipsis,
-                text: TextSpan(
-                  style: DefaultTextStyle.of(context).style,
-                  children: [
-                    TextSpan(
-                      text: text,
-                      style: const TextStyle(
-                        fontSize: 16,
-                        fontWeight: FontWeight.w500,
-                      ),
-                    ),
-                    TextSpan(
-                      text: suffixText,
-                      style: TextStyle(
-                        fontSize: 14,
-                        fontWeight: FontWeight.w500,
-                        color: CustomTheme.textColor.withAlpha(100),
-                      ),
-                    ),
-                  ],
+                style: const TextStyle(
+                  fontSize: 16,
+                  fontWeight: FontWeight.w500,
                ),
              ),
            ),
--- a/lib/presentation/widgets/tiles/text_icon_tile.dart
+++ b/lib/presentation/widgets/tiles/text_icon_tile.dart
@@ -9,7 +9,6 @@ class TextIconTile extends StatelessWidget {
  const TextIconTile({
    super.key,
    required this.text,
-    this.suffixText = '',
    this.iconEnabled = true,
    this.onIconTap,
  });
@@ -17,8 +16,6 @@ class TextIconTile extends StatelessWidget {
  /// The text to display in the tile.
  final String text;

-  final String suffixText;
-
  /// A boolean to determine if the icon should be displayed.
  final bool iconEnabled;

@@ -39,28 +36,10 @@ class TextIconTile extends StatelessWidget {
        children: [
          if (iconEnabled) const SizedBox(width: 3),
          Flexible(
-            child: RichText(
+            child: Text(
+              text,
              overflow: TextOverflow.ellipsis,
-              text: TextSpan(
-                style: DefaultTextStyle.of(context).style,
-                children: [
-                  TextSpan(
-                    text: text,
-                    style: const TextStyle(
-                      fontSize: 14,
-                      fontWeight: FontWeight.w500,
-                    ),
-                  ),
-                  TextSpan(
-                    text: suffixText,
-                    style: TextStyle(
-                      fontSize: 13,
-                      fontWeight: FontWeight.w500,
-                      color: CustomTheme.textColor.withAlpha(120),
-                    ),
-                  ),
-                ],
-              ),
+              style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500),
            ),
          ),
          if (iconEnabled) ...<Widget>[
--- a/test/db_tests/entities/player_test.dart
+++ b/test/db_tests/entities/player_test.dart
@@ -1,5 +1,5 @@
 import 'package:clock/clock.dart';
-import 'package:drift/drift.dart' hide isNull, isNotNull;
+import 'package:drift/drift.dart' hide isNull;
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:tallee/data/db/database.dart';
@@ -381,160 +381,5 @@ void main() {
      );
      expect(playerExists, true);
    });
-
-    group('Name Count Tests', () {
-      test('Single player gets initialized wih name count  0', () async {
-        await database.playerDao.addPlayer(player: testPlayer1);
-
-        final player = await database.playerDao.getPlayerById(
-          playerId: testPlayer1.id,
-        );
-        expect(player.nameCount, 0);
-      });
-
-      test('Multiple players get initialized wih name count  0', () async {
-        await database.playerDao.addPlayersAsList(
-          players: [testPlayer1, testPlayer2],
-        );
-
-        final players = await database.playerDao.getAllPlayers();
-
-        expect(players.length, 2);
-        for (Player p in players) {
-          expect(p.nameCount, 0);
-        }
-      });
-
-      test(
-        'Seperatly added players nameCount gets increased correctly',
-        () async {
-          await database.playerDao.addPlayer(player: testPlayer1);
-
-          final player1 = Player(name: testPlayer1.name, description: '');
-          await database.playerDao.addPlayer(player: player1);
-
-          var players = await database.playerDao.getAllPlayers();
-
-          expect(players.length, 2);
-          players.sort((a, b) => a.nameCount.compareTo(b.nameCount));
-
-          for (int i = 0; i < players.length - 1; i++) {
-            expect(players[i].nameCount, i + 1);
-          }
-        },
-      );
-
-      test(
-        'Together added players nameCount gets increased correctly',
-        () async {
-          final player1 = Player(name: testPlayer1.name, description: '');
-          final player2 = Player(name: testPlayer1.name, description: '');
-          final player3 = Player(name: testPlayer1.name, description: '');
-
-          // addPlayersAsList() with multiple players and with one player
-          await database.playerDao.addPlayersAsList(players: [testPlayer1]);
-          await database.playerDao.addPlayersAsList(
-            players: [player1, player2, player3],
-          );
-
-          var players = await database.playerDao.getAllPlayers();
-
-          expect(players.length, 4);
-          players.sort((a, b) => a.nameCount.compareTo(b.nameCount));
-
-          for (int i = 0; i < players.length - 1; i++) {
-            expect(players[i].nameCount, i + 1);
-          }
-        },
-      );
-
-      test('getNameCount works  correctly', () async {
-        final player2 = Player(name: testPlayer1.name);
-        final player3 = Player(name: testPlayer1.name);
-
-        await database.playerDao.addPlayersAsList(
-          players: [testPlayer1, player2, player3],
-        );
-
-        final nameCount = await database.playerDao.getNameCount(
-          name: testPlayer1.name,
-        );
-
-        expect(nameCount, 3);
-      });
-
-      test('updateNameCount works correctly', () async {
-        await database.playerDao.addPlayer(player: testPlayer1);
-
-        final success = await database.playerDao.updateNameCount(
-          playerId: testPlayer1.id,
-          nameCount: 2,
-        );
-        expect(success, true);
-
-        final player = await database.playerDao.getPlayerById(
-          playerId: testPlayer1.id,
-        );
-        expect(player.nameCount, 2);
-      });
-
-      test('getPlayerWithHighestNameCount works correctly', () async {
-        final player2 = Player(name: testPlayer1.name, description: '');
-        final player3 = Player(name: testPlayer1.name, description: '');
-
-        await database.playerDao.addPlayersAsList(
-          players: [testPlayer1, player2, player3],
-        );
-
-        final player = await database.playerDao.getPlayerWithHighestNameCount(
-          name: testPlayer1.name,
-        );
-
-        expect(player, isNotNull);
-        expect(player!.nameCount, 3);
-      });
-
-      test('getPlayerWithHighestNameCount with non existing player', () async {
-        final player = await database.playerDao.getPlayerWithHighestNameCount(
-          name: 'non-existing-name',
-        );
-        expect(player, isNull);
-      });
-
-      test('calculateNameCount works correctly', () async {
-        // Case 1: No existing players with the name
-        var count = await database.playerDao.calculateNameCount(
-          name: testPlayer1.name,
-        );
-        expect(count, 0);
-
-        // Case 2: One existing player with the name. Should update that
-        // player's nameCount to 1 and return 2 for the new player
-        await database.playerDao.addPlayer(player: testPlayer1);
-
-        count = await database.playerDao.calculateNameCount(
-          name: testPlayer1.name,
-        );
-        expect(count, 2);
-
-        // Case 3: Multiple existing players with the name.
-        final player2 = Player(name: testPlayer1.name, nameCount: count);
-        await database.playerDao.addPlayer(player: player2);
-
-        count = await database.playerDao.calculateNameCount(
-          name: testPlayer1.name,
-        );
-        expect(count, 3);
-      });
-
-      test('getPlayerWithHighestNameCount with non existing player', () async {
-        await database.playerDao.addPlayer(player: testPlayer1);
-        await database.playerDao.initializeNameCount(name: testPlayer1.name);
-        final player = await database.playerDao.getPlayerById(
-          playerId: testPlayer1.id,
-        );
-        expect(player.nameCount, 1);
-      });
-    });
  });
 }