fix: map query to and from _id alias

Author: TillaTheHun0

adapter.js

@@ -55,14 +55,13 @@ const { Async } = crocks;
  * @property {string} key
  *
  * @typedef {Object} SearchOptions
- * @property {Array<string>} fields
- * @property {Object} boost
- * @property {boolean} prefix
+ * @property {string} query
+ * @property {Array<string>} [fields]
+ * @property {Object} [filter]
  *
  * @typedef {Object} SearchQuery
  * @property {string} index
- * @property {string} query
- * @property {SearchOptions} [options]
+ * @property {SearchOptions} q
  *
  * @typedef {Object} Response
  * @property {boolean} ok

adapter_test.js

@@ -12,7 +12,7 @@ import {
   removeDocPath,
   updateDocPath,
 } from "./paths.js";
-import { moveUnderscoreId } from "./utils.js";
+import { moveUnderscoreId, underscoreIdAlias } from "./utils.js";
 
 const headers = createHeaders("admin", "password");
 
@@ -126,7 +126,7 @@ Deno.test("create index - maps _id", async () => {
       method: "PUT",
       headers,
       body:
-        '{"mappings":{"properties":{"title":{"type":"text"},"__movedUnderscoreId63__":{"type":"text"}}}}',
+        `{"mappings":{"properties":{"title":{"type":"text"},"${underscoreIdAlias}":{"type":"text"}}}}`,
     }],
   });
 
@@ -540,21 +540,43 @@ Deno.test("query", async () => {
     index: "movies",
     q: {
       query: "gatsby",
-      fields: ["title"],
+      fields: ["title", "_id"],
       filter: {
         rating: 4,
+        _id: "id-1",
       },
     },
   });
 
-  assertObjectMatch(fetch.calls.pop(), {
+  const call = fetch.calls.pop();
+  assertObjectMatch(call, {
     args: [queryPath(ES, INDEX), {
       method: "POST",
       headers,
-      // TODO: Tyler. Assert body here eventually
     }],
   });
 
+  let { args: [, { body }] } = call;
+  body = JSON.parse(body);
+
+  assertObjectMatch(body, {
+    query: {
+      bool: {
+        must: {
+          multi_match: {
+            query: "gatsby",
+            fuzziness: "AUTO",
+            fields: ["title", underscoreIdAlias],
+          },
+        },
+        filter: [
+          { term: { rating: 4 } },
+          { term: { [underscoreIdAlias]: "id-1" } },
+        ],
+      },
+    },
+  });
+
   assertEquals(result.ok, true);
   assert(result.matches);
   assertEquals(result.matches.length, 2);

utils.js

@@ -35,6 +35,8 @@ const {
   toPairs,
 } = R;
 
+export const underscoreIdAlias = "__movedUnderscoreId63__";
+
 const isDefined = complement(isNil);
 const isEmptyObject = allPass([
   complement(is(Array)), // not an array
@@ -176,13 +178,13 @@ const swap = (old, cur) =>
 
 export const moveUnderscoreId = ifElse(
   has("_id"),
-  swap("_id", "__movedUnderscoreId63__"),
+  swap("_id", underscoreIdAlias),
   identity,
 );
 
 export const toUnderscoreId = ifElse(
-  has("__movedUnderscoreId63__"),
-  swap("__movedUnderscoreId63__", "_id"),
+  has(underscoreIdAlias),
+  swap(underscoreIdAlias, "_id"),
   identity,
 );
 
@@ -244,11 +246,18 @@ export const queryToEsQuery = ({ query, fields, filter }) => ({
           query,
           // See https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-query.html#query-dsl-match-query-fuzziness
           fuzziness: "AUTO",
-          fields,
+          // map _id => underscoreIdAlias
+          fields: fields
+            ? fields.map((field) => field === "_id" ? underscoreIdAlias : field)
+            : undefined,
         },
       },
       filter: toPairs(filter).map(
-        ([key, value]) => ({ term: { [key]: value } }),
+        // map _id => underscoreIdAlias
+        ([key, value]) =>
+          key === "_id"
+            ? ({ term: { [underscoreIdAlias]: value } })
+            : ({ term: { [key]: value } }),
       ),
     },
   },