#4148: fixed merge conflicts

Author: jasperpinkus

src/backend/src/utils/errors.utils.ts

@@ -214,5 +214,5 @@ export type ExceptionObjectNames =
   | 'Guest Definition'
   | 'ProspectiveSponsor'
   | 'SponsorTier'
-  | 'Guest Defenition'
+  | 'Guest Definition'
   | 'Meeting Attendance';

src/backend/tests/unit/recruitment.test.ts

@@ -397,11 +397,10 @@ describe('Recruitment Tests', () => {
     });
 
     it('Get a single guest defenition fails', async () => {
-      const nonExistingGuestId = 'nonExistingGuest';
       const nonExistingDefinitionId = 'nonExistingDefinition';
-      await expect(async () =>
-        RecruitmentServices.getGuestDefinition(nonExistingGuestId, orgId, nonExistingDefinitionId)
-      ).rejects.toThrow(new NotFoundException('User', nonExistingGuestId));
+      await expect(async () => RecruitmentServices.getGuestDefinition(orgId, nonExistingDefinitionId)).rejects.toThrow(
+        new NotFoundException('Guest Definition', nonExistingDefinitionId)
+      );
     });
   });
   describe('Edit Guest Definition', () => {