bruh

acmucsd · Apr 24, 2024 · 7b1dbb4 · 7b1dbb4
1 parent 1dd9163
commit 7b1dbb4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/api/controllers/AdminController.ts b/api/controllers/AdminController.ts
@@ -12,7 +12,7 @@ import {
   CreateMilestoneResponse,
   CreateBonusResponse,
   UploadBannerResponse,
-  GetAllNamesEmailsResponse,
+  GetAllNamesAndEmailsResponse,
   SubmitAttendanceForUsersResponse,
   ModifyUserAccessLevelResponse,
   GetAllUserAccessLevelsResponse,
@@ -41,9 +41,9 @@ export class AdminController {
   }
 
   @Get('/email')
-  async getAllNamesEmails(@AuthenticatedUser() user: UserModel): Promise<GetAllNamesEmailsResponse> {
+  async getAllNamesAndEmails(@AuthenticatedUser() user: UserModel): Promise<GetAllNamesAndEmailsResponse> {
     if (!PermissionsService.canSeeAllUserEmails(user)) throw new ForbiddenError();
-    const namesEmails = await this.userAccountService.getAllNamesEmails();
+    const namesEmails = await this.userAccountService.getAllNamesAndEmails();
     return { error: null, namesEmails };
   }
 

diff --git a/tests/admin.test.ts b/tests/admin.test.ts
@@ -145,7 +145,7 @@ describe('names and emails retrieval', () => {
       .createUsers(...users, admin)
       .write();
 
-    const response = await ControllerFactory.admin(conn).getAllNamesEmails(admin);
+    const response = await ControllerFactory.admin(conn).getAllNamesAndEmails(admin);
     const expected: NameAndEmail = { firstName: admin.firstName, lastName: admin.lastName, email: admin.email };
     expect(expect.arrayContaining(response.namesEmails)).toEqual([...namesEmails,
       expected]);

diff --git a/types/ApiResponses.ts b/types/ApiResponses.ts
@@ -30,7 +30,7 @@ export interface UploadBannerResponse extends ApiResponse {
   banner: string;
 }
 
-export interface GetAllNamesEmailsResponse extends ApiResponse {
+export interface GetAllNamesAndEmailsResponse extends ApiResponse {
   namesEmails: NameAndEmail[];
 }