@dmptool/utils 1.0.25 → 1.0.26

package/dist/dynamo.d.ts

@@ -13,10 +13,6 @@ interface DMPVersionType {
     SK: string;
     modified: string;
 }
-export interface LatestDMPVersion {
-    dmpId: string;
-    modified: string;
-}
 /**
  * Lightweight query just to check if the DMP exists.
  *
@@ -33,7 +29,7 @@ export declare const DMPExists: (dynamoConnectionParams: DynamoConnectionParams,
  * @returns The latest version for every unique DMP ID
  * @throws DMPToolDynamoError if the records could not be fetched due to an error
  */
-export declare const getAllUniqueDMPIds: (dynamoConnectionParams: DynamoConnectionParams) => Promise<LatestDMPVersion[] | []>;
+export declare const getAllUniqueDMPIds: (dynamoConnectionParams: DynamoConnectionParams) => Promise<Map<string, string>>;
 /**
  * Fetch the version timestamps (including DMP_LATEST_VERSION) for the specified DMP ID.
  *

package/dist/dynamo.js

@@ -97,26 +97,26 @@ const getAllUniqueDMPIds = async (dynamoConnectionParams) => {
     }
     // Get the PK, SK and modified timestamps for all the latest versions
     const params = {
-        ProjectionExpression: "PK, modified",
-        FilterExpression: `SK = '${DMP_VERSION_PREFIX}#${exports.DMP_LATEST_VERSION}'`
+        ProjectionExpression: "PK, #mod", // `modified` is a reserved word in DynamoDB
+        FilterExpression: `SK = :sk`,
+        ExpressionAttributeNames: { "#mod": "modified" },
+        ExpressionAttributeValues: { ":sk": `${DMP_VERSION_PREFIX}#${exports.DMP_LATEST_VERSION}` }
     };
     try {
         dynamoConnectionParams.logger.debug(Object.assign({}, params), 'Scanning for latest DMP versions in DynamoDB');
         const response = await scanTable(dynamoConnectionParams, params);
         if (Array.isArray(response) && response.length > 0) {
-            const versions = [];
+            const versions = new Map();
             for (const item of response) {
                 const unmarshalled = (0, util_dynamodb_1.unmarshall)(item);
                 if (unmarshalled.PK && unmarshalled.SK && unmarshalled.modified) {
-                    versions.push({
-                        dmpId: unmarshalled.PK.replace(`${DMP_PK_PREFIX}#`, 'https://'),
-                        modified: unmarshalled.modified
-                    });
+                    const dmpId = unmarshalled.PK.replace(`${DMP_PK_PREFIX}#`, 'https://');
+                    versions.set(dmpId, unmarshalled.modified);
                 }
             }
             return versions;
         }
-        return [];
+        return new Map();
     }
     catch (err) {
         const errMsg = (0, general_1.toErrorMessage)(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmptool/utils",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "description": "Helper/Utility functions for use in the DMP Tool services. Particularly AWS tooling and maDMP serialization",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",