return related partner to UI from user - org methods

Author: rdonigian

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

@@ -2,7 +2,7 @@ import { Field, InputType, ObjectType } from '@nestjs/graphql';
 import { Type } from 'class-transformer';
 import { ValidateNested } from 'class-validator';
 import { type ID, IdField } from '~/common';
-import { User } from './user.dto';
+import { Partner } from '../../../components/partner/dto';
 
 @InputType()
 export class AssignOrganizationToUser {
@@ -27,5 +27,5 @@ export abstract class AssignOrganizationToUserInput {
 @ObjectType()
 export abstract class AssignOrganizationToUserOutput {
   @Field()
-  readonly assignment: User;
+  readonly partner: Partner;
 }

src/components/user/dto/remove-organization-from-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 { Partner } from '../../../components/partner/dto';
 
 @InputType()
 export class RemoveOrganizationFromUser {
@@ -21,4 +22,7 @@ export abstract class RemoveOrganizationFromUserInput {
 }
 
 @ObjectType()
-export abstract class RemoveOrganizationFromUserOutput extends MutationPlaceholderOutput {}
+export abstract class RemoveOrganizationFromUserOutput {
+  @Field()
+  readonly partner: Partner;
+}

src/components/user/user.resolver.ts

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