feat: add function to split the group and $ off of the subject id in export

Author: david-roper

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

@@ -38,6 +38,13 @@ type ExpandDataType =
       success: false;
     };
 
+function afterFirstDollar(str: string) {
+  const match = /\$(.*)/.exec(str);
+  if (!match) return str;
+  if (!match[1]) return str;
+  return match[1];
+}
+
 @Injectable()
 export class InstrumentRecordsService {
   constructor(
@@ -180,7 +187,7 @@ export class InstrumentRecordsService {
             sessionId: record.session.id,
             sessionType: record.session.type,
             subjectAge: record.subject.dateOfBirth ? yearsPassed(record.subject.dateOfBirth) : null,
-            subjectId: record.subject.id,
+            subjectId: afterFirstDollar(record.subject.id),
             subjectSex: record.subject.sex,
             timestamp: record.date.toISOString(),
             value: measureValue
@@ -203,7 +210,7 @@ export class InstrumentRecordsService {
               sessionId: record.session.id,
               sessionType: record.session.type,
               subjectAge: record.subject.dateOfBirth ? yearsPassed(record.subject.dateOfBirth) : null,
-              subjectId: record.subject.id,
+              subjectId: afterFirstDollar(record.subject.id),
               subjectSex: record.subject.sex,
               timestamp: record.date.toISOString(),
               value: arrayEntry.measureValue