feat: adding user as an optional attachment to session creation

Author: david-roper

apps/api/prisma/schema.prisma

@@ -202,6 +202,7 @@ model User {
   basePermissionLevel   BasePermissionLevel?
   additionalPermissions AuthRule[]
   firstName             String
+  sessions              Session[]
   groupIds              String[]             @db.ObjectId
   groups                Group[]              @relation(fields: [groupIds], references: [id])
   lastName              String
@@ -229,6 +230,8 @@ model Session {
   instrumentRecords InstrumentRecord[]
   subject           Subject?           @relation(fields: [subjectId], references: [id])
   subjectId         String
+  user              User?              @relation(fields: [userId], references: [id])         
+  userId            String?
   type              SessionType
 
   @@map("SessionModel")

apps/api/src/sessions/sessions.module.ts

@@ -2,14 +2,15 @@ import { Module } from '@nestjs/common';
 
 import { GroupsModule } from '@/groups/groups.module';
 import { SubjectsModule } from '@/subjects/subjects.module';
+import { UsersModule } from '@/users/users.module';
 
 import { SessionsController } from './sessions.controller';
 import { SessionsService } from './sessions.service';
 
 @Module({
   controllers: [SessionsController],
   exports: [SessionsService],
-  imports: [GroupsModule, SubjectsModule],
+  imports: [GroupsModule, SubjectsModule, UsersModule],
   providers: [SessionsService]
 })
 export class SessionsModule {}

apps/api/src/sessions/sessions.service.ts

@@ -5,19 +5,21 @@ import { InternalServerErrorException, NotFoundException } from '@nestjs/common/
 import type { Group } from '@opendatacapture/schemas/group';
 import type { CreateSessionData } from '@opendatacapture/schemas/session';
 import type { CreateSubjectData } from '@opendatacapture/schemas/subject';
-import type { Prisma, Session, Subject } from '@prisma/client';
+import type { Prisma, Session, Subject, User } from '@prisma/client';
 
 import type { EntityOperationOptions } from '@/core/types';
 import { GroupsService } from '@/groups/groups.service';
 import { SubjectsService } from '@/subjects/subjects.service';
+import { UsersService } from '@/users/users.service';
 
 @Injectable()
 export class SessionsService {
   constructor(
     @InjectModel('Session') private readonly sessionModel: Model<'Session'>,
     private readonly groupsService: GroupsService,
     private readonly loggingService: LoggingService,
-    private readonly subjectsService: SubjectsService
+    private readonly subjectsService: SubjectsService,
+    private readonly userService: UsersService
   ) {}
 
   async count(where: Prisma.SessionWhereInput = {}, { ability }: EntityOperationOptions = {}) {
@@ -26,10 +28,16 @@ export class SessionsService {
     });
   }
 
-  async create({ date, groupId, subjectData, type }: CreateSessionData): Promise<Session> {
+  async create({ date, groupId, subjectData, type, userId }: CreateSessionData): Promise<Session> {
     this.loggingService.debug({ message: 'Attempting to create session' });
     const subject = await this.resolveSubject(subjectData);
 
+    let user: null | Omit<User, 'hashedPassword'> = null;
+
+    if (userId) {
+      user = await this.userService.findById(userId);
+    }
+
     // If the subject is not yet associated with the group, check it exists then append it
     let group: Group | null = null;
     if (groupId && !subject.groupIds.includes(groupId)) {
@@ -48,7 +56,12 @@ export class SessionsService {
         subject: {
           connect: { id: subject.id }
         },
-        type
+        type,
+        user: user
+          ? {
+              connect: { id: user.id }
+            }
+          : undefined
       }
     });
 

packages/schemas/src/session/session.ts

@@ -12,13 +12,15 @@ export const $Session = $BaseModel.extend({
   groupId: z.string().nullable(),
   subject: $Subject,
   subjectId: z.string(),
-  type: $SessionType
+  type: $SessionType,
+  userId: z.string().nullable()
 });
 
 export type CreateSessionData = z.infer<typeof $CreateSessionData>;
 export const $CreateSessionData = z.object({
   date: z.coerce.date(),
   groupId: z.string().nullable(),
   subjectData: $CreateSubjectData,
-  type: $SessionType
+  type: $SessionType,
+  userId: z.string().nullish()
 });

packages/schemas/src/subject/subject.ts

@@ -22,6 +22,7 @@ export const $Subject = $BaseModel.extend({
   firstName: z.string().min(1).nullish(),
   groupIds: z.array(z.string().min(1)),
   lastName: z.string().min(1).nullish(),
+  sessionIds: z.array(z.string()).nullish(),
   sex: $Sex.nullish()
 });