fix: update group method

Author: joshunrau

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/web/src/features/group/components/ManageGroupForm.tsx

@@ -20,7 +20,7 @@ type InstrumentOptions = {
 
 export type ManageGroupFormProps = {
   availableInstruments: UnilingualInstrumentInfo[];
-  onSubmit: (data: UpdateGroupData) => Promisable<any>;
+  onSubmit: (data: Partial<UpdateGroupData>) => Promisable<any>;
 };
 
 export const ManageGroupForm = ({ availableInstruments, onSubmit }: ManageGroupFormProps) => {

packages/schemas/src/group/group.ts

@@ -28,10 +28,12 @@ export const $CreateGroupData = z.object({
 });
 
 export type UpdateGroupData = z.infer<typeof $UpdateGroupData>;
-export const $UpdateGroupData = z
-  .object({
-    accessibleInstrumentIds: z.array(z.string()),
-    name: z.string().min(1),
+export const $UpdateGroupData = $Group
+  .omit({
+    subjectIds: true,
+    userIds: true
+  })
+  .extend({
     settings: $GroupSettings.partial()
   })
   .partial();