feedback

sources/packages/backend/apps/api/src/route-controllers/assessment/_tests_/e2e/assessment.institutions.controller.getRequestedAssessmentSummary.e2e-spec.ts

@@ -1,9 +1,11 @@
 import { HttpStatus, INestApplication } from "@nestjs/common";
 import * as request from "supertest";
 import {
+  AESTGroups,
   authorizeUserTokenForLocation,
   BEARER_AUTH_TYPE,
   createTestingAppModule,
+  getAESTToken,
   getAuthRelatedEntities,
   getInstitutionToken,
   INSTITUTION_BC_PUBLIC_ERROR_MESSAGE,
@@ -30,6 +32,7 @@ import {
 } from "@sims/sims-db";
 import { saveStudentApplicationForCollegeC } from "../../../student/_tests_/e2e/student.institutions.utils";
 import { createFakeOfferingRequestChange } from "@sims/test-utils/factories/offering-change-request";
+import { RequestAssessmentTypeAPIOutDTO } from "../../models/assessment.dto";
 
 describe("AssessmentInstitutionsController(e2e)-getRequestedAssessmentSummary", () => {
   let app: INestApplication;
@@ -139,7 +142,9 @@ describe("AssessmentInstitutionsController(e2e)-getRequestedAssessmentSummary",
       const offeringRequestOfferings = createFakeOfferingRequestChange({
         currentOffering: application.currentAssessment.offering,
       });
-      await db.educationProgramOffering.save(offeringRequestOfferings);
+      const [, requestedOffering] = await db.educationProgramOffering.save(
+        offeringRequestOfferings,
+      );
       const endpoint = `/institutions/assessment/student/${student.id}/application/${application.id}/requests`;
       const institutionUserToken = await getInstitutionToken(
         InstitutionTokenTypes.CollegeFUser,
@@ -151,6 +156,27 @@ describe("AssessmentInstitutionsController(e2e)-getRequestedAssessmentSummary",
         .auth(institutionUserToken, BEARER_AUTH_TYPE)
         .expect(HttpStatus.OK)
         .expect([]);
+
+      // Checking the same scenario with the ministry user, to make sure that a fake offering change was created.
+      // Arrange.
+      const ministryEndpoint = `/aest/assessment/application/${application.id}/requests`;
+      const ministryToken = await getAESTToken(
+        AESTGroups.BusinessAdministrators,
+      );
+      // Act/Assert
+      await request(app.getHttpServer())
+        .get(ministryEndpoint)
+        .auth(ministryToken, BEARER_AUTH_TYPE)
+        .expect(HttpStatus.OK)
+        .expect([
+          {
+            id: requestedOffering.id,
+            submittedDate: requestedOffering.submittedDate.toISOString(),
+            status: requestedOffering.offeringStatus,
+            requestType: RequestAssessmentTypeAPIOutDTO.OfferingRequest,
+            programId: requestedOffering.educationProgram.id,
+          },
+        ]);
     },
   );
 

sources/packages/backend/apps/api/src/route-controllers/assessment/assessment.aest.controller.ts

@@ -41,7 +41,7 @@ export class AssessmentAESTController extends BaseController {
     return this.assessmentControllerService.requestedStudentAssessmentSummary(
       applicationId,
       {
-        showOfferingChange: true,
+        includeOfferingChanges: true,
       },
     );
   }

sources/packages/backend/apps/api/src/route-controllers/assessment/assessment.controller.service.ts

@@ -322,20 +322,19 @@ export class AssessmentControllerService {
    * @param applicationId application id.
    * @param options options for request assessments,
    * - `studentId` student id.
-   * - `showOfferingChange` will decide weather to show assessment
+   * - `includeOfferingChanges` will decide whether to include assessment
    * request for offering change.
    * @returns assessment requests or exceptions for the student application.
    */
   async requestedStudentAssessmentSummary(
     applicationId: number,
     options?: {
       studentId?: number;
-      showOfferingChange?: boolean;
+      includeOfferingChanges?: boolean;
     },
   ): Promise<RequestAssessmentSummaryAPIOutDTO[]> {
-    const showOfferingChange = options?.showOfferingChange ? true : false;
     const requestAssessmentSummary: RequestAssessmentSummaryAPIOutDTO[] = [];
-    if (showOfferingChange) {
+    if (options?.includeOfferingChanges) {
       const offeringChange =
         await this.educationProgramOfferingService.getOfferingRequestsByApplicationId(
           applicationId,

sources/packages/backend/libs/test-utils/src/factories/offering-change-request.ts

@@ -2,25 +2,27 @@ import { EducationProgramOffering, OfferingStatus } from "@sims/sims-db";
 
 /**
  * Create a fake offering request change.
- * @param relations dependencies:
- *  - `currentOffering` current offering, which is requested for the changed.
+ * @param options dependencies:
+ *  - `currentOffering` current offering, which is requested for the changed, which is
+ * already saved in the DB.
  * @returns the current and requested offering.
  */
-export function createFakeOfferingRequestChange(relations: {
+export function createFakeOfferingRequestChange(options: {
   currentOffering: EducationProgramOffering;
 }): EducationProgramOffering[] {
   const now = new Date();
-  const requestedOfferingId = relations.currentOffering.id;
-  const requestedOffering = relations.currentOffering;
+  const requestedOfferingId = options.currentOffering.id;
+  const requestedOffering = options.currentOffering;
   delete requestedOffering.id;
   requestedOffering.offeringStatus = OfferingStatus.ChangeAwaitingApproval;
   requestedOffering.parentOffering =
-    relations.currentOffering.parentOffering ??
+    options.currentOffering.parentOffering ??
     ({ id: requestedOfferingId } as EducationProgramOffering);
   requestedOffering.precedingOffering = {
     id: requestedOfferingId,
   } as EducationProgramOffering;
   requestedOffering.createdAt = now;
+  requestedOffering.submittedDate = now;
 
   // Update the status and audit details of current offering.
   const precedingOffering = new EducationProgramOffering();