Skip to content

Add group column, remove group from subject id #1215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshunrau merged 5 commits into from
Oct 22, 2025
Merged

Add group column, remove group from subject id #1215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b61559c
feat: add function to split the group and $ off of the subject id in …
david-roper Oct 22, 2025
9743f95
feat: add spliter function, now group and subject id in two separate …
david-roper Oct 22, 2025
6e8965a
feat: switch back to afterfirstdollar function, use group id from cur…
david-roper Oct 22, 2025
110b2ec
test: update tests
david-roper Oct 22, 2025
d7cf820
fix: add code rabbit suggestion
david-roper Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions apps/api/src/instrument-records/instrument-records.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@ 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(
Expand Down Expand Up @@ -180,7 +188,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
Expand All @@ -203,7 +211,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
Expand Down
12 changes: 8 additions & 4 deletions apps/web/src/hooks/__tests__/useInstrumentVisualization.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ describe('useInstrumentVisualization', () => {
const [filename, getContentFn] = mockDownloadFn.mock.calls[0] ?? [];
expect(filename).toContain('.csv');
const csvContents = getContentFn();
expect(csvContents).toMatch(`subjectId,Date,someValue\r\ntestId,${toBasicISOString(FIXED_TEST_DATE)},abc`);
expect(csvContents).toMatch(
`GroupID,subjectId,Date,someValue\r\ntestGroupId,testId,${toBasicISOString(FIXED_TEST_DATE)},abc`
);
});
});
describe('TSV', () => {
Expand All @@ -85,7 +87,9 @@ describe('useInstrumentVisualization', () => {
const [filename, getContentFn] = mockDownloadFn.mock.calls[0] ?? [];
expect(filename).toContain('.tsv');
const tsvContents = getContentFn();
expect(tsvContents).toMatch(`subjectId\tDate\tsomeValue\r\ntestId\t${toBasicISOString(FIXED_TEST_DATE)}\tabc`);
expect(tsvContents).toMatch(
`GroupID\tsubjectId\tDate\tsomeValue\r\ntestGroupId\ttestId\t${toBasicISOString(FIXED_TEST_DATE)}\tabc`
);
});
});
describe('CSV Long', () => {
Expand All @@ -100,7 +104,7 @@ describe('useInstrumentVisualization', () => {
expect(filename).toContain('.csv');
const csvLongContents = getContentFn();
expect(csvLongContents).toMatch(
`Date,SubjectID,Value,Variable\r\n${toBasicISOString(FIXED_TEST_DATE)},testId,abc,someValue`
`GroupID,Date,SubjectID,Value,Variable\r\ntestGroupId,${toBasicISOString(FIXED_TEST_DATE)},testId,abc,someValue`
);
});
});
Expand All @@ -116,7 +120,7 @@ describe('useInstrumentVisualization', () => {
expect(filename).toMatch('.tsv');
const tsvLongContents = getContentFn();
expect(tsvLongContents).toMatch(
`Date\tSubjectID\tValue\tVariable\r\n${toBasicISOString(FIXED_TEST_DATE)}\ttestId\tabc\tsomeValue`
`GroupID\tDate\tSubjectID\tValue\tVariable\r\ntestGroupId\t${toBasicISOString(FIXED_TEST_DATE)}\ttestId\tabc\tsomeValue`
);
});
});
Expand Down
21 changes: 18 additions & 3 deletions apps/web/src/hooks/useInstrumentVisualization.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ 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({
Expand Down Expand Up @@ -70,7 +78,10 @@ export function useInstrumentVisualization({ params }: UseInstrumentVisualizatio
const makeWideRows = () => {
const columnNames = Object.keys(exportRecords[0]!);
return exportRecords.map((item) => {
const obj: { [key: string]: any } = { subjectId: params.subjectId };
const obj: { [key: string]: any } = {
GroupID: currentGroup ? currentGroup.id : 'root',
subjectId: afterFirstDollar(params.subjectId)
};
for (const key of columnNames) {
const val = item[key];
if (key === '__date__') {
Expand Down Expand Up @@ -99,8 +110,10 @@ export function useInstrumentVisualization({ params }: UseInstrumentVisualizatio
objVal.forEach((arrayItem) => {
Object.entries(arrayItem as object).forEach(([arrKey, arrItem]) => {
longRecord.push({
GroupID: currentGroup ? currentGroup.id : 'root',
// eslint-disable-next-line perfectionist/sort-objects
Date: toBasicISOString(date),
SubjectID: params.subjectId,
SubjectID: afterFirstDollar(params.subjectId),
Variable: `${objKey}-${arrKey}`,
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, perfectionist/sort-objects
Value: arrItem
Expand All @@ -109,8 +122,10 @@ export function useInstrumentVisualization({ params }: UseInstrumentVisualizatio
});
} else {
longRecord.push({
GroupID: currentGroup ? currentGroup.id : 'root',
// eslint-disable-next-line perfectionist/sort-objects
Date: toBasicISOString(date),
SubjectID: params.subjectId,
SubjectID: afterFirstDollar(params.subjectId),
Value: objVal,
Variable: objKey
});
Expand Down