fix: simplify query

Rotorsoft · Aug 31, 2023 · 0c1b0f4 · 0c1b0f4
1 parent 1a190a4
commit 0c1b0f4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/libs/eventually-aws/src/__tests__/lambda.spec.ts b/libs/eventually-aws/src/__tests__/lambda.spec.ts
@@ -172,8 +172,8 @@ describe("lambda", () => {
         null,
         {},
         {
-          queryStringParameters: { where: "b" },
-          multiValueQueryStringParameters: {}
+          queryStringParameters: {},
+          multiValueQueryStringParameters: { where: ["b"] }
         }
       )
     );
@@ -208,8 +208,8 @@ describe("lambda", () => {
         null,
         {},
         {
-          queryStringParameters: { sort: "id" },
-          multiValueQueryStringParameters: {}
+          queryStringParameters: {},
+          multiValueQueryStringParameters: { sort: ["id"] }
         }
       )
     );

diff --git a/libs/eventually-aws/src/lambda/query.ts b/libs/eventually-aws/src/lambda/query.ts
@@ -39,19 +39,14 @@ export const query = async (
         type: md.type
       });
 
-    const { ids, select, where, sort, limit } =
-      event.queryStringParameters ?? {};
-    const {
-      ids: mids,
-      select: mselect,
-      where: mwhere,
-      sort: msort
-    } = event.multiValueQueryStringParameters ?? {};
+    const { limit } = event.queryStringParameters ?? {};
+    const { ids, select, where, sort } =
+      event.multiValueQueryStringParameters ?? {};
     const query: RestProjectionQuery = {
-      ids: mids ?? (ids ? [ids] : undefined),
-      select: mselect ?? (select ? [select] : undefined),
-      where: mwhere ?? (where ? [where] : undefined),
-      sort: msort ?? (sort ? [sort] : undefined),
+      ids,
+      select,
+      where,
+      sort,
       limit: limit ? +limit : undefined
     };