[REFACTOR]: add getUsername func and fix error

TogetherCrew · Aug 16, 2023 · 13b9f0a · 13b9f0a
1 parent a2b17e7
commit 13b9f0a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/controllers/memberActivity.controller.ts b/src/controllers/memberActivity.controller.ts
@@ -104,7 +104,7 @@ const activeMembersCompositionTable = catchAsync(async function (req: IAuthReque
             guildMember.roles = roleService.getRolesForGuildMember(guildMember, roles);
             guildMember.ngu = guildMemberService.getNgu(guildMember);
             guildMember.activityComposition = memberActivityService.getActivityComposition(guildMember, memberActivity, filter.activityComposition);
-            guildMember.username = guildMember.discriminator === "0" ? guildMember.username : guildMember.username + "#" + guildMember.discriminator;
+            guildMember.username = guildMemberService.getUsername(guildMember);
         });
     }
     await closeConnection(connection)
@@ -127,7 +127,7 @@ const activeMembersOnboardingTable = catchAsync(async function (req: IAuthReques
             guildMember.roles = roleService.getRolesForGuildMember(guildMember, roles);
             guildMember.ngu = guildMemberService.getNgu(guildMember);
             guildMember.activityComposition = memberActivityService.getActivityComposition(guildMember, memberActivity, filter.activityComposition);
-            guildMember.username = guildMember.discriminator === "0" ? guildMember.username : guildMember.username + "#" + guildMember.discriminator;
+            guildMember.username = guildMemberService.getUsername(guildMember);
         });
     }
     await closeConnection(connection)
@@ -150,7 +150,7 @@ const disengagedMembersCompositionTable = catchAsync(async function (req: IAuthR
             guildMember.roles = roleService.getRolesForGuildMember(guildMember, roles);
             guildMember.ngu = guildMemberService.getNgu(guildMember);
             guildMember.activityComposition = memberActivityService.getActivityComposition(guildMember, memberActivity, filter.activityComposition);
-            guildMember.username = guildMember.discriminator === "0" ? guildMember.username : guildMember.username + "#" + guildMember.discriminator;
+            guildMember.username = guildMemberService.getUsername(guildMember);
         });
     }
     await closeConnection(connection)

diff --git a/src/services/guildMember.service.ts b/src/services/guildMember.service.ts
@@ -143,6 +143,16 @@ function getNgu(guildMember: IGuildMember): string {
     }
 }
 
+/**
+ * Determines the username based on discriminator.
+ * @param {IGuildMember} guildMember - The guild member for which the ngu needs to be determined.
+ * @returns {string} - The determined username for guild member.
+ */
+function getUsername(guildMember: IGuildMember): string {
+    return guildMember.discriminator === "0" ? guildMember.username : guildMember.username + "#" + guildMember.discriminator;
+
+}
+
 
 /**
  * Get a guild member from the database based on the filter criteria.
@@ -163,6 +173,7 @@ async function getGuildMember(connection: Connection, filter: object): Promise<I
 export default {
     queryGuildMembers,
     getGuildMember,
-    getNgu
+    getNgu,
+    getUsername
 }
 
diff --git a/src/services/role.service.ts b/src/services/role.service.ts
@@ -1,6 +1,5 @@
 import { Connection } from 'mongoose';
-import { IRole } from '@togethercrew.dev/db';
-import { IGuildMember } from 'tc_dbcomm';
+import { IRole, IGuildMember } from '@togethercrew.dev/db';
 
 /**
  * Get a role from the database based on the filter criteria.