Merge pull request #1125 from david-roper/improve-upload

createMany for upload formating and linting fixes

Author: joshunrau

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

@@ -2,7 +2,7 @@ import { replacer, reviver, yearsPassed } from '@douglasneuroinformatics/libjs';
 import { accessibleQuery, InjectModel } from '@douglasneuroinformatics/libnest';
 import type { Model } from '@douglasneuroinformatics/libnest';
 import { linearRegression } from '@douglasneuroinformatics/libstats';
-import { Injectable, NotFoundException, UnprocessableEntityException } from '@nestjs/common';
+import { Injectable, UnprocessableEntityException } from '@nestjs/common';
 import type { ScalarInstrument } from '@opendatacapture/runtime-core';
 import type {
   CreateInstrumentRecordData,

apps/api/src/subjects/subjects.service.ts

@@ -55,8 +55,8 @@ export class SubjectsService {
     const existingSubjects = await this.subjectModel.findMany({
       select: { id: true },
       where: {
-        id: { in: subjectIds },
-        AND: [accessibleQuery(ability, 'read', 'Subject')]
+        AND: [accessibleQuery(ability, 'read', 'Subject')],
+        id: { in: subjectIds }
       }
     });