Return empty results when searching for a nonexistent collection

.eslintrc.json

@@ -124,5 +124,20 @@
       "consistent"
     ],
     "import/extensions": "off"
-  }
+  },
+  "overrides": [
+    {
+      "files": [
+        "test-*.js"
+      ],
+      "rules": {
+        "max-len": [
+          "error",
+          {
+            "ignoreStrings": true
+          }
+        ]
+      }
+    }
+  ]
 }

CHANGELOG.md

@@ -15,7 +15,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 
-- open-ended datetime intervals using either empty string or '..' now work
+- Open-ended datetime intervals using either empty string or '..' now work
+- Correct content types are now returned
+- Searching for a nonexistent collection returns empty results
 
 ### Changed
 

package.json

@@ -45,6 +45,7 @@
     "js-yaml": "^3.13.1",
     "memorystream": "^0.3.1",
     "morgan": "^1.10.0",
+    "p-filter": "^2.0.0",
     "pump": "^3.0.0",
     "serverless-http": "^2.7.0",
     "through2": "^3.0.1"

src/lambdas/api/app.js

@@ -60,6 +60,7 @@ app.get('/', async (req, res, next) => {
 
 app.get('/api', async (_req, res, next) => {
   try {
+    res.type('application/vnd.oai.openapi')
     const spec = await readYaml(path.join(__dirname, 'api.yaml'))
     res.json(spec)
   } catch (error) {
@@ -77,6 +78,7 @@ app.get('/conformance', async (_req, res, next) => {
 
 app.get('/search', async (req, res, next) => {
   try {
+    res.type('application/geo+json')
     res.json(await api.searchItems(null, req.query, satlib.es, req.endpoint, 'GET'))
   } catch (error) {
     next(error)
@@ -85,6 +87,7 @@ app.get('/search', async (req, res, next) => {
 
 app.post('/search', async (req, res, next) => {
   try {
+    res.type('application/geo+json')
     res.json(await api.searchItems(null, req.body, satlib.es, req.endpoint, 'POST'))
   } catch (error) {
     next(error)
@@ -112,6 +115,7 @@ app.get('/collections/:collectionId', async (req, res, next) => {
 
 app.get('/collections/:collectionId/items', async (req, res, next) => {
   try {
+    res.type('application/geo+json')
     res.json(await api.searchItems(
       req.params.collectionId,
       req.query,
@@ -140,6 +144,7 @@ app.post('/collections/:collectionId/items', async (req, res, next) => {
 
 app.get('/collections/:collectionId/items/:itemId', async (req, res, next) => {
   try {
+    res.type('application/geo+json')
     res.json(await api.getItem(
       req.params.collectionId,
       req.params.itemId,
@@ -172,6 +177,8 @@ app.use(
   /** @type {ErrorRequestHandler} */ ((err, _req, res, _next) => {
     res.status(err.status || 500)
 
+    res.type('application/json')
+
     switch (err.status) {
     case 404:
       res.json({ error: 'Not Found' })

src/lib/api.js

@@ -1,5 +1,7 @@
 const gjv = require('geojson-validation')
 const extent = require('@mapbox/extent')
+const pFilter = require('p-filter')
+const { isIndexNotFoundError, indexExists } = require('./es')
 const logger = console
 
 // max number of collections to retrieve
@@ -377,14 +379,18 @@ const searchItems = async function (collectionId, queryParameters, backend, endp
   const ids = extractIds(queryParameters)
   const collections = extractCollectionIds(queryParameters)
 
+  const collectionsThatExist = Array.isArray(collections)
+    ? await pFilter(collections, indexExists)
+    : undefined
+
   const parameters = {
     datetime,
     intersects,
     query,
     sortby,
     fields,
     ids,
-    collections
+    collections: collectionsThatExist
   }
 
   // Keep only existing parameters
@@ -401,7 +407,26 @@ const searchItems = async function (collectionId, queryParameters, backend, endp
     newEndpoint = `${endpoint}/collections/${collectionId}/items`
   }
   logger.debug(`Search parameters: ${JSON.stringify(searchParameters)}`)
-  const results = await backend.search(searchParameters, page, limit)
+
+  let results
+  try {
+    results = await backend.search(searchParameters, page, limit)
+  } catch (error) {
+    if (isIndexNotFoundError(error)) {
+      results = {
+        context: {
+          matched: 0,
+          returned: 0,
+          page,
+          limit
+        },
+        results: []
+      }
+    } else {
+      throw error
+    }
+  }
+
   const { 'results': itemsResults, 'context': itemsMeta } = results
   const pageLinks = buildPageLinks(itemsMeta, searchParameters, newEndpoint, httpMethod)
   const items = addItemLinks(itemsResults, endpoint)

src/lib/es.js

@@ -6,6 +6,11 @@ const logger = console //require('./logger')
 const COLLECTIONS_INDEX = process.env.COLLECTIONS_INDEX || 'collections'
 const ITEMS_INDEX = process.env.ITEMS_INDEX || 'items'
 
+const isIndexNotFoundError = (e) => (
+  e instanceof Error
+    && e.name === 'ResponseError'
+    && e.message.includes('index_not_found_exception'))
+
 /*
 This module is used for connecting to an Elasticsearch instance, writing records,
 searching records, and managing the indexes. It looks for the ES_HOST environment
@@ -351,9 +356,25 @@ async function search(parameters, page = 1, limit = 10) {
   return response
 }
 
+/**
+ * Test if an ES index exists
+ *
+ * @param {string} index
+ * @returns {Promise<boolean>}
+ */
+const indexExists = async (index) => {
+  const client = await esClient.client()
+
+  const result = await client.indices.exists({ index })
+
+  return result.body
+}
+
 module.exports = {
   getCollection,
   getCollections,
+  indexExists,
+  isIndexNotFoundError,
   search,
   editPartialItem,
   constructSearchParams,

tests/system/test-api-get-api.js

@@ -0,0 +1,8 @@
+const test = require('ava')
+const { apiClient } = require('../helpers/api-client')
+
+test('GET /api has a content type of "application/json', async (t) => {
+  const response = await apiClient.get('api', { resolveBodyOnly: false })
+
+  t.is(response.headers['content-type'], 'application/vnd.oai.openapi; charset=utf-8')
+})