diff --git a/sources/packages/backend/apps/api/src/route-controllers/application-exception/_tests_/e2e/application-exception.aest.getPendingApplicationExceptions.e2e-spec.ts b/sources/packages/backend/apps/api/src/route-controllers/application-exception/_tests_/e2e/application-exception.aest.getPendingApplicationExceptions.e2e-spec.ts index 2837a57049..86319d856d 100644 --- a/sources/packages/backend/apps/api/src/route-controllers/application-exception/_tests_/e2e/application-exception.aest.getPendingApplicationExceptions.e2e-spec.ts +++ b/sources/packages/backend/apps/api/src/route-controllers/application-exception/_tests_/e2e/application-exception.aest.getPendingApplicationExceptions.e2e-spec.ts @@ -7,7 +7,6 @@ import { getAESTToken, } from "../../../../testHelpers"; import { ApplicationExceptionStatus, ApplicationStatus } from "@sims/sims-db"; -import { getUserFullName } from "../../../../utilities"; import { saveFakeApplicationWithApplicationException } from "../application-exception-helper"; import { createE2EDataSources, E2EDataSources } from "@sims/test-utils"; @@ -84,7 +83,8 @@ describe("ApplicationExceptionAESTController(e2e)-getPendingApplicationException applicationNumber: application1.applicationNumber, submittedDate: application1.applicationException.createdAt.toISOString(), - fullName: getUserFullName(application1.student.user), + givenNames: application1.student.user.firstName, + lastName: application1.student.user.lastName, }), expect.objectContaining({ applicationId: application2.id, @@ -92,7 +92,8 @@ describe("ApplicationExceptionAESTController(e2e)-getPendingApplicationException applicationNumber: application2.applicationNumber, submittedDate: application2.applicationException.createdAt.toISOString(), - fullName: getUserFullName(application2.student.user), + givenNames: application2.student.user.firstName, + lastName: application2.student.user.lastName, }), ]), ); @@ -103,7 +104,8 @@ describe("ApplicationExceptionAESTController(e2e)-getPendingApplicationException applicationNumber: application3.applicationNumber, submittedDate: application3.applicationException.createdAt.toISOString(), - fullName: getUserFullName(application3.student.user), + givenNames: application3.student.user.firstName, + lastName: application3.student.user.lastName, }), ); expect(applicationExceptionList).not.toContainEqual( @@ -113,7 +115,8 @@ describe("ApplicationExceptionAESTController(e2e)-getPendingApplicationException applicationNumber: application4.applicationNumber, submittedDate: application4.applicationException.createdAt.toISOString(), - fullName: getUserFullName(application4.student.user), + givenNames: application4.student.user.firstName, + lastName: application4.student.user.lastName, }), ); expect(applicationExceptionList).not.toContainEqual( @@ -123,7 +126,8 @@ describe("ApplicationExceptionAESTController(e2e)-getPendingApplicationException applicationNumber: application5.applicationNumber, submittedDate: application5.applicationException.createdAt.toISOString(), - fullName: getUserFullName(application5.student.user), + givenNames: application5.student.user.firstName, + lastName: application5.student.user.lastName, }), ); }); diff --git a/sources/packages/backend/apps/api/src/route-controllers/application-exception/application-exception.aest.controller.ts b/sources/packages/backend/apps/api/src/route-controllers/application-exception/application-exception.aest.controller.ts index c8bf8aa0b3..50e0a397fc 100644 --- a/sources/packages/backend/apps/api/src/route-controllers/application-exception/application-exception.aest.controller.ts +++ b/sources/packages/backend/apps/api/src/route-controllers/application-exception/application-exception.aest.controller.ts @@ -30,7 +30,6 @@ import { UpdateApplicationExceptionAPIInDTO, } from "./models/application-exception.dto"; import { IUserToken } from "../../auth/userToken.interface"; -import { getUserFullName } from "../../utilities"; import { CustomNamedError } from "@sims/utilities"; import { STUDENT_APPLICATION_EXCEPTION_INVALID_STATE, @@ -141,7 +140,8 @@ export class ApplicationExceptionAESTController extends BaseController { studentId: eachApplication.application.student.id, applicationNumber: eachApplication.application.applicationNumber, submittedDate: eachApplication.createdAt, - fullName: getUserFullName(eachApplication.application.student.user), + givenNames: eachApplication.application.student.user.firstName, + lastName: eachApplication.application.student.user.lastName, })), count: applicationExceptions.count, }; diff --git a/sources/packages/backend/apps/api/src/route-controllers/application-exception/models/application-exception.dto.ts b/sources/packages/backend/apps/api/src/route-controllers/application-exception/models/application-exception.dto.ts index e4ecf50af6..a745b4fa0a 100644 --- a/sources/packages/backend/apps/api/src/route-controllers/application-exception/models/application-exception.dto.ts +++ b/sources/packages/backend/apps/api/src/route-controllers/application-exception/models/application-exception.dto.ts @@ -61,6 +61,7 @@ export class ApplicationExceptionSummaryAPIOutDTO { applicationId: number; studentId: number; submittedDate: Date; - fullName: string; + givenNames?: string; + lastName: string; applicationNumber: string; } diff --git a/sources/packages/backend/apps/api/src/route-controllers/models/pagination.dto.ts b/sources/packages/backend/apps/api/src/route-controllers/models/pagination.dto.ts index f6bbd2a79c..2868439ecd 100644 --- a/sources/packages/backend/apps/api/src/route-controllers/models/pagination.dto.ts +++ b/sources/packages/backend/apps/api/src/route-controllers/models/pagination.dto.ts @@ -63,7 +63,7 @@ export class ApplicationStatusPaginationOptionsAPIInDTO extends PaginationOption export class ApplicationExceptionPaginationOptionsAPIInDTO extends PaginationOptionsAPIInDTO { @IsOptional() - @IsIn(["submittedDate", "applicationNumber", "fullName"]) + @IsIn(["submittedDate", "applicationNumber", "givenNames", "lastName"]) sortField?: string; } diff --git a/sources/packages/backend/apps/api/src/services/application-exception/application-exception.service.ts b/sources/packages/backend/apps/api/src/services/application-exception/application-exception.service.ts index 2c0e8eb7ce..16442ecdf2 100644 --- a/sources/packages/backend/apps/api/src/services/application-exception/application-exception.service.ts +++ b/sources/packages/backend/apps/api/src/services/application-exception/application-exception.service.ts @@ -292,15 +292,12 @@ export class ApplicationExceptionService extends RecordDataModelService - + +