quidproquo-actionprocessor-awslambda 0.0.116 → 0.0.117

package/lib/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 }) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ keyValueStoreName, keyCondition, filterCondition, nextPageKey }) => __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, (0, qpqDynamoOrm_1.getDynamoTableIndexByConfigAndQuery)(storeConfig, keyCondition));
+        const items = yield (0, dynamo_1.query)(dynamoTableName, region, keyCondition, filterCondition, nextPageKey, (0, qpqDynamoOrm_1.getDynamoTableIndexByConfigAndQuery)(storeConfig, keyCondition));
         return (0, quidproquo_core_2.actionResult)(items);
     });
 };

package/lib/getActionProcessor/core/keyValueStore/getKeyValueStoreScanActionProcessor.js

@@ -14,10 +14,10 @@ const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const quidproquo_core_2 = require("quidproquo-core");
 const scan_1 = require("../../../logic/dynamo/scan");
 const getProcessKeyValueStoreScan = (qpqConfig) => {
-    return ({ keyValueStoreName, filterCondition }) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ keyValueStoreName, filterCondition, nextPageKey }) => __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 items = yield (0, scan_1.scan)(dynamoTableName, region, filterCondition);
+        const items = yield (0, scan_1.scan)(dynamoTableName, region, filterCondition, nextPageKey);
         return (0, quidproquo_core_2.actionResult)(items);
     });
 };

package/lib/logic/dynamo/logs/utils/stringToLastEvaluatedKey.d.ts

@@ -1 +1,2 @@
-export declare function stringToLastEvaluatedKey(encodedKey: string): any;
+import { AttributeValue } from '@aws-sdk/client-dynamodb';
+export declare function stringToLastEvaluatedKey(encodedKey: string): Record<string, AttributeValue>;

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

@@ -1,2 +1,2 @@
-import { KvsQueryOperation } from 'quidproquo-core';
-export declare function query<Item>(tableName: string, region: string, keyExpression: KvsQueryOperation, filterExpression?: KvsQueryOperation, indexName?: string): Promise<Item[]>;
+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>>;

package/lib/logic/dynamo/query.js

@@ -12,8 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.query = void 0;
 const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
 const convertObjectToDynamoMap_1 = require("./convertObjectToDynamoMap");
+const logs_1 = require("./logs");
+const itemsToQpqPagedData_1 = require("./utils/itemsToQpqPagedData");
 const qpqDynamoOrm_1 = require("./qpqDynamoOrm");
-function query(tableName, region, keyExpression, filterExpression, indexName) {
+function query(tableName, region, keyExpression, filterExpression, pageKey, indexName) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         // Instantiate DynamoDB client
@@ -26,13 +28,14 @@ function query(tableName, region, keyExpression, filterExpression, indexName) {
             ExpressionAttributeNames: (0, qpqDynamoOrm_1.buildExpressionAttributeNames)([keyExpression, filterExpression]),
             IndexName: indexName,
         };
-        // TODO: Remove this log
-        console.log(params);
+        if (pageKey) {
+            params.ExclusiveStartKey = (0, logs_1.stringToLastEvaluatedKey)(pageKey);
+        }
         // Create QueryCommand
         const command = new client_dynamodb_1.QueryCommand(params);
         // TODO: Catch errors and throw QPQ ones
         const data = yield dynamoClient.send(command);
-        return (((_a = data.Items) === null || _a === void 0 ? void 0 : _a.map((i) => (0, convertObjectToDynamoMap_1.convertDynamoMapToObject)(i))) || []);
+        return (0, itemsToQpqPagedData_1.itemsToQpqPagedData)((((_a = data.Items) === null || _a === void 0 ? void 0 : _a.map((i) => (0, convertObjectToDynamoMap_1.convertDynamoMapToObject)(i))) || []), data.LastEvaluatedKey);
     });
 }
 exports.query = query;

package/lib/logic/dynamo/scan.d.ts

@@ -1,2 +1,2 @@
-import { KvsQueryOperation } from 'quidproquo-core';
-export declare function scan<Item>(tableName: string, region: string, filterExpression?: KvsQueryOperation): Promise<Item[]>;
+import { KvsQueryOperation, QpqPagedData } from 'quidproquo-core';
+export declare function scan<Item>(tableName: string, region: string, filterExpression?: KvsQueryOperation, pageKey?: string): Promise<QpqPagedData<Item>>;

package/lib/logic/dynamo/scan.js

@@ -12,8 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.scan = void 0;
 const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
 const convertObjectToDynamoMap_1 = require("./convertObjectToDynamoMap");
+const logs_1 = require("./logs");
+const itemsToQpqPagedData_1 = require("./utils/itemsToQpqPagedData");
 const qpqDynamoOrm_1 = require("./qpqDynamoOrm");
-function scan(tableName, region, filterExpression) {
+function scan(tableName, region, filterExpression, pageKey) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         // Instantiate DynamoDB client
@@ -24,12 +26,14 @@ function scan(tableName, region, filterExpression) {
             ExpressionAttributeValues: (0, qpqDynamoOrm_1.buildExpressionAttributeValues)([filterExpression]),
             ExpressionAttributeNames: (0, qpqDynamoOrm_1.buildExpressionAttributeNames)([filterExpression]),
         };
-        console.log(params);
+        if (pageKey) {
+            params.ExclusiveStartKey = (0, logs_1.stringToLastEvaluatedKey)(pageKey);
+        }
         // Create ScanCommand
         const command = new client_dynamodb_1.ScanCommand(params);
         // TODO: Catch errors and throw QPQ ones
         const data = yield dynamoClient.send(command);
-        return (((_a = data.Items) === null || _a === void 0 ? void 0 : _a.map((i) => (0, convertObjectToDynamoMap_1.convertDynamoMapToObject)(i))) || []);
+        return (0, itemsToQpqPagedData_1.itemsToQpqPagedData)((((_a = data.Items) === null || _a === void 0 ? void 0 : _a.map((i) => (0, convertObjectToDynamoMap_1.convertDynamoMapToObject)(i))) || []), data.LastEvaluatedKey);
     });
 }
 exports.scan = scan;

package/lib/logic/dynamo/utils/itemsToQpqPagedData.d.ts

@@ -0,0 +1,2 @@
+import { QpqPagedData } from 'quidproquo-core';
+export declare const itemsToQpqPagedData: <T>(items: T[], lastEvaluatedKey?: any) => QpqPagedData<T>;

package/lib/logic/dynamo/utils/itemsToQpqPagedData.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.itemsToQpqPagedData = void 0;
+const logs_1 = require("../logs");
+const itemsToQpqPagedData = (items, lastEvaluatedKey) => ({
+    items,
+    nextPageKey: lastEvaluatedKey ? (0, logs_1.lastEvaluatedKeyToString)(lastEvaluatedKey) : undefined,
+});
+exports.itemsToQpqPagedData = itemsToQpqPagedData;

package/lib/logic/dynamo/utils/qpqPagedDataToItems.d.ts

@@ -0,0 +1,4 @@
+export declare const itemsToQpqPagedData: <T>(items: T[], lastEvaluatedKey?: string) => {
+    items: T[];
+    lastEvaluatedKey: "" | Record<string, import("@aws-sdk/client-dynamodb").AttributeValue> | undefined;
+};

package/lib/logic/dynamo/utils/qpqPagedDataToItems.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.itemsToQpqPagedData = void 0;
+const logs_1 = require("../logs");
+const itemsToQpqPagedData = (items, lastEvaluatedKey) => ({
+    items,
+    lastEvaluatedKey: lastEvaluatedKey && (0, logs_1.stringToLastEvaluatedKey)(lastEvaluatedKey),
+});
+exports.itemsToQpqPagedData = itemsToQpqPagedData;

package/package.json

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