fix test

Author: joshunrau

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

@@ -4,7 +4,6 @@ import { MockFactory } from '@douglasneuroinformatics/libnest/testing';
 import type { MockedInstance } from '@douglasneuroinformatics/libnest/testing';
 import { NotFoundException } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
-import type { InstrumentRecord, Session, Subject, User } from '@prisma/client';
 import { beforeEach, describe, expect, it } from 'vitest';
 
 import { GroupsService } from '../../groups/groups.service';
@@ -14,14 +13,12 @@ import { SubjectsService } from '../../subjects/subjects.service';
 import { InstrumentMeasuresService } from '../instrument-measures.service';
 import { InstrumentRecordsService } from '../instrument-records.service';
 
+import type { RecordType } from '../thread-types';
+
 describe('InstrumentRecordsService', () => {
   let instrumentRecordsService: InstrumentRecordsService;
   let instrumentRecordModel: MockedInstance<Model<'InstrumentRecord'>>;
-  // let _groupsService: MockedInstance<GroupsService>;
-  // let _instrumentMeasuresService: MockedInstance<InstrumentMeasuresService>;
   let instrumentsService: MockedInstance<InstrumentsService>;
-  // let _sessionsService: MockedInstance<SessionsService>;
-  // let _subjectsService: MockedInstance<SubjectsService>;
 
   beforeEach(async () => {
     const moduleRef = await Test.createTestingModule({
@@ -38,11 +35,7 @@ describe('InstrumentRecordsService', () => {
 
     instrumentRecordModel = moduleRef.get(getModelToken('InstrumentRecord'));
     instrumentRecordsService = moduleRef.get(InstrumentRecordsService);
-    // _groupsService = moduleRef.get(GroupsService);
-    // _instrumentMeasuresService = moduleRef.get(InstrumentMeasuresService);
     instrumentsService = moduleRef.get(InstrumentsService);
-    // _sessionsService = moduleRef.get(SessionsService);
-    // _subjectsService = moduleRef.get(SubjectsService);
   });
 
   describe('findById', () => {
@@ -80,36 +73,25 @@ describe('InstrumentRecordsService', () => {
     it('should return an array of export records with correct shape', async () => {
       const mockRecords = [
         {
-          assignmentId: '123',
           computedMeasures: { score: 85 },
-          createdAt: new Date(),
-          data: {
-            score: 85
-          },
-          date: new Date('2023-01-01'),
+          date: '2023-01-01',
           groupId: '123',
           id: 'record-1',
           instrumentId: 'instrument-1',
           session: {
-            date: new Date('2023-01-01'),
+            date: '2023-01-01',
             id: 'session-1',
             type: 'IN_PERSON' as const,
             user: { username: 'testuser' }
           },
-          sessionId: '123',
           subject: {
-            dateOfBirth: new Date('1990-01-01'),
+            age: 20,
             groupIds: ['group-1'],
             id: 'subject-1',
             sex: 'MALE' as const
-          },
-          subjectId: '123',
-          updatedAt: new Date()
+          }
         }
-      ] satisfies (InstrumentRecord & {
-        session: Partial<Session> & { user: Partial<User> };
-        subject: Partial<Subject>;
-      })[];
+      ] satisfies RecordType[];
 
       const mockInstruments = [
         {