chore!: update searching with jurisdiction scopes

opencrvs · Dec 3, 2024 · d94227d · d94227d
1 parent 222db41
commit d94227d
Show file tree

Hide file tree

Showing 7 changed files with 165 additions and 47 deletions.
diff --git a/packages/client/src/ListSyncController.ts b/packages/client/src/ListSyncController.ts
@@ -12,7 +12,6 @@ import { client } from '@client/utils/apolloClient'
 import { REGISTRATION_HOME_QUERY } from '@client/views/OfficeHome/queries'
 
 export async function syncRegistrarWorkqueue(
-  locationId: string,
   reviewStatuses: string[],
   pageSize: number,
   inProgressSkip: number,
@@ -28,7 +27,6 @@ export async function syncRegistrarWorkqueue(
     const queryResult = await client.query({
       query: REGISTRATION_HOME_QUERY,
       variables: {
-        declarationLocationId: locationId,
         pageSize,
         reviewStatuses: reviewStatuses,
         inProgressSkip: inProgressSkip,

diff --git a/packages/client/src/views/OfficeHome/queries.ts b/packages/client/src/views/OfficeHome/queries.ts
@@ -76,7 +76,6 @@ const EVENT_SEARCH_RESULT_FIELDS = gql`
 export const REGISTRATION_HOME_QUERY = gql`
   ${EVENT_SEARCH_RESULT_FIELDS}
   query registrationHome(
-    $declarationLocationId: String!
     $pageSize: Int
     $inProgressSkip: Int
     $healthSystemSkip: Int
@@ -90,7 +89,6 @@ export const REGISTRATION_HOME_QUERY = gql`
   ) {
     inProgressTab: searchEvents(
       advancedSearchParameters: {
-        declarationLocationId: $declarationLocationId
         registrationStatuses: ["IN_PROGRESS"]
         compositionType: [
           "birth-declaration"
@@ -108,7 +106,6 @@ export const REGISTRATION_HOME_QUERY = gql`
     }
     notificationTab: searchEvents(
       advancedSearchParameters: {
-        declarationLocationId: $declarationLocationId
         registrationStatuses: ["IN_PROGRESS"]
         compositionType: [
           "birth-notification"
@@ -125,10 +122,7 @@ export const REGISTRATION_HOME_QUERY = gql`
       }
     }
     reviewTab: searchEvents(
-      advancedSearchParameters: {
-        declarationLocationId: $declarationLocationId
-        registrationStatuses: $reviewStatuses
-      }
+      advancedSearchParameters: { registrationStatuses: $reviewStatuses }
       count: $pageSize
       skip: $reviewSkip
     ) {
@@ -138,10 +132,7 @@ export const REGISTRATION_HOME_QUERY = gql`
       }
     }
     rejectTab: searchEvents(
-      advancedSearchParameters: {
-        declarationLocationId: $declarationLocationId
-        registrationStatuses: ["REJECTED"]
-      }
+      advancedSearchParameters: { registrationStatuses: ["REJECTED"] }
       count: $pageSize
       skip: $rejectSkip
       sortColumn: "createdAt.keyword"
@@ -154,7 +145,6 @@ export const REGISTRATION_HOME_QUERY = gql`
     }
     approvalTab: searchEvents(
       advancedSearchParameters: {
-        declarationLocationId: $declarationLocationId
         registrationStatuses: ["VALIDATED", "CORRECTION_REQUESTED"]
       }
       count: $pageSize
@@ -166,10 +156,7 @@ export const REGISTRATION_HOME_QUERY = gql`
       }
     }
     externalValidationTab: searchEvents(
-      advancedSearchParameters: {
-        declarationLocationId: $declarationLocationId
-        registrationStatuses: ["WAITING_VALIDATION"]
-      }
+      advancedSearchParameters: { registrationStatuses: ["WAITING_VALIDATION"] }
       count: $pageSize
       skip: $externalValidationSkip
     ) {
@@ -179,10 +166,7 @@ export const REGISTRATION_HOME_QUERY = gql`
       }
     }
     printTab: searchEvents(
-      advancedSearchParameters: {
-        declarationLocationId: $declarationLocationId
-        registrationStatuses: ["REGISTERED"]
-      }
+      advancedSearchParameters: { registrationStatuses: ["REGISTERED"] }
       count: $pageSize
       skip: $printSkip
     ) {
@@ -192,10 +176,7 @@ export const REGISTRATION_HOME_QUERY = gql`
       }
     }
     issueTab: searchEvents(
-      advancedSearchParameters: {
-        declarationLocationId: $declarationLocationId
-        registrationStatuses: ["CERTIFIED"]
-      }
+      advancedSearchParameters: { registrationStatuses: ["CERTIFIED"] }
       count: $pageSize
       skip: $issueSkip
     ) {

diff --git a/packages/client/src/workqueue/reducer.ts b/packages/client/src/workqueue/reducer.ts
@@ -23,7 +23,7 @@ import {
 } from '@client/declarations'
 import { IStoreState } from '@client/store'
 import { getUserDetails, getScope } from '@client/profile/profileSelectors'
-import { getUserLocation, UserDetails } from '@client/utils/userUtils'
+import { UserDetails } from '@client/utils/userUtils'
 import { syncRegistrarWorkqueue } from '@client/ListSyncController'
 import type {
   GQLEventSearchResultSet,
@@ -348,10 +348,7 @@ async function getWorkqueueData(
   userDetails: UserDetails,
   workqueuePaginationParams: IWorkqueuePaginationParams
 ) {
-  const registrationLocationId =
-    (userDetails && getUserLocation(userDetails).id) || ''
-
-  const scope = getScope(state)
+  const scope = getScope(state)!
   const reviewStatuses =
     scope && scope.includes(SCOPES.RECORD_REGISTER)
       ? [
@@ -374,7 +371,6 @@ async function getWorkqueueData(
   } = workqueuePaginationParams
 
   const result = await syncRegistrarWorkqueue(
-    registrationLocationId,
     reviewStatuses,
     pageSize,
     inProgressSkip,

diff --git a/packages/gateway/src/features/search/root-resolvers.ts b/packages/gateway/src/features/search/root-resolvers.ts
@@ -84,7 +84,7 @@ export const resolvers: GQLResolver = {
         sort = 'desc',
         sortBy
       },
-      { headers: authHeader }
+      { headers: authHeader, dataSources }
     ) {
       if (
         !inScope(authHeader, [
@@ -101,9 +101,13 @@ export const resolvers: GQLResolver = {
           results: []
         }
 
+      const userIdentifier = getTokenPayload(authHeader.Authorization).sub
+      const user = await dataSources.usersAPI.getUserById(userIdentifier!)
+
       const filteredSearchParamsWithScopes = filterSearchParamsWithScope(
         authHeader.Authorization,
-        advancedSearchParameters
+        advancedSearchParameters,
+        user
       )
 
       const searchCriteria: ISearchCriteria = {

diff --git a/packages/gateway/src/features/search/utils.ts b/packages/gateway/src/features/search/utils.ts
@@ -21,6 +21,7 @@ import {
   Scope,
   SCOPES
 } from '@opencrvs/commons/authentication'
+import { IUserModelData } from '@gateway/features/user/type-resolvers'
 
 export interface ISearchCriteria {
   parameters: GQLAdvancedSearchParametersInput
@@ -51,12 +52,43 @@ export const postAdvancedSearch = async (
   }
 }
 
-const addEventParamForScope = (
+const addJurisdictionIdParamWithScopes = (
+  currentScopes: Scope[],
+  searchParams: Omit<GQLAdvancedSearchParametersInput, 'event'> & {
+    event?: GQLEventType[]
+    birthJurisdictionId?: string
+    deathJurisdictionId?: string
+    marriageJurisdictionId?: string
+  },
+  user: IUserModelData
+) => {
+  if (
+    searchParams.event &&
+    (searchParams.declarationJurisdictionId ||
+      searchParams.declarationLocationId)
+  ) {
+  }
+
+  if (currentScopes.includes(SCOPES.SEARCH_BIRTH_MY_JURISDICTION)) {
+    searchParams.birthJurisdictionId = user.primaryOfficeId
+  }
+  if (currentScopes.includes(SCOPES.SEARCH_DEATH_MY_JURISDICTION)) {
+    searchParams.deathJurisdictionId = user.primaryOfficeId
+  }
+  if (currentScopes.includes(SCOPES.SEARCH_MARRIAGE_MY_JURISDICTION)) {
+    searchParams.marriageJurisdictionId = user.primaryOfficeId
+  }
+}
+
+const addSearchParamForScope = (
   requiredScopes: Scope[],
   event: GQLEventType,
   tokenScopes: Scope[],
   filteredParams: Omit<GQLAdvancedSearchParametersInput, 'event'> & {
     event?: GQLEventType[]
+    birthJurisdictionId?: string
+    deathJurisdictionId?: string
+    marriageJurisdictionId?: string
   },
   searchParamEvent: GQLEventType | undefined
 ) => {
@@ -70,7 +102,8 @@ const addEventParamForScope = (
 
 export const filterSearchParamsWithScope = (
   token: string,
-  advancedSearchParameters: GQLAdvancedSearchParametersInput
+  advancedSearchParameters: GQLAdvancedSearchParametersInput,
+  user: IUserModelData
 ): Omit<
   GQLAdvancedSearchParametersInput,
   'event' & {
@@ -81,29 +114,31 @@ export const filterSearchParamsWithScope = (
     advancedSearchParameters
   const currentUserScopes = getTokenPayload(token).scope
 
-  addEventParamForScope(
+  addSearchParamForScope(
     [SCOPES.SEARCH_BIRTH, SCOPES.SEARCH_BIRTH_MY_JURISDICTION],
     GQLEventType.birth,
     currentUserScopes,
     filteredParams,
     searchParamEvent
   )
 
-  addEventParamForScope(
+  addSearchParamForScope(
     [SCOPES.SEARCH_DEATH, SCOPES.SEARCH_DEATH_MY_JURISDICTION],
     GQLEventType.death,
     currentUserScopes,
     filteredParams,
     searchParamEvent
   )
 
-  addEventParamForScope(
+  addSearchParamForScope(
     [SCOPES.SEARCH_MARRIAGE, SCOPES.SEARCH_MARRIAGE_MY_JURISDICTION],
     GQLEventType.marriage,
     currentUserScopes,
     filteredParams,
     searchParamEvent
   )
 
+  addJurisdictionIdParamWithScopes(currentUserScopes, filteredParams, user)
+
   return filteredParams
 }
diff --git a/packages/search/src/features/search/types.ts b/packages/search/src/features/search/types.ts
@@ -92,6 +92,9 @@ export interface IAdvancedSearchParam {
   brideDoBEnd?: string
   brideIdentifier?: string
   dateOfMarriage?: string
+  birthJurisdictionId?: UUID
+  deathJurisdictionId?: UUID
+  marriageJurisdictionId?: UUID
 }
 
 export interface ISearchCriteria {