chore: refactor fetching role

opencrvs · Oct 3, 2024 · 1f6e30e · 1f6e30e
1 parent 0c9cc04
commit 1f6e30e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 25 deletions.
diff --git a/packages/commons/src/fhir/practitioner.ts b/packages/commons/src/fhir/practitioner.ts
@@ -131,11 +131,9 @@ export const getUserRoleFromHistory = (
   )
 
   const targetCode = result?.code?.find((element) => {
-    return element.coding?.[0].system === 'http://opencrvs.org/specs/types'
+    return element.coding?.[0].system === 'http://opencrvs.org/specs/roles'
   })
 
   const role = targetCode?.coding?.[0].code
-  const systemRole = result?.code?.[0].coding?.[0].code
-
-  return { role, systemRole }
+  return role
 }
diff --git a/packages/gateway/src/features/registration/type-resolvers.test.ts b/packages/gateway/src/features/registration/type-resolvers.test.ts
@@ -519,15 +519,9 @@ test('getting role at a specific time from roleHistory', async () => {
   */
 
   const lastModified = '2024-08-30T13:14:33.704Z'
-  const expectedRole =
-    '[{"lang":"en","label":"National Registrar"},{"lang":"fr","label":"Registraire national"}]'
-  const expectedSystemRole = 'NATIONAL_REGISTRAR'
+  const expectedRole = 'NATIONAL_REGISTRAR'
 
-  const { role, systemRole } = getUserRoleFromHistory(
-    practitionerRoleHistory,
-    lastModified
-  )
+  const role = getUserRoleFromHistory(practitionerRoleHistory, lastModified)
 
   expect(role).toEqual(expectedRole)
-  expect(systemRole).toEqual(expectedSystemRole)
 })
diff --git a/packages/gateway/src/features/registration/type-resolvers.ts b/packages/gateway/src/features/registration/type-resolvers.ts
@@ -87,7 +87,8 @@ import {
   findLastOfficeFromSavedBundle,
   findLastOfficeLocationFromSavedBundle,
   notCorrectedHistory,
-  findResourceFromBundleById
+  findResourceFromBundleById,
+  getUserRoleFromHistory
 } from '@opencrvs/commons/types'
 
 import { GQLQuestionnaireQuestion, GQLResolver } from '@gateway/graphql/schema'
@@ -1552,19 +1553,11 @@ export const typeResolvers: GQLResolver = {
 
       const practitionerRoleHistory =
         await dataSources.fhirAPI.getPractionerRoleHistory(practitionerRoleId)
-      const result = practitionerRoleHistory.find(
-        (it) =>
-          it?.meta?.lastUpdated &&
-          task.lastModified &&
-          it?.meta?.lastUpdated <= task.lastModified!
-      )
-
-      const targetCode = result?.code?.find((element) => {
-        return element.coding?.[0].system === 'http://opencrvs.org/specs/roles'
-      })
-
-      const roleId = targetCode?.coding?.[0].code
 
+      const roleId = getUserRoleFromHistory(
+        practitionerRoleHistory,
+        task.lastModified
+      )
       const userResponse = await dataSources.usersAPI.getUserByPractitionerId(
         resourceIdentifierToUUID(user.valueReference.reference)
       )