Add search function and fix transformer logic

src/api/opensearch.js

@@ -54,4 +54,17 @@ function isVisible(doc) {
   }
 }
 
-module.exports = { getCollection, getFileSet, getWork };
+async function search(body) {
+  const endpoint = new AWS.Endpoint(elasticsearchEndpoint);
+  const request = new AWS.HttpRequest(endpoint, region);
+
+  request.method = "POST";
+  request.body = body;
+  request.path += prefix("dc-v2-work") + `/_search`;
+  request.headers["host"] = elasticsearchEndpoint;
+  request.headers["Content-Type"] = "application/json";
+
+  return await awsFetch(request);
+}
+
+module.exports = { getCollection, getFileSet, getWork, search };

src/api/response/opensearch/index.js

@@ -1,27 +1,34 @@
 function transform(response) {
-
-  if (response.statusCode === 200){
-    return response?.hits?.hits ? 
-      transformMany(response) : 
-      transformOne(response);
+  if (response.statusCode === 200) {
+    const responseBody = JSON.parse(response.body);
+    return responseBody?.hits?.hits
+      ? transformMany(responseBody)
+      : transformOne(responseBody);
   }
   return transformError(response);
 }
 
-function transformOne(response) {
-  const responseBody = {data: JSON.parse(response.body)._source}
-
-  return {statusCode: 200, body: JSON.stringify(responseBody)};
+function transformOne(responseBody) {
+  return {
+    statusCode: 200,
+    body: JSON.stringify({ data: responseBody._source }),
+  };
 }
 
-function transformMany(response) {
-  return response;
+function transformMany(responseBody) {
+  return {
+    statusCode: 200,
+    body: JSON.stringify({ data: responseBody.hits, pagination: {} }),
+  };
 }
 
-function transformError(response){
-  const responseBody = {status: response.statusCode, error: "TODO"}
+function transformError(response) {
+  const responseBody = { status: response.statusCode, error: "TODO" };
 
-  return {statusCode: response.statusCode, body: JSON.stringify(responseBody)};
+  return {
+    statusCode: response.statusCode,
+    body: JSON.stringify(responseBody),
+  };
 }
 
-module.exports = { transform }
+module.exports = { transform };

src/aws/fetch.js

@@ -1,33 +1,30 @@
 const AWS = require("aws-sdk");
 
 function awsFetch(request) {
-  console.log(`request`, request);
-
   return new Promise((resolve, reject) => {
-    signRequest(request)
-      .then((signedRequest) => {
-        var client = new AWS.HttpClient();
-        client.handleRequest(
-          signedRequest,
-          null,
-          function (response) {
-            let returnValue = {
-              statusCode: response.statusCode
-            }
-            let responseBody = "";
-            response.on("data", function (chunk) {
-              responseBody += chunk;
-            });
-            response.on("end", function (chunk) {
-              resolve({ ...returnValue, body: responseBody });
-            });
-          },
-          function (error) {
-            console.error("Error: " + error);
-            reject(error);
-          }
-        );
-      })
+    signRequest(request).then((signedRequest) => {
+      var client = new AWS.HttpClient();
+      client.handleRequest(
+        signedRequest,
+        null,
+        function (response) {
+          let returnValue = {
+            statusCode: response.statusCode,
+          };
+          let responseBody = "";
+          response.on("data", function (chunk) {
+            responseBody += chunk;
+          });
+          response.on("end", function (chunk) {
+            resolve({ ...returnValue, body: responseBody });
+          });
+        },
+        function (error) {
+          console.error("Error: " + error);
+          reject(error);
+        }
+      );
+    });
   });
 }
 
@@ -44,8 +41,7 @@ function signRequest(request) {
       }
       resolve(request);
     });
-
-  })
+  });
 }
 
-module.exports = { awsFetch };
+module.exports = { awsFetch };

src/handlers/search.js

@@ -0,0 +1,12 @@
+const { search } = require("../api/opensearch");
+const opensearchResponse = require("../api/response/opensearch");
+
+/**
+ * Function to wrap search requests and transform responses
+ */
+exports.handler = async (event) => {
+  const eventBody = event.body;
+  let esResponse = await search(eventBody);
+  let transformedResponse = opensearchResponse.transform(esResponse);
+  return transformedResponse;
+};

template.yaml

@@ -122,6 +122,35 @@ Resources:
             RestApiId: !Ref dcApi
             Path: /works/{id}
             Method: GET
+  searchFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: src/handlers/search.handler
+      Runtime: nodejs16.x
+      Architectures:
+        - x86_64
+      MemorySize: 128
+      Timeout: 100
+      Description: Handles OpenSearch search requests, Works only by default.
+      Policies:
+        Version: 2012-10-17
+        Statement:
+          - Sid: ESHTTPPolicy
+            Effect: Allow
+            Action:
+              - es:ESHttp*
+            Resource: "*"
+      Environment:
+        Variables:
+          ENV_PREFIX: !Ref EnvironmentPrefix
+          ELASTICSEARCH_ENDPOINT: !Ref ElasticsearchEndpoint
+      Events:
+        Api:
+          Type: Api
+          Properties:
+            RestApiId: !Ref dcApi
+            Path: /search
+            Method: POST
   dcApi:
     Type: AWS::Serverless::Api
     Properties: