From 14d984e545207aae909ad8b23b35fec64308e44d Mon Sep 17 00:00:00 2001 From: Andre Hui Date: Sat, 18 Mar 2023 12:18:17 -0700 Subject: [PATCH] fix: renamed 'Badge' to 'CollActionBadge' to avoid conflict --- lib/domain/badge/badge.dart | 8 ++++---- lib/domain/crowdaction/crowdaction.dart | 2 +- lib/domain/profile/profile.dart | 2 +- lib/infrastructure/badge/badge_dto.dart | 16 ++++++++-------- .../crowdaction/crowdaction_dto.dart | 2 +- lib/infrastructure/profile/profile_dto.dart | 2 +- .../crowdaction/crowdaction_dto_fixtures.dart | 8 ++++---- .../infrastructure/profile/profile_fixtures.dart | 8 ++++---- test/test_utilities.dart | 4 ++-- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/domain/badge/badge.dart b/lib/domain/badge/badge.dart index 805e3dd7..1b2fd2c0 100644 --- 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 index 2e417614..571f4ab9 100644 --- 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? badges, + List? badges, }) = _CrowdAction; bool get hasParticipants => participantCount > 0; diff --git a/lib/domain/profile/profile.dart b/lib/domain/profile/profile.dart index 5f2f8610..d8c2319f 100644 --- 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? badges, + List? badges, }) = _Profile; String get fullName => '$firstName $lastName'; diff --git a/lib/infrastructure/badge/badge_dto.dart b/lib/infrastructure/badge/badge_dto.dart index 3c578ce3..01fee7f4 100644 --- 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 json) => - _$BadgeDtoFromJson(json); + factory CollActionBadgeDto.fromJson(Map json) => + _$CollActionBadgeDtoFromJson(json); } diff --git a/lib/infrastructure/crowdaction/crowdaction_dto.dart b/lib/infrastructure/crowdaction/crowdaction_dto.dart index 2335e216..9ca2c532 100644 --- 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? badges, + List? badges, }) = _CrowdActionDto; CrowdAction toDomain() { diff --git a/lib/infrastructure/profile/profile_dto.dart b/lib/infrastructure/profile/profile_dto.dart index 4699258a..98f6259b 100644 --- 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? badges, + List? badges, }) = _ProfileDto; Profile toDomain() { diff --git a/test/infrastructure/crowdaction/crowdaction_dto_fixtures.dart b/test/infrastructure/crowdaction/crowdaction_dto_fixtures.dart index 8eaf5f5b..7453ec77 100644 --- 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 index 13fe1bdb..f55e32dd 100644 --- 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 index 0783f6bb..ae98b970 100644 --- a/test/test_utilities.dart +++ b/test/test_utilities.dart @@ -172,10 +172,10 @@ final List tTopParticipants = [ tParticipation ]; -final Badge tBadge = Badge( +final CollActionBadge tBadge = CollActionBadge( awardType: AwardTypeEnum.all, tier: BadgeTierEnum.diamond, minimumCheckIns: 0, ); -final List tBadges = [tBadge]; +final List tBadges = [tBadge];