@dmptool/utils 1.0.15 → 1.0.18

package/dist/maDMP.js

@@ -349,7 +349,6 @@ const loadRelatedWorksInfo = async (rdsConnectionParams, planId) => {
  * @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,
@@ -372,57 +371,47 @@ 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
-        || !Array.isArray(results[0].section) || results[0].section.length === 0) {
+    if (!Array.isArray(results) || results.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);
-    });
-    // Sort the sections by display order
-    results[0].section.sort((a, b) => {
-        return a.sectionOrder - b.sectionOrder;
-    });
-    return {
+    const narrative = {
         id: results[0].templateId,
         title: results[0].templateTitle,
         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,
-                        text: question.questionText,
-                        answer: {
-                            id: question.answerId,
-                            json: question.answerJSON
-                        }
-                    };
-                })
-            };
-        })
+        section: [],
     };
+    results.forEach((row) => {
+        // Sections may have several rows in the results, so we need to check if we
+        // already have the section defined.
+        let curSection = narrative.section.find((s) => {
+            return s.id === row.sectionId;
+        });
+        if (curSection === undefined || curSection === null) {
+            curSection = {
+                id: row.sectionId,
+                title: row.sectionTitle,
+                description: row.sectionDescription,
+                order: row.sectionOrder,
+                question: [],
+            };
+            narrative.section.push(curSection);
+        }
+        const hasAnswer = row.answerJson !== undefined && row.answerJson !== null;
+        // Every row in the results represents a single question/answer pair
+        curSection.question.push({
+            id: row.questionId,
+            text: row.questionText,
+            order: row.questionOrder,
+            answer: hasAnswer
+                ? {
+                    id: row.answerId,
+                    json: JSON.parse(row.answerJson)
+                }
+                : undefined
+        });
+    });
+    return narrative;
 };
 /**
  * Builds the RDA Common Standard Contact entry for the DMP
@@ -549,6 +538,7 @@ const buildDMPToolExtensions = async (rdsConnectionParams, applicationName, doma
     };
     // Generate the DMP Narrative
     const narrative = await loadNarrativeTemplateInfo(rdsConnectionParams, plan.id);
+    rdsConnectionParams.logger.debug({ narrative }, 'Loaded narrative information');
     // Fetch the research domain if one was specified
     const research_domain = project.dmptool_research_domain
         ? { name: project.dmptool_research_domain }

package/dist/maDMPTypes.d.ts

@@ -59,24 +59,26 @@ export interface LoadRelatedWorkInfo {
     workType?: string;
 }
 export interface LoadNarrativeQuestionInfo {
-    questionId: number;
-    questionText: string;
-    questionOrder: number;
-    answerId: number;
-    answerJSON: AnyAnswerType;
+    id: number;
+    text: string;
+    order: number;
+    answer: {
+        id: number;
+        json: AnyAnswerType;
+    };
 }
 export interface LoadNarrativeSectionInfo {
-    sectionId: number;
-    sectionTitle: string;
-    sectionDescription?: string;
-    sectionOrder: number;
+    id: number;
+    title: string;
+    description?: string;
+    order: number;
     question: LoadNarrativeQuestionInfo[];
 }
 export interface LoadNarrativeInfo {
-    templateId: number;
-    templateTitle: string;
-    templateDescription?: string;
-    templateVersion?: string;
+    id: number;
+    title: string;
+    description?: string;
+    version?: string;
     section: LoadNarrativeSectionInfo[];
 }
 export interface RDACommonStandardAffiliation {

package/package.json

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