Merge pull request #549 from NDLANO/feat/add-primary-context-to-searc…

…h-result feat: add primary context to SearchResult
NDLANO · Feb 12, 2025 · 872edc5 · 872edc5
2 parents e88ec26 + 4a02177
commit 872edc5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/api/searchApi.ts b/src/api/searchApi.ts
@@ -47,9 +47,10 @@ export async function search(searchQuery: GQLQuerySearchArgs, context: Context):
     fallback: searchQuery.fallback === "true",
   };
   const concepts = await searchConcepts(conceptQuery, context);
+  const subjects = searchQuery.subjects?.split(",") || [];
   return {
     ...searchResults,
-    results: searchResults.results.map((result: IMultiSearchSummaryDTO) => transformResult(result)),
+    results: searchResults.results.map((result: IMultiSearchSummaryDTO) => transformResult(result, subjects)),
     concepts: { concepts },
   };
 }
@@ -130,18 +131,20 @@ export async function searchWithoutPagination(
   const response = await Promise.all(requests);
   const allResultsJson = await Promise.all(response.map(resolveJson));
   allResultsJson.push(firstPageJson);
+  const subjects = searchQuery.subjects?.split(",") || [];
   return {
     results: allResultsJson.flatMap((json) =>
-      json.results.map((result: IMultiSearchSummaryDTO) => transformResult(result)),
+      json.results.map((result: IMultiSearchSummaryDTO) => transformResult(result, subjects)),
     ),
   };
 }
 
-const transformResult = (result: IMultiSearchSummaryDTO) => ({
+const transformResult = (result: IMultiSearchSummaryDTO, subjects: string[]) => ({
   ...result,
   title: result.title.title,
   htmlTitle: result.title.htmlTitle,
   metaDescription: result.metaDescription?.metaDescription,
+  context: result.contexts.find((c) => (subjects.length === 1 ? c.rootId === subjects[0] : c.isPrimary)),
 });
 
 export const grepSearch = async (input: IGrepSearchInputDTO, context: Context): Promise<IGrepSearchResultsDTO> => {

diff --git a/src/schema.ts b/src/schema.ts
@@ -939,6 +939,7 @@ export const typeDefs = gql`
     metaDescription: String!
     metaImage: MetaImage
     traits: [String!]!
+    context: SearchContext
     contexts: [SearchContext!]!
   }
 
@@ -951,6 +952,7 @@ export const typeDefs = gql`
     metaDescription: String!
     metaImage: MetaImage
     traits: [String!]!
+    context: SearchContext
     contexts: [SearchContext!]!
   }
 
@@ -963,6 +965,7 @@ export const typeDefs = gql`
     metaDescription: String!
     metaImage: MetaImage
     traits: [String!]!
+    context: SearchContext
     contexts: [SearchContext!]!
   }