From 920ca4ad3f5792e07e369464c077b2928afbceb0 Mon Sep 17 00:00:00 2001
From: Tiago Graf <tiago.graf@quartech.com>
Date: Sun, 15 Mar 2026 17:57:22 -0700
Subject: [PATCH 01/16] Make location code optional

---
 .../models/institution-location.dto.ts        | 18 +++--
 .../institution-location.models.ts            |  3 +-
 .../institution-location.service.ts           | 56 ++++++++------
 .../entities/institution-location.model.ts    |  3 +-
 sources/packages/forms/package-lock.json      |  4 +-
 .../form-definitions/institutionlocation.json | 61 +++++++++++++++-
 .../modals/ApproveDenyDesignationModal.vue    | 73 ++++++++++++-------
 .../DesignationAgreementForm.models.ts        |  1 +
 .../http/dto/DesignationAgreement.dto.ts      |  5 +-
 .../http/dto/InstitutionLocation.dto.ts       | 11 ++-
 .../aest/institution/DesignationAESTView.vue  |  6 +-
 .../institution/AddInstitutionLocation.vue    | 13 ++--
 12 files changed, 179 insertions(+), 75 deletions(-)

diff --git a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts
index b991c181a7..2d65d659ba 100644
--- a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts
+++ b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts
@@ -1,4 +1,10 @@
-import { Allow, IsEmail, IsNotEmpty, Length } from "class-validator";
+import {
+  Allow,
+  IsEmail,
+  IsNotEmpty,
+  IsOptional,
+  Length,
+} from "class-validator";
 import {
   AddressAPIOutDTO,
   AddressDetailsAPIInDTO,
@@ -16,6 +22,8 @@ export class InstitutionLocationFormAPIInDTO extends AddressDetailsAPIInDTO {
   @Allow()
   institutionCode: string;
   @Allow()
+  noInstitutionCode?: boolean;
+  @Allow()
   primaryContactFirstName: string;
   @Allow()
   primaryContactLastName: string;
@@ -47,8 +55,8 @@ export class AESTInstitutionLocationAPIInDTO extends AddressDetailsAPIInDTO {
   primaryContactPhone: string;
   @IsNotEmpty()
   locationName: string;
-  @IsNotEmpty()
-  institutionCode: string;
+  @IsOptional()
+  institutionCode?: string | null;
 }
 
 /**
@@ -56,7 +64,7 @@ export class AESTInstitutionLocationAPIInDTO extends AddressDetailsAPIInDTO {
  */
 export class InstitutionLocationDetailsAPIOutDTO extends AddressDetailsAPIOutDTO {
   locationName: string;
-  institutionCode: string;
+  institutionCode: string | null;
   primaryContactFirstName: string;
   primaryContactLastName: string;
   primaryContactEmail: string;
@@ -80,7 +88,7 @@ export class InstitutionLocationAPIOutDTO {
     address: AddressAPIOutDTO;
   };
   primaryContact: InstitutionPrimaryContactAPIOutDTO;
-  institutionCode: string;
+  institutionCode?: string;
   designationStatus: DesignationStatus;
 }
 
diff --git a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.models.ts b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.models.ts
index 80e64c2674..46adf926fa 100644
--- a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.models.ts
+++ b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.models.ts
@@ -18,7 +18,8 @@ export interface LocationWithDesignationStatus {
  */
 export interface InstitutionLocationModel extends AddressInfo {
   locationName: string;
-  institutionCode: string;
+  institutionCode?: string;
+  noInstitutionCode?: boolean;
   primaryContactFirstName: string;
   primaryContactLastName: string;
   primaryContactEmail: string;
diff --git a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
index 307d016b15..f8b8d90f00 100644
--- a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
+++ b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
@@ -40,16 +40,20 @@ export class InstitutionLocationService extends RecordDataModelService<Instituti
     const auditUser = { id: auditUserId } as User;
     const institution = { id: institutionId };
 
-    const isInstitutionCodeDuplicate = await this.hasLocationCodeForInstitution(
-      data.institutionCode,
-      { institutionId },
-    );
+    const hasInstitutionCode = !!data.institutionCode?.trim();
 
-    if (isInstitutionCodeDuplicate) {
-      throw new CustomNamedError(
-        "Duplicate institution location code.",
-        DUPLICATE_INSTITUTION_LOCATION_CODE,
-      );
+    if (hasInstitutionCode) {
+      const isInstitutionCodeDuplicate =
+        await this.hasLocationCodeForInstitution(data.institutionCode, {
+          institutionId,
+        });
+
+      if (isInstitutionCodeDuplicate) {
+        throw new CustomNamedError(
+          "Duplicate institution location code.",
+          DUPLICATE_INSTITUTION_LOCATION_CODE,
+        );
+      }
     }
 
     const saveLocation: InstitutionLocation = {
@@ -64,7 +68,7 @@ export class InstitutionLocationService extends RecordDataModelService<Instituti
         phone: data.primaryContactPhone,
       },
       institution: institution,
-      institutionCode: data.institutionCode,
+      institutionCode: hasInstitutionCode ? data.institutionCode : null,
       creator: auditUser,
     } as InstitutionLocation;
 
@@ -108,16 +112,24 @@ export class InstitutionLocationService extends RecordDataModelService<Instituti
     locationId: number,
     auditUserId: number,
   ): Promise<InstitutionLocation> {
-    const isInstitutionCodeDuplicate = await this.hasLocationCodeForInstitution(
-      institutionLocationData.institutionCode,
-      { locationId },
-    );
+    const hasInstitutionCode =
+      !!institutionLocationData.institutionCode?.trim();
 
-    if (isInstitutionCodeDuplicate) {
-      throw new CustomNamedError(
-        "Duplicate institution location code.",
-        DUPLICATE_INSTITUTION_LOCATION_CODE,
-      );
+    if (hasInstitutionCode) {
+      const isInstitutionCodeDuplicate =
+        await this.hasLocationCodeForInstitution(
+          institutionLocationData.institutionCode,
+          {
+            locationId,
+          },
+        );
+
+      if (isInstitutionCodeDuplicate) {
+        throw new CustomNamedError(
+          "Duplicate institution location code.",
+          DUPLICATE_INSTITUTION_LOCATION_CODE,
+        );
+      }
     }
 
     const saveLocation: InstitutionLocation = {
@@ -131,7 +143,9 @@ export class InstitutionLocationService extends RecordDataModelService<Instituti
         email: institutionLocationData.primaryContactEmail,
         phone: institutionLocationData.primaryContactPhone,
       },
-      institutionCode: institutionLocationData.institutionCode,
+      institutionCode: hasInstitutionCode
+        ? institutionLocationData.institutionCode
+        : null,
       id: locationId,
       modifier: { id: auditUserId } as User,
     } as InstitutionLocation;
@@ -332,7 +346,7 @@ export class InstitutionLocationService extends RecordDataModelService<Instituti
   async getLocation(
     locationId: number,
   ): Promise<LocationWithDesignationStatus> {
-    return this.buildLocationQuery(locationId, undefined).getRawOne();
+    return this.buildLocationQuery(locationId).getRawOne();
   }
 
   /**
diff --git a/sources/packages/backend/libs/sims-db/src/entities/institution-location.model.ts b/sources/packages/backend/libs/sims-db/src/entities/institution-location.model.ts
index 07ff8f89ce..e8ff2e7583 100644
--- a/sources/packages/backend/libs/sims-db/src/entities/institution-location.model.ts
+++ b/sources/packages/backend/libs/sims-db/src/entities/institution-location.model.ts
@@ -43,8 +43,9 @@ export class InstitutionLocation extends RecordDataModel {
 
   @Column({
     name: "institution_code",
+    nullable: true,
   })
-  institutionCode: string;
+  institutionCode?: string;
 
   @Column({
     name: "primary_contact",
diff --git a/sources/packages/forms/package-lock.json b/sources/packages/forms/package-lock.json
index 490da0b6dd..4e843e6928 100644
--- a/sources/packages/forms/package-lock.json
+++ b/sources/packages/forms/package-lock.json
@@ -450,6 +450,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -776,7 +777,8 @@
       "version": "5.9.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "v8-compile-cache-lib": {
       "version": "3.0.1",
diff --git a/sources/packages/forms/src/form-definitions/institutionlocation.json b/sources/packages/forms/src/form-definitions/institutionlocation.json
index 4ce5edc04c..44271c8002 100644
--- a/sources/packages/forms/src/form-definitions/institutionlocation.json
+++ b/sources/packages/forms/src/form-definitions/institutionlocation.json
@@ -73,15 +73,40 @@
         },
         {
           "label": "Institution location code",
-          "tooltip": "Unique 4 digit alpha code assigned the first time an institution is designated in Canada. If your institution has not yet been designated, input a random 4-letter code as a temporary Institution Location Code, and contact SABC to revise this code once your permanent code has been received. This code must be a valid federal education institution code prior to students submitting applications",
           "tableView": true,
           "case": "uppercase",
           "validate": {
-            "required": true,
             "minLength": 4,
             "maxLength": 4,
-            "pattern": "[A-Z]*"
+            "pattern": "[A-Z]*",
+            "custom": "valid = (!data.noInstitutionCode && !input) ? 'Institution location code is required.' : true;"
           },
+          "logic": [
+            {
+              "name": "Disable and clear when no institution location code",
+              "trigger": {
+                "type": "javascript",
+                "javascript": "result = data.noInstitutionCode === true"
+              },
+              "actions": [
+                {
+                  "name": "Disable field",
+                  "type": "property",
+                  "property": {
+                    "label": "Disabled",
+                    "value": "disabled",
+                    "type": "boolean"
+                  },
+                  "state": true
+                },
+                {
+                  "name": "Clear value",
+                  "type": "value",
+                  "value": "value = '';"
+                }
+              ]
+            }
+          ],
           "key": "institutionCode",
           "attributes": {
             "data-cy": "institutionCode"
@@ -89,6 +114,36 @@
           "type": "textfield",
           "input": true
         },
+        {
+          "label": "I do not have an institution location code.",
+          "tableView": false,
+          "defaultValue": false,
+          "key": "noInstitutionCode",
+          "attributes": {
+            "data-cy": "noInstitutionCode"
+          },
+          "type": "checkbox",
+          "input": true
+        },
+        {
+          "label": "Missing institution location code",
+          "tag": "p",
+          "className": "alert alert-warning fa fa-exclamation-triangle w-100",
+          "attrs": [
+            {
+              "attr": "",
+              "value": ""
+            }
+          ],
+          "content": "<strong class=\"ml-2\">Missing institution location code</strong><br><span>Please note: You will be able to create this location without an institution location code. However, you will not be able to designate this location until you obtain a federally issued code from StudentAid BC. Once you submit your location please email designat@gov.bc.ca and request they provide you with the code and update the location information.</span>",
+          "refreshOnChange": true,
+          "hidden": true,
+          "key": "noInstitutionCodeBanner",
+          "customConditional": "show = data.noInstitutionCode === true;",
+          "type": "htmlelement",
+          "input": false,
+          "tableView": false
+        },
         {
           "label": "Address line 1",
           "tableView": false,
diff --git a/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue b/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue
index e2902bf7b6..f4d980bc74 100644
--- a/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue
+++ b/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue
@@ -1,6 +1,6 @@
 <template>
   <v-form ref="approveDenyDesignation">
-    <modal-dialog-base :showDialog="showDialog" :title="title">
+    <modal-dialog-base :show-dialog="showDialog" :title="title">
       <template #content>
         <error-summary :errors="approveDenyDesignation.errors" />
         <p class="label-value">{{ subTitle }}</p>
@@ -28,21 +28,42 @@
                 hide-details="auto" /></v-col></v-row
           ><v-divider-opaque />
           <h4 class="label-bold color-blue">Designate locations</h4>
-          <v-row
+          <template
             v-for="(item, index) in formModel.locationsDesignations"
             :key="index"
-            ><v-col
-              ><title-value
-                :propertyTitle="item.locationName"
-                :propertyValue="item.locationAddress" /></v-col
-            ><v-col
-              ><v-checkbox
-                class="float-right"
-                color="primary"
-                v-model="item.approved"
-                hide-details="auto" /></v-col
-          ></v-row> </content-group
-        ><v-textarea
+          >
+            <v-row>
+              <v-col>
+                <title-value
+                  :property-title="item.locationName"
+                  :property-value="item.locationAddress"
+                />
+                <title-value :property-title="item.institutionCode ?? ''" />
+              </v-col>
+              <v-col cols="auto">
+                <v-checkbox
+                  color="primary"
+                  v-model="item.approved"
+                  :hide-details="true"
+                  :rules="[
+                    (v: boolean) =>
+                      !v ||
+                      !!item.institutionCode ||
+                      'No institution location code',
+                  ]"
+                />
+              </v-col>
+            </v-row>
+            <v-row v-if="item.approved && !item.institutionCode" class="mt-0">
+              <v-col class="text-right pt-0">
+                <span class="text-error d-block"
+                  >No institution location code</span
+                >
+              </v-col>
+            </v-row>
+          </template>
+        </content-group>
+        <v-textarea
           class="mt-4"
           label="Notes"
           placeholder="Long text..."
@@ -58,11 +79,13 @@
           <template #="{ notAllowed }">
             <footer-buttons
               :processing="processing"
-              :primaryLabel="submitLabel"
-              @primaryClick="submit"
-              @secondaryClick="cancel"
-              :disablePrimaryButton="notAllowed" /></template
-        ></check-permission-role>
+              :primary-label="submitLabel"
+              @primary-click="submit"
+              @secondary-click="cancel"
+              :disable-primary-button="notAllowed"
+            />
+          </template>
+        </check-permission-role>
       </template>
     </modal-dialog-base>
   </v-form>
@@ -70,16 +93,14 @@
 
 <script lang="ts">
 import ModalDialogBase from "@/components/generic/ModalDialogBase.vue";
-import {
-  UpdateDesignationDetailsAPIInDTO,
-  DesignationAgreementStatus,
-} from "@/services/http/dto";
+import { DesignationAgreementStatus } from "@/services/http/dto";
 import { useModalDialog, useRules } from "@/composables";
 import CheckPermissionRole from "@/components/generic/CheckPermissionRole.vue";
 import { Role, VForm } from "@/types";
 import { ref, reactive, defineComponent } from "vue";
 import ErrorSummary from "@/components/generic/ErrorSummary.vue";
 import TitleValue from "@/components/generic/TitleValue.vue";
+import { UpdateDesignationDetailsModel } from "@/components/partial-view/DesignationAgreement/DesignationAgreementForm.models";
 
 export default defineComponent({
   components: {
@@ -100,9 +121,9 @@ export default defineComponent({
       showDialog,
       resolvePromise,
       showModal: showModalInternal,
-    } = useModalDialog<UpdateDesignationDetailsAPIInDTO | boolean>();
+    } = useModalDialog<UpdateDesignationDetailsModel | boolean>();
     const approveDenyDesignation = ref({} as VForm);
-    const formModel = reactive({} as UpdateDesignationDetailsAPIInDTO);
+    const formModel = reactive({} as UpdateDesignationDetailsModel);
     const title = ref("");
     const subTitle = ref("");
     const submitLabel = ref("");
@@ -110,7 +131,7 @@ export default defineComponent({
     const { checkNotesLengthRule, checkStringDateFormatRule } = useRules();
 
     //Setting the title values based on the DesignationAgreementStatus status passed to show modal.
-    const showModal = async (designation: UpdateDesignationDetailsAPIInDTO) => {
+    const showModal = async (designation: UpdateDesignationDetailsModel) => {
       formModel.note = "";
       formModel.designationStatus = designation.designationStatus;
       formModel.locationsDesignations = designation.locationsDesignations;
diff --git a/sources/packages/web/src/components/partial-view/DesignationAgreement/DesignationAgreementForm.models.ts b/sources/packages/web/src/components/partial-view/DesignationAgreement/DesignationAgreementForm.models.ts
index b0e775bd8f..444975eb6a 100644
--- a/sources/packages/web/src/components/partial-view/DesignationAgreement/DesignationAgreementForm.models.ts
+++ b/sources/packages/web/src/components/partial-view/DesignationAgreement/DesignationAgreementForm.models.ts
@@ -68,6 +68,7 @@ export interface UpdateDesignationLocationsListItem {
   locationId: number;
   locationName: string;
   locationAddress: string;
+  institutionCode?: string;
   requestForDesignation: boolean;
   approvedForDesignation?: boolean;
   approved: boolean;
diff --git a/sources/packages/web/src/services/http/dto/DesignationAgreement.dto.ts b/sources/packages/web/src/services/http/dto/DesignationAgreement.dto.ts
index 4f958891dc..b7cecb6cac 100644
--- a/sources/packages/web/src/services/http/dto/DesignationAgreement.dto.ts
+++ b/sources/packages/web/src/services/http/dto/DesignationAgreement.dto.ts
@@ -18,7 +18,7 @@ export interface DesignationAgreementAPIOutDTO {
   locationsDesignations: LocationDesignationAPIOutDTO[];
   startDate: string;
   endDate: string;
-  submittedData: any;
+  submittedData: unknown;
   institutionId: number;
   institutionName: string;
   institutionType: string;
@@ -42,8 +42,7 @@ export interface DesignationAgreementDetailsAPIOutDTO {
   endDate?: string;
 }
 
-export interface PendingDesignationAgreementDetailsAPIOutDTO
-  extends DesignationAgreementDetailsAPIOutDTO {
+export interface PendingDesignationAgreementDetailsAPIOutDTO extends DesignationAgreementDetailsAPIOutDTO {
   legalOperatingName: string;
 }
 
diff --git a/sources/packages/web/src/services/http/dto/InstitutionLocation.dto.ts b/sources/packages/web/src/services/http/dto/InstitutionLocation.dto.ts
index 5b5f2434b6..4cd906b607 100644
--- a/sources/packages/web/src/services/http/dto/InstitutionLocation.dto.ts
+++ b/sources/packages/web/src/services/http/dto/InstitutionLocation.dto.ts
@@ -15,6 +15,8 @@ export class InstitutionLocationFormAPIInDTO extends AddressDetailsFormAPIDTO {
   @Expose()
   institutionCode: string;
   @Expose()
+  noInstitutionCode?: boolean;
+  @Expose()
   primaryContactFirstName: string;
   @Expose()
   primaryContactLastName: string;
@@ -36,9 +38,7 @@ export class InstitutionLocationPrimaryContactAPIInDTO {
 }
 
 export class InstitutionLocationAPIInDTO
-  implements
-    AddressDetailsFormAPIDTO,
-    InstitutionLocationPrimaryContactAPIInDTO
+  implements AddressDetailsFormAPIDTO, InstitutionLocationPrimaryContactAPIInDTO
 {
   @Expose()
   locationName: string;
@@ -76,8 +76,7 @@ export class InstitutionLocationAPIInDTO
   otherCountry?: string;
 }
 
-export interface InstitutionLocationFormAPIOutDTO
-  extends AddressDetailsFormAPIDTO {
+export interface InstitutionLocationFormAPIOutDTO extends AddressDetailsFormAPIDTO {
   locationName: string;
   institutionCode: string;
   primaryContactFirstName: string;
@@ -93,7 +92,7 @@ export interface InstitutionLocationAPIOutDTO {
     address: AddressAPIOutDTO;
   };
   primaryContact: InstitutionPrimaryContactAPIOutDTO;
-  institutionCode: string;
+  institutionCode?: string;
   designationStatus: DesignationAgreementStatus;
 }
 
diff --git a/sources/packages/web/src/views/aest/institution/DesignationAESTView.vue b/sources/packages/web/src/views/aest/institution/DesignationAESTView.vue
index f35bf12f0c..d99841ee3d 100644
--- a/sources/packages/web/src/views/aest/institution/DesignationAESTView.vue
+++ b/sources/packages/web/src/views/aest/institution/DesignationAESTView.vue
@@ -3,8 +3,8 @@
     <template #header>
       <header-navigator
         :title="navigationTitle"
-        subTitle="View designation agreement"
-        :routeLocation="routeLocation"
+        sub-title="View designation agreement"
+        :route-location="routeLocation"
       >
         <template #buttons>
           <check-permission-role
@@ -179,6 +179,8 @@ export default defineComponent({
             designationLocation.locationAddress = formatter.getFormattedAddress(
               institutionLocation.data.address,
             );
+            designationLocation.institutionCode =
+              institutionLocation.institutionCode;
             const existingDesignationLocation =
               designationAgreement.value.locationsDesignations.find(
                 (item) => item.locationId === institutionLocation.id,
diff --git a/sources/packages/web/src/views/institution/AddInstitutionLocation.vue b/sources/packages/web/src/views/institution/AddInstitutionLocation.vue
index b4b02f61a1..9a5fa89ce5 100644
--- a/sources/packages/web/src/views/institution/AddInstitutionLocation.vue
+++ b/sources/packages/web/src/views/institution/AddInstitutionLocation.vue
@@ -3,18 +3,18 @@
     <template #header>
       <header-navigator
         title="Manage locations"
-        :routeLocation="{ name: InstitutionRoutesConst.MANAGE_LOCATIONS }"
-        subTitle="Add Location"
+        :route-location="{ name: InstitutionRoutesConst.MANAGE_LOCATIONS }"
+        sub-title="Add Location"
         data-cy="addLocationHeader"
       />
     </template>
-    <formio-container formName="institutionLocation" @submitted="submitted">
+    <formio-container form-name="institutionLocation" @submitted="submitted">
       <template #actions="{ submit }">
         <footer-buttons
           :processing="processing"
-          primaryLabel="Submit"
-          @primaryClick="submit"
-          :showSecondaryButton="false"
+          primary-label="Submit"
+          @primary-click="submit"
+          :show-secondary-button="false"
         />
       </template>
     </formio-container>
@@ -47,6 +47,7 @@ export default defineComponent({
     const snackBar = useSnackBar();
     const { excludeExtraneousValues } = useFormioUtils();
     const router = useRouter();
+
     const submitted = async (form: FormIOForm<unknown>) => {
       processing.value = true;
       if (props.createMode) {

From 1e9b9029d190ff06fb7e34d92a8eab317c3b7f17 Mon Sep 17 00:00:00 2001
From: Tiago Graf <tiago.graf@quartech.com>
Date: Sun, 15 Mar 2026 18:31:55 -0700
Subject: [PATCH 02/16] Added e2e tests

---
 .../api/src/constants/error-code.constants.ts |   5 +
 ...ler.updateDesignationAgreement.e2e-spec.ts | 209 ++++++++++++++++++
 .../designation-agreement.aest.controller.ts  |  18 +-
 ...troller.getInstitutionLocation.e2e-spec.ts |  78 +++++++
 ...ocation.aest.controller.update.e2e-spec.ts | 104 +++++++++
 .../institution-location.service.ts           |  18 ++
 6 files changed, 431 insertions(+), 1 deletion(-)
 create mode 100644 sources/packages/backend/apps/api/src/route-controllers/designation-agreement/_tests_/e2e/designation-agreement.aest.controller.updateDesignationAgreement.e2e-spec.ts
 create mode 100644 sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.getInstitutionLocation.e2e-spec.ts
 create mode 100644 sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.update.e2e-spec.ts

diff --git a/sources/packages/backend/apps/api/src/constants/error-code.constants.ts b/sources/packages/backend/apps/api/src/constants/error-code.constants.ts
index 6a5958a131..04a954a625 100644
--- a/sources/packages/backend/apps/api/src/constants/error-code.constants.ts
+++ b/sources/packages/backend/apps/api/src/constants/error-code.constants.ts
@@ -143,6 +143,11 @@ export const DUPLICATE_SABC_CODE = "DUPLICATE_SABC_CODE";
  * Institution location not valid.
  */
 export const INSTITUTION_LOCATION_NOT_VALID = "INSTITUTION_LOCATION_NOT_VALID";
+/**
+ * One or more approved locations are missing an institution location code.
+ */
+export const MISSING_INSTITUTION_LOCATION_CODE =
+  "MISSING_INSTITUTION_LOCATION_CODE";
 
 /**
  * Request for disability not allowed.
diff --git a/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/_tests_/e2e/designation-agreement.aest.controller.updateDesignationAgreement.e2e-spec.ts b/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/_tests_/e2e/designation-agreement.aest.controller.updateDesignationAgreement.e2e-spec.ts
new file mode 100644
index 0000000000..9953643381
--- /dev/null
+++ b/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/_tests_/e2e/designation-agreement.aest.controller.updateDesignationAgreement.e2e-spec.ts
@@ -0,0 +1,209 @@
+import { HttpStatus, INestApplication } from "@nestjs/common";
+import * as request from "supertest";
+import { DesignationAgreementStatus } from "@sims/sims-db";
+import {
+  AESTGroups,
+  BEARER_AUTH_TYPE,
+  InstitutionTokenTypes,
+  createTestingAppModule,
+  getAESTToken,
+  getAuthRelatedEntities,
+} from "../../../../testHelpers";
+import {
+  E2EDataSources,
+  createE2EDataSources,
+  createFakeDesignationAgreement,
+  createFakeInstitutionLocation,
+  createFakeUser,
+} from "@sims/test-utils";
+import { MISSING_INSTITUTION_LOCATION_CODE } from "../../../../constants";
+
+describe("DesignationAgreementAESTController(e2e)-updateDesignationAgreement", () => {
+  let app: INestApplication;
+  let db: E2EDataSources;
+
+  beforeAll(async () => {
+    const { nestApplication, dataSource } = await createTestingAppModule();
+    app = nestApplication;
+    db = createE2EDataSources(dataSource);
+  });
+
+  it("Should approve a designation agreement when all payload locations belong to the institution.", async () => {
+    // Arrange
+    const { institution } = await getAuthRelatedEntities(
+      db.dataSource,
+      InstitutionTokenTypes.CollegeFAdminLegalSigningUser,
+    );
+    const fakeLocation = createFakeInstitutionLocation({ institution });
+    const savedLocation = await db.institutionLocation.save(fakeLocation);
+    const fakeUser = await db.user.save(createFakeUser());
+    const fakeDesignation = createFakeDesignationAgreement({
+      fakeInstitution: institution,
+      fakeInstitutionLocations: [savedLocation],
+      fakeUser,
+    });
+    fakeDesignation.designationStatus = DesignationAgreementStatus.Pending;
+    const savedDesignation =
+      await db.designationAgreement.save(fakeDesignation);
+    const token = await getAESTToken(AESTGroups.BusinessAdministrators);
+    const endpoint = `/aest/designation-agreement/${savedDesignation.id}`;
+
+    // Act
+    await request(app.getHttpServer())
+      .patch(endpoint)
+      .auth(token, BEARER_AUTH_TYPE)
+      .send({
+        designationStatus: DesignationAgreementStatus.Approved,
+        startDate: "2026-01-01",
+        endDate: "2027-12-31",
+        locationsDesignations: [
+          { locationId: savedLocation.id, approved: true },
+        ],
+        note: "Designation approved.",
+      })
+      .expect(HttpStatus.OK);
+
+    // Assert
+    const updatedDesignation = await db.designationAgreement.findOneBy({
+      id: savedDesignation.id,
+    });
+    expect(updatedDesignation.designationStatus).toBe(
+      DesignationAgreementStatus.Approved,
+    );
+  });
+
+  it("Should decline a designation agreement.", async () => {
+    // Arrange
+    const { institution } = await getAuthRelatedEntities(
+      db.dataSource,
+      InstitutionTokenTypes.CollegeFAdminLegalSigningUser,
+    );
+    const fakeLocation = createFakeInstitutionLocation({ institution });
+    const savedLocation = await db.institutionLocation.save(fakeLocation);
+    const fakeUser = await db.user.save(createFakeUser());
+    const fakeDesignation = createFakeDesignationAgreement({
+      fakeInstitution: institution,
+      fakeInstitutionLocations: [savedLocation],
+      fakeUser,
+    });
+    fakeDesignation.designationStatus = DesignationAgreementStatus.Pending;
+    const savedDesignation =
+      await db.designationAgreement.save(fakeDesignation);
+    const token = await getAESTToken(AESTGroups.BusinessAdministrators);
+    const endpoint = `/aest/designation-agreement/${savedDesignation.id}`;
+
+    // Act
+    await request(app.getHttpServer())
+      .patch(endpoint)
+      .auth(token, BEARER_AUTH_TYPE)
+      .send({
+        designationStatus: DesignationAgreementStatus.Declined,
+        note: "Designation declined.",
+      })
+      .expect(HttpStatus.OK);
+
+    // Assert
+    const updatedDesignation = await db.designationAgreement.findOneBy({
+      id: savedDesignation.id,
+    });
+    expect(updatedDesignation.designationStatus).toBe(
+      DesignationAgreementStatus.Declined,
+    );
+  });
+
+  it("Should return not found when the designation agreement does not exist.", async () => {
+    // Arrange
+    const token = await getAESTToken(AESTGroups.BusinessAdministrators);
+    const endpoint = `/aest/designation-agreement/99999999`;
+
+    // Act/Assert
+    await request(app.getHttpServer())
+      .patch(endpoint)
+      .auth(token, BEARER_AUTH_TYPE)
+      .send({
+        designationStatus: DesignationAgreementStatus.Declined,
+        note: "Some note.",
+      })
+      .expect(HttpStatus.NOT_FOUND);
+  });
+
+  it("Should return unprocessable entity when approved location does not belong to the designation institution.", async () => {
+    // Arrange
+    const { institution } = await getAuthRelatedEntities(
+      db.dataSource,
+      InstitutionTokenTypes.CollegeFAdminLegalSigningUser,
+    );
+    const fakeLocation = createFakeInstitutionLocation({ institution });
+    const savedLocation = await db.institutionLocation.save(fakeLocation);
+    const fakeUser = await db.user.save(createFakeUser());
+    const fakeDesignation = createFakeDesignationAgreement({
+      fakeInstitution: institution,
+      fakeInstitutionLocations: [savedLocation],
+      fakeUser,
+    });
+    fakeDesignation.designationStatus = DesignationAgreementStatus.Pending;
+    const savedDesignation =
+      await db.designationAgreement.save(fakeDesignation);
+    // Create a location that belongs to a different institution.
+    const unrelatedLocation = createFakeInstitutionLocation();
+    const savedUnrelatedLocation =
+      await db.institutionLocation.save(unrelatedLocation);
+    const token = await getAESTToken(AESTGroups.BusinessAdministrators);
+    const endpoint = `/aest/designation-agreement/${savedDesignation.id}`;
+
+    // Act/Assert
+    await request(app.getHttpServer())
+      .patch(endpoint)
+      .auth(token, BEARER_AUTH_TYPE)
+      .send({
+        designationStatus: DesignationAgreementStatus.Approved,
+        startDate: "2026-01-01",
+        endDate: "2027-12-31",
+        locationsDesignations: [
+          { locationId: savedUnrelatedLocation.id, approved: true },
+        ],
+        note: "Attempt with unrelated location.",
+      })
+      .expect(HttpStatus.UNPROCESSABLE_ENTITY);
+  });
+
+  it("Should return unprocessable entity when an approved location is missing an institution location code.", async () => {
+    // Arrange
+    const { institution } = await getAuthRelatedEntities(
+      db.dataSource,
+      InstitutionTokenTypes.CollegeFAdminLegalSigningUser,
+    );
+    // Create a location without an institution code to simulate locations
+    // submitted with the "I do not have an institution location code" option selected.
+    const fakeLocation = createFakeInstitutionLocation({ institution });
+    fakeLocation.institutionCode = null;
+    const savedLocation = await db.institutionLocation.save(fakeLocation);
+    const fakeUser = await db.user.save(createFakeUser());
+    const fakeDesignation = createFakeDesignationAgreement({
+      fakeInstitution: institution,
+      fakeInstitutionLocations: [savedLocation],
+      fakeUser,
+    });
+    fakeDesignation.designationStatus = DesignationAgreementStatus.Pending;
+    const savedDesignation =
+      await db.designationAgreement.save(fakeDesignation);
+    const token = await getAESTToken(AESTGroups.BusinessAdministrators);
+    const endpoint = `/aest/designation-agreement/${savedDesignation.id}`;
+
+    // Act/Assert
+    const response = await request(app.getHttpServer())
+      .patch(endpoint)
+      .auth(token, BEARER_AUTH_TYPE)
+      .send({
+        designationStatus: DesignationAgreementStatus.Approved,
+        startDate: "2026-01-01",
+        endDate: "2027-12-31",
+        locationsDesignations: [
+          { locationId: savedLocation.id, approved: true },
+        ],
+        note: "Attempt to approve location without code.",
+      })
+      .expect(HttpStatus.UNPROCESSABLE_ENTITY);
+    expect(response.body.errorType).toBe(MISSING_INSTITUTION_LOCATION_CODE);
+  });
+});
diff --git a/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/designation-agreement.aest.controller.ts b/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/designation-agreement.aest.controller.ts
index f8c9418e31..9e9587f012 100644
--- a/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/designation-agreement.aest.controller.ts
+++ b/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/designation-agreement.aest.controller.ts
@@ -41,6 +41,7 @@ import {
 import BaseController from "../BaseController";
 import { Role } from "../../auth/roles.enum";
 import { ClientTypeBaseRoute } from "../../types";
+import { MISSING_INSTITUTION_LOCATION_CODE } from "../../constants";
 
 @AllowAuthorizedParty(AuthorizedParties.aest)
 @Groups(UserGroups.AESTUser)
@@ -127,7 +128,7 @@ export class DesignationAgreementAESTController extends BaseController {
   })
   @ApiUnprocessableEntityResponse({
     description:
-      "One or more locations provided do not belong to designation institution.",
+      "One or more locations provided do not belong to designation institution or are missing an institution location code.",
   })
   async updateDesignationAgreement(
     @Param("designationId", ParseIntPipe) designationId: number,
@@ -157,6 +158,21 @@ export class DesignationAgreementAESTController extends BaseController {
           "One or more locations provided do not belong to designation institution.",
         );
       }
+      const approvedLocationIds = payload.locationsDesignations
+        .filter((location) => location.approved)
+        .map((location) => location.locationId);
+      if (approvedLocationIds.length > 0) {
+        const allApprovedLocationsHaveCode =
+          await this.institutionLocationService.validateLocationsHaveInstitutionCode(
+            approvedLocationIds,
+          );
+        if (!allApprovedLocationsHaveCode) {
+          throw new UnprocessableEntityException(
+            "One or more approved locations are missing an institution location code.",
+            MISSING_INSTITUTION_LOCATION_CODE,
+          );
+        }
+      }
     }
     await this.designationAgreementService.updateDesignation(
       designationId,
diff --git a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.getInstitutionLocation.e2e-spec.ts b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.getInstitutionLocation.e2e-spec.ts
new file mode 100644
index 0000000000..23f0b0847b
--- /dev/null
+++ b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.getInstitutionLocation.e2e-spec.ts
@@ -0,0 +1,78 @@
+import { HttpStatus, INestApplication } from "@nestjs/common";
+import * as request from "supertest";
+import {
+  AESTGroups,
+  BEARER_AUTH_TYPE,
+  createTestingAppModule,
+  getAESTToken,
+} from "../../../../testHelpers";
+import {
+  E2EDataSources,
+  createE2EDataSources,
+  createFakeInstitutionLocation,
+} from "@sims/test-utils";
+
+describe("InstitutionLocationAESTController(e2e)-getInstitutionLocation", () => {
+  let app: INestApplication;
+  let db: E2EDataSources;
+
+  beforeAll(async () => {
+    const { nestApplication, dataSource } = await createTestingAppModule();
+    app = nestApplication;
+    db = createE2EDataSources(dataSource);
+  });
+
+  it("Should return institution location with a null institution code when none is assigned.", async () => {
+    // Arrange
+    // Create a location without an institution code to simulate locations
+    // submitted with the "I do not have an institution location code" option selected.
+    const location = createFakeInstitutionLocation();
+    location.institutionCode = null;
+    const savedLocation = await db.institutionLocation.save(location);
+    const token = await getAESTToken(AESTGroups.BusinessAdministrators);
+    const endpoint = `/aest/location/${savedLocation.id}`;
+
+    // Act/Assert
+    const response = await request(app.getHttpServer())
+      .get(endpoint)
+      .auth(token, BEARER_AUTH_TYPE)
+      .expect(HttpStatus.OK);
+    expect(response.body.institutionCode).toBeNull();
+  });
+
+  it("Should return institution location with the institution code when one is assigned.", async () => {
+    // Arrange
+    const location = createFakeInstitutionLocation();
+    const savedLocation = await db.institutionLocation.save(location);
+    const token = await getAESTToken(AESTGroups.BusinessAdministrators);
+    const endpoint = `/aest/location/${savedLocation.id}`;
+
+    // Act/Assert
+    const response = await request(app.getHttpServer())
+      .get(endpoint)
+      .auth(token, BEARER_AUTH_TYPE)
+      .expect(HttpStatus.OK);
+    expect(response.body.institutionCode).toBe(savedLocation.institutionCode);
+  });
+
+  it("Should return not found when the institution location does not exist.", async () => {
+    // Arrange
+    const token = await getAESTToken(AESTGroups.BusinessAdministrators);
+    const endpoint = `/aest/location/99999999`;
+
+    // Act/Assert
+    await request(app.getHttpServer())
+      .get(endpoint)
+      .auth(token, BEARER_AUTH_TYPE)
+      .expect(HttpStatus.NOT_FOUND)
+      .expect({
+        statusCode: HttpStatus.NOT_FOUND,
+        message: "Institution Location was not found.",
+        error: "Not Found",
+      });
+  });
+
+  afterAll(async () => {
+    await app?.close();
+  });
+});
diff --git a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.update.e2e-spec.ts b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.update.e2e-spec.ts
new file mode 100644
index 0000000000..e4d0a761e2
--- /dev/null
+++ b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.update.e2e-spec.ts
@@ -0,0 +1,104 @@
+import { HttpStatus, INestApplication } from "@nestjs/common";
+import * as request from "supertest";
+import {
+  AESTGroups,
+  BEARER_AUTH_TYPE,
+  createTestingAppModule,
+  getAESTToken,
+} from "../../../../testHelpers";
+import {
+  E2EDataSources,
+  createE2EDataSources,
+  createFakeInstitutionLocation,
+} from "@sims/test-utils";
+import { DUPLICATE_INSTITUTION_LOCATION_CODE } from "../../../../constants";
+
+describe("InstitutionLocationAESTController(e2e)-update", () => {
+  let app: INestApplication;
+  let db: E2EDataSources;
+
+  beforeAll(async () => {
+    const { nestApplication, dataSource } = await createTestingAppModule();
+    app = nestApplication;
+    db = createE2EDataSources(dataSource);
+  });
+
+  it("Should save institution location with null code when an empty institution code is submitted.", async () => {
+    // Arrange
+    const location = createFakeInstitutionLocation();
+    const savedLocation = await db.institutionLocation.save(location);
+    const token = await getAESTToken(AESTGroups.BusinessAdministrators);
+    const endpoint = `/aest/location/${savedLocation.id}`;
+    const address = savedLocation.data.address;
+
+    // Act
+    await request(app.getHttpServer())
+      .patch(endpoint)
+      .auth(token, BEARER_AUTH_TYPE)
+      .send({
+        locationName: savedLocation.name,
+        institutionCode: "",
+        primaryContactFirstName: savedLocation.primaryContact.firstName,
+        primaryContactLastName: savedLocation.primaryContact.lastName,
+        primaryContactEmail: savedLocation.primaryContact.email,
+        primaryContactPhone: savedLocation.primaryContact.phone,
+        addressLine1: address.addressLine1,
+        city: address.city,
+        country: address.country,
+        postalCode: address.postalCode,
+        selectedCountry: address.selectedCountry,
+        provinceState: address.provinceState,
+        canadaPostalCode: address.postalCode,
+      })
+      .expect(HttpStatus.OK);
+
+    // Assert
+    const updatedLocation = await db.institutionLocation.findOneBy({
+      id: savedLocation.id,
+    });
+    expect(updatedLocation.institutionCode).toBeNull();
+  });
+
+  it("Should return unprocessable entity when trying to update with a code already assigned to another location in the same institution.", async () => {
+    // Arrange
+    // Create two locations for the same institution so both share the same institutionCode conflict check scope.
+    const locationA = createFakeInstitutionLocation();
+    const savedLocationA = await db.institutionLocation.save(locationA);
+    const locationB = createFakeInstitutionLocation({
+      institution: savedLocationA.institution,
+    });
+    const savedLocationB = await db.institutionLocation.save(locationB);
+    const token = await getAESTToken(AESTGroups.BusinessAdministrators);
+    const endpoint = `/aest/location/${savedLocationB.id}`;
+    const address = savedLocationB.data.address;
+
+    // Act/Assert — attempt to assign locationA's code to locationB.
+    await request(app.getHttpServer())
+      .patch(endpoint)
+      .auth(token, BEARER_AUTH_TYPE)
+      .send({
+        locationName: savedLocationB.name,
+        institutionCode: savedLocationA.institutionCode,
+        primaryContactFirstName: savedLocationB.primaryContact.firstName,
+        primaryContactLastName: savedLocationB.primaryContact.lastName,
+        primaryContactEmail: savedLocationB.primaryContact.email,
+        primaryContactPhone: savedLocationB.primaryContact.phone,
+        addressLine1: address.addressLine1,
+        city: address.city,
+        country: address.country,
+        postalCode: address.postalCode,
+        selectedCountry: address.selectedCountry,
+        provinceState: address.provinceState,
+        canadaPostalCode: address.postalCode,
+      })
+      .expect(HttpStatus.UNPROCESSABLE_ENTITY)
+      .expect({
+        message: "Duplicate institution location code.",
+        errorType: DUPLICATE_INSTITUTION_LOCATION_CODE,
+      });
+  });
+
+  afterAll(async () => {
+    await app?.close();
+  });
+});
diff --git a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
index f8b8d90f00..5101ee7109 100644
--- a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
+++ b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
@@ -288,6 +288,24 @@ export class InstitutionLocationService extends RecordDataModelService<Instituti
     return found.length === locations.length;
   }
 
+  /**
+   * Validate that all the given locations have an institution location code assigned.
+   * A location code is required for approved designation agreement locations.
+   * @param locationIds location IDs to validate.
+   * @returns true when all locations have a non-null institution location code.
+   */
+  async validateLocationsHaveInstitutionCode(
+    locationIds: number[],
+  ): Promise<boolean> {
+    const locationsWithCode = await this.repo
+      .createQueryBuilder("location")
+      .select("1")
+      .where("location.id IN (:...locationIds)", { locationIds })
+      .andWhere("location.institutionCode IS NOT NULL")
+      .getRawMany();
+    return locationsWithCode.length === locationIds.length;
+  }
+
   /**
    * Check if location code is already registered for the institution.
    * @param locationCode location code.

From ea1cfd88bbd73046a037ebbedc0f294e75edb905 Mon Sep 17 00:00:00 2001
From: Tiago Graf <tiago.graf@quartech.com>
Date: Mon, 16 Mar 2026 09:54:36 -0700
Subject: [PATCH 03/16] Fix e2e test

---
 ...t.controller.updateDesignationAgreement.e2e-spec.ts | 10 +++++++---
 .../designation-agreement.aest.controller.ts           |  8 +++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/_tests_/e2e/designation-agreement.aest.controller.updateDesignationAgreement.e2e-spec.ts b/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/_tests_/e2e/designation-agreement.aest.controller.updateDesignationAgreement.e2e-spec.ts
index 9953643381..c0461317ef 100644
--- a/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/_tests_/e2e/designation-agreement.aest.controller.updateDesignationAgreement.e2e-spec.ts
+++ b/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/_tests_/e2e/designation-agreement.aest.controller.updateDesignationAgreement.e2e-spec.ts
@@ -191,7 +191,7 @@ describe("DesignationAgreementAESTController(e2e)-updateDesignationAgreement", (
     const endpoint = `/aest/designation-agreement/${savedDesignation.id}`;
 
     // Act/Assert
-    const response = await request(app.getHttpServer())
+    await request(app.getHttpServer())
       .patch(endpoint)
       .auth(token, BEARER_AUTH_TYPE)
       .send({
@@ -203,7 +203,11 @@ describe("DesignationAgreementAESTController(e2e)-updateDesignationAgreement", (
         ],
         note: "Attempt to approve location without code.",
       })
-      .expect(HttpStatus.UNPROCESSABLE_ENTITY);
-    expect(response.body.errorType).toBe(MISSING_INSTITUTION_LOCATION_CODE);
+      .expect(HttpStatus.UNPROCESSABLE_ENTITY)
+      .expect({
+        message:
+          "One or more approved locations are missing an institution location code.",
+        errorType: MISSING_INSTITUTION_LOCATION_CODE,
+      });
   });
 });
diff --git a/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/designation-agreement.aest.controller.ts b/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/designation-agreement.aest.controller.ts
index 9e9587f012..c4db5560bb 100644
--- a/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/designation-agreement.aest.controller.ts
+++ b/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/designation-agreement.aest.controller.ts
@@ -40,7 +40,7 @@ import {
 } from "@nestjs/swagger";
 import BaseController from "../BaseController";
 import { Role } from "../../auth/roles.enum";
-import { ClientTypeBaseRoute } from "../../types";
+import { ApiProcessError, ClientTypeBaseRoute } from "../../types";
 import { MISSING_INSTITUTION_LOCATION_CODE } from "../../constants";
 
 @AllowAuthorizedParty(AuthorizedParties.aest)
@@ -168,8 +168,10 @@ export class DesignationAgreementAESTController extends BaseController {
           );
         if (!allApprovedLocationsHaveCode) {
           throw new UnprocessableEntityException(
-            "One or more approved locations are missing an institution location code.",
-            MISSING_INSTITUTION_LOCATION_CODE,
+            new ApiProcessError(
+              "One or more approved locations are missing an institution location code.",
+              MISSING_INSTITUTION_LOCATION_CODE,
+            ),
           );
         }
       }

From 5adcbf00ebb8f18c18a02d4b5c2e7736d5ff0b75 Mon Sep 17 00:00:00 2001
From: Tiago Graf <tiago.graf@quartech.com>
Date: Mon, 16 Mar 2026 10:06:55 -0700
Subject: [PATCH 04/16] PR comments

---
 .../models/institution-location.dto.ts        |  2 +-
 .../institution-location.service.ts           | 23 +++++++++----------
 .../modals/ApproveDenyDesignationModal.vue    |  6 ++++-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts
index 2d65d659ba..fb48537c4b 100644
--- a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts
+++ b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts
@@ -88,7 +88,7 @@ export class InstitutionLocationAPIOutDTO {
     address: AddressAPIOutDTO;
   };
   primaryContact: InstitutionPrimaryContactAPIOutDTO;
-  institutionCode?: string;
+  institutionCode?: string | null;
   designationStatus: DesignationStatus;
 }
 
diff --git a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
index 5101ee7109..9786315b8d 100644
--- a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
+++ b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
@@ -40,11 +40,12 @@ export class InstitutionLocationService extends RecordDataModelService<Instituti
     const auditUser = { id: auditUserId } as User;
     const institution = { id: institutionId };
 
-    const hasInstitutionCode = !!data.institutionCode?.trim();
+    const normalizedInstitutionCode = data.institutionCode?.trim();
+    const hasInstitutionCode = !!normalizedInstitutionCode;
 
     if (hasInstitutionCode) {
       const isInstitutionCodeDuplicate =
-        await this.hasLocationCodeForInstitution(data.institutionCode, {
+        await this.hasLocationCodeForInstitution(normalizedInstitutionCode, {
           institutionId,
         });
 
@@ -68,7 +69,7 @@ export class InstitutionLocationService extends RecordDataModelService<Instituti
         phone: data.primaryContactPhone,
       },
       institution: institution,
-      institutionCode: hasInstitutionCode ? data.institutionCode : null,
+      institutionCode: normalizedInstitutionCode,
       creator: auditUser,
     } as InstitutionLocation;
 
@@ -114,15 +115,15 @@ export class InstitutionLocationService extends RecordDataModelService<Instituti
   ): Promise<InstitutionLocation> {
     const hasInstitutionCode =
       !!institutionLocationData.institutionCode?.trim();
+    const normalizedInstitutionCode = hasInstitutionCode
+      ? institutionLocationData.institutionCode.trim()
+      : null;
 
     if (hasInstitutionCode) {
       const isInstitutionCodeDuplicate =
-        await this.hasLocationCodeForInstitution(
-          institutionLocationData.institutionCode,
-          {
-            locationId,
-          },
-        );
+        await this.hasLocationCodeForInstitution(normalizedInstitutionCode, {
+          locationId,
+        });
 
       if (isInstitutionCodeDuplicate) {
         throw new CustomNamedError(
@@ -143,9 +144,7 @@ export class InstitutionLocationService extends RecordDataModelService<Instituti
         email: institutionLocationData.primaryContactEmail,
         phone: institutionLocationData.primaryContactPhone,
       },
-      institutionCode: hasInstitutionCode
-        ? institutionLocationData.institutionCode
-        : null,
+      institutionCode: normalizedInstitutionCode,
       id: locationId,
       modifier: { id: auditUserId } as User,
     } as InstitutionLocation;
diff --git a/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue b/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue
index f4d980bc74..4f3eb2ad87 100644
--- a/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue
+++ b/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue
@@ -38,7 +38,11 @@
                   :property-title="item.locationName"
                   :property-value="item.locationAddress"
                 />
-                <title-value :property-title="item.institutionCode ?? ''" />
+                <title-value
+                  v-if="item.institutionCode"
+                  property-title="Institution location code"
+                  :property-value="item.institutionCode"
+                />
               </v-col>
               <v-col cols="auto">
                 <v-checkbox

From de0af9ea55a4e0087a85cdb503983bb3d7d7b37d Mon Sep 17 00:00:00 2001
From: Tiago Graf <tiago.graf@quartech.com>
Date: Mon, 16 Mar 2026 10:44:51 -0700
Subject: [PATCH 05/16] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 ...ment.aest.controller.updateDesignationAgreement.e2e-spec.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/_tests_/e2e/designation-agreement.aest.controller.updateDesignationAgreement.e2e-spec.ts b/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/_tests_/e2e/designation-agreement.aest.controller.updateDesignationAgreement.e2e-spec.ts
index c0461317ef..059124a3df 100644
--- a/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/_tests_/e2e/designation-agreement.aest.controller.updateDesignationAgreement.e2e-spec.ts
+++ b/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/_tests_/e2e/designation-agreement.aest.controller.updateDesignationAgreement.e2e-spec.ts
@@ -210,4 +210,7 @@ describe("DesignationAgreementAESTController(e2e)-updateDesignationAgreement", (
         errorType: MISSING_INSTITUTION_LOCATION_CODE,
       });
   });
+  afterAll(async () => {
+    await app?.close();
+  });
 });

From d31d28787950fd97730cd58da8a7fac180eb55d3 Mon Sep 17 00:00:00 2001
From: Tiago Graf <tiago.graf@quartech.com>
Date: Mon, 16 Mar 2026 10:52:22 -0700
Subject: [PATCH 06/16] Update institution-location.service.ts

---
 .../institution-location/institution-location.service.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
index 9786315b8d..5efc1f5d51 100644
--- a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
+++ b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
@@ -69,7 +69,7 @@ export class InstitutionLocationService extends RecordDataModelService<Instituti
         phone: data.primaryContactPhone,
       },
       institution: institution,
-      institutionCode: normalizedInstitutionCode,
+      institutionCode: hasInstitutionCode ? normalizedInstitutionCode : null,
       creator: auditUser,
     } as InstitutionLocation;
 

From 2b5e2b66497c7cb5c1763dee48db90e82255d236 Mon Sep 17 00:00:00 2001
From: Tiago Graf <tiago.graf@quartech.com>
Date: Mon, 16 Mar 2026 10:56:16 -0700
Subject: [PATCH 07/16] Updated institutionCode type

---
 .../libs/sims-db/src/entities/institution-location.model.ts   | 2 +-
 .../web/src/services/http/dto/InstitutionLocation.dto.ts      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sources/packages/backend/libs/sims-db/src/entities/institution-location.model.ts b/sources/packages/backend/libs/sims-db/src/entities/institution-location.model.ts
index e8ff2e7583..2a0ff42a81 100644
--- a/sources/packages/backend/libs/sims-db/src/entities/institution-location.model.ts
+++ b/sources/packages/backend/libs/sims-db/src/entities/institution-location.model.ts
@@ -45,7 +45,7 @@ export class InstitutionLocation extends RecordDataModel {
     name: "institution_code",
     nullable: true,
   })
-  institutionCode?: string;
+  institutionCode: string | null;
 
   @Column({
     name: "primary_contact",
diff --git a/sources/packages/web/src/services/http/dto/InstitutionLocation.dto.ts b/sources/packages/web/src/services/http/dto/InstitutionLocation.dto.ts
index 4cd906b607..ee185687a0 100644
--- a/sources/packages/web/src/services/http/dto/InstitutionLocation.dto.ts
+++ b/sources/packages/web/src/services/http/dto/InstitutionLocation.dto.ts
@@ -78,7 +78,7 @@ export class InstitutionLocationAPIInDTO
 
 export interface InstitutionLocationFormAPIOutDTO extends AddressDetailsFormAPIDTO {
   locationName: string;
-  institutionCode: string;
+  institutionCode: string | null;
   primaryContactFirstName: string;
   primaryContactLastName: string;
   primaryContactEmail: string;
@@ -92,7 +92,7 @@ export interface InstitutionLocationAPIOutDTO {
     address: AddressAPIOutDTO;
   };
   primaryContact: InstitutionPrimaryContactAPIOutDTO;
-  institutionCode?: string;
+  institutionCode: string | null;
   designationStatus: DesignationAgreementStatus;
 }
 

From 5c44b047cb1bbe6ab37b2b40e7a71c2dca423b7d Mon Sep 17 00:00:00 2001
From: Tiago Graf <tiago.graf@quartech.com>
Date: Tue, 17 Mar 2026 11:03:41 -0700
Subject: [PATCH 08/16] Update ApproveDenyDesignationModal.vue

---
 .../aest/institution/modals/ApproveDenyDesignationModal.vue    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue b/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue
index 4f3eb2ad87..5aa055abcf 100644
--- a/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue
+++ b/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue
@@ -40,8 +40,7 @@
                 />
                 <title-value
                   v-if="item.institutionCode"
-                  property-title="Institution location code"
-                  :property-value="item.institutionCode"
+                  :property-title="item.institutionCode"
                 />
               </v-col>
               <v-col cols="auto">

From fee3664d7c3ab108b3cc459b8a8657271bbf16e3 Mon Sep 17 00:00:00 2001
From: Tiago Graf <tiago.graf@quartech.com>
Date: Tue, 17 Mar 2026 22:49:48 -0700
Subject: [PATCH 09/16] Update PR Comments

---
 .../api/src/constants/error-code.constants.ts |   5 -
 ...ler.updateDesignationAgreement.e2e-spec.ts | 185 ++++++++++++------
 .../designation-agreement.aest.controller.ts  |  24 +--
 ...troller.getInstitutionLocation.e2e-spec.ts |  31 ++-
 ...institution-location.controller.service.ts |   2 +
 ...tution-location.institutions.controller.ts |   1 +
 .../models/institution-location.dto.ts        |  11 +-
 .../institution-location.models.ts            |  15 +-
 .../institution-location.service.ts           |  54 +++--
 .../entities/institution-location.model.ts    |   2 +-
 sources/packages/forms/package-lock.json      |   6 +-
 .../form-definitions/institutionlocation.json |  42 +++-
 .../modals/ApproveDenyDesignationModal.vue    |   7 -
 .../src/components/common/LocationSummary.vue |   8 +-
 .../http/dto/InstitutionLocation.dto.ts       |  10 +-
 15 files changed, 255 insertions(+), 148 deletions(-)

diff --git a/sources/packages/backend/apps/api/src/constants/error-code.constants.ts b/sources/packages/backend/apps/api/src/constants/error-code.constants.ts
index 04a954a625..6a5958a131 100644
--- a/sources/packages/backend/apps/api/src/constants/error-code.constants.ts
+++ b/sources/packages/backend/apps/api/src/constants/error-code.constants.ts
@@ -143,11 +143,6 @@ export const DUPLICATE_SABC_CODE = "DUPLICATE_SABC_CODE";
  * Institution location not valid.
  */
 export const INSTITUTION_LOCATION_NOT_VALID = "INSTITUTION_LOCATION_NOT_VALID";
-/**
- * One or more approved locations are missing an institution location code.
- */
-export const MISSING_INSTITUTION_LOCATION_CODE =
-  "MISSING_INSTITUTION_LOCATION_CODE";
 
 /**
  * Request for disability not allowed.
diff --git a/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/_tests_/e2e/designation-agreement.aest.controller.updateDesignationAgreement.e2e-spec.ts b/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/_tests_/e2e/designation-agreement.aest.controller.updateDesignationAgreement.e2e-spec.ts
index 059124a3df..59a684691e 100644
--- a/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/_tests_/e2e/designation-agreement.aest.controller.updateDesignationAgreement.e2e-spec.ts
+++ b/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/_tests_/e2e/designation-agreement.aest.controller.updateDesignationAgreement.e2e-spec.ts
@@ -1,48 +1,49 @@
 import { HttpStatus, INestApplication } from "@nestjs/common";
 import * as request from "supertest";
-import { DesignationAgreementStatus } from "@sims/sims-db";
+import { DesignationAgreementStatus, NoteType, User } from "@sims/sims-db";
 import {
   AESTGroups,
   BEARER_AUTH_TYPE,
-  InstitutionTokenTypes,
   createTestingAppModule,
   getAESTToken,
-  getAuthRelatedEntities,
+  getAESTUser,
 } from "../../../../testHelpers";
 import {
   E2EDataSources,
   createE2EDataSources,
   createFakeDesignationAgreement,
+  createFakeInstitution,
   createFakeInstitutionLocation,
   createFakeUser,
 } from "@sims/test-utils";
-import { MISSING_INSTITUTION_LOCATION_CODE } from "../../../../constants";
 
 describe("DesignationAgreementAESTController(e2e)-updateDesignationAgreement", () => {
   let app: INestApplication;
   let db: E2EDataSources;
+  let fakeUser: User;
 
   beforeAll(async () => {
     const { nestApplication, dataSource } = await createTestingAppModule();
     app = nestApplication;
     db = createE2EDataSources(dataSource);
+    fakeUser = await db.user.save(createFakeUser());
   });
 
-  it("Should approve a designation agreement when all payload locations belong to the institution.", async () => {
+  it("Should approve a designation agreement and persist all fields when all payload locations belong to the institution.", async () => {
     // Arrange
-    const { institution } = await getAuthRelatedEntities(
-      db.dataSource,
-      InstitutionTokenTypes.CollegeFAdminLegalSigningUser,
-    );
+    const institution = await db.institution.save(createFakeInstitution());
     const fakeLocation = createFakeInstitutionLocation({ institution });
     const savedLocation = await db.institutionLocation.save(fakeLocation);
-    const fakeUser = await db.user.save(createFakeUser());
-    const fakeDesignation = createFakeDesignationAgreement({
-      fakeInstitution: institution,
-      fakeInstitutionLocations: [savedLocation],
-      fakeUser,
-    });
-    fakeDesignation.designationStatus = DesignationAgreementStatus.Pending;
+    const fakeDesignation = createFakeDesignationAgreement(
+      {
+        fakeInstitution: institution,
+        fakeInstitutionLocations: [savedLocation],
+        fakeUser,
+      },
+      {
+        initialValue: { designationStatus: DesignationAgreementStatus.Pending },
+      },
+    );
     const savedDesignation =
       await db.designationAgreement.save(fakeDesignation);
     const token = await getAESTToken(AESTGroups.BusinessAdministrators);
@@ -64,29 +65,78 @@ describe("DesignationAgreementAESTController(e2e)-updateDesignationAgreement", (
       .expect(HttpStatus.OK);
 
     // Assert
-    const updatedDesignation = await db.designationAgreement.findOneBy({
+    const auditUser = await getAESTUser(
+      db.dataSource,
+      AESTGroups.BusinessAdministrators,
+    );
+    const updatedDesignation = await db.designationAgreement.findOne({
+      select: {
+        id: true,
+        designationStatus: true,
+        startDate: true,
+        endDate: true,
+        designationAgreementLocations: {
+          id: true,
+          institutionLocation: { id: true },
+          approved: true,
+        },
+        institution: {
+          id: true,
+          notes: { id: true, noteType: true, description: true },
+        },
+        assessedBy: { id: true },
+        assessedDate: true,
+      },
+      relations: {
+        designationAgreementLocations: { institutionLocation: true },
+        institution: { notes: true },
+        assessedBy: true,
+      },
+      where: { id: savedDesignation.id },
+      loadEagerRelations: false,
+    });
+    expect(updatedDesignation).toEqual({
       id: savedDesignation.id,
+      designationStatus: DesignationAgreementStatus.Approved,
+      startDate: "2026-01-01",
+      endDate: "2027-12-31",
+      designationAgreementLocations: [
+        {
+          id: expect.any(Number),
+          institutionLocation: { id: savedLocation.id },
+          approved: true,
+        },
+      ],
+      institution: {
+        id: institution.id,
+        notes: [
+          {
+            id: expect.any(Number),
+            noteType: NoteType.Designation,
+            description: "Designation approved.",
+          },
+        ],
+      },
+      assessedBy: { id: auditUser.id },
+      assessedDate: expect.any(Date),
     });
-    expect(updatedDesignation.designationStatus).toBe(
-      DesignationAgreementStatus.Approved,
-    );
   });
 
   it("Should decline a designation agreement.", async () => {
     // Arrange
-    const { institution } = await getAuthRelatedEntities(
-      db.dataSource,
-      InstitutionTokenTypes.CollegeFAdminLegalSigningUser,
-    );
+    const institution = await db.institution.save(createFakeInstitution());
     const fakeLocation = createFakeInstitutionLocation({ institution });
     const savedLocation = await db.institutionLocation.save(fakeLocation);
-    const fakeUser = await db.user.save(createFakeUser());
-    const fakeDesignation = createFakeDesignationAgreement({
-      fakeInstitution: institution,
-      fakeInstitutionLocations: [savedLocation],
-      fakeUser,
-    });
-    fakeDesignation.designationStatus = DesignationAgreementStatus.Pending;
+    const fakeDesignation = createFakeDesignationAgreement(
+      {
+        fakeInstitution: institution,
+        fakeInstitutionLocations: [savedLocation],
+        fakeUser,
+      },
+      {
+        initialValue: { designationStatus: DesignationAgreementStatus.Pending },
+      },
+    );
     const savedDesignation =
       await db.designationAgreement.save(fakeDesignation);
     const token = await getAESTToken(AESTGroups.BusinessAdministrators);
@@ -124,30 +174,36 @@ describe("DesignationAgreementAESTController(e2e)-updateDesignationAgreement", (
         designationStatus: DesignationAgreementStatus.Declined,
         note: "Some note.",
       })
-      .expect(HttpStatus.NOT_FOUND);
+      .expect(HttpStatus.NOT_FOUND)
+      .expect({
+        statusCode: HttpStatus.NOT_FOUND,
+        message:
+          "Designation agreement not found or it has been declined already.",
+        error: "Not Found",
+      });
   });
 
   it("Should return unprocessable entity when approved location does not belong to the designation institution.", async () => {
     // Arrange
-    const { institution } = await getAuthRelatedEntities(
-      db.dataSource,
-      InstitutionTokenTypes.CollegeFAdminLegalSigningUser,
-    );
+    const institution = await db.institution.save(createFakeInstitution());
     const fakeLocation = createFakeInstitutionLocation({ institution });
     const savedLocation = await db.institutionLocation.save(fakeLocation);
-    const fakeUser = await db.user.save(createFakeUser());
-    const fakeDesignation = createFakeDesignationAgreement({
-      fakeInstitution: institution,
-      fakeInstitutionLocations: [savedLocation],
-      fakeUser,
-    });
-    fakeDesignation.designationStatus = DesignationAgreementStatus.Pending;
+    const fakeDesignation = createFakeDesignationAgreement(
+      {
+        fakeInstitution: institution,
+        fakeInstitutionLocations: [savedLocation],
+        fakeUser,
+      },
+      {
+        initialValue: { designationStatus: DesignationAgreementStatus.Pending },
+      },
+    );
     const savedDesignation =
       await db.designationAgreement.save(fakeDesignation);
     // Create a location that belongs to a different institution.
-    const unrelatedLocation = createFakeInstitutionLocation();
-    const savedUnrelatedLocation =
-      await db.institutionLocation.save(unrelatedLocation);
+    const unrelatedLocation = await db.institutionLocation.save(
+      createFakeInstitutionLocation(),
+    );
     const token = await getAESTToken(AESTGroups.BusinessAdministrators);
     const endpoint = `/aest/designation-agreement/${savedDesignation.id}`;
 
@@ -160,31 +216,37 @@ describe("DesignationAgreementAESTController(e2e)-updateDesignationAgreement", (
         startDate: "2026-01-01",
         endDate: "2027-12-31",
         locationsDesignations: [
-          { locationId: savedUnrelatedLocation.id, approved: true },
+          { locationId: unrelatedLocation.id, approved: true },
         ],
         note: "Attempt with unrelated location.",
       })
-      .expect(HttpStatus.UNPROCESSABLE_ENTITY);
+      .expect(HttpStatus.UNPROCESSABLE_ENTITY)
+      .expect({
+        message:
+          "One or more locations provided do not belong to designation institution.",
+        error: "Unprocessable Entity",
+        statusCode: HttpStatus.UNPROCESSABLE_ENTITY,
+      });
   });
 
   it("Should return unprocessable entity when an approved location is missing an institution location code.", async () => {
     // Arrange
-    const { institution } = await getAuthRelatedEntities(
-      db.dataSource,
-      InstitutionTokenTypes.CollegeFAdminLegalSigningUser,
-    );
+    const institution = await db.institution.save(createFakeInstitution());
     // Create a location without an institution code to simulate locations
     // submitted with the "I do not have an institution location code" option selected.
     const fakeLocation = createFakeInstitutionLocation({ institution });
-    fakeLocation.institutionCode = null;
+    fakeLocation.institutionCode = undefined;
     const savedLocation = await db.institutionLocation.save(fakeLocation);
-    const fakeUser = await db.user.save(createFakeUser());
-    const fakeDesignation = createFakeDesignationAgreement({
-      fakeInstitution: institution,
-      fakeInstitutionLocations: [savedLocation],
-      fakeUser,
-    });
-    fakeDesignation.designationStatus = DesignationAgreementStatus.Pending;
+    const fakeDesignation = createFakeDesignationAgreement(
+      {
+        fakeInstitution: institution,
+        fakeInstitutionLocations: [savedLocation],
+        fakeUser,
+      },
+      {
+        initialValue: { designationStatus: DesignationAgreementStatus.Pending },
+      },
+    );
     const savedDesignation =
       await db.designationAgreement.save(fakeDesignation);
     const token = await getAESTToken(AESTGroups.BusinessAdministrators);
@@ -207,7 +269,8 @@ describe("DesignationAgreementAESTController(e2e)-updateDesignationAgreement", (
       .expect({
         message:
           "One or more approved locations are missing an institution location code.",
-        errorType: MISSING_INSTITUTION_LOCATION_CODE,
+        error: "Unprocessable Entity",
+        statusCode: HttpStatus.UNPROCESSABLE_ENTITY,
       });
   });
   afterAll(async () => {
diff --git a/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/designation-agreement.aest.controller.ts b/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/designation-agreement.aest.controller.ts
index c4db5560bb..0ca075f44b 100644
--- a/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/designation-agreement.aest.controller.ts
+++ b/sources/packages/backend/apps/api/src/route-controllers/designation-agreement/designation-agreement.aest.controller.ts
@@ -40,8 +40,7 @@ import {
 } from "@nestjs/swagger";
 import BaseController from "../BaseController";
 import { Role } from "../../auth/roles.enum";
-import { ApiProcessError, ClientTypeBaseRoute } from "../../types";
-import { MISSING_INSTITUTION_LOCATION_CODE } from "../../constants";
+import { ClientTypeBaseRoute } from "../../types";
 
 @AllowAuthorizedParty(AuthorizedParties.aest)
 @Groups(UserGroups.AESTUser)
@@ -161,19 +160,14 @@ export class DesignationAgreementAESTController extends BaseController {
       const approvedLocationIds = payload.locationsDesignations
         .filter((location) => location.approved)
         .map((location) => location.locationId);
-      if (approvedLocationIds.length > 0) {
-        const allApprovedLocationsHaveCode =
-          await this.institutionLocationService.validateLocationsHaveInstitutionCode(
-            approvedLocationIds,
-          );
-        if (!allApprovedLocationsHaveCode) {
-          throw new UnprocessableEntityException(
-            new ApiProcessError(
-              "One or more approved locations are missing an institution location code.",
-              MISSING_INSTITUTION_LOCATION_CODE,
-            ),
-          );
-        }
+      if (
+        await this.institutionLocationService.hasAnyLocationWithoutCode(
+          approvedLocationIds,
+        )
+      ) {
+        throw new UnprocessableEntityException(
+          "One or more approved locations are missing an institution location code.",
+        );
       }
     }
     await this.designationAgreementService.updateDesignation(
diff --git a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.getInstitutionLocation.e2e-spec.ts b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.getInstitutionLocation.e2e-spec.ts
index 23f0b0847b..eb71ebcf21 100644
--- a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.getInstitutionLocation.e2e-spec.ts
+++ b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.getInstitutionLocation.e2e-spec.ts
@@ -22,12 +22,12 @@ describe("InstitutionLocationAESTController(e2e)-getInstitutionLocation", () =>
     db = createE2EDataSources(dataSource);
   });
 
-  it("Should return institution location with a null institution code when none is assigned.", async () => {
+  it("Should not return the institution code property when no code is assigned.", async () => {
     // Arrange
     // Create a location without an institution code to simulate locations
     // submitted with the "I do not have an institution location code" option selected.
     const location = createFakeInstitutionLocation();
-    location.institutionCode = null;
+    location.institutionCode = undefined;
     const savedLocation = await db.institutionLocation.save(location);
     const token = await getAESTToken(AESTGroups.BusinessAdministrators);
     const endpoint = `/aest/location/${savedLocation.id}`;
@@ -40,19 +40,34 @@ describe("InstitutionLocationAESTController(e2e)-getInstitutionLocation", () =>
     expect(response.body.institutionCode).toBeNull();
   });
 
-  it("Should return institution location with the institution code when one is assigned.", async () => {
+  it("Should return institution location with all fields when an institution code is assigned.", async () => {
     // Arrange
-    const location = createFakeInstitutionLocation();
-    const savedLocation = await db.institutionLocation.save(location);
+    const savedLocation = await db.institutionLocation.save(
+      createFakeInstitutionLocation(),
+    );
     const token = await getAESTToken(AESTGroups.BusinessAdministrators);
     const endpoint = `/aest/location/${savedLocation.id}`;
 
     // Act/Assert
-    const response = await request(app.getHttpServer())
+    await request(app.getHttpServer())
       .get(endpoint)
       .auth(token, BEARER_AUTH_TYPE)
-      .expect(HttpStatus.OK);
-    expect(response.body.institutionCode).toBe(savedLocation.institutionCode);
+      .expect(HttpStatus.OK)
+      .expect({
+        locationName: savedLocation.name,
+        institutionCode: savedLocation.institutionCode,
+        primaryContactFirstName: savedLocation.primaryContact.firstName,
+        primaryContactLastName: savedLocation.primaryContact.lastName,
+        primaryContactEmail: savedLocation.primaryContact.email,
+        primaryContactPhone: savedLocation.primaryContact.phone,
+        addressLine1: savedLocation.data.address.addressLine1,
+        provinceState: savedLocation.data.address.provinceState,
+        country: savedLocation.data.address.country,
+        city: savedLocation.data.address.city,
+        postalCode: savedLocation.data.address.postalCode,
+        canadaPostalCode: savedLocation.data.address.postalCode,
+        selectedCountry: savedLocation.data.address.selectedCountry,
+      });
   });
 
   it("Should return not found when the institution location does not exist.", async () => {
diff --git a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/institution-location.controller.service.ts b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/institution-location.controller.service.ts
index 0ec0d796b4..8a4e7f18be 100644
--- a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/institution-location.controller.service.ts
+++ b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/institution-location.controller.service.ts
@@ -51,6 +51,7 @@ export class InstitutionLocationControllerService {
             primaryContactPhone: el.primaryContact?.phone,
           },
           institutionCode: el.institutionCode,
+          noInstitutionCode: !el.institutionCode,
         };
       },
     );
@@ -95,6 +96,7 @@ export class InstitutionLocationControllerService {
     return {
       locationName: institutionLocation.name,
       institutionCode: institutionLocation.institutionCode,
+      noInstitutionCode: !institutionLocation.institutionCode,
       primaryContactFirstName: institutionLocation.primaryContact.firstName,
       primaryContactLastName: institutionLocation.primaryContact.lastName,
       primaryContactEmail: institutionLocation.primaryContact.email,
diff --git a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/institution-location.institutions.controller.ts b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/institution-location.institutions.controller.ts
index 4c4c2b3ec2..4d80fb4d88 100644
--- a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/institution-location.institutions.controller.ts
+++ b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/institution-location.institutions.controller.ts
@@ -204,6 +204,7 @@ export class InstitutionLocationInstitutionsController extends BaseController {
     return {
       locationName: institutionLocation.name,
       institutionCode: institutionLocation.institutionCode,
+      noInstitutionCode: !institutionLocation.institutionCode,
       primaryContactFirstName: institutionLocation.primaryContact.firstName,
       primaryContactLastName: institutionLocation.primaryContact.lastName,
       primaryContactEmail: institutionLocation.primaryContact.email,
diff --git a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts
index fb48537c4b..2aab460125 100644
--- a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts
+++ b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts
@@ -2,7 +2,6 @@ import {
   Allow,
   IsEmail,
   IsNotEmpty,
-  IsOptional,
   Length,
 } from "class-validator";
 import {
@@ -55,8 +54,8 @@ export class AESTInstitutionLocationAPIInDTO extends AddressDetailsAPIInDTO {
   primaryContactPhone: string;
   @IsNotEmpty()
   locationName: string;
-  @IsOptional()
-  institutionCode?: string | null;
+  @IsNotEmpty()
+  institutionCode: string;
 }
 
 /**
@@ -64,7 +63,8 @@ export class AESTInstitutionLocationAPIInDTO extends AddressDetailsAPIInDTO {
  */
 export class InstitutionLocationDetailsAPIOutDTO extends AddressDetailsAPIOutDTO {
   locationName: string;
-  institutionCode: string | null;
+  institutionCode?: string;
+  noInstitutionCode: boolean;
   primaryContactFirstName: string;
   primaryContactLastName: string;
   primaryContactEmail: string;
@@ -88,7 +88,8 @@ export class InstitutionLocationAPIOutDTO {
     address: AddressAPIOutDTO;
   };
   primaryContact: InstitutionPrimaryContactAPIOutDTO;
-  institutionCode?: string | null;
+  institutionCode?: string;
+  noInstitutionCode: boolean;
   designationStatus: DesignationStatus;
 }
 
diff --git a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.models.ts b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.models.ts
index 46adf926fa..f986f32edc 100644
--- a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.models.ts
+++ b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.models.ts
@@ -14,7 +14,7 @@ export interface LocationWithDesignationStatus {
 }
 
 /**
- * Service model for AEST user location update.
+ * Service model for institution user location create.
  */
 export interface InstitutionLocationModel extends AddressInfo {
   locationName: string;
@@ -26,6 +26,19 @@ export interface InstitutionLocationModel extends AddressInfo {
   primaryContactPhone: string;
 }
 
+/**
+ * Service model for AEST user location update.
+ * Derived from {@link InstitutionLocationModel} without the
+ * `noInstitutionCode` flag, as the AEST user must always provide
+ * an institution location code when updating a location.
+ */
+export type InstitutionLocationUpdateModel = Omit<
+  InstitutionLocationModel,
+  "noInstitutionCode"
+> & {
+  institutionCode: string;
+};
+
 /**
  * Service model for Institution user location update.
  */
diff --git a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
index 5efc1f5d51..a5fbd7ed8c 100644
--- a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
+++ b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
@@ -9,6 +9,7 @@ import { DesignationAgreementLocationService } from "../designation-agreement/de
 import {
   LocationWithDesignationStatus,
   InstitutionLocationModel,
+  InstitutionLocationUpdateModel,
   InstitutionLocationPrimaryContactModel,
 } from "./institution-location.models";
 import { transformAddressDetails } from "../../utilities";
@@ -69,7 +70,9 @@ export class InstitutionLocationService extends RecordDataModelService<Instituti
         phone: data.primaryContactPhone,
       },
       institution: institution,
-      institutionCode: hasInstitutionCode ? normalizedInstitutionCode : null,
+      institutionCode: hasInstitutionCode
+        ? normalizedInstitutionCode
+        : undefined,
       creator: auditUser,
     } as InstitutionLocation;
 
@@ -109,28 +112,24 @@ export class InstitutionLocationService extends RecordDataModelService<Instituti
    * @returns Updated institution Location.
    */
   async updateLocation(
-    institutionLocationData: InstitutionLocationModel,
+    institutionLocationData: InstitutionLocationUpdateModel,
     locationId: number,
     auditUserId: number,
   ): Promise<InstitutionLocation> {
-    const hasInstitutionCode =
-      !!institutionLocationData.institutionCode?.trim();
-    const normalizedInstitutionCode = hasInstitutionCode
-      ? institutionLocationData.institutionCode.trim()
-      : null;
-
-    if (hasInstitutionCode) {
-      const isInstitutionCodeDuplicate =
-        await this.hasLocationCodeForInstitution(normalizedInstitutionCode, {
-          locationId,
-        });
+    const normalizedInstitutionCode =
+      institutionLocationData.institutionCode.trim();
+    const isInstitutionCodeDuplicate = await this.hasLocationCodeForInstitution(
+      normalizedInstitutionCode,
+      {
+        locationId,
+      },
+    );
 
-      if (isInstitutionCodeDuplicate) {
-        throw new CustomNamedError(
-          "Duplicate institution location code.",
-          DUPLICATE_INSTITUTION_LOCATION_CODE,
-        );
-      }
+    if (isInstitutionCodeDuplicate) {
+      throw new CustomNamedError(
+        "Duplicate institution location code.",
+        DUPLICATE_INSTITUTION_LOCATION_CODE,
+      );
     }
 
     const saveLocation: InstitutionLocation = {
@@ -288,21 +287,20 @@ export class InstitutionLocationService extends RecordDataModelService<Instituti
   }
 
   /**
-   * Validate that all the given locations have an institution location code assigned.
+   * Checks if any of the given locations is missing an institution location code.
    * A location code is required for approved designation agreement locations.
    * @param locationIds location IDs to validate.
-   * @returns true when all locations have a non-null institution location code.
+   * @returns true when at least one location has a null institution location code.
    */
-  async validateLocationsHaveInstitutionCode(
-    locationIds: number[],
-  ): Promise<boolean> {
-    const locationsWithCode = await this.repo
+  async hasAnyLocationWithoutCode(locationIds: number[]): Promise<boolean> {
+    const locationWithoutCode = await this.repo
       .createQueryBuilder("location")
       .select("1")
       .where("location.id IN (:...locationIds)", { locationIds })
-      .andWhere("location.institutionCode IS NOT NULL")
-      .getRawMany();
-    return locationsWithCode.length === locationIds.length;
+      .andWhere("location.institutionCode IS NULL")
+      .limit(1)
+      .getRawOne();
+    return !!locationWithoutCode;
   }
 
   /**
diff --git a/sources/packages/backend/libs/sims-db/src/entities/institution-location.model.ts b/sources/packages/backend/libs/sims-db/src/entities/institution-location.model.ts
index 2a0ff42a81..e8ff2e7583 100644
--- a/sources/packages/backend/libs/sims-db/src/entities/institution-location.model.ts
+++ b/sources/packages/backend/libs/sims-db/src/entities/institution-location.model.ts
@@ -45,7 +45,7 @@ export class InstitutionLocation extends RecordDataModel {
     name: "institution_code",
     nullable: true,
   })
-  institutionCode: string | null;
+  institutionCode?: string;
 
   @Column({
     name: "primary_contact",
diff --git a/sources/packages/forms/package-lock.json b/sources/packages/forms/package-lock.json
index 4e843e6928..d050716fa8 100644
--- a/sources/packages/forms/package-lock.json
+++ b/sources/packages/forms/package-lock.json
@@ -450,7 +450,6 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -777,8 +776,7 @@
       "version": "5.9.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "v8-compile-cache-lib": {
       "version": "3.0.1",
@@ -793,4 +791,4 @@
       "dev": true
     }
   }
-}
+}
\ No newline at end of file
diff --git a/sources/packages/forms/src/form-definitions/institutionlocation.json b/sources/packages/forms/src/form-definitions/institutionlocation.json
index 44271c8002..5e39464e8d 100644
--- a/sources/packages/forms/src/form-definitions/institutionlocation.json
+++ b/sources/packages/forms/src/form-definitions/institutionlocation.json
@@ -73,14 +73,17 @@
         },
         {
           "label": "Institution location code",
+          "applyMaskOn": "change",
           "tableView": true,
           "case": "uppercase",
           "validate": {
-            "minLength": 4,
-            "maxLength": 4,
+            "required": true,
             "pattern": "[A-Z]*",
-            "custom": "valid = (!data.noInstitutionCode && !input) ? 'Institution location code is required.' : true;"
+            "minLength": 4,
+            "maxLength": 4
           },
+          "validateWhenHidden": false,
+          "key": "institutionCode",
           "logic": [
             {
               "name": "Disable and clear when no institution location code",
@@ -103,11 +106,39 @@
                   "name": "Clear value",
                   "type": "value",
                   "value": "value = '';"
+                },
+                {
+                  "name": "Required false",
+                  "type": "property",
+                  "property": {
+                    "label": "Required",
+                    "value": "validate.required",
+                    "type": "boolean"
+                  },
+                  "state": false
+                }
+              ]
+            },
+            {
+              "name": "Required when no institution code is unchecked",
+              "trigger": {
+                "type": "javascript",
+                "javascript": "result = data.noInstitutionCode === false"
+              },
+              "actions": [
+                {
+                  "name": "Required true",
+                  "type": "property",
+                  "property": {
+                    "label": "Required",
+                    "value": "validate.required",
+                    "type": "boolean"
+                  },
+                  "state": true
                 }
               ]
             }
           ],
-          "key": "institutionCode",
           "attributes": {
             "data-cy": "institutionCode"
           },
@@ -135,8 +166,9 @@
               "value": ""
             }
           ],
-          "content": "<strong class=\"ml-2\">Missing institution location code</strong><br><span>Please note: You will be able to create this location without an institution location code. However, you will not be able to designate this location until you obtain a federally issued code from StudentAid BC. Once you submit your location please email designat@gov.bc.ca and request they provide you with the code and update the location information.</span>",
+          "content": "<strong> Missing institution location code</strong>\n<br />Please note: You will be able to create this location without an institution location code. However, you will not be able to designate this location until you obtain a federally issued code from StudentAid BC. Once you submit your location please email designat@gov.bc.ca and request they provide you with the code and update the location information.",
           "refreshOnChange": true,
+          "customClass": "banner-warning",
           "hidden": true,
           "key": "noInstitutionCodeBanner",
           "customConditional": "show = data.noInstitutionCode === true;",
diff --git a/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue b/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue
index 5aa055abcf..2eace9123f 100644
--- a/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue
+++ b/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue
@@ -57,13 +57,6 @@
                 />
               </v-col>
             </v-row>
-            <v-row v-if="item.approved && !item.institutionCode" class="mt-0">
-              <v-col class="text-right pt-0">
-                <span class="text-error d-block"
-                  >No institution location code</span
-                >
-              </v-col>
-            </v-row>
           </template>
         </content-group>
         <v-textarea
diff --git a/sources/packages/web/src/components/common/LocationSummary.vue b/sources/packages/web/src/components/common/LocationSummary.vue
index f43cbbadf0..5d21b72bee 100644
--- a/sources/packages/web/src/components/common/LocationSummary.vue
+++ b/sources/packages/web/src/components/common/LocationSummary.vue
@@ -4,7 +4,7 @@
     <template #header>
       <body-header
         title="All locations"
-        :recordsCount="institutionLocationList.length"
+        :records-count="institutionLocationList.length"
         ><template #actions>
           <!-- Todo: We to eventually eliminate the logic which is based
       on the client type on the vue components.-->
@@ -61,7 +61,7 @@
       <v-row>
         <!-- Address -->
         <v-col>
-          <title-value propertyTitle="Address" />
+          <title-value property-title="Address" />
           <span
             class="label-value muted-content clearfix"
             v-for="addressLine in addressList(item)"
@@ -73,7 +73,7 @@
         </v-col>
         <!-- Primary contact -->
         <v-col>
-          <title-value propertyTitle="Primary contact" />
+          <title-value property-title="Primary contact" />
           <span
             class="label-value muted-content clearfix"
             v-for="contactLine in primaryContactList(item)"
@@ -85,7 +85,7 @@
         </v-col>
         <!-- Institution code -->
         <v-col>
-          <title-value propertyTitle="Institution location code" />
+          <title-value property-title="Institution location code" />
           <span
             data-cy="institutionCode"
             class="label-value muted-content clearfix"
diff --git a/sources/packages/web/src/services/http/dto/InstitutionLocation.dto.ts b/sources/packages/web/src/services/http/dto/InstitutionLocation.dto.ts
index ee185687a0..7494b6a42b 100644
--- a/sources/packages/web/src/services/http/dto/InstitutionLocation.dto.ts
+++ b/sources/packages/web/src/services/http/dto/InstitutionLocation.dto.ts
@@ -13,9 +13,9 @@ export class InstitutionLocationFormAPIInDTO extends AddressDetailsFormAPIDTO {
   @Expose()
   locationName: string;
   @Expose()
-  institutionCode: string;
+  institutionCode?: string;
   @Expose()
-  noInstitutionCode?: boolean;
+  noInstitutionCode: boolean;
   @Expose()
   primaryContactFirstName: string;
   @Expose()
@@ -78,7 +78,8 @@ export class InstitutionLocationAPIInDTO
 
 export interface InstitutionLocationFormAPIOutDTO extends AddressDetailsFormAPIDTO {
   locationName: string;
-  institutionCode: string | null;
+  institutionCode?: string;
+  noInstitutionCode: boolean;
   primaryContactFirstName: string;
   primaryContactLastName: string;
   primaryContactEmail: string;
@@ -92,7 +93,8 @@ export interface InstitutionLocationAPIOutDTO {
     address: AddressAPIOutDTO;
   };
   primaryContact: InstitutionPrimaryContactAPIOutDTO;
-  institutionCode: string | null;
+  institutionCode?: string;
+  noInstitutionCode: boolean;
   designationStatus: DesignationAgreementStatus;
 }
 

From 3d48d1b19026e1dc91cadf0519499d164e9cc903 Mon Sep 17 00:00:00 2001
From: Tiago Graf <tiago.graf@quartech.com>
Date: Wed, 18 Mar 2026 10:08:10 -0700
Subject: [PATCH 10/16] Revert changes: institution code mandatory for Ministry

---
 .../models/institution-location.dto.ts        |  5 ++--
 .../institution-location.models.ts            | 13 ---------
 .../institution-location.service.ts           | 28 +++++++++----------
 3 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts
index 2aab460125..3b373f582a 100644
--- a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts
+++ b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts
@@ -2,6 +2,7 @@ import {
   Allow,
   IsEmail,
   IsNotEmpty,
+  IsOptional,
   Length,
 } from "class-validator";
 import {
@@ -54,8 +55,8 @@ export class AESTInstitutionLocationAPIInDTO extends AddressDetailsAPIInDTO {
   primaryContactPhone: string;
   @IsNotEmpty()
   locationName: string;
-  @IsNotEmpty()
-  institutionCode: string;
+  @IsOptional()
+  institutionCode?: string;
 }
 
 /**
diff --git a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.models.ts b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.models.ts
index f986f32edc..36365f1745 100644
--- a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.models.ts
+++ b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.models.ts
@@ -26,19 +26,6 @@ export interface InstitutionLocationModel extends AddressInfo {
   primaryContactPhone: string;
 }
 
-/**
- * Service model for AEST user location update.
- * Derived from {@link InstitutionLocationModel} without the
- * `noInstitutionCode` flag, as the AEST user must always provide
- * an institution location code when updating a location.
- */
-export type InstitutionLocationUpdateModel = Omit<
-  InstitutionLocationModel,
-  "noInstitutionCode"
-> & {
-  institutionCode: string;
-};
-
 /**
  * Service model for Institution user location update.
  */
diff --git a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
index a5fbd7ed8c..7d14114d65 100644
--- a/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
+++ b/sources/packages/backend/apps/api/src/services/institution-location/institution-location.service.ts
@@ -9,7 +9,6 @@ import { DesignationAgreementLocationService } from "../designation-agreement/de
 import {
   LocationWithDesignationStatus,
   InstitutionLocationModel,
-  InstitutionLocationUpdateModel,
   InstitutionLocationPrimaryContactModel,
 } from "./institution-location.models";
 import { transformAddressDetails } from "../../utilities";
@@ -112,24 +111,23 @@ export class InstitutionLocationService extends RecordDataModelService<Instituti
    * @returns Updated institution Location.
    */
   async updateLocation(
-    institutionLocationData: InstitutionLocationUpdateModel,
+    institutionLocationData: InstitutionLocationModel,
     locationId: number,
     auditUserId: number,
   ): Promise<InstitutionLocation> {
     const normalizedInstitutionCode =
-      institutionLocationData.institutionCode.trim();
-    const isInstitutionCodeDuplicate = await this.hasLocationCodeForInstitution(
-      normalizedInstitutionCode,
-      {
-        locationId,
-      },
-    );
-
-    if (isInstitutionCodeDuplicate) {
-      throw new CustomNamedError(
-        "Duplicate institution location code.",
-        DUPLICATE_INSTITUTION_LOCATION_CODE,
-      );
+      institutionLocationData.institutionCode?.trim() || null;
+    if (normalizedInstitutionCode) {
+      const isInstitutionCodeDuplicate =
+        await this.hasLocationCodeForInstitution(normalizedInstitutionCode, {
+          locationId,
+        });
+      if (isInstitutionCodeDuplicate) {
+        throw new CustomNamedError(
+          "Duplicate institution location code.",
+          DUPLICATE_INSTITUTION_LOCATION_CODE,
+        );
+      }
     }
 
     const saveLocation: InstitutionLocation = {

From abf91057117a431f85165f3eccba0998e37f597e Mon Sep 17 00:00:00 2001
From: Tiago Graf <tiago.graf@quartech.com>
Date: Wed, 18 Mar 2026 10:53:49 -0700
Subject: [PATCH 11/16] Update
 institution-location.aest.controller.getInstitutionLocation.e2e-spec.ts

---
 ...n-location.aest.controller.getInstitutionLocation.e2e-spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.getInstitutionLocation.e2e-spec.ts b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.getInstitutionLocation.e2e-spec.ts
index eb71ebcf21..d0e3669352 100644
--- a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.getInstitutionLocation.e2e-spec.ts
+++ b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.getInstitutionLocation.e2e-spec.ts
@@ -56,6 +56,7 @@ describe("InstitutionLocationAESTController(e2e)-getInstitutionLocation", () =>
       .expect({
         locationName: savedLocation.name,
         institutionCode: savedLocation.institutionCode,
+        noInstitutionCode: false,
         primaryContactFirstName: savedLocation.primaryContact.firstName,
         primaryContactLastName: savedLocation.primaryContact.lastName,
         primaryContactEmail: savedLocation.primaryContact.email,

From 9351c3c3d96b9765a737b160375971b2cf274ae2 Mon Sep 17 00:00:00 2001
From: Tiago Graf <tiago.graf@quartech.com>
Date: Wed, 18 Mar 2026 13:02:02 -0700
Subject: [PATCH 12/16] Update institution-location.dto.ts

---
 .../institution-locations/models/institution-location.dto.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts
index 3b373f582a..7b9d056d6a 100644
--- a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts
+++ b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/models/institution-location.dto.ts
@@ -22,7 +22,7 @@ export class InstitutionLocationFormAPIInDTO extends AddressDetailsAPIInDTO {
   @Allow()
   institutionCode: string;
   @Allow()
-  noInstitutionCode?: boolean;
+  noInstitutionCode: boolean;
   @Allow()
   primaryContactFirstName: string;
   @Allow()

From ebf40fc687934d76c49fea55c3484c55c97b0457 Mon Sep 17 00:00:00 2001
From: Tiago Graf <tiago.graf@quartech.com>
Date: Wed, 18 Mar 2026 13:11:43 -0700
Subject: [PATCH 13/16] Update
 institution-location.aest.controller.update.e2e-spec.ts

---
 ...ocation.aest.controller.update.e2e-spec.ts | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.update.e2e-spec.ts b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.update.e2e-spec.ts
index e4d0a761e2..e1f856d7bf 100644
--- a/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.update.e2e-spec.ts
+++ b/sources/packages/backend/apps/api/src/route-controllers/institution-locations/_tests_/e2e/institution-location.aest.controller.update.e2e-spec.ts
@@ -23,6 +23,68 @@ describe("InstitutionLocationAESTController(e2e)-update", () => {
     db = createE2EDataSources(dataSource);
   });
 
+  it("Should update all institution location fields and persist them correctly.", async () => {
+    // Arrange
+    const location = createFakeInstitutionLocation();
+    const savedLocation = await db.institutionLocation.save(location);
+    const token = await getAESTToken(AESTGroups.BusinessAdministrators);
+    const endpoint = `/aest/location/${savedLocation.id}`;
+
+    // Act
+    await request(app.getHttpServer())
+      .patch(endpoint)
+      .auth(token, BEARER_AUTH_TYPE)
+      .send({
+        locationName: "Updated Location Name",
+        institutionCode: "UPDT",
+        primaryContactFirstName: "John",
+        primaryContactLastName: "Doe",
+        primaryContactEmail: "john.doe@testmail.com",
+        primaryContactPhone: "(250) 555-1234",
+        addressLine1: "123 Updated Street",
+        city: "Vancouver",
+        country: "canada",
+        postalCode: "B1B1B1",
+        selectedCountry: "Canada",
+        provinceState: "BC",
+        canadaPostalCode: "B1B1B1",
+      })
+      .expect(HttpStatus.OK);
+
+    // Assert
+    const updatedLocation = await db.institutionLocation.findOne({
+      select: {
+        id: true,
+        name: true,
+        institutionCode: true,
+        data: true,
+        primaryContact: true,
+      },
+      where: { id: savedLocation.id },
+    });
+    expect(updatedLocation).toEqual({
+      id: savedLocation.id,
+      name: "Updated Location Name",
+      institutionCode: "UPDT",
+      data: {
+        address: {
+          addressLine1: "123 Updated Street",
+          city: "Vancouver",
+          country: "canada",
+          postalCode: "B1B1B1",
+          selectedCountry: "Canada",
+          provinceState: "BC",
+        },
+      },
+      primaryContact: {
+        firstName: "John",
+        lastName: "Doe",
+        email: "john.doe@testmail.com",
+        phone: "(250) 555-1234",
+      },
+    });
+  });
+
   it("Should save institution location with null code when an empty institution code is submitted.", async () => {
     // Arrange
     const location = createFakeInstitutionLocation();

From 80790d5a781edd5fa75a5533ee988a2a9270c818 Mon Sep 17 00:00:00 2001
From: Tiago Graf <tiago.graf@quartech.com>
Date: Wed, 18 Mar 2026 14:25:03 -0700
Subject: [PATCH 14/16] Update institutionlocation.json

---
 .../form-definitions/institutionlocation.json | 67 +++++--------------
 1 file changed, 17 insertions(+), 50 deletions(-)

diff --git a/sources/packages/forms/src/form-definitions/institutionlocation.json b/sources/packages/forms/src/form-definitions/institutionlocation.json
index 5e39464e8d..eadb23eefd 100644
--- a/sources/packages/forms/src/form-definitions/institutionlocation.json
+++ b/sources/packages/forms/src/form-definitions/institutionlocation.json
@@ -65,9 +65,6 @@
             "maxLength": 100
           },
           "key": "locationName",
-          "attributes": {
-            "data-cy": "locationName"
-          },
           "type": "textfield",
           "input": true
         },
@@ -88,8 +85,12 @@
             {
               "name": "Disable and clear when no institution location code",
               "trigger": {
-                "type": "javascript",
-                "javascript": "result = data.noInstitutionCode === true"
+                "type": "simple",
+                "simple": {
+                  "show": true,
+                  "when": "noInstitutionCode",
+                  "eq": "true"
+                }
               },
               "actions": [
                 {
@@ -122,8 +123,12 @@
             {
               "name": "Required when no institution code is unchecked",
               "trigger": {
-                "type": "javascript",
-                "javascript": "result = data.noInstitutionCode === false"
+                "type": "simple",
+                "simple": {
+                  "show": true,
+                  "when": "noInstitutionCode",
+                  "eq": "false"
+                }
               },
               "actions": [
                 {
@@ -139,9 +144,6 @@
               ]
             }
           ],
-          "attributes": {
-            "data-cy": "institutionCode"
-          },
           "type": "textfield",
           "input": true
         },
@@ -150,9 +152,6 @@
           "tableView": false,
           "defaultValue": false,
           "key": "noInstitutionCode",
-          "attributes": {
-            "data-cy": "noInstitutionCode"
-          },
           "type": "checkbox",
           "input": true
         },
@@ -171,7 +170,11 @@
           "customClass": "banner-warning",
           "hidden": true,
           "key": "noInstitutionCodeBanner",
-          "customConditional": "show = data.noInstitutionCode === true;",
+          "conditional": {
+            "show": true,
+            "when": "noInstitutionCode",
+            "eq": "true"
+          },
           "type": "htmlelement",
           "input": false,
           "tableView": false
@@ -184,9 +187,6 @@
             "maxLength": 100
           },
           "key": "addressLine1",
-          "attributes": {
-            "data-cy": "addressLine1"
-          },
           "type": "textfield",
           "input": true
         },
@@ -197,9 +197,6 @@
             "maxLength": 100
           },
           "key": "addressLine2",
-          "attributes": {
-            "data-cy": "addressLine2"
-          },
           "type": "textfield",
           "input": true
         },
@@ -229,9 +226,6 @@
                     "onlyAvailableItems": true
                   },
                   "key": "selectedCountry",
-                  "attributes": {
-                    "data-cy": "selectedCountry"
-                  },
                   "type": "select",
                   "input": true
                 }
@@ -315,9 +309,6 @@
                     "when": "selectedCountry",
                     "eq": "Canada"
                   },
-                  "attributes": {
-                    "data-cy": "provinceState"
-                  },
                   "type": "select",
                   "input": true
                 },
@@ -335,9 +326,6 @@
                     "when": "selectedCountry",
                     "eq": "other"
                   },
-                  "attributes": {
-                    "data-cy": "otherCountry"
-                  },
                   "type": "textfield",
                   "input": true
                 },
@@ -377,9 +365,6 @@
                     "maxLength": 100
                   },
                   "key": "city",
-                  "attributes": {
-                    "data-cy": "city"
-                  },
                   "type": "textfield",
                   "input": true,
                   "hideOnChildrenHidden": false
@@ -411,9 +396,6 @@
                     "when": "selectedCountry",
                     "eq": "Canada"
                   },
-                  "attributes": {
-                    "data-cy": "canadaPostalCode"
-                  },
                   "type": "textfield",
                   "input": true,
                   "hideOnChildrenHidden": false
@@ -431,9 +413,6 @@
                     "when": "selectedCountry",
                     "eq": "other"
                   },
-                  "attributes": {
-                    "data-cy": "otherPostalCode"
-                  },
                   "type": "textfield",
                   "input": true
                 },
@@ -518,9 +497,6 @@
                     "maxLength": 100
                   },
                   "key": "primaryContactFirstName",
-                  "attributes": {
-                    "data-cy": "primaryContactFirstName"
-                  },
                   "type": "textfield",
                   "input": true,
                   "hideOnChildrenHidden": false
@@ -543,9 +519,6 @@
                     "maxLength": 100
                   },
                   "key": "primaryContactLastName",
-                  "attributes": {
-                    "data-cy": "primaryContactLastName"
-                  },
                   "type": "textfield",
                   "input": true,
                   "hideOnChildrenHidden": false
@@ -576,9 +549,6 @@
                     "required": true
                   },
                   "key": "primaryContactEmail",
-                  "attributes": {
-                    "data-cy": "primaryContactEmail"
-                  },
                   "type": "email",
                   "input": true
                 }
@@ -603,9 +573,6 @@
                     "maxLength": 20
                   },
                   "key": "primaryContactPhone",
-                  "attributes": {
-                    "data-cy": "primaryContactPhone"
-                  },
                   "type": "textfield",
                   "input": true,
                   "hideOnChildrenHidden": false

From 2ed5e43ebab14a35b3f388df38839a3a734b28b6 Mon Sep 17 00:00:00 2001
From: Tiago Graf <tiago.graf@quartech.com>
Date: Wed, 18 Mar 2026 14:31:30 -0700
Subject: [PATCH 15/16] Update ApproveDenyDesignationModal.vue

---
 .../institution/modals/ApproveDenyDesignationModal.vue     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue b/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue
index 2eace9123f..bccb401db5 100644
--- a/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue
+++ b/sources/packages/web/src/components/aest/institution/modals/ApproveDenyDesignationModal.vue
@@ -57,6 +57,13 @@
                 />
               </v-col>
             </v-row>
+            <v-row v-if="item.approved && !item.institutionCode" class="mt-0">
+              <v-col class="text-right pt-0">
+                <span class="text-error d-block">
+                  No institution location code
+                </span>
+              </v-col>
+            </v-row>
           </template>
         </content-group>
         <v-textarea

From 7852a327266cdc48e9d777b9cdc92c94272c9f59 Mon Sep 17 00:00:00 2001
From: Tiago Graf <tiago.graf@quartech.com>
Date: Wed, 18 Mar 2026 14:33:50 -0700
Subject: [PATCH 16/16] Update institutionlocation.json

---
 .../form-definitions/institutionlocation.json | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/sources/packages/forms/src/form-definitions/institutionlocation.json b/sources/packages/forms/src/form-definitions/institutionlocation.json
index eadb23eefd..8b13ef0d5f 100644
--- a/sources/packages/forms/src/form-definitions/institutionlocation.json
+++ b/sources/packages/forms/src/form-definitions/institutionlocation.json
@@ -119,29 +119,6 @@
                   "state": false
                 }
               ]
-            },
-            {
-              "name": "Required when no institution code is unchecked",
-              "trigger": {
-                "type": "simple",
-                "simple": {
-                  "show": true,
-                  "when": "noInstitutionCode",
-                  "eq": "false"
-                }
-              },
-              "actions": [
-                {
-                  "name": "Required true",
-                  "type": "property",
-                  "property": {
-                    "label": "Required",
-                    "value": "validate.required",
-                    "type": "boolean"
-                  },
-                  "state": true
-                }
-              ]
             }
           ],
           "type": "textfield",