Merge pull request #1217 from david-roper/add-group-column

refactor: use removeSubjectIDScope method instead of regex function

Author: joshunrau

apps/api/src/instrument-records/instrument-records.service.ts

@@ -14,6 +14,7 @@ import type {
   LinearRegressionResults,
   UploadInstrumentRecordsData
 } from '@opendatacapture/schemas/instrument-records';
+import { removeSubjectIdScope } from '@opendatacapture/subject-utils';
 import { Prisma } from '@prisma/client';
 import type { Session } from '@prisma/client';
 import { isNumber, mergeWith, pickBy } from 'lodash-es';
@@ -38,14 +39,6 @@ type ExpandDataType =
       success: false;
     };
 
-function afterFirstDollar(str: string) {
-  if (!str) return str;
-  const match = /\$(.*)/.exec(str);
-  if (!match) return str;
-  if (!match[1]) return str;
-  return match[1];
-}
-
 @Injectable()
 export class InstrumentRecordsService {
   constructor(
@@ -188,7 +181,7 @@ export class InstrumentRecordsService {
             sessionId: record.session.id,
             sessionType: record.session.type,
             subjectAge: record.subject.dateOfBirth ? yearsPassed(record.subject.dateOfBirth) : null,
-            subjectId: afterFirstDollar(record.subject.id),
+            subjectId: removeSubjectIdScope(record.subject.id),
             subjectSex: record.subject.sex,
             timestamp: record.date.toISOString(),
             value: measureValue
@@ -211,7 +204,7 @@ export class InstrumentRecordsService {
               sessionId: record.session.id,
               sessionType: record.session.type,
               subjectAge: record.subject.dateOfBirth ? yearsPassed(record.subject.dateOfBirth) : null,
-              subjectId: afterFirstDollar(record.subject.id),
+              subjectId: removeSubjectIdScope(record.subject.id),
               subjectSex: record.subject.sex,
               timestamp: record.date.toISOString(),
               value: arrayEntry.measureValue

apps/web/src/hooks/useInstrumentVisualization.ts

@@ -3,6 +3,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { toBasicISOString } from '@douglasneuroinformatics/libjs';
 import { useDownload, useNotificationsStore, useTranslation } from '@douglasneuroinformatics/libui/hooks';
 import type { AnyUnilingualScalarInstrument, InstrumentKind } from '@opendatacapture/runtime-core';
+import { removeSubjectIdScope } from '@opendatacapture/subject-utils';
 import { omit } from 'lodash-es';
 import { unparse } from 'papaparse';
 
@@ -36,14 +37,6 @@ export function useInstrumentVisualization({ params }: UseInstrumentVisualizatio
   const [minDate, setMinDate] = useState<Date | null>(null);
   const [instrumentId, setInstrumentId] = useState<null | string>(null);
 
-  function afterFirstDollar(str: string) {
-    if (!str) return str;
-    const match = /\$(.*)/.exec(str);
-    if (!match) return str;
-    if (!match[1]) return str;
-    return match[1];
-  }
-
   const instrument = useInstrument(instrumentId) as AnyUnilingualScalarInstrument;
 
   const instrumentInfoQuery = useInstrumentInfoQuery({
@@ -80,7 +73,7 @@ export function useInstrumentVisualization({ params }: UseInstrumentVisualizatio
       return exportRecords.map((item) => {
         const obj: { [key: string]: any } = {
           GroupID: currentGroup ? currentGroup.id : 'root',
-          subjectId: afterFirstDollar(params.subjectId)
+          subjectId: removeSubjectIdScope(params.subjectId)
         };
         for (const key of columnNames) {
           const val = item[key];
@@ -113,7 +106,7 @@ export function useInstrumentVisualization({ params }: UseInstrumentVisualizatio
                   GroupID: currentGroup ? currentGroup.id : 'root',
                   // eslint-disable-next-line perfectionist/sort-objects
                   Date: toBasicISOString(date),
-                  SubjectID: afterFirstDollar(params.subjectId),
+                  SubjectID: removeSubjectIdScope(params.subjectId),
                   Variable: `${objKey}-${arrKey}`,
                   // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, perfectionist/sort-objects
                   Value: arrItem
@@ -125,7 +118,7 @@ export function useInstrumentVisualization({ params }: UseInstrumentVisualizatio
               GroupID: currentGroup ? currentGroup.id : 'root',
               // eslint-disable-next-line perfectionist/sort-objects
               Date: toBasicISOString(date),
-              SubjectID: afterFirstDollar(params.subjectId),
+              SubjectID: removeSubjectIdScope(params.subjectId),
               Value: objVal,
               Variable: objKey
             });