Skip to content

Commit 14d984e

Browse files
committed
fix: renamed 'Badge' to 'CollActionBadge' to avoid conflict
1 parent 3a083d1 commit 14d984e

File tree

9 files changed

+26
-26
lines changed

9 files changed

+26
-26
lines changed

lib/domain/badge/badge.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import 'package:freezed_annotation/freezed_annotation.dart';
33
part 'badge.freezed.dart';
44

55
@freezed
6-
class Badge with _$Badge {
7-
const Badge._();
6+
class CollActionBadge with _$CollActionBadge {
7+
const CollActionBadge._();
88

9-
const factory Badge({
9+
const factory CollActionBadge({
1010
required BadgeTierEnum tier,
1111
required AwardTypeEnum awardType,
1212
required int minimumCheckIns,
13-
}) = _Badge;
13+
}) = _CollActionBadge;
1414
}
1515

1616
enum BadgeTierEnum {

lib/domain/crowdaction/crowdaction.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class CrowdAction with _$CrowdAction {
2727
required DateTime endAt,
2828
String? password,
2929
String? subcategory,
30-
List<Badge>? badges,
30+
List<CollActionBadge>? badges,
3131
}) = _CrowdAction;
3232

3333
bool get hasParticipants => participantCount > 0;

lib/domain/profile/profile.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Profile with _$Profile {
1414
required String lastName,
1515
required String avatar,
1616
String? bio,
17-
List<Badge>? badges,
17+
List<CollActionBadge>? badges,
1818
}) = _Profile;
1919

2020
String get fullName => '$firstName $lastName';

lib/infrastructure/badge/badge_dto.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ part 'badge_dto.freezed.dart';
77
part 'badge_dto.g.dart';
88

99
@freezed
10-
class BadgeDto with _$BadgeDto {
11-
const BadgeDto._();
10+
class CollActionBadgeDto with _$CollActionBadgeDto {
11+
const CollActionBadgeDto._();
1212

13-
factory BadgeDto({
13+
factory CollActionBadgeDto({
1414
required BadgeTierEnum tier,
1515
required AwardTypeEnum awardType,
1616
required int minimumCheckIns,
17-
}) = _BadgeDto;
17+
}) = _CollActionBadgeDto;
1818

19-
Badge toDomain() {
20-
return Badge(
19+
CollActionBadge toDomain() {
20+
return CollActionBadge(
2121
tier: tier,
2222
awardType: awardType,
2323
minimumCheckIns: minimumCheckIns,
2424
);
2525
}
2626

27-
factory BadgeDto.fromJson(Map<String, dynamic> json) =>
28-
_$BadgeDtoFromJson(json);
27+
factory CollActionBadgeDto.fromJson(Map<String, dynamic> json) =>
28+
_$CollActionBadgeDtoFromJson(json);
2929
}

lib/infrastructure/crowdaction/crowdaction_dto.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class CrowdActionDto with _$CrowdActionDto {
2727
required String endAt,
2828
String? password,
2929
String? subcategory,
30-
List<BadgeDto>? badges,
30+
List<CollActionBadgeDto>? badges,
3131
}) = _CrowdActionDto;
3232

3333
CrowdAction toDomain() {

lib/infrastructure/profile/profile_dto.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ProfileDto with _$ProfileDto {
1616
required String lastName,
1717
required String avatar,
1818
String? bio,
19-
List<BadgeDto>? badges,
19+
List<CollActionBadgeDto>? badges,
2020
}) = _ProfileDto;
2121

2222
Profile toDomain() {

test/infrastructure/crowdaction/crowdaction_dto_fixtures.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ final crowdActionDto = CrowdActionDto(
1818
password: 'crowdaction-password',
1919
subcategory: 'crowdaction-subcategory',
2020
badges: [
21-
BadgeDto(
21+
CollActionBadgeDto(
2222
tier: BadgeTierEnum.diamond,
2323
awardType: AwardTypeEnum.all,
2424
minimumCheckIns: 0,
2525
),
26-
BadgeDto(
26+
CollActionBadgeDto(
2727
tier: BadgeTierEnum.gold,
2828
awardType: AwardTypeEnum.tier,
2929
minimumCheckIns: 1,
@@ -46,12 +46,12 @@ final crowdActionDomain = CrowdAction(
4646
endAt: DateTime.parse("2024-01-01T00:00:00.000+00:00"),
4747
commitments: [],
4848
badges: [
49-
Badge(
49+
CollActionBadge(
5050
tier: BadgeTierEnum.diamond,
5151
awardType: AwardTypeEnum.all,
5252
minimumCheckIns: 0,
5353
),
54-
Badge(
54+
CollActionBadge(
5555
tier: BadgeTierEnum.gold,
5656
awardType: AwardTypeEnum.tier,
5757
minimumCheckIns: 1,

test/infrastructure/profile/profile_fixtures.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ final tProfile = Profile(
1010
avatar: 'avatar',
1111
bio: 'bio',
1212
badges: [
13-
Badge(
13+
CollActionBadge(
1414
tier: BadgeTierEnum.diamond,
1515
awardType: AwardTypeEnum.all,
1616
minimumCheckIns: 0,
1717
),
18-
Badge(
18+
CollActionBadge(
1919
tier: BadgeTierEnum.gold,
2020
awardType: AwardTypeEnum.tier,
2121
minimumCheckIns: 1,
@@ -29,12 +29,12 @@ final tProfileDto = ProfileDto(
2929
avatar: 'avatar',
3030
bio: 'bio',
3131
badges: [
32-
BadgeDto(
32+
CollActionBadgeDto(
3333
tier: BadgeTierEnum.diamond,
3434
awardType: AwardTypeEnum.all,
3535
minimumCheckIns: 0,
3636
),
37-
BadgeDto(
37+
CollActionBadgeDto(
3838
tier: BadgeTierEnum.gold,
3939
awardType: AwardTypeEnum.tier,
4040
minimumCheckIns: 1,

test/test_utilities.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ final List<Participation> tTopParticipants = [
172172
tParticipation
173173
];
174174

175-
final Badge tBadge = Badge(
175+
final CollActionBadge tBadge = CollActionBadge(
176176
awardType: AwardTypeEnum.all,
177177
tier: BadgeTierEnum.diamond,
178178
minimumCheckIns: 0,
179179
);
180180

181-
final List<Badge> tBadges = [tBadge];
181+
final List<CollActionBadge> tBadges = [tBadge];

0 commit comments

Comments
 (0)