Bug fixes #5825

wellcomecollection · Nov 22, 2024 · dafa6c8 · dafa6c8
1 parent ed71af6
commit dafa6c8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/common/search/src/test/resources/WorksIndexConfig.json b/common/search/src/test/resources/WorksIndexConfig.json
diff --git a/search/src/main/scala/weco/api/search/models/Aggregation.scala b/search/src/main/scala/weco/api/search/models/Aggregation.scala
@@ -79,7 +79,7 @@ object AggregationMapping {
             firstBucket <- labelBuckets.headOption
           } yield firstBucket
 
-          val key = bucket.key.toString
+          val key = bucket.key.as[String].toOption.get
 
           // For label-based aggregations (which do not contain sub-aggregation buckets), set the label equal to the key.
           val label = firstLabelBucket.map(_.key).getOrElse(key)

diff --git a/search/src/main/scala/weco/api/search/services/WorksRequestBuilder.scala b/search/src/main/scala/weco/api/search/services/WorksRequestBuilder.scala
@@ -81,12 +81,12 @@ object WorksRequestBuilder
       .field(s"$nestedFieldPath.id")
       .subAggregations(termsAgg("labels", s"$nestedFieldPath.label").size(1))
 
-//  private def toLabelBasedAggregation(
-//    aggregationName: String,
-//    idFieldPath: String,
-//    size: Int
-//  ) =
-//    TermsAggregation(aggregationName).size(size).field(idFieldPath)
+  private def toLabelBasedAggregation(
+    aggregationName: String,
+    idFieldPath: String,
+    size: Int
+  ) =
+    TermsAggregation(aggregationName).size(size).field(idFieldPath)
 
   private def toAggregation(aggReq: WorkAggregationRequest) = aggReq match {
     // Note: we want these aggregations to return every possible value, so we
@@ -98,9 +98,9 @@ object WorksRequestBuilder
       toIdBasedAggregation("format", "aggregatableValues.workType", size = 30)
 
     case WorkAggregationRequest.ProductionDate =>
-      toIdBasedAggregation(
+      toLabelBasedAggregation(
         "productionDates",
-        "aggregatableValues.production.dates",
+        "aggregatableValues.production.dates.label",
         size = 10
       ).minDocCount(1)
 

diff --git a/search/src/test/scala/weco/api/search/services/AggregationsTest.scala b/search/src/test/scala/weco/api/search/services/AggregationsTest.scala
@@ -108,6 +108,7 @@ class AggregationsTest
             "E-videos",
             "Videos",
             "Archives and manuscripts",
+            "Born-digital archives",
             "Audio",
             "E-journals",
             "Pictures",
@@ -121,7 +122,6 @@ class AggregationsTest
             "Standing order",
             "E-books",
             "Student dissertations",
-            "Manuscripts",
             "Web sites"
           )
         }