Merge branch 'master' into revert-changes

partio-scout · Apr 27, 2023 · e037a39 · e037a39
2 parents ff66c94 + 42c44b8
commit e037a39
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/groups.js b/src/groups.js
@@ -28,7 +28,7 @@ async function getMemberData(groupMembers) {
         {},
         {
           memberId: groupMember.id.id,
-          isGroupLeader: groupMember.is_leader,
+          isGroupLeader: groupMember.isLeader,
           memberName:
             groupMember.name.firstname + ' ' + groupMember.name.lastname,
           memberTasks: taskEntries,
@@ -60,17 +60,17 @@ async function getAllGroups(userNumber) {
       const memberData = await getMemberData(groupMembers)
       const ageGroupId =
         (memberData[0] &&
-          (await getMember(memberData[0].memberId)).age_groupId) ||
+          (await getMember(memberData[0].memberId)).ageGroupId) ||
         4
       return Object.assign(
         {},
         {
           id: group.id,
           name: group.name,
-          ageGroup: groupInfo.age_groups[0],
+          ageGroup: groupInfo.ageGroups[0],
           ageGroupId,
           troop: groupInfo.troops.filter(
-            (troop) => troop.id === member.default_troop_id
+            (troop) => troop.id === member.defaultTroopId
           ),
           members: memberData,
         }

diff --git a/src/profile.js b/src/profile.js
@@ -13,7 +13,7 @@ export async function getProfile(userNumber) {
       ageGroup: member.age_group || 'Sudenpennut',
       language: 'fi',
       troops: member.troops,
-      isLeader: member.is_leader || false,
+      isLeader: member.isLeader || false,
       image: memberImage,
     }
   )