searhcHits as field in manifestations :)

src/datasources/complexsearch.datasource.js

@@ -21,7 +21,17 @@ function prefixFacets(facets) {
  * Search via complex search
  */
 export async function load(
-  { cql, offset, limit, profile, filters, sort, facets, facetLimit },
+  {
+    cql,
+    offset,
+    limit,
+    profile,
+    filters,
+    sort,
+    facets,
+    facetLimit,
+    includeFilteredPids,
+  },
   context
 ) {
   const body = {
@@ -35,6 +45,7 @@ export async function load(
     facets: prefixFacets(facets || []),
     facetLimit: facetLimit,
     trackingId: context?.trackingId,
+    includeFilteredPids: includeFilteredPids || false,
     ...(sort && { sort: sort }),
   };
 
@@ -67,6 +78,7 @@ export async function load(
     tokenizerDurationInMs: json?.tokenizerDurationInMs || 0,
     solrExecutionDurationInMs: json?.solrExecutionDurationInMs || 0,
     solrFilter: json?.solrFilter || "",
+    searchHits: json.expanded || null,
   };
 }
 

src/middlewares/dataHubMiddleware.js

@@ -529,6 +529,7 @@ export function dataHubMiddleware(req, res, next) {
       offset: input?.offset || 0,
       limit: input?.limit || 10,
       sort: input?.sort,
+      includeFilteredPids: input?.includeFilteredPids || false,
     };
 
     const identifiers = result?.works?.map((w) => ({

src/schema/complexsearch.js

@@ -180,6 +180,7 @@ function setPost(parent, context, args) {
     filters: parent.filters,
     facets: parent?.facets?.facets,
     facetLimit: parent?.facets?.facetLimit,
+    includeFilteredPids: parent?.includeFilteredPids || false,
     ...(args && args),
   };
 }
@@ -265,16 +266,20 @@ export const resolvers = {
       const res = await context.datasources
         .getLoader("complexsearch")
         .load(setPost(parent, context, args));
-      const expanded = await Promise.all(
-        res?.works?.map(async (id) => resolveWork({ id }, context))
+
+      const resolvedWorks = await Promise.all(
+        res?.works?.map(async (id) =>
+          resolveWork({ id, searchHits: res?.searchHits }, context)
+        )
       );
 
       const input = {
         ...parent,
         ...args,
         profile: context.profile,
       };
-      const works = expanded.filter((work) => !!work);
+
+      const works = resolvedWorks.filter((work) => !!work);
       context?.dataHub?.createComplexSearchEvent({
         input: input,
         result: { works },

src/schema/draft/manifestation.js

@@ -565,7 +565,16 @@ type LevelForAudience {
   Level expressed as integer on a scale from 1 to 5
   """
   realisticVsFictional: Int
+}
+
+type HighLightType {
+  hit: String
+  field: [String!]
+}
 
+type SearchHitsType {
+  match: Manifestation
+  highlights: [HighLightType]
 }
 
 type Manifestations {
@@ -574,6 +583,10 @@ type Manifestations {
   all: [Manifestation!]! @complexity(value: 50)
   bestRepresentation: Manifestation! 
   mostRelevant: [Manifestation!]! @complexity(value: 25)
+  """
+  Complex search only !!! - manifestations with search hits
+  """
+  searchHits: [SearchHitsType]
 }
 
 type Manifestation {

src/schema/draft/work.js

@@ -312,13 +312,15 @@ export const resolvers = {
       const bestRepresentation =
         manifestations?.bestRepresentations?.[0] || manifestations?.all?.[0];
       const mostRelevant = manifestations?.mostRelevant || manifestations?.all;
+      const searchHits = manifestations?.searchHits || null;
 
       return {
         first,
         latest,
         all,
         bestRepresentation,
         mostRelevant,
+        searchHits,
       };
     },
   },

src/schema/root.js

@@ -40,7 +40,7 @@ type Query {
   work(id: String, faust: String, pid: String, oclc: String, language: LanguageCodeEnum): Work @complexity(value: 5)
   works(id: [String!], faust: [String!], pid: [String!], oclc:[String!], language: LanguageCodeEnum): [Work]! @complexity(value: 5, multipliers: ["id", "pid", "faust", "oclc"])
   search(q: SearchQueryInput!, filters: SearchFiltersInput, search_exact: Boolean): SearchResponse!
-  complexSearch(cql: String!, filters: ComplexSearchFiltersInput, facets: ComplexSearchFacetsInput): ComplexSearchResponse!
+  complexSearch(cql: String!, filters: ComplexSearchFiltersInput, includeFilteredPids: Boolean, facets: ComplexSearchFacetsInput): ComplexSearchResponse!
   linkCheck: LinkCheckService! @complexity(value: 10, multipliers: ["urls"])
   """
   ComplexFacets is for internal use only - there is no limit on how many facets are allowed to extract

src/utils/utils.js

@@ -387,6 +387,18 @@ export async function resolveWork(args, context) {
         ...m,
         traceId: createTraceId(),
       })),
+      searchHits: () => {
+        return args?.searchHits
+          ? w?.manifestations?.all
+              ?.filter((m) => args?.searchHits?.[w.workId]?.includes(m.pid))
+              .map((m) => ({
+                match: { ...m, traceId: createTraceId() },
+                // highlights is an empty array for now
+                // @TODO find the highlights in matches array from search query (cql)
+                highlights: [],
+              }))
+          : null;
+      },
     };
 
     return withTraceId;