Merge pull request #982 from joshunrau/dev

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/groups/dto/update-group.dto.ts

@@ -1,6 +1,6 @@
 import { ValidationSchema } from '@douglasneuroinformatics/libnest/core';
 import { PartialType } from '@nestjs/swagger';
-import { $UpdateGroupData, type GroupSettings } from '@opendatacapture/schemas/group';
+import { $UpdateGroupData, type GroupSettings, type GroupType } from '@opendatacapture/schemas/group';
 
 import { CreateGroupDto } from './create-group.dto';
 
@@ -9,4 +9,5 @@ export class UpdateGroupDto extends PartialType(CreateGroupDto) {
   accessibleInstrumentIds?: string[];
   override name?: string;
   settings?: GroupSettings;
+  override type?: GroupType;
 }

apps/api/src/groups/groups.service.ts

@@ -1,4 +1,5 @@
 import { ConflictException, Injectable, NotFoundException } from '@nestjs/common';
+import type { Prisma } from '@prisma/client';
 
 import { accessibleQuery } from '@/ability/ability.utils';
 import type { EntityOperationOptions } from '@/core/types';
@@ -61,6 +62,15 @@ export class GroupsService {
     { accessibleInstrumentIds, ...data }: UpdateGroupDto,
     { ability }: EntityOperationOptions = {}
   ) {
+    const where: Prisma.GroupModelWhereInput = { AND: [accessibleQuery(ability, 'update', 'Group')], id };
+    const group = await this.groupModel.findFirst({ where });
+    if (!group) {
+      throw new NotFoundException(`Failed to find group with ID: ${id}`);
+    }
+    const exists = typeof data.name === 'string' && (await this.groupModel.exists({ name: group.name }));
+    if (exists) {
+      throw new ConflictException(`Group with name '${group.name}' already exists!`);
+    }
     return this.groupModel.update({
       data: {
         accessibleInstruments: accessibleInstrumentIds

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/components/IdentificationForm/IdentificationForm.tsx

@@ -13,6 +13,7 @@ export type IdentificationFormProps = {
   onSubmit: (data: { id: string }) => Promisable<void>;
 };
 
+// eslint-disable-next-line max-lines-per-function
 export const IdentificationForm = ({ onSubmit }: IdentificationFormProps) => {
   const currentGroup = useAppStore((store) => store.currentGroup);
   const { t } = useTranslation();

apps/web/src/components/Sidebar/Sidebar.tsx

@@ -13,6 +13,7 @@ import { useAppStore } from '@/store';
 import { NavButton } from '../NavButton';
 import { UserDropup } from '../UserDropup';
 
+// eslint-disable-next-line max-lines-per-function
 export const Sidebar = () => {
   const navItems = useNavItems();
   const currentSession = useAppStore((store) => store.currentSession);

apps/web/src/features/admin/hooks/useGroupsQuery.ts

@@ -1,9 +1,9 @@
 import { $Group } from '@opendatacapture/schemas/group';
-import { useSuspenseQuery } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 import axios from 'axios';
 
 export function useGroupsQuery() {
-  return useSuspenseQuery({
+  return useQuery({
     queryFn: async () => {
       const response = await axios.get('/v1/groups');
       return $Group.array().parse(response.data);

apps/web/src/features/admin/hooks/useUsersQuery.ts

@@ -1,9 +1,9 @@
 import { $User } from '@opendatacapture/schemas/user';
-import { useSuspenseQuery } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 import axios from 'axios';
 
 export function useUsersQuery() {
-  return useSuspenseQuery({
+  return useQuery({
     queryFn: async () => {
       const response = await axios.get('/v1/users');
       return $User.array().parse(response.data);