@izara_project/izara-core-library-dynamodb 1.0.11 → 1.0.13

package/index.js

@@ -18,4 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 
 // Re-export everything from DynamoDBSharedLib
-module.exports = require('./src/DynamoDBSharedLib');
+import dynamoDBSharedLib from './src/DynamoDBSharedLib.js';
+
+export default dynamoDBSharedLib;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-library-dynamodb",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "Connecting with AWS DynamoDB Resource",
   "main": "index.js",
   "scripts": {
@@ -14,16 +14,17 @@
   "license": "AGPL-3.0-or-later",
   "homepage": "https://bitbucket.org/izara-core-libraries/izara-core-library-dynamodb/src/master/README.md",
   "devDependencies": {
-    "jest": "^30.0.5"
+    "jest": "^30.2.0"
   },
   "jest": {
     "testEnvironment": "node"
   },
+  "type": "module",
   "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.864.0",
-    "@aws-sdk/lib-dynamodb": "^3.864.0",
-    "@aws-sdk/util-dynamodb": "^3.864.0",
-    "@izara_project/izara-core-library-core": "^1.0.20",
+    "@aws-sdk/client-dynamodb": "^3.932.0",
+    "@aws-sdk/lib-dynamodb": "^3.932.0",
+    "@aws-sdk/util-dynamodb": "^3.932.0",
+    "@izara_project/izara-core-library-core": "^1.0.28",
     "lodash.clonedeep": "^4.5.0"
   }
 }

package/src/DynamoDBSharedLib.js

@@ -17,15 +17,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 
-const { DynamoDBDocument } = require('@aws-sdk/lib-dynamodb');
-const { DynamoDB } = require('@aws-sdk/client-dynamodb');
-const { marshall, unmarshall } = require('@aws-sdk/util-dynamodb');
+import { DynamoDBDocument } from '@aws-sdk/lib-dynamodb';
+import { DynamoDB } from '@aws-sdk/client-dynamodb';
+import { marshall, unmarshall } from '@aws-sdk/util-dynamodb';
 
-const cloneDeep = require('lodash.clonedeep');
+import cloneDeep from 'lodash.clonedeep';
 
 // External Izara project imports
-const NoRetryError = require('@izara_project/izara-core-library-core').NoRetryError;
-// const { getServiceNameWithCache } = require('@izara_project/izara-core-library-service-schemas').serviceConfig;
+import { NoRetryError } from '@izara_project/izara-core-library-core';
+// import { getServiceNameWithCache } = require('@izara_project/izara-core-library-service-schemas').serviceConfig;
 
 // Constants
 const MAX_RECURSION_LEVEL = 20;
@@ -1547,46 +1547,48 @@ async function batchDeleteItems(
   writeItems,
   keyFieldName
 ) {
+  try {
 
-  let size = 25; // maybe should check size < 400 KB
-  let chunked = [];
+    let size = 25; // maybe should check size < 400 KB
+    let chunked = [];
 
-  for (let i = 0; i < writeItems.length; i += size) {
-    chunked.push(writeItems.slice(i, i + size)
-    );
-  }
-
-  // ---- perform each chuck < 25 ----
-  for (let chunkIdx = 0; chunkIdx < chunked.length; chunkIdx++) {
-    let chunkSet = chunked[chunkIdx];
-    let requestItems = new Array();
-    // console.log('chunkSet', chunkSet);
-    // check sortKeyFieldName
-    for (let i = 0; i < chunkSet.length; i++) {
-      requestItems.push({
-        DeleteRequest: {
-          Key: {
-            [keyFieldName.partitionKeyFieldName]: chunkSet[i][keyFieldName.partitionKeyFieldName],
-            [keyFieldName.sortKeyFieldName]: chunkSet[i][keyFieldName.sortKeyFieldName]
-          }
-        }
-      });
+    for (let i = 0; i < writeItems.length; i += size) {
+      chunked.push(writeItems.slice(i, i + size)
+      );
     }
 
-    let payload = {
-      RequestItems: {
-        [tableName]: requestItems
-      },
-      ReturnConsumedCapacity: "TOTAL"
-    };
-    _izContext.logger.debug('payload writeItems... ', payload);
-
-    const returnValue = await dynamodb.batchWrite(payload);
-    _izContext.logger.debug("batchDeleteItems status: ", returnValue['$metadata']);
-    await captureCapacityUsed(_izContext, returnValue.ConsumedCapacity, 'write', 'delete');
+    // ---- perform each chuck < 25 ----
+    for (let chunkIdx = 0; chunkIdx < chunked.length; chunkIdx++) {
+      let chunkSet = chunked[chunkIdx];
+      let requestItems = new Array();
+      // console.log('chunkSet', chunkSet);
+      // check sortKeyFieldName
+      for (let i = 0; i < chunkSet.length; i++) {
+        requestItems.push({
+          DeleteRequest: {
+            Key: {
+              [keyFieldName.partitionKeyFieldName]: chunkSet[i][keyFieldName.partitionKeyFieldName],
+              [keyFieldName.sortKeyFieldName]: chunkSet[i][keyFieldName.sortKeyFieldName]
+            }
+          }
+        });
+      }
 
-  } // end loop
+      let payload = {
+        RequestItems: {
+          [tableName]: requestItems
+        },
+        ReturnConsumedCapacity: "TOTAL"
+      };
+      _izContext.logger.debug('payload writeItems... ', payload);
 
+      const returnValue = await dynamodb.batchWrite(payload);
+      _izContext.logger.debug("batchDeleteItems status: ", returnValue['$metadata']);
+      await captureCapacityUsed(_izContext, returnValue.ConsumedCapacity, 'write', 'delete');
+    } // end loop
+  } catch (err) {
+    throw ('Error:baatchDeleteItems', err);
+  };
   _izContext.logger.info('----- finish all batchDeleteItems -----');
 
 };
@@ -1603,84 +1605,79 @@ async function batchPutItems(
   writeItems,
   settings // for batchWriteItems command,e.g., ReturnConsumedCapacity, ConsumedCapacity
 ) {
+  try {
+    let size = 25; // maybe should check size < 400 KB
+    let chunked = [];
+
+    // sample usage --------------------
+    // writeItems = [
+    //   {
+    //     attributes: {
+    //       configKey: 'configKey_1',
+    //       configTag: 'configTag_2',
+    //       configValue: 'configValue_3',
+    //       configValue2: 'configValue_3',
+    //       configValue3: 'configValue_3',
+    //     },
+    //     queryElements: {},
+    //     settings: {} // will not work in this command
+    //   },
+    // ]
+    // ---------------------------------
+
+
+    for (let i = 0; i < writeItems.length; i += size) {
+      chunked.push(writeItems.slice(i, i + size)
+      );
+    }
 
-  let size = 25; // maybe should check size < 400 KB
-  let chunked = [];
-
-  // sample usage --------------------
-  // writeItems = [
-  //   {
-  //     attributes: {
-  //       configKey: 'configKey_1',
-  //       configTag: 'configTag_2',
-  //       configValue: 'configValue_3',
-  //       configValue2: 'configValue_3',
-  //       configValue3: 'configValue_3',
-  //     },
-  //     queryElements: {},
-  //     settings: {} // will not work in this command
-  //   },
-  // ]
-  // ---------------------------------
-
-
-  for (let i = 0; i < writeItems.length; i += size) {
-    chunked.push(writeItems.slice(i, i + size)
-    );
-  }
-
-  // ---- perform each chuck < 25 ----
-  for (let chunkIdx = 0; chunkIdx < chunked.length; chunkIdx++) {
-    let chunkSet = chunked[chunkIdx];
-    let requestItems = new Array();
-    // console.log('chunkSet', chunkSet);
+    // ---- perform each chuck < 25 ----
+    for (let chunkIdx = 0; chunkIdx < chunked.length; chunkIdx++) {
+      let chunkSet = chunked[chunkIdx];
+      let requestItems = new Array();
+      // console.log('chunkSet', chunkSet);
 
-    for (let i = 0; i < chunkSet.length; i++) {
+      for (let i = 0; i < chunkSet.length; i++) {
 
-      // hard code set to return just query
-      chunkSet[i].settings.returnQuery = true;
+        // hard code set to return just query
+        chunkSet[i].settings.returnQuery = true;
 
-      // NOTE: not help, cannot use complex in this batchWrite command just validata attributes and add context.
-      let putItemPayload = await module.exports.putItem(
-        _izContext,
-        await tableName(_izContext, tableNameData),
-        chunkSet[i].attributes,
-        chunkSet[i].queryElements,
-        chunkSet[i].settings
-      );
+        // NOTE: not help, cannot use complex in this batchWrite command just validata attributes and add context.
+        let putItemPayload = await putItem(
+          _izContext,
+          await tableName(_izContext, tableNameData),
+          chunkSet[i].attributes,
+          chunkSet[i].queryElements,
+          chunkSet[i].settings
+        );
 
-      requestItems.push({
-        PutRequest: {
-          // Item: chunkSet[i] // just basic using
-          Item: putItemPayload.Item
-        }
-      });
-    }
+        requestItems.push({
+          PutRequest: {
+            // Item: chunkSet[i] // just basic using
+            Item: putItemPayload.Item
+          }
+        });
+      }
 
-    let payload = {
-      RequestItems: {
-        [tableNameData]: requestItems
-      },
-      ReturnConsumedCapacity: "TOTAL"
-    };
-    _izContext.logger.debug('payload writeItems... ', payload);
 
-    const returnValue = await dynamodb.batchWrite(payload);
-    _izContext.logger.debug("batchPutItems status: ", returnValue['$metadata']);
-    await captureCapacityUsed(_izContext, returnValue.ConsumedCapacity, 'write', 'put');
+      let payload = {
+        RequestItems: {
+          [tableNameData]: requestItems
+        },
+        ReturnConsumedCapacity: "TOTAL"
+      };
+      _izContext.logger.debug('payload writeItems... ', payload);
 
-  } // end loop
+      const returnValue = await dynamodb.batchWrite(payload);
+      _izContext.logger.debug("batchPutItems status: ", returnValue['$metadata']);
+      await captureCapacityUsed(_izContext, returnValue.ConsumedCapacity, 'write', 'put');
+    } // end loop
+  } catch (err) {
+    throw ('Error:baatchPutItems', err);
+  }
 
 };
 
-// this.batchPutItems(
-//   {
-//     correlationIds: require('@izara_project/izara-core-library-correlation-ids'),
-//     logger: require('@izara_project/izara-core-library-logger'),
-//     // integrationTestDetail: require('@izara_project/izara-core-library-integration-tests')
-//   }
-// )
-
 /**
  *
  * @param {object} _izContext
@@ -1718,7 +1715,7 @@ async function captureCapacityUsed(_izContext, capacityUsed, capacityStatus, que
 }
 
 // Consolidated exports
-module.exports = {
+export default {
   // Table name functions
   tableName,