@xube/kit-aws-data-infrastructure 0.0.76 → 0.0.78

package/dist/functions/get-data.js

@@ -5,6 +5,8 @@ const kit_aws_data_schema_1 = require("@xube/kit-aws-data-schema");
 const kit_constants_1 = require("@xube/kit-constants");
 const kit_aws_data_1 = require("@xube/kit-aws-data");
 const kit_log_1 = require("@xube/kit-log");
+const zod_1 = require("zod");
+const zod_validation_error_1 = require("zod-validation-error");
 const dataTableName = process.env[kit_aws_data_schema_1.DATA_TABLE_NAME_ENV_VAR] ?? "";
 const handler = async (event) => {
     const log = kit_log_1.XubeLog.getInstance();
@@ -23,17 +25,41 @@ const handler = async (event) => {
         };
     }
     const request = JSON.parse(event.body);
-    if (!(0, kit_aws_data_schema_1.isGetDataByDateRangeRequest)(request)) {
+    try {
+        if ((0, kit_aws_data_schema_1.isGetDataByDateRangeRequest)(request)) {
+            log.info(`Request body is a valid Get Data By Date Range request`);
+            const response = await (0, kit_aws_data_1.getDataForDateRange)(request, dataTableName, log);
+            if (response.hasFailed() || !response.data) {
+                if (response.statusCode == kit_constants_1.StatusCode.NotFound) {
+                    return {
+                        body: response.error ?? `Could not find any data for the request`,
+                        statusCode: response.statusCode,
+                    };
+                }
+            }
+            else {
+                return {
+                    body: JSON.stringify(response.data),
+                    statusCode: response.statusCode,
+                };
+            }
+        }
+    }
+    catch (e) {
         log.warn(`Request body is not a valid Get Data By Date Range request`);
-        return {
-            body: `Request body is not a valid Get Data By Date Range request`,
-            statusCode: kit_constants_1.StatusCode.BadRequest,
-        };
+        if (e instanceof zod_1.z.ZodError) {
+            const validationError = (0, zod_validation_error_1.fromZodError)(e);
+            log.warn(`Validation error: ${JSON.stringify(validationError)}`);
+            return {
+                body: validationError.message,
+                statusCode: kit_constants_1.StatusCode.BadRequest,
+            };
+        }
     }
-    const response = await (0, kit_aws_data_1.getDataForDateRange)(request, dataTableName, log);
+    log.error(`Could not get data by date range with request: ${event.body}`);
     return {
-        body: JSON.stringify(response),
-        statusCode: response.statusCode,
+        body: `An error occurred when getting data by date range`,
+        statusCode: kit_constants_1.StatusCode.InternalError,
     };
 };
 exports.handler = handler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xube/kit-aws-data-infrastructure",
-  "version": "0.0.76",
+  "version": "0.0.78",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -19,19 +19,21 @@
   "homepage": "https://github.com/XubeLtd/dev-kit#readme",
   "devDependencies": {
     "@types/node": "^20.4.7",
-    "@xube/kit-build": "^0.0.76",
+    "@xube/kit-build": "^0.0.78",
     "ts-node": "^10.9.1",
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "@xube/kit-aws": "^0.0.76",
-    "@xube/kit-aws-data": "^0.0.76",
-    "@xube/kit-aws-data-schema": "^0.0.76",
-    "@xube/kit-aws-infrastructure": "^0.0.76",
-    "@xube/kit-constants": "^0.0.76",
-    "@xube/kit-log": "^0.0.76",
+    "@xube/kit-aws": "^0.0.78",
+    "@xube/kit-aws-data": "^0.0.78",
+    "@xube/kit-aws-data-schema": "^0.0.78",
+    "@xube/kit-aws-infrastructure": "^0.0.78",
+    "@xube/kit-constants": "^0.0.78",
+    "@xube/kit-log": "^0.0.78",
     "aws-cdk-lib": "^2.100.0",
     "aws-lambda": "^1.0.7",
-    "constructs": "^10.3.0"
+    "constructs": "^10.3.0",
+    "zod": "^3.22.4",
+    "zod-validation-error": "^2.0.0"
   }
 }

package/src/functions/get-data.ts

@@ -9,6 +9,8 @@ import {
 import { StatusCode } from "@xube/kit-constants";
 import { getDataForDateRange } from "@xube/kit-aws-data";
 import { XubeLog } from "@xube/kit-log";
+import { z } from "zod";
+import { fromZodError } from "zod-validation-error";
 
 const dataTableName = process.env[DATA_TABLE_NAME_ENV_VAR] ?? "";
 
@@ -35,18 +37,42 @@ export const handler = async (
 
   const request: unknown = JSON.parse(event.body);
 
-  if (!isGetDataByDateRangeRequest(request)) {
+  try {
+    if (isGetDataByDateRangeRequest(request)) {
+      log.info(`Request body is a valid Get Data By Date Range request`);
+      const response = await getDataForDateRange(request, dataTableName, log);
+
+      if (response.hasFailed() || !response.data) {
+        if (response.statusCode == StatusCode.NotFound) {
+          return {
+            body: response.error ?? `Could not find any data for the request`,
+            statusCode: response.statusCode,
+          };
+        }
+      } else {
+        return {
+          body: JSON.stringify(response.data),
+          statusCode: response.statusCode,
+        };
+      }
+    }
+  } catch (e) {
     log.warn(`Request body is not a valid Get Data By Date Range request`);
-    return {
-      body: `Request body is not a valid Get Data By Date Range request`,
-      statusCode: StatusCode.BadRequest,
-    };
+
+    if (e instanceof z.ZodError) {
+      const validationError = fromZodError(e);
+      log.warn(`Validation error: ${JSON.stringify(validationError)}`);
+      return {
+        body: validationError.message,
+        statusCode: StatusCode.BadRequest,
+      };
+    }
   }
 
-  const response = await getDataForDateRange(request, dataTableName, log);
+  log.error(`Could not get data by date range with request: ${event.body}`);
 
-    return {
-        body: JSON.stringify(response),
-        statusCode: response.statusCode,
-    };
+  return {
+    body: `An error occurred when getting data by date range`,
+    statusCode: StatusCode.InternalError,
+  };
 };