Skip to content

Commit c6fd0ce

Browse files
SiekamCebuleSiekamCebule
committed
Another important work (refactoring, Clean Architecture)
1 parent 560853c commit c6fd0ce

File tree

215 files changed

+3042
-2380
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+3042
-2380
lines changed

‎lib/core/algorithms/filter/composite_filter.dart

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import 'package:sj_manager/core/algorithms/filter/filter.dart';
2+
3+
class CompositeFilter<T> implements Filter<T> {
4+
const CompositeFilter({
5+
required this.filters,
6+
});
7+
8+
final Iterable<Filter<T>> filters;
9+
10+
@override
11+
Iterable<T> call(Iterable<T> source) {
12+
Iterable<T> currentItems = List.of(source);
13+
for (var filter in filters) {
14+
currentItems = filter(currentItems);
15+
}
16+
return currentItems;
17+
}
18+
19+
@override
20+
bool get isValid =>
21+
filters.isNotEmpty ? filters.every((filter) => filter.isValid) : false;
22+
}

‎lib/core/algorithms/filter/filter.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
abstract interface class Filter<T> {
2+
const Filter();
3+
4+
bool get isValid;
5+
Iterable<T> call(Iterable<T> source);
6+
}

‎lib/core/algorithms/filter/generic_filters.dart

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
import 'package:sj_manager/core/classes/country/country.dart';
2+
import 'package:sj_manager/core/algorithms/filter/filter.dart';
3+
import 'package:sj_manager/core/mixins/country_mixin.dart';
4+
import 'package:sj_manager/core/mixins/name_and_surname_mixin.dart';
5+
import 'package:sj_manager/utilities/filters/matching_algorithms/matching_by_text_algorithm.dart';
6+
7+
class NoFilter<T> implements Filter<T> {
8+
@override
9+
Iterable<T> call(Iterable<T> source) {
10+
return source;
11+
}
12+
13+
@override
14+
bool get isValid => false;
15+
}
16+
17+
class NameSurnameFilter<T extends NameAndSurnameMixin> implements Filter<T> {
18+
const NameSurnameFilter({
19+
required this.text,
20+
});
21+
22+
final String text;
23+
24+
@override
25+
Iterable<T> call(Iterable<T> source) {
26+
bool shouldPass(NameAndSurnameMixin data) {
27+
final base = data.nameAndSurname();
28+
return DefaultMatchingByTextAlgorithm(target: base, text: text).matches();
29+
}
30+
31+
return source.where(shouldPass);
32+
}
33+
34+
@override
35+
bool get isValid => text.isNotEmpty;
36+
}
37+
38+
class CountryFilter<T extends CountryMixin> implements Filter<T> {
39+
const CountryFilter({
40+
required this.country,
41+
});
42+
43+
final Country? country;
44+
45+
@override
46+
Iterable<T> call(Iterable<T> source) {
47+
bool shouldPass(CountryMixin data) {
48+
return data.country == country;
49+
}
50+
51+
return source.where(shouldPass);
52+
}
53+
54+
@override
55+
bool get isValid => country != null;
56+
}

‎lib/core/country/country.dart renamed to ‎lib/core/classes/country/country.dart

File renamed without changes.

‎lib/core/country/country.g.dart renamed to ‎lib/core/classes/country/country.g.dart

File renamed without changes.

‎lib/core/team/country_team/country_team.dart renamed to ‎lib/core/classes/country_team/country_team.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import 'package:sj_manager/core/country/country.dart';
1+
import 'package:sj_manager/core/classes/country/country.dart';
22
import 'package:sj_manager/features/game_variants/data/models/game_variant_database.dart/sex.dart';
3-
import 'package:sj_manager/core/team/country_team/country_team_facts_model.dart';
3+
import 'package:sj_manager/core/classes/country_team/country_team_facts_model.dart';
44
import 'package:sj_manager/domain/entities/simulation/team/team.dart';
55

66
class CountryTeam extends Team {

‎lib/core/team/country_team/country_team_facts.g.dart renamed to ‎lib/core/classes/country_team/country_team_facts.g.dart

File renamed without changes.

‎lib/core/team/country_team/country_team_facts_model.dart renamed to ‎lib/core/classes/country_team/country_team_facts_model.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:equatable/equatable.dart';
22
import 'package:json_annotation/json_annotation.dart';
33
import 'package:sj_manager/utilities/json/json_types.dart';
4-
import 'package:sj_manager/core/jumps/simple_jump_model.dart';
4+
import 'package:sj_manager/core/classes/jumps/simple_jump_model.dart';
55
import 'package:sj_manager/domain/entities/simulation/team/subteam_type.dart';
66

77
part 'country_team_facts.g.dart';

‎lib/core/jumps/simple_jump.g.dart renamed to ‎lib/core/classes/jumps/simple_jump.g.dart

File renamed without changes.

‎lib/core/jumps/simple_jump_model.dart renamed to ‎lib/core/classes/jumps/simple_jump_model.dart

File renamed without changes.

‎lib/core/countries/countries_repository/countries_repository.dart

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import 'package:sj_manager/core/classes/country/country.dart';
2+
3+
abstract interface class CountriesRepository {
4+
Future<Iterable<Country>> getAll();
5+
Future<Country> byCode(String code);
6+
Future<Country> get none;
7+
}
8+
9+
class CountryNotFoundError extends Error {
10+
CountryNotFoundError({
11+
required this.countryCode,
12+
});
13+
14+
final String countryCode;
15+
16+
@override
17+
String toString() {
18+
return 'Didn\'t find a country with the code of \'$countryCode\'';
19+
}
20+
}

‎lib/core/countries/countries_repository/in_memory_countries_repository.dart

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import 'package:collection/collection.dart';
2+
import 'package:equatable/equatable.dart';
3+
import 'package:sj_manager/core/classes/country/country.dart';
4+
import 'package:sj_manager/core/countries/countries_repository/countries_repository.dart';
5+
6+
class InMemoryCountriesRepository with EquatableMixin implements CountriesRepository {
7+
const InMemoryCountriesRepository({
8+
required this.countries,
9+
});
10+
11+
final Iterable<Country> countries;
12+
13+
@override
14+
Future<Iterable<Country>> getAll() async => countries;
15+
16+
@override
17+
Future<Country> byCode(String code) async {
18+
final toReturn = countries.singleWhereOrNull(
19+
(country) => country.code.toLowerCase() == code.toLowerCase(),
20+
);
21+
if (toReturn == null) {
22+
throw CountryNotFoundError(countryCode: code.toLowerCase());
23+
}
24+
return toReturn;
25+
}
26+
27+
@override
28+
Future<Country> get none async => byCode('none');
29+
30+
@override
31+
List<Object?> get props => [countries];
32+
}

‎lib/core/database_editor/database_editor_filter_type.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
enum DatabaseEditorFilterType {
2+
nameSurname,
3+
country,
4+
}

‎lib/core/database_editor/database_editor_items_type.dart

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
enum DatabaseEditorItemsType {
2+
maleJumper,
3+
femaleJumper,
4+
}
5+
6+
const sjmDatabaseEditorItemsTypeOrder = [
7+
DatabaseEditorItemsType.maleJumper,
8+
DatabaseEditorItemsType.femaleJumper,
9+
];

‎lib/core/mixins/country_mixin.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import 'package:sj_manager/core/classes/country/country.dart';
2+
3+
mixin CountryMixin {
4+
Country get country;
5+
}

‎lib/core/mixins/name_and_surname_mixin.dart

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
mixin NameAndSurnameMixin {
2+
String get name;
3+
String get surname;
4+
5+
String nameAndSurname({bool capitalizeSurname = false, bool reverse = false}) {
6+
var appropriateSurname = surname;
7+
if (capitalizeSurname) {
8+
appropriateSurname = appropriateSurname.toUpperCase();
9+
}
10+
return reverse ? '$appropriateSurname $name ' : '$name $appropriateSurname';
11+
}
12+
}

‎lib/core/mixins/sex_mixin.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import 'package:sj_manager/features/game_variants/data/models/game_variant_database.dart/sex.dart';
2+
3+
mixin SexMixin {
4+
Sex get sex;
5+
}

‎lib/core/utils/jumper/jumper_sex_utils.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import 'package:sj_manager/core/mixins/sex_mixin.dart';
2+
import 'package:sj_manager/features/game_variants/data/models/game_variant_database.dart/sex.dart';
3+
4+
bool jumperIsMale(SexMixin jumper) => jumper.sex == Sex.male;
5+
bool jumperIsFemale(SexMixin jumper) => jumper.sex == Sex.female;

‎lib/data/models/running/competition_flow_controller.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:sj_manager/data/models/running/competition_start_list_repository.dart';
22
import 'package:sj_manager/domain/entities/simulation/competition/rules/competition_rules/default_competition_rules.dart';
3-
import 'package:sj_manager/features/game_variants/domain/entities/jumper/jumper_db_record.dart';
3+
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
44
import 'package:sj_manager/domain/entities/simulation/team/team.dart';
55

66
abstract class CompetitionFlowController<E> {

‎lib/domain/entities/game_variant/hill/hill.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import 'package:equatable/equatable.dart';
22
import 'package:json_annotation/json_annotation.dart';
3+
import 'package:sj_manager/core/mixins/country_mixin.dart';
34

45
import 'package:sj_manager/utilities/json/countries.dart';
56
import 'package:sj_manager/utilities/json/json_types.dart';
6-
import 'package:sj_manager/core/country/country.dart';
7+
import 'package:sj_manager/core/classes/country/country.dart';
78
import 'package:sj_manager/domain/entities/game_variant/hill/hill_profile_type.dart';
89
import 'package:sj_manager/domain/entities/game_variant/hill/hill_type_by_size.dart';
910
import 'package:sj_manager/domain/entities/game_variant/hill/jumps_variability.dart';
@@ -13,7 +14,7 @@ import 'package:sj_manager/utilities/utils/doubles.dart';
1314

1415
part '../../../../utilities/json/manual_json/hill_json.dart';
1516

16-
class Hill with EquatableMixin {
17+
class Hill with EquatableMixin, CountryMixin {
1718
Hill({
1819
required this.name,
1920
required this.locality,
@@ -47,6 +48,8 @@ class Hill with EquatableMixin {
4748

4849
String name;
4950
String locality;
51+
52+
@override
5053
Country country;
5154

5255
double k;

‎lib/domain/entities/simulation/classification/default_classification_rules.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'package:sj_manager/domain/entities/simulation/competition/competition.da
44
import 'package:sj_manager/domain/entities/simulation/competition/rules/utils/classification_score_creator/classification_score_creator.dart';
55
import 'package:sj_manager/domain/entities/simulation/standings/score/details/classification_score_details.dart';
66
import 'package:sj_manager/domain/entities/simulation/standings/standings.dart';
7-
import 'package:sj_manager/features/game_variants/domain/entities/jumper/jumper_db_record.dart';
7+
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
88
import 'package:sj_manager/domain/entities/simulation/team/team.dart';
99

1010
abstract class ClassificationRules<E> {

‎lib/domain/entities/simulation/competition/calendar_records/calendar_main_competition_record.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:sj_manager/domain/entities/simulation/competition/rules/competit
66
import 'package:sj_manager/domain/entities/simulation/competition/rules/competition_rules/default_competition_rules_provider.dart';
77
import 'package:sj_manager/domain/entities/simulation/standings/standings.dart';
88
import 'package:sj_manager/domain/entities/game_variant/hill/hill.dart';
9-
import 'package:sj_manager/features/game_variants/domain/entities/jumper/jumper_db_record.dart';
9+
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
1010
import 'package:sj_manager/domain/entities/simulation/team/competition_team.dart';
1111
import 'package:equatable/equatable.dart';
1212

‎lib/domain/entities/simulation/competition/calendar_records/calendar_main_competition_record_setup.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:equatable/equatable.dart';
22
import 'package:sj_manager/domain/entities/simulation/competition/rules/competition_rules/default_competition_rules.dart';
33
import 'package:sj_manager/domain/entities/simulation/competition/rules/competition_rules/default_competition_rules_provider.dart';
4-
import 'package:sj_manager/features/game_variants/domain/entities/jumper/jumper_db_record.dart';
4+
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
55
import 'package:sj_manager/presentation/ui/database_item_editors/default_competition_rules_preset_editor/default_competition_rules_editor.dart';
66

77
class CalendarMainCompetitionRecordSetup with EquatableMixin {

‎lib/domain/entities/simulation/competition/calendar_records/calendar_main_competition_records_to_calendar.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:sj_manager/domain/entities/simulation/competition/high_level_cal
77
import 'package:sj_manager/domain/entities/simulation/competition/rules/competition_rules/default_competition_rules.dart';
88
import 'package:sj_manager/domain/entities/simulation/event_series/event_series_calendar.dart';
99
import 'package:sj_manager/domain/entities/game_variant/hill/hill.dart';
10-
import 'package:sj_manager/features/game_variants/domain/entities/jumper/jumper_db_record.dart';
10+
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
1111
import 'package:sj_manager/domain/entities/simulation/team/competition_team.dart';
1212
import 'package:sj_manager/utilities/utils/iterable.dart';
1313

‎lib/domain/entities/simulation/competition/rules/competition_round_rules/default_individual_competition_round_rules.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'package:sj_manager/domain/entities/simulation/standings/score/details/co
1111
import 'package:sj_manager/domain/entities/simulation/standings/score/score.dart';
1212
import 'package:sj_manager/domain/entities/simulation/standings/score/typedefs.dart';
1313
import 'package:sj_manager/domain/entities/simulation/standings/standings_positions_map_creator/standings_positions_creator.dart';
14-
import 'package:sj_manager/features/game_variants/domain/entities/jumper/jumper_db_record.dart';
14+
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
1515

1616
class DefaultIndividualCompetitionRoundRules
1717
extends DefaultCompetitionRoundRules<JumperDbRecord> {

‎lib/domain/entities/simulation/competition/rules/competition_rules/default_competition_rules_preset.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:equatable/equatable.dart';
22
import 'package:sj_manager/domain/entities/simulation/competition/rules/competition_rules/default_competition_rules.dart';
33
import 'package:sj_manager/domain/entities/simulation/competition/rules/competition_rules/default_competition_rules_provider.dart';
4-
import 'package:sj_manager/features/game_variants/domain/entities/jumper/jumper_db_record.dart';
4+
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
55
import 'package:sj_manager/domain/entities/simulation/team/team.dart';
66

77
class DefaultCompetitionRulesPreset<T>

‎lib/domain/entities/simulation/competition/rules/utils/classification_score_creator/classification_score_creator.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:sj_manager/domain/entities/simulation/event_series/event_series.
88
import 'package:sj_manager/domain/entities/simulation/standings/score/details/classification_score_details.dart';
99
import 'package:sj_manager/domain/entities/simulation/standings/score/details/competition_score_details.dart';
1010
import 'package:sj_manager/domain/entities/simulation/standings/standings.dart';
11-
import 'package:sj_manager/features/game_variants/domain/entities/jumper/jumper_db_record.dart';
11+
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
1212
import 'package:sj_manager/domain/entities/simulation/team/team.dart';
1313
import 'package:sj_manager/domain/entities/simulation/standings/score/typedefs.dart';
1414

‎lib/domain/entities/simulation/competition/rules/utils/classification_score_creator/concrete/default.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'package:sj_manager/domain/entities/simulation/competition/competition_la
33
import 'package:sj_manager/domain/entities/simulation/competition/rules/utils/classification_score_creator/classification_score_creator.dart';
44
import 'package:sj_manager/domain/entities/simulation/standings/score/details/classification_score_details.dart';
55
import 'package:sj_manager/domain/entities/simulation/standings/score/typedefs.dart';
6-
import 'package:sj_manager/features/game_variants/domain/entities/jumper/jumper_db_record.dart';
6+
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
77

88
abstract class DefaultClassificationScoreCreator<E,
99
C extends DefaultClassificationScoreCreatingContext<E>>

‎lib/domain/entities/simulation/competition/rules/utils/classification_score_creator/concrete/individual_default.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:sj_manager/domain/entities/simulation/standings/score/typedefs.d
66
import 'package:sj_manager/domain/entities/simulation/standings/standings.dart';
77
import 'package:sj_manager/domain/entities/simulation/standings/standings_positions_map_creator/standings_positions_with_ex_aequos_creator.dart';
88
import 'package:sj_manager/domain/entities/simulation/standings/utils/standings_utils.dart';
9-
import 'package:sj_manager/features/game_variants/domain/entities/jumper/jumper_db_record.dart';
9+
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
1010
import 'package:sj_manager/domain/entities/simulation/team/competition_team.dart';
1111

1212
class DefaultIndividualClassificationScoreCreator

‎lib/domain/entities/simulation/competition/rules/utils/classification_score_creator/concrete/team_default.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:sj_manager/domain/entities/simulation/competition/rules/utils/cl
55
import 'package:sj_manager/domain/entities/simulation/standings/score/typedefs.dart';
66
import 'package:sj_manager/domain/entities/simulation/standings/standings.dart';
77
import 'package:sj_manager/domain/entities/simulation/standings/utils/standings_utils.dart';
8-
import 'package:sj_manager/features/game_variants/domain/entities/jumper/jumper_db_record.dart';
8+
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
99
import 'package:sj_manager/domain/entities/simulation/team/competition_team.dart';
1010
import 'package:sj_manager/domain/entities/simulation/team/team.dart';
1111

‎lib/domain/entities/simulation/competition/rules/utils/competition_score_creator/competition_score_creator.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:sj_manager/domain/entities/simulation/standings/score/details/ju
88
import 'package:sj_manager/domain/entities/simulation/standings/score/score.dart';
99
import 'package:sj_manager/domain/entities/simulation/standings/standings.dart';
1010
import 'package:sj_manager/domain/entities/game_variant/hill/hill.dart';
11-
import 'package:sj_manager/features/game_variants/domain/entities/jumper/jumper_db_record.dart';
11+
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
1212
import 'package:sj_manager/domain/entities/simulation/team/competition_team.dart';
1313

1414
abstract class CompetitionScoreCreatingContext<T>

‎lib/domain/entities/simulation/competition/rules/utils/competition_score_creator/concrete/team/default_linear.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:sj_manager/domain/entities/simulation/competition/rules/utils/competition_score_creator/competition_score_creator.dart';
22
import 'package:sj_manager/domain/entities/simulation/standings/score/details/competition_score_details.dart';
33
import 'package:sj_manager/domain/entities/simulation/standings/score/score.dart';
4-
import 'package:sj_manager/features/game_variants/domain/entities/jumper/jumper_db_record.dart';
4+
import 'package:sj_manager/features/database_editor/domain/entities/jumper/jumper_db_record.dart';
55
import 'package:sj_manager/domain/entities/simulation/team/competition_team.dart';
66
import 'package:collection/collection.dart';
77
import 'package:sj_manager/domain/entities/simulation/team/team.dart';

‎lib/domain/entities/simulation/database/simulation_database_and_models/simulation_database.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'package:equatable/equatable.dart';
22
import 'package:flutter/material.dart';
3+
import 'package:sj_manager/core/countries/countries_repository/countries_repository.dart';
34

45
import 'package:sj_manager/domain/entities/simulation/database/actions/simulation_action_type.dart';
56
import 'package:sj_manager/domain/entities/simulation/database/actions/simulation_actions_repo.dart';
@@ -11,9 +12,8 @@ import 'package:sj_manager/domain/entities/simulation/jumper/reports/jumper_repo
1112
import 'package:sj_manager/domain/entities/simulation/flow/reports/team_reports.dart';
1213
import 'package:sj_manager/domain/entities/game_variant/hill/hill.dart';
1314
import 'package:sj_manager/features/game_variants/data/models/game_variant_database.dart/sex.dart';
14-
import 'package:sj_manager/core/team/country_team/country_team.dart';
15+
import 'package:sj_manager/core/classes/country_team/country_team.dart';
1516
import 'package:sj_manager/domain/entities/simulation/team/subteam.dart';
16-
import 'package:sj_manager/domain/repository_interfaces/countries/countries_repo.dart';
1717
import 'package:sj_manager/domain/repository_interfaces/generic/items_ids_repo.dart';
1818

1919
class SimulationDatabase with EquatableMixin, ChangeNotifier {
@@ -39,7 +39,7 @@ class SimulationDatabase with EquatableMixin, ChangeNotifier {
3939
DateTime currentDate;
4040
List<SimulationJumper> jumpers;
4141
List<Hill> hills;
42-
CountriesRepo countries;
42+
CountriesRepository countries;
4343
List<CountryTeam> countryTeams;
4444
List<SimulationSeason> seasons;
4545
ItemsIdsRepo<String> idsRepo;
@@ -67,7 +67,7 @@ class SimulationDatabase with EquatableMixin, ChangeNotifier {
6767
DateTime? currentDate,
6868
List<SimulationJumper>? jumpers,
6969
List<Hill>? hills,
70-
CountriesRepo? countries,
70+
CountriesRepository? countries,
7171
List<CountryTeam>? countryTeams,
7272
Map<Subteam, Iterable<String>>? subteamJumpers,
7373
List<SimulationSeason>? seasons,

‎lib/domain/entities/simulation/database/simulation_wizard_options_repo.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import 'package:async/async.dart';
2-
import 'package:sj_manager/data/models/game_variant/game_variant.dart';
32
import 'package:sj_manager/data/models/game_variant/game_variant_start_date.dart';
4-
import 'package:sj_manager/core/team/country_team/country_team.dart';
3+
import 'package:sj_manager/core/classes/country_team/country_team.dart';
54
import 'package:sj_manager/domain/entities/simulation/team/subteam_type.dart';
65
import 'package:sj_manager/domain/entities/simulation/flow/simulation_mode.dart';
76
import 'package:sj_manager/domain/repository_interfaces/generic/value_repo.dart';
7+
import 'package:sj_manager/features/game_variants/domain/entities/game_variant.dart';
88

99
class SimulationWizardOptionsRepo {
1010
SimulationWizardOptionsRepo() {

0 commit comments

Comments
 (0)