@izara_project/izara-core-library-dynamodb 1.0.19 → 1.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-library-dynamodb",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "Connecting with AWS DynamoDB Resource",
   "main": "index.js",
   "scripts": {

package/src/DynamoDBSharedLib.js

@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { DynamoDBDocument } from '@aws-sdk/lib-dynamodb';
-import { DynamoDB } from '@aws-sdk/client-dynamodb';
+import { DynamoDB, DescribeTableCommand, DynamoDBClient } from '@aws-sdk/client-dynamodb';
 import { marshall, unmarshall } from '@aws-sdk/util-dynamodb';
 
 // External Izara project imports
@@ -33,6 +33,7 @@ const dynamodb = DynamoDBDocument.from(new DynamoDB(), {
   }
 });
 
+
 // Commented imports and alternatives
 // const izara = require("@izara_project/izara-middleware");
 // const dynamodb = DynamoDBDocument.from(new DynamoDB());
@@ -2162,39 +2163,44 @@ async function batchDeleteItems(
   keyFieldName
 ) {
   try {
-    let size = 25; // maybe should check size < 400 KB
+    const size = 25;
     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
+      let requestItems = [];
+
       for (let i = 0; i < chunkSet.length; i++) {
+        const item = chunkSet[i];
+        const pKeyName = keyFieldName.partitionKeyFieldName;
+        const sKeyName = keyFieldName.sortKeyFieldName;
+
+        // Construct the primary key object
+        let dynamoKey = {
+          [pKeyName]: item[pKeyName]
+        };
+
+        // 💡 FIX: Only add Sort Key if it exists in the table schema
+        if (sKeyName) {
+          dynamoKey[sKeyName] = item[sKeyName];
+        }
+
         requestItems.push({
           DeleteRequest: {
-            Key: {
-              [keyFieldName.partitionKeyFieldName]:
-                chunkSet[i][keyFieldName.partitionKeyFieldName],
-              [keyFieldName.sortKeyFieldName]:
-                chunkSet[i][keyFieldName.sortKeyFieldName]
-            }
+            Key: dynamoKey
           }
         });
       }
 
       let payload = {
-        RequestItems: {
-          [tableName]: requestItems
-        },
+        RequestItems: { [tableName]: requestItems },
         ReturnConsumedCapacity: 'TOTAL'
       };
-      _izContext.logger.debug('payload writeItems... ', payload);
+
+      _izContext.logger.debug('Final Payload for BatchWrite: ', JSON.stringify(payload, null, 2));
 
       const returnValue = await dynamodb.batchWrite(payload);
       _izContext.logger.debug(
@@ -2392,6 +2398,47 @@ async function captureCapacityUsed(
   }
 }
 
+/**
+ * helper function to get partitionKeys and sortKeys for table
+ * @param {*} _izContext
+ * @param {*} tableName
+ * @returns
+ */
+async function describeTable(
+  _izContext,
+  payload
+) {
+  const region = process.env.iz_region;
+  if (!region) {
+    throw new Error("Environment variable 'iz_region' is missing or undefined.");
+  }
+
+  const dynamoDbClient = new DynamoDBClient({ region });
+
+  if (!payload || !payload.TableName) {
+    throw new Error("Missing required parameter: TableName");
+  }
+
+  try {
+    const result = await dynamoDbClient.send(
+      new DescribeTableCommand({ TableName: payload.TableName })
+    );
+
+    const partitionKey = result.Table.KeySchema.find(k => k.KeyType === 'HASH');
+    const sortKey = result.Table.KeySchema.find(k => k.KeyType === 'RANGE');
+
+    // Return a clean object with field names
+    return {
+      partitionKeyFieldName: partitionKey?.AttributeName,
+      sortKeyFieldName: sortKey?.AttributeName // Might be undefined if table has no Sort Key
+    };
+
+  } catch (error) {
+    console.error(`[describeTable Error] Failed for table: ${payload.TableName}`, error);
+    throw error;
+  }
+}
+
 // Consolidated exports
 export {
   // Table name functions
@@ -2422,5 +2469,6 @@ export {
   // Helper functions
   QueryElementConditionalCheckStringSetEquals,
   generateNotExistLogicalElements,
-  refractorAttributesToComplex
+  refractorAttributesToComplex,
+  describeTable
 };