Merge branch 'develop' into feature/DEVSU-2815-make-create-report-access-project-specific

Author: sshugsc

app/models/reports/report.js

@@ -168,6 +168,12 @@ module.exports = (sequelize, Sq) => {
       type: Sq.STRING,
       defaultValue: null,
     },
+    dataType: {
+      name: 'dataType',
+      field: 'data_type',
+      type: Sq.STRING,
+      defaultValue: null,
+    },
     uploadContents: {
       name: 'uploadContents',
       field: 'upload_contents',

app/routes/report/report.js

@@ -398,6 +398,14 @@ router.route('/')
       req.body.sampleInfo = cleanSampleInfo;
     }
 
+    if (req.body.seqQC) {
+      req.body.dataType = req.body.seqQC.filter(
+        (item) => {return item.Sample?.startsWith('Tumour');},
+      ).map(
+        (item) => {return item.Sample.replace(/^Tumour\s+/i, '');},
+      ).join(', ');
+    }
+
     try {
       // eslint-disable-next-line camelcase
       if (ignore_extra_fields) {

app/routes/report/reportAsync.js

@@ -59,6 +59,14 @@ router.route('/')
       req.body.sampleInfo = cleanSampleInfo;
     }
 
+    if (req.body.seqQC) {
+      req.body.dataType = req.body.seqQC.filter(
+        (item) => {return item.Sample?.startsWith('Tumour');},
+      ).map(
+        (item) => {return item.Sample.replace(/^Tumour\s+/i, '');},
+      ).join(', ');
+    }
+
     try {
       // eslint-disable-next-line camelcase
       if (ignore_extra_fields) {

migrations/latest/20260204195816-DEVSU-2787-add-data-type-column.js

@@ -0,0 +1,21 @@
+const TABLE = 'reports';
+
+module.exports = {
+  up: async (queryInterface, Sq) => {
+    return queryInterface.sequelize.transaction(async (transaction) => {
+      await queryInterface.addColumn(
+        TABLE,
+        'data_type',
+        {
+          type: Sq.STRING,
+          defaultValue: null,
+        },
+        {transaction},
+      );
+    });
+  },
+
+  down: async () => {
+    throw new Error('Not Implemented!');
+  },
+};