#3315 - Content: Ministry: Student Requests Exceptions

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,15 +83,17 @@ 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,
               studentId: application2.student.id,
               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,
           }),
         );
       });

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,
     };

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;
 }

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;
 }
 

sources/packages/backend/apps/api/src/services/application-exception/application-exception.service.ts

@@ -292,15 +292,12 @@ export class ApplicationExceptionService extends RecordDataModelService<Applicat
     sortOrder = FieldSortOrder.ASC,
   ): OrderByCondition {
     const orderByCondition = {};
-    if (sortField === "fullName") {
-      orderByCondition["user.firstName"] = sortOrder;
-      orderByCondition["user.lastName"] = sortOrder;
-      return orderByCondition;
-    }
 
     const fieldSortOptions = {
       applicationNumber: "application.applicationNumber",
       submittedDate: "exception.createdAt",
+      givenNames: "user.firstName",
+      lastName: "user.lastName",
     };
 
     const dbColumnName = fieldSortOptions[sortField];

sources/packages/web/src/services/http/dto/ApplicationException.dto.ts

@@ -38,6 +38,7 @@ export interface ApplicationExceptionSummaryAPIOutDTO {
   applicationId: number;
   studentId: number;
   submittedDate: Date;
-  fullName: string;
+  givenNames?: string;
+  lastName: string;
   applicationNumber: string;
 }

sources/packages/web/src/views/aest/student/StudentApplicationExceptions.vue

@@ -4,9 +4,9 @@
       <header-navigator title="Student requests" subTitle="Exceptions" />
     </template>
     <body-header
-      title="Requested exceptions"
+      title="Pending exception requests"
       :recordsCount="applicationExceptions.count"
-      subTitle="Make a determination on application submitted with exceptions."
+      subTitle="Exception requests that require ministry review."
     >
       <template #actions>
         <v-text-field
@@ -46,7 +46,8 @@
               </span>
             </template>
           </Column>
-          <Column field="fullName" header="Name" :sortable="true"> </Column>
+          <Column field="givenNames" header="Given names" :sortable="true" />
+          <Column field="lastName" header="Last name" :sortable="true" />
           <Column
             field="applicationNumber"
             :sortable="true"