Refactor the models and repositories of classifications system. Add Score class, new StandingsRepo class, add creators of positions maps. Close the issues #44 and #48

Author: SiekamCebule

lib/models/db/event_series/classification/classification.dart

@@ -1,9 +1,11 @@
-import 'package:sj_manager/models/db/event_series/classification/classification_scoring_delegate.dart';
-import 'package:sj_manager/models/db/event_series/classification/classification_standings_repo.dart';
+import 'package:sj_manager/models/db/event_series/classification/classification_scoring_delegate/classification_scoring_delegate.dart';
+import 'package:sj_manager/models/db/event_series/standings/score/score.dart';
+import 'package:sj_manager/models/db/event_series/standings/standings_record.dart';
+import 'package:sj_manager/models/db/event_series/standings/standings_repo.dart';
 import 'package:sj_manager/models/db/event_series/competition/competition.dart';
 import 'package:sj_manager/repositories/generic/items_repo.dart';
 
-class Classification<T> {
+class Classification<E, S extends Score, R extends StandingsRecord<E, S>> {
   const Classification({
     required this.name,
     required this.competitions,
@@ -13,6 +15,6 @@ class Classification<T> {
 
   final String name;
   final ItemsRepo<Competition> competitions;
-  final ClassificationStandingsRepo<T> standings;
+  final StandingsRepo<E, S, R> standings;
   final ClassificationScoringDelegate scoringDelegate; // TODO: embrace type parameters
 }

lib/models/db/event_series/classification/classification_result.dart

@@ -0,0 +1,16 @@
+import 'package:sj_manager/models/db/event_series/classification/classification_scoring_delegate/classification_scoring_delegate.dart';
+import 'package:sj_manager/models/db/event_series/event_series.dart';
+
+class CallbackClassificationScoringDelegateByEventSeries<S, T>
+    implements ClassificationScoringDelegate<S, T, EventSeries> {
+  const CallbackClassificationScoringDelegateByEventSeries({
+    required this.compute,
+  });
+
+  final S Function(T entity, EventSeries series) compute;
+
+  @override
+  S calculateScore({required T entity, required EventSeries input}) {
+    return compute(entity, input);
+  }
+}

lib/models/db/event_series/classification/classification_scoring_delegate.dart

@@ -0,0 +1,5 @@
+abstract interface class ClassificationScoringDelegate<S, E, I> {
+  const ClassificationScoringDelegate();
+
+  S calculateScore({required E entity, required I input});
+}

lib/models/db/event_series/classification/classification_scoring_delegate/callback_classification_scoring_delegates.dart

@@ -0,0 +1,29 @@
+import 'package:sj_manager/models/db/event_series/standings/score/score.dart';
+
+abstract class SingleValueScore<T> extends Score {
+  const SingleValueScore(this.value);
+
+  final T value;
+
+  @override
+  List<Object?> get props => [value];
+}
+
+class PointsScore extends SingleValueScore<double> {
+  const PointsScore(super.value);
+
+  @override
+  bool operator >(covariant PointsScore other) {
+    return value > other.value;
+  }
+
+  @override
+  bool operator <(covariant PointsScore other) {
+    return value < other.value;
+  }
+
+  @override
+  int compareTo(covariant PointsScore other) {
+    return value.compareTo(other.value);
+  }
+}

lib/models/db/event_series/classification/classification_scoring_delegate/classification_scoring_delegate.dart

@@ -0,0 +1,8 @@
+import 'package:equatable/equatable.dart';
+
+abstract class Score with EquatableMixin implements Comparable {
+  const Score();
+
+  bool operator <(Score other);
+  bool operator >(Score other);
+}

lib/models/db/event_series/classification/classification_standings_repo.dart

@@ -0,0 +1,5 @@
+import 'package:sj_manager/models/db/event_series/standings/standings_record.dart';
+
+abstract interface class StandingsPositionsCreator<T extends StandingsRecord> {
+  Map<int, List<T>> create(List<T> records);
+}

lib/models/db/event_series/standings/score/basic_score_types.dart

@@ -0,0 +1,32 @@
+import 'package:sj_manager/models/db/event_series/standings/standings_positions_map_creator/standings_positions_creator.dart';
+import 'package:sj_manager/models/db/event_series/standings/standings_record.dart';
+
+class StandingsPositionsWithExAequoCreator<T extends StandingsRecord>
+    implements StandingsPositionsCreator<T> {
+  @override
+  Map<int, List<T>> create(List<T> records) {
+    _sortRecords(records);
+    return _generatePositionsMap(records);
+  }
+
+  void _sortRecords(List<T> records) {
+    records.sort((a, b) => b.compareTo(a));
+  }
+
+  Map<int, List<T>> _generatePositionsMap(List<T> records) {
+    Map<int, List<T>> positionsMap = {};
+    int currentPosition = 1;
+    int currentRank = 1;
+
+    for (int i = 0; i < records.length; i++) {
+      if (i > 0 && records[i].score != records[i - 1].score) {
+        currentRank = currentPosition;
+      }
+
+      positionsMap.putIfAbsent(currentRank, () => []).add(records[i]);
+      currentPosition++;
+    }
+
+    return positionsMap;
+  }
+}

lib/models/db/event_series/standings/score/score.dart

@@ -0,0 +1,27 @@
+import 'package:sj_manager/models/db/event_series/standings/standings_positions_map_creator/standings_positions_creator.dart';
+import 'package:sj_manager/models/db/event_series/standings/standings_record.dart';
+
+class StandingsPositionsWithNoExAequoCreator<T extends StandingsRecord>
+    implements StandingsPositionsCreator<T> {
+  @override
+  Map<int, List<T>> create(List<T> records) {
+    _sortRecords(records);
+    return _generatePositionsMap(records);
+  }
+
+  void _sortRecords(List<T> records) {
+    records.sort((a, b) => a.score > b.score ? -1 : 1);
+  }
+
+  Map<int, List<T>> _generatePositionsMap(List<T> records) {
+    Map<int, List<T>> positionsMap = {};
+    int currentPosition = 1;
+
+    for (T record in records) {
+      positionsMap[currentPosition] = [record];
+      currentPosition++;
+    }
+
+    return positionsMap;
+  }
+}

lib/models/db/event_series/standings/standings_positions_map_creator/standings_positions_creator.dart

@@ -0,0 +1,41 @@
+import 'dart:math';
+
+import 'package:sj_manager/models/db/event_series/standings/standings_positions_map_creator/standings_positions_creator.dart';
+import 'package:sj_manager/models/db/event_series/standings/standings_record.dart';
+
+class StandingsPositionsWithShuffleOnEqualsCreator<T extends StandingsRecord>
+    implements StandingsPositionsCreator<T> {
+  final Random _random = Random();
+
+  @override
+  Map<int, List<T>> create(List<T> records) {
+    _sortRecords(records);
+    return _generatePositionsMap(records);
+  }
+
+  void _sortRecords(List<T> records) {
+    records.sort((a, b) => a.score > b.score ? -1 : 1);
+  }
+
+  Map<int, List<T>> _generatePositionsMap(List<T> records) {
+    Map<int, List<T>> positionsMap = {};
+    int currentPosition = 1;
+    int currentRank = 1;
+
+    for (int i = 0; i < records.length; i++) {
+      if (i > 0 && records[i].score < records[i - 1].score) {
+        currentRank = currentPosition;
+      }
+
+      positionsMap.putIfAbsent(currentRank, () => []).add(records[i]);
+      currentPosition++;
+    }
+
+    // Shuffle the records with the same score
+    for (var position in positionsMap.keys) {
+      positionsMap[position]!.shuffle(_random);
+    }
+
+    return positionsMap;
+  }
+}

lib/models/db/event_series/standings/standings_positions_map_creator/standings_positions_with_ex_aequo_creator.dart

@@ -0,0 +1,38 @@
+import 'package:equatable/equatable.dart';
+import 'package:sj_manager/models/db/event_series/standings/score/score.dart';
+
+class StandingsRecord<E, S extends Score> with EquatableMixin implements Comparable {
+  const StandingsRecord({
+    required this.entity,
+    required this.score,
+  });
+
+  final E entity;
+  final S score;
+
+  StandingsRecord<E, S> copyWith({
+    E? entity,
+    S? score,
+  }) {
+    return StandingsRecord<E, S>(
+      entity: entity ?? this.entity,
+      score: score ?? this.score,
+    );
+  }
+
+  bool operator >(StandingsRecord<E, S> other) {
+    return score > other.score;
+  }
+
+  bool operator <(StandingsRecord<E, S> other) {
+    return score > other.score;
+  }
+
+  @override
+  int compareTo(covariant StandingsRecord other) {
+    return score.compareTo(other.score);
+  }
+
+  @override
+  List<Object?> get props => [entity, score];
+}