Release v1.0.0 to main merge (#2046)

Merging the changes for Release v1.0.0 into the main branch.
bcgov · Jun 26, 2023 · d521713 · d521713
2 parents 0fdbe8f + 6713338
commit d521713
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 199 deletions.
diff --git a/README.md b/README.md
@@ -23,9 +23,9 @@ High, new features released weekly
 - [Technologies Overview](./docs/technologies-overview.md)
 - [BCeID-Web Service Integration](./docs/bceid-webservice-integration.md)
 - How To
-  - [DevOps](./docs/howto/devops.md)
+  - [DevOps](https://github.com/bcgov/SIMS/wiki/DevOps-and-Running-the-Application#devops)
   - [Database Migration](./docs/howto/db-migration.md)
-  - [Keycloak Configuration](./docs/hotwot/keycloak-config.md)
+  - [Keycloak Configuration](https://github.com/bcgov/SIMS/wiki/Keycloak-Config)
 
 ## License
 

diff --git a/devops/Makefile b/devops/Makefile
@@ -286,7 +286,9 @@ deploy-redis:
 # Command to initialize the redis cluster.
 # Make sure that all the redis pods are up and running before initializing the cluster.
 init-redis-cluster:
-	@oc exec -n $(NAMESPACE) -it redis-0 -- redis-cli -a $(oc get secret -n $(NAMESPACE) redis-creds -o jsonpath='{.data.password}' | base64 -d) --cluster create --cluster-replicas 1 $(oc get pods -n $(NAMESPACE) -l app=redis -o jsonpath='{range.items[*]}{.status.podIP}:6379 ')
+	REDIS_PASSWORD=$$(oc get secret -n $(NAMESPACE) redis-creds -o jsonpath='{.data.password}' | base64 -d); \
+	REDIS_NODES=$$(oc get pods -n $(NAMESPACE) -l app=redis -o jsonpath='{range .items[*]}{.status.podIP}:6379 ' | sed 's/ :6379 $$/ /'); \
+	oc exec -n $(NAMESPACE) -it redis-0 -- redis-cli -a $$REDIS_PASSWORD --cluster create $$REDIS_NODES --cluster-replicas 1
 
 create-db:
 	test -n $(DB_NAME)

diff --git a/devops/openshift/database/patroni-deploy.yml b/devops/openshift/database/patroni-deploy.yml
@@ -31,10 +31,6 @@ objects:
       role: master
       cluster-name: ${NAME}
       app.kubernetes.io/name: patroni
-      sessionAffinity: None
-      type: ClusterIP
-    status:
-      loadBalancer: {}
 - apiVersion: apps/v1
   kind: StatefulSet
   metadata:

diff --git a/docs/howto/devops.md b/docs/howto/devops.md
diff --git a/sources/packages/backend/apps/api/Dockerfile b/sources/packages/backend/apps/api/Dockerfile
@@ -15,6 +15,7 @@ RUN npm ci
 # Copying sources.
 COPY ./apps/api ./apps/api
 COPY ./libs ./libs
+COPY ./apps/db-migrations ./apps/db-migrations
 
 # Building app
 RUN npm run build api

diff --git a/...-enrollment/_tests_/e2e/confirmation-of-enrollment.institutions.getCOESummary.e2e-spec.ts b/...-enrollment/_tests_/e2e/confirmation-of-enrollment.institutions.getCOESummary.e2e-spec.ts
@@ -128,6 +128,30 @@ describe("ConfirmationOfEnrollmentInstitutionsController(e2e)-getCOESummary", ()
       });
   });
 
+  it("Should return a BadRequest error when the page number has an invalid integer.", async () => {
+    // Arrange
+    const collegeCLocation = createFakeInstitutionLocation(collegeC);
+    await authorizeUserTokenForLocation(
+      appDataSource,
+      InstitutionTokenTypes.CollegeCUser,
+      collegeCLocation,
+    );
+    const invalidPage = Number.MAX_SAFE_INTEGER + 1;
+    const endpoint = `/institutions/location/${collegeCLocation.id}/confirmation-of-enrollment/enrollmentPeriod/${EnrollmentPeriod.Current}?page=${invalidPage}&pageLimit=10&sortField=disbursementDate&sortOrder=ASC`;
+    const token = await getInstitutionToken(InstitutionTokenTypes.CollegeCUser);
+
+    // Act/Assert
+    await request(app.getHttpServer())
+      .get(endpoint)
+      .auth(token, BEARER_AUTH_TYPE)
+      .expect(HttpStatus.BAD_REQUEST)
+      .expect({
+        statusCode: HttpStatus.BAD_REQUEST,
+        message: ["page must not be greater than 9007199254740991"],
+        error: "Bad Request",
+      });
+  });
+
   it("Should get the COE upcoming summary when there are 2 COEs available.", async () => {
     // Arrange
     const collegeCLocation = createFakeInstitutionLocation(collegeC);

diff --git a/sources/packages/backend/apps/api/src/route-controllers/models/pagination.dto.ts b/sources/packages/backend/apps/api/src/route-controllers/models/pagination.dto.ts
@@ -21,6 +21,7 @@ abstract class PaginationOptionsAPIInDTO {
    * Page number.
    */
   @Min(0)
+  @Max(Number.MAX_SAFE_INTEGER)
   page: number;
   /**
    * Page size or records per page.

diff --git a/sources/packages/forms/src/form-definitions/educationprogram.json b/sources/packages/forms/src/form-definitions/educationprogram.json
@@ -1,9 +1,9 @@
 {
     "title": "Education Program",
-    "display": "form",
-    "type": "form",
     "name": "educationProgram",
     "path": "educationprogram",
+    "type": "form",
+    "display": "form",
     "tags": [
         "common"
     ],
@@ -816,7 +816,8 @@
                     "addons": [],
                     "inputType": "text",
                     "id": "e7oydq",
-                    "defaultValue": ""
+                    "defaultValue": "",
+                    "isNew": false
                 },
                 {
                     "label": "Field of study code",
@@ -917,7 +918,7 @@
                     "labelWidth": "",
                     "labelMargin": "",
                     "placeholder": "",
-                    "description": "Format (####) Optional**",
+                    "description": "Format (#####) Optional**",
                     "tooltip": "",
                     "prefix": "",
                     "suffix": "",
@@ -961,8 +962,8 @@
                         "maxLength": "",
                         "minWords": "",
                         "maxWords": "",
-                        "pattern": "[0-9]{4}",
-                        "customMessage": "Incorrect Format'",
+                        "pattern": "[0-9]{5}",
+                        "customMessage": "Incorrect Format",
                         "custom": "",
                         "customPrivate": false,
                         "json": "",
@@ -977,7 +978,7 @@
                     "tags": [],
                     "properties": {},
                     "conditional": {
-                        "show": null,
+                        "show": "",
                         "when": null,
                         "eq": "",
                         "json": ""
@@ -1022,7 +1023,8 @@
                     "addons": [],
                     "inputType": "text",
                     "id": "esqh37ui",
-                    "defaultValue": ""
+                    "defaultValue": "",
+                    "lockKey": true
                 },
                 {
                     "label": "SABC program code, if this program has been approved for SABC funding before",
@@ -1090,7 +1092,7 @@
                     "tags": [],
                     "properties": {},
                     "conditional": {
-                        "show": null,
+                        "show": "",
                         "when": null,
                         "eq": "",
                         "json": ""
@@ -2064,7 +2066,8 @@
                     "allowMultipleMasks": false,
                     "addons": [],
                     "tag": "p",
-                    "id": "eaximc"
+                    "id": "eaximc",
+                    "className": ""
                 },
                 {
                     "label": "Program length",
@@ -5906,7 +5909,8 @@
                     "allowMultipleMasks": false,
                     "addons": [],
                     "tag": "p",
-                    "id": "exxean"
+                    "id": "exxean",
+                    "className": ""
                 },
                 {
                     "label": "I confirm this program meets the policies outlined in the StudentAid BC policy manual.",