Merge branch 'develop' into feature/DEVSU-834-add-email-when-user-ass…

…igned
bcgsc · Aug 25, 2023 · caf02a6 · caf02a6
2 parents 2773d52 + 62850e2
commit caf02a6
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/app/models/reports/probeResults.js b/app/models/reports/probeResults.js
@@ -33,6 +33,11 @@ module.exports = (sequelize, Sq) => {
     comments: {
       type: Sq.TEXT,
     },
+    displayName: {
+      name: 'displayName',
+      field: 'display_name',
+      type: Sq.TEXT,
+    },
   }, {
     ...DEFAULT_REPORT_OPTIONS,
     tableName: 'reports_probe_results',

diff --git a/migrations/20230824190218-DEVSU-2050-add-displayName-to-probeResults.js b/migrations/20230824190218-DEVSU-2050-add-displayName-to-probeResults.js
@@ -0,0 +1,19 @@
+const TABLE = 'reports_probe_results';
+
+module.exports = {
+  up: async (queryInterface, Sq) => {
+    return queryInterface.sequelize.transaction(async (transaction) => {
+      await queryInterface.addColumn(
+        TABLE,
+        'display_name',
+        {type: Sq.TEXT,
+          defaultValue: null},
+        {transaction},
+      );
+    });
+  },
+
+  down: async () => {
+    throw new Error('Not Implemented!');
+  },
+};
diff --git a/test/routes/report/probeResults.test.js b/test/routes/report/probeResults.test.js
@@ -15,16 +15,18 @@ const PROBE_RESULT_DATA = {
   variant: 'TEST VARIANT',
   sample: 'TEST SAMPLE',
   comments: 'TEST COMMENTS',
+  displayName: 'TEST DISPLAY NAME',
 };
 
 const PROBE_RESULT_UPDATE_DATA = {
   variant: 'UPDATED VARIANT',
   sample: 'UPDATED SAMPLE',
   comments: 'UPDATED COMMENTS',
+  displayName: 'NEW DISPLAY NAME',
 };
 
 const probeResultProperties = [
-  'ident', 'createdAt', 'variant', 'sample', 'comments', 'gene',
+  'ident', 'createdAt', 'variant', 'sample', 'comments', 'gene', 'displayName',
 ];
 
 const checkProbeResult = (probeResultObject) => {
@@ -37,6 +39,7 @@ const checkProbeResult = (probeResultObject) => {
     geneId: expect.any(Number),
     updatedBy: expect.any(Number),
     deletedAt: expect.any(String),
+    displayName: expect.any(String),
   }));
 };