Merge pull request #520 from impresso/develop

Release v3.1.2

src/services/images/images-v1.hooks.ts

@@ -11,6 +11,8 @@ import {
 import { HookContext } from '@feathersjs/feathers'
 import { ImpressoApplication } from '../../types'
 import { Image } from '../../models/generated/schemas'
+import { protobuf } from 'impresso-jscommons'
+import { BadRequest } from '@feathersjs/errors'
 
 // const { authenticate } = require('@feathersjs/authentication').hooks;
 const {
@@ -63,7 +65,6 @@ const updateIiifUrls = (context: HookContext<ImpressoApplication>) => {
         })
       })
     })
-    console.log(context.result.data)
   }
 }
 
@@ -111,17 +112,36 @@ const convertItemToNewImageFormat = (context: HookContext<ImpressoApplication>)
   context.result = newResult
 }
 
+const deserializeFilters = (serializedFilters: string) => {
+  if (serializedFilters == null) return []
+  try {
+    return protobuf.searchQuery.deserialize(serializedFilters).filters || []
+  } catch (error) {
+    throw new BadRequest(`Could not deserialize filters: ${(error as Error).message}`)
+  }
+}
+
+// parse filters
+const parseFiltersHook = (context: HookContext<ImpressoApplication>) => {
+  const { filters } = context.params?.query ?? {}
+  context.params.query.filters = deserializeFilters(filters)
+  console.log('ooo', context.params.query.filters)
+}
+
+const parseQ = (context: HookContext<ImpressoApplication>) => {
+  if (context?.params?.query?.term) {
+    context.params.query.q = context.params.query.term
+  }
+}
+
 export default {
   before: {
     all: [
       // authenticate('jwt')
     ],
     find: [
-      (context: HookContext<ImpressoApplication>) => {
-        if (context?.params?.query?.term) {
-          context.params.query.q = context.params.query.term
-        }
-      },
+      parseFiltersHook,
+      parseQ,
       validate({
         order_by: utils.orderBy({
           values: {