@dmptool/utils 1.0.7 → 1.0.9

package/dist/maDMP.js

@@ -348,6 +348,7 @@ const loadRelatedWorksInfo = async (rdsConnectionParams, projectId) => {
  * @returns the DMP Tool Narrative extension for the DMP
  */
 const loadNarrativeTemplateInfo = async (rdsConnectionParams, planId) => {
+    var _a, _b, _c, _d, _e, _f;
     // Fetch the template, sections, questions and answers all at once
     const sql = `
     SELECT t.id templateId, t.name templateTitle, t.description templateDescription,
@@ -370,9 +371,16 @@ const loadNarrativeTemplateInfo = async (rdsConnectionParams, planId) => {
     if (resp && Array.isArray(resp.results) && resp.results.length > 0) {
         results = resp.results.filter((row) => !(0, general_1.isNullOrUndefined)(row));
     }
-    if (!Array.isArray(results) || results.length === 0) {
+    if (!Array.isArray(results) || results.length === 0
+        || !Array.isArray(results[0].section) || results[0].section.length === 0) {
         return undefined;
     }
+    rdsConnectionParams.logger.debug({
+        planId,
+        nbrRsults: results.length,
+        sectionCount: (_b = (_a = results === null || results === void 0 ? void 0 : results[0]) === null || _a === void 0 ? void 0 : _a.section) === null || _b === void 0 ? void 0 : _b.length,
+        questionCount: (_f = (_e = (_d = (_c = results === null || results === void 0 ? void 0 : results[0]) === null || _c === void 0 ? void 0 : _c.section) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.question) === null || _f === void 0 ? void 0 : _f.length
+    }, 'Loaded narrative information');
     // Sort the questions by display order
     results[0].section.forEach((section) => {
         section.question.sort((a, b) => a.questionOrder - b.questionOrder);
@@ -387,12 +395,20 @@ const loadNarrativeTemplateInfo = async (rdsConnectionParams, planId) => {
         description: results[0].templateDescription,
         version: results[0].templateVersion,
         section: results[0].section.map((section) => {
+            rdsConnectionParams.logger.debug({
+                sectionId: section.sectionId,
+                questionCount: section.question.length
+            }, 'Loaded narrative section information');
             return {
                 id: section.sectionId,
                 title: section.sectionTitle,
                 description: section.sectionDescription,
                 order: section.sectionOrder,
                 question: section.question.map((question) => {
+                    rdsConnectionParams.logger.debug({
+                        questionId: question.questionId,
+                        answerId: question.answerId
+                    }, 'Loaded narrative question information');
                     return {
                         id: question.questionId,
                         order: question.questionOrder,
@@ -846,6 +862,7 @@ const validateRDACommonStandard = (logger, dmp) => {
     if (validationErrors.length > 0) {
         const msg = `Invalid RDA Common Standard: ${validationErrors.join('; ')}`;
         logger.warn({ dmpId: (_b = (_a = dmp === null || dmp === void 0 ? void 0 : dmp.dmp) === null || _a === void 0 ? void 0 : _a.dmp_id) === null || _b === void 0 ? void 0 : _b.identifier }, msg);
+        logger.warn({ dmp: dmp === null || dmp === void 0 ? void 0 : dmp.dmp }, 'Full DMP');
         throw new DMPValidationError(msg);
     }
     return dmp;
@@ -871,6 +888,7 @@ const validateDMPToolExtensions = (logger, dmpId, dmp) => {
     if (validationErrors.length > 0) {
         const msg = `Invalid DMP Tool extensions: ${validationErrors.join('; ')}`;
         logger.warn({ dmpId }, msg);
+        logger.warn({ dmp }, 'Full DMP Tool extensions');
         throw new DMPValidationError(msg);
     }
     return dmp;

package/package.json

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