fix(signups): fixes an issue with casing on remove signups (#262)

ssilve1989 · May 15, 2024 · bd6bbfb · bd6bbfb
1 parent 73ff251
commit bd6bbfb
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/src/commands/signup/subcommands/remove-signup/remove-signup-command.handler.spec.ts b/src/commands/signup/subcommands/remove-signup/remove-signup-command.handler.spec.ts
@@ -31,8 +31,14 @@ describe('Remove Signup Command Handler', () => {
     signupsRepository = fixture.get(SignupCollection);
 
     interaction = createMock<ChatInputCommandInteraction<'cached' | 'raw'>>({
-      user: createMock<User>({ id: '1', toString: () => '<@1>' }),
-      options: createMock({}),
+      user: createMock<User>({
+        id: '1',
+        toString: () => '<@1>',
+        valueOf: () => '',
+      }),
+      options: {
+        getString: () => '',
+      },
       valueOf: () => '',
     });
   });

diff --git a/src/commands/signup/subcommands/remove-signup/remove-signup-command.handler.ts b/src/commands/signup/subcommands/remove-signup/remove-signup-command.handler.ts
@@ -1,4 +1,5 @@
 import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
+import { plainToClass } from 'class-transformer';
 import { APIUser, ChatInputCommandInteraction, User } from 'discord.js';
 import { DiscordService } from '../../../../discord/discord.service.js';
 import { Encounter } from '../../../../encounters/encounters.consts.js';
@@ -8,6 +9,7 @@ import { SignupCompositeKeyProps } from '../../../../firebase/models/signup.mode
 import { SheetsService } from '../../../../sheets/sheets.service.js';
 import { SIGNUP_MESSAGES } from '../../signup.consts.js';
 import { RemoveSignupCommand } from './remove-signup.command.js';
+import { RemoveSignupDto } from './remove-signup.dto.js';
 
 @CommandHandler(RemoveSignupCommand)
 class RemoveSignupCommandHandler
@@ -61,11 +63,11 @@ class RemoveSignupCommandHandler
   }
 
   private getOptions({ options }: ChatInputCommandInteraction) {
-    return {
+    return plainToClass(RemoveSignupDto, {
       character: options.getString('character')!,
       world: options.getString('world')!,
       encounter: options.getString('encounter')! as Encounter,
-    };
+    });
   }
 
   private async canModifySignup(
@@ -80,7 +82,9 @@ class RemoveSignupCommandHandler
       guildId,
     });
 
-    if (hasRole) return true;
+    if (hasRole) {
+      return true;
+    }
 
     const signup = await this.signupsRepository.findOne(options);
 

diff --git a/src/commands/signup/subcommands/remove-signup/remove-signup.dto.ts b/src/commands/signup/subcommands/remove-signup/remove-signup.dto.ts
@@ -0,0 +1,21 @@
+import { IsEnum, IsString } from 'class-validator';
+import { ToLowercase } from '../../../../common/decorators/to-lowercase.js';
+import { Encounter } from '../../../../encounters/encounters.consts.js';
+import { SignupDocument } from '../../../../firebase/models/signup.model.js';
+
+class RemoveSignupDto
+  implements Pick<SignupDocument, 'character' | 'world' | 'encounter'>
+{
+  @IsString()
+  @ToLowercase()
+  character: string;
+
+  @IsEnum(Encounter)
+  encounter: Encounter;
+
+  @IsString()
+  @ToLowercase()
+  world: string;
+}
+
+export { RemoveSignupDto };