Merge pull request #455 from impresso/develop

Release v3.0.7

Author: theorm

src/services/impresso-ner/impresso-ner.class.ts

@@ -172,12 +172,12 @@ export class ImpressoNerService {
     if (response.statusCode !== 200) {
       let bodyText = ''
       try {
-        bodyText = await response.body.text()
+        bodyText = String(await response.body.text())
       } catch {
         /* ignore */
       }
 
-      logger.error(`Failed to fetch downstream data. Error (${response.statusCode}): `, bodyText)
+      logger.error(`Failed to fetch downstream data. Error (${response.statusCode}): ${bodyText}`)
       throw new Error('Failed to fetch downstream data')
     }
 

src/util/json.js

@@ -35,7 +35,7 @@ ajv.addSchema(require('../services/entity-mentions-timeline/schema/create/respon
 const BaseSchemaURI = 'https://github.com/impresso/impresso-middle-layer/tree/master/src'
 
 function validated(obj, schemaUri) {
-  const uri = schemaUri.startsWith('http') ? schemaUri : `${BaseSchemaURI}/${schemaUri}`
+  const uri = schemaUri?.startsWith('http') ? schemaUri : `${BaseSchemaURI}/${schemaUri}`
   const validate = ajv.getSchema(uri)
 
   if (validate === undefined) {
@@ -54,7 +54,7 @@ function validated(obj, schemaUri) {
 function formatValidationErrors(errors) {
   return (errors || [])
     .map(error => {
-      const dataPath = error.dataPath.startsWith('.') ? error.dataPath.slice(1) : error.dataPath
+      const dataPath = error.dataPath?.startsWith('.') ? error.dataPath?.slice(1) : error.dataPath
 
       if (error.keyword === 'additionalProperties') {
         const currentPath = dataPath

src/util/jsonschema.js

@@ -9,7 +9,7 @@ ajv.addSchema(require('../schema/find.json'))
 ajv.addSchema(require('../schema/addons.json'))
 
 function validated(obj, schemaUri) {
-  const uri = schemaUri.startsWith('http') ? schemaUri : `${BaseSchemaURI}/${schemaUri}`
+  const uri = schemaUri?.startsWith('http') ? schemaUri : `${BaseSchemaURI}/${schemaUri}`
   const validate = ajv.getSchema(uri)
 
   if (validate === undefined) {

src/util/queryParameters.ts

@@ -3,7 +3,7 @@ import { protobuf } from 'impresso-jscommons'
 
 export const parseOrderBy = (orderBy: string, keyFieldMap: Record<string, string> = {}) => {
   if (orderBy == null) return []
-  const isDescending = orderBy.startsWith('-')
+  const isDescending = orderBy?.startsWith('-')
   const orderKey = orderBy.replace(/^-/, '')
   const field = keyFieldMap[orderKey]
   return field != null ? [field, isDescending] : []