feat: add date of birth and sex to user model

Author: joshunrau

apps/api/prisma/schema.prisma

@@ -164,6 +164,8 @@ model UserModel {
   lastName            String
   password            String
   username            String
+  sex                 Sex?
+  dateOfBirth         DateTime?            @db.Date
 }
 
 enum SessionType {

apps/api/src/ability/__tests__/ability.factory.spec.ts

@@ -17,11 +17,13 @@ describe('AbilityFactory', () => {
     userModelStub = {
       basePermissionLevel: null,
       createdAt: new Date(),
+      dateOfBirth: null,
       firstName: 'Jane',
       groupIds: [],
       id: '12345',
       lastName: 'Doe',
       password: 'Password123',
+      sex: null,
       updatedAt: new Date(),
       username: 'user'
     };

apps/api/src/users/dto/create-user.dto.ts

@@ -1,8 +1,9 @@
 import { ValidationSchema } from '@douglasneuroinformatics/libnest/core';
 import { estimatePasswordStrength } from '@douglasneuroinformatics/libpasswd';
 import { ApiProperty } from '@nestjs/swagger';
+import type { Sex } from '@opendatacapture/schemas/subject';
 import { $CreateUserData } from '@opendatacapture/schemas/user';
-import type { BasePermissionLevel } from '@opendatacapture/schemas/user';
+import type { BasePermissionLevel, CreateUserData } from '@opendatacapture/schemas/user';
 import { z } from 'zod';
 
 @ValidationSchema(
@@ -20,14 +21,17 @@ import { z } from 'zod';
     })
   })
 )
-export class CreateUserDto {
+export class CreateUserDto implements CreateUserData {
   @ApiProperty({
     description: "Determines the user's base permissions, which may later be modified by an admin",
     enum: ['ADMIN', 'GROUP_MANAGER', 'STANDARD'] satisfies BasePermissionLevel[],
     type: String
   })
   basePermissionLevel: BasePermissionLevel | null;
 
+  @ApiProperty({ description: 'Date of Birth' })
+  dateOfBirth?: Date;
+
   @ApiProperty({ description: 'First Name' })
   firstName: string;
 
@@ -44,6 +48,10 @@ export class CreateUserDto {
   })
   password: string;
 
+  @ApiProperty({ description: 'Sex at Birth' })
+  @ApiProperty()
+  sex?: Sex;
+
   @ApiProperty({
     description: 'A unique descriptive name associated with this user',
     example: 'JaneDoeMemoryClinic'

apps/api/src/users/users.service.ts

@@ -30,7 +30,7 @@ export class UsersService {
 
   /** Adds a new user to the database with default permissions, verifying the provided groups exist */
   async create(
-    { basePermissionLevel, firstName, groupIds, lastName, password, username }: CreateUserDto,
+    { basePermissionLevel, dateOfBirth, firstName, groupIds, lastName, password, sex, username }: CreateUserDto,
     options?: EntityOperationOptions
   ) {
     if (await this.userModel.exists({ username })) {
@@ -50,12 +50,14 @@ export class UsersService {
     return this.userModel.create({
       data: {
         basePermissionLevel,
+        dateOfBirth,
         firstName,
         groups: {
           connect: groupIds.map((id) => ({ id }))
         },
         lastName,
         password: hashedPassword,
+        sex,
         username: username
       }
     });

apps/web/src/features/admin/pages/CreateUserPage.tsx

@@ -94,6 +94,19 @@ export const CreateUserPage = () => {
                 kind: 'string',
                 label: t('core.identificationData.lastName.label'),
                 variant: 'input'
+              },
+              sex: {
+                kind: 'string',
+                label: t('core.identificationData.sex.label'),
+                options: {
+                  MALE: t('core.identificationData.sex.male'),
+                  FEMALE: t('core.identificationData.sex.female')
+                },
+                variant: 'select'
+              },
+              dateOfBirth: {
+                kind: 'date',
+                label: t('core.identificationData.dateOfBirth.label')
               }
             },
             title: t({

packages/schemas/src/user/user.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod';
 
 import { $BaseModel } from '../core/core.js';
+import { $Sex } from '../subject/subject.js';
 
 export const $BasePermissionLevel = z.enum(['ADMIN', 'GROUP_MANAGER', 'STANDARD']);
 
@@ -9,22 +10,29 @@ export type BasePermissionLevel = z.infer<typeof $BasePermissionLevel>;
 export type User = z.infer<typeof $User>;
 export const $User = $BaseModel.extend({
   basePermissionLevel: $BasePermissionLevel.nullable(),
+  dateOfBirth: z.coerce.date().nullish(),
   firstName: z.string().min(1),
   groupIds: z.array(z.string()),
   lastName: z.string().min(1),
   password: z.string().min(1),
+  sex: $Sex.nullish(),
   username: z.string().min(1)
 });
 
 export type CreateUserData = z.infer<typeof $CreateUserData>;
-export const $CreateUserData = $User.pick({
-  basePermissionLevel: true,
-  firstName: true,
-  groupIds: true,
-  lastName: true,
-  password: true,
-  username: true
-});
+export const $CreateUserData = $User
+  .pick({
+    basePermissionLevel: true,
+    firstName: true,
+    groupIds: true,
+    lastName: true,
+    password: true,
+    username: true
+  })
+  .extend({
+    dateOfBirth: z.coerce.date().optional(),
+    sex: $Sex.optional()
+  });
 
 export type UpdateUserData = z.infer<typeof $UpdateUserData>;
 export const $UpdateUserData = $CreateUserData.partial();