quidproquo-actionprocessor-awslambda 0.0.213 → 0.0.215

package/lib/commonjs/getActionProcessor/core/keyValueStore/getKeyValueStoreUpdateActionProcessor.js

@@ -15,10 +15,11 @@ const quidproquo_core_2 = require("quidproquo-core");
 const dynamo_1 = require("../../../logic/dynamo");
 const getProcessKeyValueStoreUpdate = (qpqConfig) => {
     return ({ keyValueStoreName, key, sortKey, updates, options }) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         const dynamoTableName = (0, awsNamingUtils_1.getKvsDynamoTableNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
         const storeConfig = quidproquo_core_1.qpqCoreUtils.getKeyValueStoreByName(qpqConfig, keyValueStoreName);
-        const item = yield (0, dynamo_1.updateItem)(dynamoTableName, region, updates, storeConfig.partitionKey.key, key, sortKey);
+        const item = yield (0, dynamo_1.updateItem)(dynamoTableName, region, updates, storeConfig.partitionKey.key, key, (_a = storeConfig.sortKeys[0]) === null || _a === void 0 ? void 0 : _a.key, sortKey);
         return (0, quidproquo_core_2.actionResult)(item);
     });
 };

package/lib/commonjs/getActionProcessor/core/keyValueStore/getKeyValueStoreUpsertActionProcessor.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const quidproquo_core_1 = require("quidproquo-core");
 const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const dynamo_1 = require("../../../logic/dynamo");
+const src_1 = require("quidproquo-core/src");
 const getProcessKeyValueStoreUpsert = (qpqConfig) => {
     return ({ keyValueStoreName, item, options }) => __awaiter(void 0, void 0, void 0, function* () {
         const dynamoTableName = (0, awsNamingUtils_1.getKvsDynamoTableNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
@@ -26,10 +27,17 @@ const getProcessKeyValueStoreUpsert = (qpqConfig) => {
             ...storeConfig.indexes.map((i) => i.partitionKey),
             ...storeConfig.indexes.filter((i) => !!i.sortKey).map((i) => i.sortKey),
         ];
-        yield (0, dynamo_1.putItem)(dynamoTableName, item, keys, {
-            expires: options === null || options === void 0 ? void 0 : options.ttlInSeconds,
-        }, region);
-        return (0, quidproquo_core_1.actionResult)(void 0);
+        try {
+            yield (0, dynamo_1.putItem)(dynamoTableName, item, keys, {
+                expires: options === null || options === void 0 ? void 0 : options.ttlInSeconds,
+            }, region);
+            return (0, quidproquo_core_1.actionResult)(void 0);
+        }
+        catch (error) {
+            return (0, quidproquo_core_1.actionResultErrorFromCaughtError)(error, {
+                InternalServerError: () => (0, quidproquo_core_1.actionResultError)(src_1.KeyValueStoreUpsertErrorTypeEnum.ServiceUnavailable, 'KVS Service Unavailable'),
+            });
+        }
     });
 };
 exports.default = (qpqConfig) => ({

package/lib/commonjs/logic/dynamo/updateItem.d.ts

@@ -1,2 +1,2 @@
 import { KvsUpdate, KvsCoreDataType } from 'quidproquo-core';
-export declare function updateItem<Item>(tableName: string, region: string, update: KvsUpdate, keyName: string, key: KvsCoreDataType, sortKey?: KvsCoreDataType): Promise<Item>;
+export declare function updateItem<Item>(tableName: string, region: string, update: KvsUpdate, keyName: string, key: KvsCoreDataType, sortkeyName?: string, sortKey?: KvsCoreDataType): Promise<Item>;

package/lib/commonjs/logic/dynamo/updateItem.js

@@ -14,7 +14,7 @@ const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
 const qpqDynamoOrm_1 = require("./qpqDynamoOrm");
 const createAwsClient_1 = require("../createAwsClient");
 const convertObjectToDynamoMap_1 = require("./convertObjectToDynamoMap");
-function updateItem(tableName, region, update, keyName, key, sortKey) {
+function updateItem(tableName, region, update, keyName, key, sortkeyName, sortKey) {
     return __awaiter(this, void 0, void 0, function* () {
         const dynamoDBClient = (0, createAwsClient_1.createAwsClient)(client_dynamodb_1.DynamoDBClient, { region });
         const params = {
@@ -27,8 +27,8 @@ function updateItem(tableName, region, update, keyName, key, sortKey) {
             ExpressionAttributeNames: (0, qpqDynamoOrm_1.buildUpdateExpressionAttributeNames)(update),
             ReturnValues: client_dynamodb_1.ReturnValue.ALL_NEW,
         };
-        if (sortKey) {
-            params.Key['sk'] = (0, qpqDynamoOrm_1.buildAttributeValue)(sortKey);
+        if (sortkeyName && sortKey !== undefined) {
+            params.Key[sortkeyName] = (0, qpqDynamoOrm_1.buildAttributeValue)(sortKey);
         }
         const result = yield dynamoDBClient.send(new client_dynamodb_1.UpdateItemCommand(params));
         return (0, convertObjectToDynamoMap_1.convertDynamoMapToObject)(result.Attributes);

package/lib/esm/getActionProcessor/core/keyValueStore/getKeyValueStoreUpdateActionProcessor.js

@@ -1,13 +1,13 @@
 import { qpqCoreUtils } from 'quidproquo-core';
 import { getKvsDynamoTableNameFromConfig } from '../../../awsNamingUtils';
-import { actionResult, KeyValueStoreActionType, } from 'quidproquo-core';
+import { actionResult, KeyValueStoreActionType } from 'quidproquo-core';
 import { updateItem } from '../../../logic/dynamo';
 const getProcessKeyValueStoreUpdate = (qpqConfig) => {
     return async ({ keyValueStoreName, key, sortKey, updates, options }) => {
         const dynamoTableName = getKvsDynamoTableNameFromConfig(keyValueStoreName, qpqConfig, 'kvs');
         const region = qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
         const storeConfig = qpqCoreUtils.getKeyValueStoreByName(qpqConfig, keyValueStoreName);
-        const item = await updateItem(dynamoTableName, region, updates, storeConfig.partitionKey.key, key, sortKey);
+        const item = await updateItem(dynamoTableName, region, updates, storeConfig.partitionKey.key, key, storeConfig.sortKeys[0]?.key, sortKey);
         return actionResult(item);
     };
 };

package/lib/esm/getActionProcessor/core/keyValueStore/getKeyValueStoreUpsertActionProcessor.js

@@ -1,6 +1,7 @@
-import { qpqCoreUtils, actionResult, KeyValueStoreActionType, ErrorTypeEnum, actionResultError, } from 'quidproquo-core';
+import { qpqCoreUtils, actionResult, KeyValueStoreActionType, ErrorTypeEnum, actionResultError, actionResultErrorFromCaughtError, } from 'quidproquo-core';
 import { getKvsDynamoTableNameFromConfig } from '../../../awsNamingUtils';
 import { putItem } from '../../../logic/dynamo';
+import { KeyValueStoreUpsertErrorTypeEnum } from 'quidproquo-core/src';
 const getProcessKeyValueStoreUpsert = (qpqConfig) => {
     return async ({ keyValueStoreName, item, options }) => {
         const dynamoTableName = getKvsDynamoTableNameFromConfig(keyValueStoreName, qpqConfig, 'kvs');
@@ -15,10 +16,17 @@ const getProcessKeyValueStoreUpsert = (qpqConfig) => {
             ...storeConfig.indexes.map((i) => i.partitionKey),
             ...storeConfig.indexes.filter((i) => !!i.sortKey).map((i) => i.sortKey),
         ];
-        await putItem(dynamoTableName, item, keys, {
-            expires: options?.ttlInSeconds,
-        }, region);
-        return actionResult(void 0);
+        try {
+            await putItem(dynamoTableName, item, keys, {
+                expires: options?.ttlInSeconds,
+            }, region);
+            return actionResult(void 0);
+        }
+        catch (error) {
+            return actionResultErrorFromCaughtError(error, {
+                InternalServerError: () => actionResultError(KeyValueStoreUpsertErrorTypeEnum.ServiceUnavailable, 'KVS Service Unavailable'),
+            });
+        }
     };
 };
 export default (qpqConfig) => ({

package/lib/esm/logic/dynamo/updateItem.d.ts

@@ -1,2 +1,2 @@
 import { KvsUpdate, KvsCoreDataType } from 'quidproquo-core';
-export declare function updateItem<Item>(tableName: string, region: string, update: KvsUpdate, keyName: string, key: KvsCoreDataType, sortKey?: KvsCoreDataType): Promise<Item>;
+export declare function updateItem<Item>(tableName: string, region: string, update: KvsUpdate, keyName: string, key: KvsCoreDataType, sortkeyName?: string, sortKey?: KvsCoreDataType): Promise<Item>;

package/lib/esm/logic/dynamo/updateItem.js

@@ -1,8 +1,8 @@
-import { DynamoDBClient, ReturnValue, UpdateItemCommand, } from '@aws-sdk/client-dynamodb';
+import { DynamoDBClient, ReturnValue, UpdateItemCommand } from '@aws-sdk/client-dynamodb';
 import { buildAttributeValue, buildDynamoUpdateExpression, buildUpdateExpressionAttributeNames, buildUpdateExpressionAttributeValues, } from './qpqDynamoOrm';
 import { createAwsClient } from '../createAwsClient';
 import { convertDynamoMapToObject } from './convertObjectToDynamoMap';
-export async function updateItem(tableName, region, update, keyName, key, sortKey) {
+export async function updateItem(tableName, region, update, keyName, key, sortkeyName, sortKey) {
     const dynamoDBClient = createAwsClient(DynamoDBClient, { region });
     const params = {
         TableName: tableName,
@@ -14,8 +14,8 @@ export async function updateItem(tableName, region, update, keyName, key, sortKe
         ExpressionAttributeNames: buildUpdateExpressionAttributeNames(update),
         ReturnValues: ReturnValue.ALL_NEW,
     };
-    if (sortKey) {
-        params.Key['sk'] = buildAttributeValue(sortKey);
+    if (sortkeyName && sortKey !== undefined) {
+        params.Key[sortkeyName] = buildAttributeValue(sortKey);
     }
     const result = await dynamoDBClient.send(new UpdateItemCommand(params));
     return convertDynamoMapToObject(result.Attributes);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-actionprocessor-awslambda",
-  "version": "0.0.213",
+  "version": "0.0.215",
   "description": "",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/esm/index.js",
@@ -51,9 +51,9 @@
     "lodash": "^4.17.21",
     "node-cache": "^5.1.2",
     "node-match-path": "^0.6.3",
-    "quidproquo-config-aws": "0.0.213",
-    "quidproquo-core": "0.0.213",
-    "quidproquo-webserver": "0.0.213"
+    "quidproquo-config-aws": "0.0.215",
+    "quidproquo-core": "0.0.215",
+    "quidproquo-webserver": "0.0.215"
   },
   "devDependencies": {
     "@types/aws-lambda": "^8.10.109",
@@ -61,7 +61,7 @@
     "@types/jsonwebtoken": "^9.0.2",
     "@types/lodash": "^4.14.194",
     "@types/node": "^18.11.9",
-    "quidproquo-tsconfig": "0.0.213",
+    "quidproquo-tsconfig": "0.0.215",
     "typescript": "^4.9.3"
   }
 }