added 'creators' facet

colonial-heritage · Oct 2, 2023 · a3691d6 · a3691d6
1 parent 9b4caf3
commit a3691d6
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 0 deletions.
diff --git a/apps/researcher/src/lib/api/objects/definitions.ts b/apps/researcher/src/lib/api/objects/definitions.ts
@@ -18,5 +18,6 @@ export type SearchResult = {
     subjects: SearchResultFilter[];
     locations: SearchResultFilter[];
     materials: SearchResultFilter[];
+    creators: SearchResultFilter[];
   };
 };
diff --git a/apps/researcher/src/lib/api/objects/searcher.integration.test.ts b/apps/researcher/src/lib/api/objects/searcher.integration.test.ts
@@ -371,6 +371,23 @@ describe('search', () => {
             name: 'Paper',
           },
         ],
+        creators: [
+          {
+            totalCount: 1,
+            id: 'Adriaan Boer',
+            name: 'Adriaan Boer',
+          },
+          {
+            totalCount: 1,
+            id: 'Geeske van Châtellerault',
+            name: 'Geeske van Châtellerault',
+          },
+          {
+            totalCount: 1,
+            id: 'Vincent van Gogh',
+            name: 'Vincent van Gogh',
+          },
+        ],
       },
     });
   });
@@ -492,4 +509,35 @@ describe('search', () => {
       },
     });
   });
+
+  it('finds heritage objects if "creators" filter matches', async () => {
+    const result = await heritageObjectSearcher.search({
+      filters: {
+        creators: ['Adriaan Boer'],
+      },
+    });
+
+    expect(result).toMatchObject({
+      totalCount: 1,
+      filters: {
+        creators: [
+          {
+            totalCount: 1,
+            id: 'Adriaan Boer',
+            name: 'Adriaan Boer',
+          },
+          {
+            totalCount: 0,
+            id: 'Geeske van Châtellerault',
+            name: 'Geeske van Châtellerault',
+          },
+          {
+            totalCount: 0,
+            id: 'Vincent van Gogh',
+            name: 'Vincent van Gogh',
+          },
+        ],
+      },
+    });
+  });
 });
diff --git a/apps/researcher/src/lib/api/objects/searcher.ts b/apps/researcher/src/lib/api/objects/searcher.ts
@@ -61,6 +61,7 @@ const searchOptionsSchema = z.object({
       subjects: z.array(z.string()).optional().default([]),
       locations: z.array(z.string()).optional().default([]),
       materials: z.array(z.string()).optional().default([]),
+      creators: z.array(z.string()).optional().default([]),
     })
     .optional(),
 });
@@ -119,12 +120,14 @@ const rawSearchResponseWithAggregationsSchema = rawSearchResponseSchema.merge(
         subjects: rawAggregationSchema,
         locations: rawAggregationSchema,
         materials: rawAggregationSchema,
+        creators: rawAggregationSchema,
       }),
       owners: rawAggregationSchema,
       types: rawAggregationSchema,
       subjects: rawAggregationSchema,
       locations: rawAggregationSchema,
       materials: rawAggregationSchema,
+      creators: rawAggregationSchema,
     }),
   })
 );
@@ -260,6 +263,7 @@ export class HeritageObjectSearcher {
       subjects: buildAggregation(RawKeys.About),
       locations: buildAggregation(RawKeys.CountryCreated),
       materials: buildAggregation(RawKeys.Material),
+      creators: buildAggregation(RawKeys.Creator),
     };
 
     const sortByRawKey = sortByToRawKeys.get(options.sortBy!)!;
@@ -313,6 +317,7 @@ export class HeritageObjectSearcher {
       [RawKeys.About, options.filters?.subjects],
       [RawKeys.CountryCreated, options.filters?.locations],
       [RawKeys.Material, options.filters?.materials],
+      [RawKeys.Creator, options.filters?.creators],
     ]);
 
     for (const [rawHeritageObjectKey, filters] of queryFilters) {
@@ -364,6 +369,11 @@ export class HeritageObjectSearcher {
       aggregations.materials.buckets
     );
 
+    const creatorFilters = buildFilters(
+      aggregations.all.creators.buckets,
+      aggregations.creators.buckets
+    );
+
     const searchResult: SearchResult = {
       totalCount: hits.total.value,
       offset: options.offset!,
@@ -377,6 +387,7 @@ export class HeritageObjectSearcher {
         subjects: subjectFilters,
         locations: locationFilters,
         materials: materialFilters,
+        creators: creatorFilters,
       },
     };