fix: renamed 'Badge' to 'CollActionBadge' to avoid conflict

CollActionteam · Mar 18, 2023 · 14d984e · 14d984e
1 parent 3a083d1
commit 14d984e
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 26 deletions.
diff --git a/lib/domain/badge/badge.dart b/lib/domain/badge/badge.dart
@@ -3,14 +3,14 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 part 'badge.freezed.dart';
 
 @freezed
-class Badge with _$Badge {
-  const Badge._();
+class CollActionBadge with _$CollActionBadge {
+  const CollActionBadge._();
 
-  const factory Badge({
+  const factory CollActionBadge({
     required BadgeTierEnum tier,
     required AwardTypeEnum awardType,
     required int minimumCheckIns,
-  }) = _Badge;
+  }) = _CollActionBadge;
 }
 
 enum BadgeTierEnum {

diff --git a/lib/domain/crowdaction/crowdaction.dart b/lib/domain/crowdaction/crowdaction.dart
@@ -27,7 +27,7 @@ class CrowdAction with _$CrowdAction {
     required DateTime endAt,
     String? password,
     String? subcategory,
-    List<Badge>? badges,
+    List<CollActionBadge>? badges,
   }) = _CrowdAction;
 
   bool get hasParticipants => participantCount > 0;

diff --git a/lib/domain/profile/profile.dart b/lib/domain/profile/profile.dart
@@ -14,7 +14,7 @@ class Profile with _$Profile {
     required String lastName,
     required String avatar,
     String? bio,
-    List<Badge>? badges,
+    List<CollActionBadge>? badges,
   }) = _Profile;
 
   String get fullName => '$firstName $lastName';

diff --git a/lib/infrastructure/badge/badge_dto.dart b/lib/infrastructure/badge/badge_dto.dart
@@ -7,23 +7,23 @@ part 'badge_dto.freezed.dart';
 part 'badge_dto.g.dart';
 
 @freezed
-class BadgeDto with _$BadgeDto {
-  const BadgeDto._();
+class CollActionBadgeDto with _$CollActionBadgeDto {
+  const CollActionBadgeDto._();
 
-  factory BadgeDto({
+  factory CollActionBadgeDto({
     required BadgeTierEnum tier,
     required AwardTypeEnum awardType,
     required int minimumCheckIns,
-  }) = _BadgeDto;
+  }) = _CollActionBadgeDto;
 
-  Badge toDomain() {
-    return Badge(
+  CollActionBadge toDomain() {
+    return CollActionBadge(
       tier: tier,
       awardType: awardType,
       minimumCheckIns: minimumCheckIns,
     );
   }
 
-  factory BadgeDto.fromJson(Map<String, dynamic> json) =>
-      _$BadgeDtoFromJson(json);
+  factory CollActionBadgeDto.fromJson(Map<String, dynamic> json) =>
+      _$CollActionBadgeDtoFromJson(json);
 }
diff --git a/lib/infrastructure/crowdaction/crowdaction_dto.dart b/lib/infrastructure/crowdaction/crowdaction_dto.dart
@@ -27,7 +27,7 @@ class CrowdActionDto with _$CrowdActionDto {
     required String endAt,
     String? password,
     String? subcategory,
-    List<BadgeDto>? badges,
+    List<CollActionBadgeDto>? badges,
   }) = _CrowdActionDto;
 
   CrowdAction toDomain() {

diff --git a/lib/infrastructure/profile/profile_dto.dart b/lib/infrastructure/profile/profile_dto.dart
@@ -16,7 +16,7 @@ class ProfileDto with _$ProfileDto {
     required String lastName,
     required String avatar,
     String? bio,
-    List<BadgeDto>? badges,
+    List<CollActionBadgeDto>? badges,
   }) = _ProfileDto;
 
   Profile toDomain() {

diff --git a/test/infrastructure/crowdaction/crowdaction_dto_fixtures.dart b/test/infrastructure/crowdaction/crowdaction_dto_fixtures.dart
@@ -18,12 +18,12 @@ final crowdActionDto = CrowdActionDto(
     password: 'crowdaction-password',
     subcategory: 'crowdaction-subcategory',
     badges: [
-      BadgeDto(
+      CollActionBadgeDto(
         tier: BadgeTierEnum.diamond,
         awardType: AwardTypeEnum.all,
         minimumCheckIns: 0,
       ),
-      BadgeDto(
+      CollActionBadgeDto(
         tier: BadgeTierEnum.gold,
         awardType: AwardTypeEnum.tier,
         minimumCheckIns: 1,
@@ -46,12 +46,12 @@ final crowdActionDomain = CrowdAction(
     endAt: DateTime.parse("2024-01-01T00:00:00.000+00:00"),
     commitments: [],
     badges: [
-      Badge(
+      CollActionBadge(
         tier: BadgeTierEnum.diamond,
         awardType: AwardTypeEnum.all,
         minimumCheckIns: 0,
       ),
-      Badge(
+      CollActionBadge(
         tier: BadgeTierEnum.gold,
         awardType: AwardTypeEnum.tier,
         minimumCheckIns: 1,

diff --git a/test/infrastructure/profile/profile_fixtures.dart b/test/infrastructure/profile/profile_fixtures.dart
@@ -10,12 +10,12 @@ final tProfile = Profile(
     avatar: 'avatar',
     bio: 'bio',
     badges: [
-      Badge(
+      CollActionBadge(
         tier: BadgeTierEnum.diamond,
         awardType: AwardTypeEnum.all,
         minimumCheckIns: 0,
       ),
-      Badge(
+      CollActionBadge(
         tier: BadgeTierEnum.gold,
         awardType: AwardTypeEnum.tier,
         minimumCheckIns: 1,
@@ -29,12 +29,12 @@ final tProfileDto = ProfileDto(
     avatar: 'avatar',
     bio: 'bio',
     badges: [
-      BadgeDto(
+      CollActionBadgeDto(
         tier: BadgeTierEnum.diamond,
         awardType: AwardTypeEnum.all,
         minimumCheckIns: 0,
       ),
-      BadgeDto(
+      CollActionBadgeDto(
         tier: BadgeTierEnum.gold,
         awardType: AwardTypeEnum.tier,
         minimumCheckIns: 1,

diff --git a/test/test_utilities.dart b/test/test_utilities.dart
@@ -172,10 +172,10 @@ final List<Participation> tTopParticipants = [
   tParticipation
 ];
 
-final Badge tBadge = Badge(
+final CollActionBadge tBadge = CollActionBadge(
   awardType: AwardTypeEnum.all,
   tier: BadgeTierEnum.diamond,
   minimumCheckIns: 0,
 );
 
-final List<Badge> tBadges = [tBadge];
+final List<CollActionBadge> tBadges = [tBadge];