diff --git a/api/src/adapters/badge-service.ts b/api/src/adapters/badge-service.ts index e43c866d..702d7a16 100644 --- a/api/src/adapters/badge-service.ts +++ b/api/src/adapters/badge-service.ts @@ -21,7 +21,7 @@ export async function createBadgeService({ } function getAllBadges(): Badge[] { - return Array.from(badges.values()).filter((badge) => badge.id !== BadgeId.MUSIC_FESTIVAL_2024) + return Array.from(badges.values()) } async function getUserStates(address: EthAddress) { diff --git a/api/src/logic/backfill-merger.ts b/api/src/logic/backfill-merger.ts index bbb0b0ed..146fd3fa 100644 --- a/api/src/logic/backfill-merger.ts +++ b/api/src/logic/backfill-merger.ts @@ -112,7 +112,7 @@ export function createBackfillMergerComponent({ badgeService.getBadge(BadgeId.OPEN_FOR_BUSINESS), backfillData ) - case BadgeId.MUSIC_FESTIVAL_2024: + case BadgeId.MUSIC_FESTIVAL: return mergeUniqueEventProgress( userAddress, currentUserProgress, diff --git a/api/test/unit/adapters/badge-service.spec.ts b/api/test/unit/adapters/badge-service.spec.ts index 9120eb92..bc22711d 100644 --- a/api/test/unit/adapters/badge-service.spec.ts +++ b/api/test/unit/adapters/badge-service.spec.ts @@ -40,7 +40,7 @@ describe('Badge Service', () => { describe('getAllBadges', () => { it('should return an array with all the badges definitions', async () => { const allBadges = badgeService.getAllBadges() - const allExpectedBadges = Array.from(badgeStorage.getBadges().values()).filter((badge) => badge.id !== BadgeId.MUSIC_FESTIVAL_2024) + const allExpectedBadges = Array.from(badgeStorage.getBadges().values()) expect(allBadges).toStrictEqual(allExpectedBadges) }) diff --git a/api/test/unit/logic/backfill-merger.spec.ts b/api/test/unit/logic/backfill-merger.spec.ts index 83896136..805318a8 100644 --- a/api/test/unit/logic/backfill-merger.spec.ts +++ b/api/test/unit/logic/backfill-merger.spec.ts @@ -70,7 +70,7 @@ describe('Backfill Merger', () => { [BadgeId.LAND_ARCHITECT, mergeLandArchitectProgress], [BadgeId.PROFILE_PRO, mergeProfileProProgress], [BadgeId.OPEN_FOR_BUSINESS, mergeOpenForBusinessProgress], - // [BadgeId.MUSIC_FESTIVAL, mergeUniqueEventProgress] + [BadgeId.MUSIC_FESTIVAL, mergeUniqueEventProgress] ])('should merge the progress for the user when the badge id is %s', (badgeId: BadgeId, merger: jest.Mock) => { const mergerMock = merger as jest.Mock diff --git a/common/src/types/badge-definitions.ts b/common/src/types/badge-definitions.ts index 19148891..fedb5577 100644 --- a/common/src/types/badge-definitions.ts +++ b/common/src/types/badge-definitions.ts @@ -67,7 +67,7 @@ export enum BadgeId { LAND_ARCHITECT = 'land_architect', EMOTE_CREATOR = 'emote_creator', WEARABLE_DESIGNER = 'wearable_designer', - MUSIC_FESTIVAL_2024 = 'music_festival_2024' + MUSIC_FESTIVAL = 'music_festival_2024' } export enum BadgeCategory { diff --git a/common/src/types/badges.ts b/common/src/types/badges.ts index 630fe7a8..17d134f5 100644 --- a/common/src/types/badges.ts +++ b/common/src/types/badges.ts @@ -311,9 +311,9 @@ const badges: Map = new Map([ } ], [ - BadgeId.MUSIC_FESTIVAL_2024, + BadgeId.MUSIC_FESTIVAL, { - id: BadgeId.MUSIC_FESTIVAL_2024, + id: BadgeId.MUSIC_FESTIVAL, name: 'Decentraland Music Festival 2024', category: BadgeCategory.EXPLORER, description: 'Jumped in and attended Decentraland Music Festival 2024',