Utilize new route for admin

IABTechLab · Dec 5, 2023 · 4ee711d · 4ee711d
1 parent 0db97a0
commit 4ee711d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/api/routers/usersRouter.ts b/src/api/routers/usersRouter.ts
@@ -8,7 +8,7 @@ import { UserRole } from '../entities/User';
 import { getLoggers, getTraceId } from '../helpers/loggingHelpers';
 import { mapClientTypeToParticipantType } from '../helpers/siteConvertingHelpers';
 import { getKcAdminClient } from '../keycloakAdminClient';
-import { getSiteList } from '../services/adminServiceClient';
+import { getSite, getSiteList } from '../services/adminServiceClient';
 import {
   assignClientRoleToUser,
   deleteUserByEmail,
@@ -58,8 +58,12 @@ export function createUsersRouter() {
 
   usersRouter.get('/current/participant', async (req: UserRequest, res) => {
     const currentParticipant = await Participant.query().findOne({ id: req.user!.participantId });
-    const sites = await getSiteList();
-    const currentSite = sites.find((x) => x.id === currentParticipant?.siteId);
+
+    const currentSite =
+      currentParticipant?.siteId === undefined
+        ? undefined
+        : await getSite(currentParticipant?.siteId);
+
     const allParticipantTypes = await ParticipantType.query();
     const result = {
       ...currentParticipant,

diff --git a/src/api/services/adminServiceClient.ts b/src/api/services/adminServiceClient.ts
@@ -83,6 +83,11 @@ export const getSiteList = async (): Promise<SiteDTO[]> => {
   return response.data;
 };
 
+export const getSite = async (siteId: number): Promise<SiteDTO> => {
+  const response = await adminServiceClient.get<SiteDTO>(`/api/site/${siteId}`);
+  return response.data;
+};
+
 export const getVisibleSiteList = async (): Promise<SiteDTO[]> => {
   const siteList = await getSiteList();
   return siteList.filter((x) => x.visible !== false);