From 61e8a4b5a8b3a593db6187db1b5f54142bc0b8af Mon Sep 17 00:00:00 2001 From: Arthur Date: Wed, 10 Jan 2024 16:34:06 +0100 Subject: [PATCH] API: Updating BungieAccount constructor to stringify bungieCode --- lib/api/models/bungie_account.dart | 8 ++++++-- test/models/bungie_account_test.dart | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/lib/api/models/bungie_account.dart b/lib/api/models/bungie_account.dart index bc5c9c9..5df5d06 100644 --- a/lib/api/models/bungie_account.dart +++ b/lib/api/models/bungie_account.dart @@ -8,10 +8,14 @@ class BungieAccountData { BungieAccountData({ required this.bungieGlobalDisplayName, - required this.bungieGlobalDisplayNameCode, + required int bungieGlobalDisplayNameCode, String? bungieMembershipId, List? memberships - }) : bungieNetMembershipId = bungieMembershipId ?? "", memberships = memberships ?? []; + }) : + bungieGlobalDisplayNameCode = bungieGlobalDisplayNameCode.toString().padLeft(4, '0'), + bungieNetMembershipId = bungieMembershipId ?? "", + memberships = memberships ?? [] + ; String get fullBungieId => "$bungieGlobalDisplayName#$bungieGlobalDisplayNameCode"; diff --git a/test/models/bungie_account_test.dart b/test/models/bungie_account_test.dart index eda419e..f7f00be 100644 --- a/test/models/bungie_account_test.dart +++ b/test/models/bungie_account_test.dart @@ -27,7 +27,7 @@ void main() { final accountData = BungieAccountData.fromJson(json); expect(accountData.bungieGlobalDisplayName, "ALED"); - expect(accountData.bungieGlobalDisplayNameCode, 3064); + expect(accountData.bungieGlobalDisplayNameCode, "3064"); expect(accountData.bungieNetMembershipId, "31142636"); expect(accountData.fullBungieId, "ALED#3064"); @@ -58,10 +58,10 @@ void main() { final accountData = BungieAccountData.fromJson(json); expect(accountData.bungieGlobalDisplayName, "A"); - expect(accountData.bungieGlobalDisplayNameCode, 206); + expect(accountData.bungieGlobalDisplayNameCode, "0206"); expect(accountData.bungieNetMembershipId, "31841225"); - expect(accountData.fullBungieId, "A#206"); + expect(accountData.fullBungieId, "A#0206"); expect(accountData.isCrossSavedAccount, false); expect(accountData.isNotCrossSavedAccount, false); expect(accountData.isSinglePlatformAccount, false); @@ -93,10 +93,10 @@ void main() { final accountData = BungieAccountData.fromJson(json); expect(accountData.bungieGlobalDisplayName, "A"); - expect(accountData.bungieGlobalDisplayNameCode, 196); + expect(accountData.bungieGlobalDisplayNameCode, "0196"); expect(accountData.bungieNetMembershipId, ""); - expect(accountData.fullBungieId, "A#196"); + expect(accountData.fullBungieId, "A#0196"); expect(accountData.isCrossSavedAccount, false); expect(accountData.isNotCrossSavedAccount, false); expect(accountData.isSinglePlatformAccount, true); @@ -114,10 +114,10 @@ void main() { final accountData = BungieAccountData.fromJson(json); expect(accountData.bungieGlobalDisplayName, "A"); - expect(accountData.bungieGlobalDisplayNameCode, 206); + expect(accountData.bungieGlobalDisplayNameCode, "0206"); expect(accountData.bungieNetMembershipId, ""); - expect(accountData.fullBungieId, "A#206"); + expect(accountData.fullBungieId, "A#0206"); expect(accountData.isCrossSavedAccount, false); expect(accountData.isNotCrossSavedAccount, false); expect(accountData.isSinglePlatformAccount, false); @@ -134,10 +134,10 @@ void main() { final accountData = BungieAccountData.fromJson(json); expect(accountData.bungieGlobalDisplayName, "A"); - expect(accountData.bungieGlobalDisplayNameCode, 206); + expect(accountData.bungieGlobalDisplayNameCode, "0206"); expect(accountData.bungieNetMembershipId, ""); - expect(accountData.fullBungieId, "A#206"); + expect(accountData.fullBungieId, "A#0206"); expect(accountData.isCrossSavedAccount, false); expect(accountData.isNotCrossSavedAccount, false); expect(accountData.isSinglePlatformAccount, false); @@ -152,10 +152,10 @@ void main() { bungieGlobalDisplayNameCode: 206 ); expect(accountData.bungieGlobalDisplayName, "A"); - expect(accountData.bungieGlobalDisplayNameCode, 206); + expect(accountData.bungieGlobalDisplayNameCode, "0206"); expect(accountData.bungieNetMembershipId, ""); - expect(accountData.fullBungieId, "A#206"); + expect(accountData.fullBungieId, "A#0206"); expect(accountData.isCrossSavedAccount, false); expect(accountData.isNotCrossSavedAccount, false); expect(accountData.isSinglePlatformAccount, false);