finalize this feature

FAForever · Dec 30, 2023 · ab7242b · ab7242b
1 parent 466e1d0
commit ab7242b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/src/backend/routes/views/clans/transfer.js b/src/backend/routes/views/clans/transfer.js
@@ -7,26 +7,19 @@ exports = module.exports = [
         try {
             await req.requestContainer
                 .get('ClanManagementService')
-                .transferOwnership(newOwnerMemberId, clanId)
+                .transferOwnership(newOwnerMemberId)
             await req.asyncFlash('info', 'Clan ownership transferred')
 
-            return res.redirect(`/clans/view/${clanId}`, {
-                clan_tag: req.body.clan_tag,
-                clan_name: req.body.clan_name,
-                clan_description: req.body.clan_description,
-            })
+            return res.redirect(`/clans/view/${clanId}`)
         } catch (e) {
+            console.log('<==============HIT ERROR ==============>')
             let message = e.toString()
             if (e instanceof JavaApiError && e.error?.errors) {
                 message = e.error.errors[0].detail
             }
 
             await req.asyncFlash('error', message)
-            return res.redirect(`/clans/view/${clanId}`, {
-                clan_tag: req.body.clan_tag,
-                clan_name: req.body.clan_name,
-                clan_description: req.body.clan_description,
-            })
+            return res.redirect(`/clans/view/${clanId}`)
         }
     },
 ]
diff --git a/src/backend/services/ClanManagementService.js b/src/backend/services/ClanManagementService.js
@@ -36,12 +36,17 @@ class ClanManagementService {
         }
     }
 
-    async transferOwnership(newOwnerMemberId, clanId) {
-        const newOwnerUser =
+    async transferOwnership(newOwnerMemberId) {
+        const clanMembership =
             await this.clanService.getClanMembership(newOwnerMemberId)
+
+        const newOwnerMember = Object.values(clanMembership.members).find(
+            (member) => member.membershipId === newOwnerMemberId
+        )
+
         await this.clanManagementRepository.transferOwnership(
-            newOwnerUser.id,
-            clanId
+            newOwnerMember.id,
+            clanMembership.clan_id
         )
         try {
             this.clanService

diff --git a/src/backend/templates/views/clans/clan.pug b/src/backend/templates/views/clans/clan.pug
@@ -57,7 +57,7 @@ block content
                                             href=`/clans/kick/${member.membershipId}`,
                                             onclick='return confirm(\'Kick?\')'
                                         ) Kick
-                                        a#transfer-clan-ownership.action-link(
+                                        a.action-link(
                                             href=`/clans/transfer/${member.membershipId}`,
                                             onclick='return confirm(\'Transfer Clan Ownership?\')'
                                         ) Make Leader