quidproquo-actionprocessor-awslambda 0.0.160 → 0.0.162

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

@@ -15,14 +15,14 @@ const quidproquo_core_2 = require("quidproquo-core");
 const dynamo_1 = require("../../../logic/dynamo");
 const qpqDynamoOrm_1 = require("../../../logic/dynamo/qpqDynamoOrm");
 const getProcessKeyValueStoreQuery = (qpqConfig) => {
-    return ({ keyValueStoreName, keyCondition, filterCondition, nextPageKey }) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ keyValueStoreName, keyCondition, options }) => __awaiter(void 0, void 0, void 0, function* () {
         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);
         if (!storeConfig) {
             return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `Could not find key value store with name "${keyValueStoreName}"`);
         }
-        const items = yield (0, dynamo_1.query)(dynamoTableName, region, keyCondition, filterCondition, nextPageKey, (0, qpqDynamoOrm_1.getDynamoTableIndexByConfigAndQuery)(storeConfig, keyCondition));
+        const items = yield (0, dynamo_1.query)(dynamoTableName, region, keyCondition, options === null || options === void 0 ? void 0 : options.filter, options === null || options === void 0 ? void 0 : options.nextPageKey, (0, qpqDynamoOrm_1.getDynamoTableIndexByConfigAndQuery)(storeConfig, keyCondition), options === null || options === void 0 ? void 0 : options.limit, options === null || options === void 0 ? void 0 : options.sortAscending);
         return (0, quidproquo_core_2.actionResult)(items);
     });
 };

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

@@ -17,8 +17,9 @@ const getProcessKeyValueStoreUpdate = (qpqConfig) => {
     return ({ keyValueStoreName, key, sortKey, updates, options }) => __awaiter(void 0, void 0, void 0, function* () {
         const dynamoTableName = (0, awsNamingUtils_1.getKvsDynamoTableNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
-        yield (0, dynamo_1.updateItem)(dynamoTableName, region, updates, key, sortKey);
-        return (0, quidproquo_core_2.actionResult)(void 0);
+        const storeConfig = quidproquo_core_1.qpqCoreUtils.getKeyValueStoreByName(qpqConfig, keyValueStoreName);
+        const item = yield (0, dynamo_1.updateItem)(dynamoTableName, region, updates, storeConfig.partitionKey.key, key, sortKey);
+        return (0, quidproquo_core_2.actionResult)(item);
     });
 };
 exports.default = (qpqConfig) => ({

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

@@ -1,2 +1,2 @@
 import { KvsQueryOperation, QpqPagedData } from 'quidproquo-core';
-export declare function query<Item>(tableName: string, region: string, keyExpression: KvsQueryOperation, filterExpression?: KvsQueryOperation, pageKey?: string, indexName?: string): Promise<QpqPagedData<Item>>;
+export declare function query<Item>(tableName: string, region: string, keyExpression: KvsQueryOperation, filterExpression?: KvsQueryOperation, pageKey?: string, indexName?: string, limit?: number, sortAscending?: boolean): Promise<QpqPagedData<Item>>;

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

@@ -16,7 +16,7 @@ const logs_1 = require("./logs");
 const itemsToQpqPagedData_1 = require("./utils/itemsToQpqPagedData");
 const qpqDynamoOrm_1 = require("./qpqDynamoOrm");
 const createAwsClient_1 = require("../createAwsClient");
-function query(tableName, region, keyExpression, filterExpression, pageKey, indexName) {
+function query(tableName, region, keyExpression, filterExpression, pageKey, indexName, limit, sortAscending) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         // Instantiate DynamoDB client
@@ -28,6 +28,8 @@ function query(tableName, region, keyExpression, filterExpression, pageKey, inde
             ExpressionAttributeValues: (0, qpqDynamoOrm_1.buildExpressionAttributeValues)([keyExpression, filterExpression]),
             ExpressionAttributeNames: (0, qpqDynamoOrm_1.buildExpressionAttributeNames)([keyExpression, filterExpression]),
             IndexName: indexName,
+            Limit: limit,
+            ScanIndexForward: sortAscending,
         };
         if (pageKey) {
             params.ExclusiveStartKey = (0, logs_1.stringToLastEvaluatedKey)(pageKey);

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

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

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

@@ -13,22 +13,25 @@ exports.updateItem = void 0;
 const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
 const qpqDynamoOrm_1 = require("./qpqDynamoOrm");
 const createAwsClient_1 = require("../createAwsClient");
-function updateItem(tableName, region, update, key, sortKey) {
+const convertObjectToDynamoMap_1 = require("./convertObjectToDynamoMap");
+function updateItem(tableName, region, update, keyName, key, sortKey) {
     return __awaiter(this, void 0, void 0, function* () {
         const dynamoDBClient = (0, createAwsClient_1.createAwsClient)(client_dynamodb_1.DynamoDBClient, { region });
         const params = {
             TableName: tableName,
             Key: {
-                id: (0, qpqDynamoOrm_1.buildAttributeValue)(key),
+                [keyName]: (0, qpqDynamoOrm_1.buildAttributeValue)(key),
             },
             UpdateExpression: (0, qpqDynamoOrm_1.buildDynamoUpdateExpression)(update),
             ExpressionAttributeValues: (0, qpqDynamoOrm_1.buildUpdateExpressionAttributeValues)(update),
             ExpressionAttributeNames: (0, qpqDynamoOrm_1.buildUpdateExpressionAttributeNames)(update),
+            ReturnValues: client_dynamodb_1.ReturnValue.ALL_NEW,
         };
         if (sortKey) {
             params.Key['sk'] = (0, qpqDynamoOrm_1.buildAttributeValue)(sortKey);
         }
-        console.log(yield dynamoDBClient.send(new client_dynamodb_1.UpdateItemCommand(params)));
+        const result = yield dynamoDBClient.send(new client_dynamodb_1.UpdateItemCommand(params));
+        return (0, convertObjectToDynamoMap_1.convertDynamoMapToObject)(result.Attributes);
     });
 }
 exports.updateItem = updateItem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-actionprocessor-awslambda",
-  "version": "0.0.160",
+  "version": "0.0.162",
   "description": "",
   "main": "./lib/commonjs/index.js",
   "types": "./lib/commonjs/index.d.js",