draft

Author: rdonigian

src/components/user/dto/assign-organization-to-user.dto.ts

@@ -1,7 +1,8 @@
 import { Field, InputType, ObjectType } from '@nestjs/graphql';
 import { Type } from 'class-transformer';
 import { ValidateNested } from 'class-validator';
-import { type ID, IdField, MutationPlaceholderOutput } from '~/common';
+import { type ID, IdField } from '~/common';
+import { User } from './user.dto';
 
 @InputType()
 export class AssignOrganizationToUser {
@@ -20,8 +21,11 @@ export abstract class AssignOrganizationToUserInput {
   @Field()
   @Type(() => AssignOrganizationToUser)
   @ValidateNested()
-  readonly request: AssignOrganizationToUser;
+  readonly assignment: AssignOrganizationToUser;
 }
 
 @ObjectType()
-export abstract class AssignOrganizationToUserOutput extends MutationPlaceholderOutput {}
+export abstract class AssignOrganizationToUserOutput {
+  @Field()
+  readonly assignment: User;
+}

src/components/user/dto/remove-organization-from-user.dto.ts

@@ -17,7 +17,7 @@ export abstract class RemoveOrganizationFromUserInput {
   @Field()
   @Type(() => RemoveOrganizationFromUser)
   @ValidateNested()
-  readonly request: RemoveOrganizationFromUser;
+  readonly assignment: RemoveOrganizationFromUser;
 }
 
 @ObjectType()

src/components/user/user.resolver.ts

@@ -31,15 +31,13 @@ import { TimeZoneService } from '../timezone';
 import { SecuredTimeZone } from '../timezone/timezone.dto';
 import {
   AssignOrganizationToUserInput,
-  AssignOrganizationToUserOutput,
   CheckEmailArgs,
   CreatePersonInput,
   CreatePersonOutput,
   DeleteUserOutput,
   KnownLanguage,
   ModifyKnownLanguageArgs,
   RemoveOrganizationFromUserInput,
-  RemoveOrganizationFromUserOutput,
   UpdateUserInput,
   UpdateUserOutput,
   User,
@@ -257,24 +255,24 @@ export class UserResolver {
     return await this.userService.readOne(userId);
   }
 
-  @Mutation(() => AssignOrganizationToUserOutput, {
+  @Mutation(() => User, {
     description: 'Assign organization OR primaryOrganization to user',
   })
   async assignOrganizationToUser(
     @Args('input') input: AssignOrganizationToUserInput,
-  ): Promise<AssignOrganizationToUserOutput> {
-    await this.userService.assignOrganizationToUser(input.request);
-    return { success: true };
+  ): Promise<User> {
+    await this.userService.assignOrganizationToUser(input.assignment);
+    return await this.userService.readOne(input.assignment.userId);
   }
 
-  @Mutation(() => RemoveOrganizationFromUserOutput, {
+  @Mutation(() => User, {
     description: 'Remove organization OR primaryOrganization from user',
   })
   async removeOrganizationFromUser(
     @Args('input') input: RemoveOrganizationFromUserInput,
-  ): Promise<RemoveOrganizationFromUserOutput> {
-    await this.userService.removeOrganizationFromUser(input.request);
-    return { success: true };
+  ): Promise<User> {
+    await this.userService.removeOrganizationFromUser(input.assignment);
+    return await this.userService.readOne(input.assignment.userId);
   }
 
   @Mutation(() => User, {