use the correct filter namespace for clusters and do not double-valid…

…ate filters.
impresso · Aug 2, 2024 · 05d0566 · 05d0566
1 parent 474ad3b
commit 05d0566
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/services/text-reuse-clusters/text-reuse-clusters.class.ts b/src/services/text-reuse-clusters/text-reuse-clusters.class.ts
@@ -42,9 +42,9 @@ function buildResponseClusters(clusters: any, clusterIdsAndText: { id: any; text
 
 const deserializeFilters = (serializedFilters: string) => protobuf.searchQuery.deserialize(serializedFilters).filters
 
-function filtersToSolrQueries(filters: any) {
+function filtersToSolrQueries(filters: any, namespace = SolrNamespaces.TextReusePassages) {
   const filtersGroupsByType = values(groupBy(filters, 'type'))
-  return uniq(filtersGroupsByType.map((f: any) => sameTypeFiltersToQuery(f, SolrNamespaces.TextReusePassages)))
+  return uniq(filtersGroupsByType.map((f: any) => sameTypeFiltersToQuery(f, namespace)))
 }
 
 export const OrderByKeyToField = {
@@ -122,7 +122,7 @@ export class TextReuseClusters {
   async find(params: Params<FindQueyParameters>): Promise<FindTextReuseClustersResponse> {
     const { text, offset = 0, limit = 10, order_by: orderBy } = params.query ?? {}
     const { filters }: Pick<FindQueyParameters, 'filters'> = (params as any).sanitized ?? {}
-    const filterQueryParts = filtersToSolrQueries(filters)
+    const filterQueryParts = filtersToSolrQueries(filters, SolrNamespaces.TextReuseClusters)
     const [orderByField, orderByDescending] = parseOrderBy(orderBy, OrderByKeyToField)
     const query = getTextReusePassagesClusterIdsSearchRequestForText(
       text,

diff --git a/src/services/text-reuse-clusters/text-reuse-clusters.hooks.js b/src/services/text-reuse-clusters/text-reuse-clusters.hooks.js
@@ -1,8 +1,6 @@
 import { authenticateAround as authenticate } from '../../hooks/authenticate'
 import { rateLimit } from '../../hooks/rateLimiter'
 import { decodeJsonQueryParameters } from '../../hooks/parameters'
-import { validate } from '../../hooks/params'
-import { parseFilters } from '../../util/queryParameters'
 
 // const { validateWithSchema } = require('../../hooks/schema')
 
@@ -14,12 +12,6 @@ module.exports = {
     all: [],
     find: [
       decodeJsonQueryParameters(['filters']), //
-      validate({
-        filters: {
-          required: false,
-          transform: parseFilters,
-        },
-      }),
     ],
     get: [],
     create: [],