@dmptool/utils 1.0.10 → 1.0.12

package/dist/maDMP.js

@@ -116,7 +116,7 @@ const loadDefaultMemberRole = async (rdsConnectionParams) => {
     rdsConnectionParams.logger.debug({ sql }, 'Fetching default role');
     const resp = await (0, rds_1.queryTable)(rdsConnectionParams, sql, []);
     if (resp && Array.isArray(resp.results) && resp.results.length > 0) {
-        return resp.results[0].id;
+        return resp.results[0].uri;
     }
     return undefined;
 };
@@ -312,19 +312,19 @@ const loadDatasetInfo = async (rdsConnectionParams, applicationName, projectId,
  * Builds the RDA Common Standard Related Identifier entries for the DMP
  *
  * @param rdsConnectionParams the connection parameters for the MySQL database
- * @param projectId the Project ID to fetch the Related Works information for
+ * @param planId the Plan ID to fetch the Related Works information for
  * @returns the RDA Common Standard Related Identifier entries for the DMP
  */
-const loadRelatedWorksInfo = async (rdsConnectionParams, projectId) => {
+const loadRelatedWorksInfo = async (rdsConnectionParams, planId) => {
     const sql = `
     SELECT w.doi AS identifier, LOWER(wv.workType) AS workType
     FROM relatedWorks rw
       JOIN workVersions wv ON rw.workVersionId = wv.id
         JOIN works w ON wv.workId = w.id
-    WHERE rw.projectId = ?;
+    WHERE rw.planId = ?;
   `;
-    rdsConnectionParams.logger.debug({ projectId, sql }, 'Fetching related works information');
-    const resp = await (0, rds_1.queryTable)(rdsConnectionParams, sql, [projectId.toString()]);
+    rdsConnectionParams.logger.debug({ planId, sql }, 'Fetching related works information');
+    const resp = await (0, rds_1.queryTable)(rdsConnectionParams, sql, [planId.toString()]);
     if (resp && Array.isArray(resp.results) && resp.results.length > 0) {
         const works = resp.results.filter((row) => !(0, general_1.isNullOrUndefined)(row));
         // Determine the identifier types
@@ -488,9 +488,7 @@ const buildContributors = (applicationName, env, planId, projectId, members, def
     }
     return members.map((member) => {
         // Make sure that we always have roles as an array
-        const roles = member.roles && member.roles.includes('[')
-            ? JSON.parse(member.roles)
-            : [defaultRole];
+        const roles = member.roles ? JSON.parse(member.roles) : [defaultRole];
         // Combine the member's given name and surname into a single name'
         const contrib = {
             name: [member.givenName, member.surName]
@@ -974,7 +972,7 @@ async function planToDMPCommonStandard(rdsConnectionParams, applicationName, dom
     // We only allow one funding per plan at this time
     const fundings = await loadFundingInfo(rdsConnectionParams, plan.id);
     const funding = fundings.length > 0 ? fundings[0] : undefined;
-    const works = await loadRelatedWorksInfo(rdsConnectionParams, plan.projectId);
+    const works = await loadRelatedWorksInfo(rdsConnectionParams, plan.id);
     const defaultRole = await loadDefaultMemberRole(rdsConnectionParams);
     // If the plan is registered, use the DOI as the identifier, otherwise convert to a URL
     const dmpId = plan.registered

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmptool/utils",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "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",