Merge pull request #730 from bcgov/feature/GRAD2-3220

GRAD2-3220: task is completed.
bcgov · Jan 16, 2025 · b9e05f4 · b9e05f4
2 parents df2d84a + 8102683
commit b9e05f4
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 39 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/constant/FieldName.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/constant/FieldName.java
@@ -1,7 +1,6 @@
 package ca.bc.gov.educ.api.gradstudent.constant;
 
 public enum FieldName {
-    SCHOOL_OF_RECORD,
     SCHOOL_OF_RECORD_ID,
     GRAD_PROGRAM,
     ADULT_START_DATE,

diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/GradStatusEventPayloadDTO.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/GradStatusEventPayloadDTO.java
@@ -5,6 +5,8 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.UUID;
+
 @Data
 @Builder
 @AllArgsConstructor
@@ -13,8 +15,8 @@ public class GradStatusEventPayloadDTO {
     private String pen;
     private String program;
     private String programCompletionDate;
-    private String schoolOfRecord;
-    private String schoolAtGrad;
+    private UUID schoolOfRecordId;
+    private UUID schoolAtGradId;
     private String studentGrade;
     private String studentStatus;
     private String honoursStanding;

diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/SchoolClob.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/SchoolClob.java
@@ -23,30 +23,6 @@ public class SchoolClob {
 	private String openFlag;
 	private String schoolCategoryCode;
 	private String schoolCategoryLegacyCode;
-
-	public String getSchoolName() {
-		return  schoolName != null ? schoolName.trim(): null;
-	}
-
-	public String getDistrictName() {
-		return districtName != null ? districtName.trim(): null;
-	}
-
-	public String getAddress1() {
-		return address1 != null ? address1.trim(): null;
-	}
-
-	public String getAddress2() {
-		return address2 != null ? address2.trim(): null;
-	}
-
-	public String getCity() {
-		return city != null ? city.trim(): null;
-	}
-
-	public String getPostal() {
-		return postal != null ? postal.trim(): null;
-	}
 
 	@Override
 	public String toString() {

diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/GraduationStatusService.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/GraduationStatusService.java
@@ -1149,18 +1149,6 @@ private GradStatusEvent createGradStatusEvent(String updateUser,
             }
         }
         GradStatusEventPayloadDTO eventPayload = EducGradStudentApiUtils.transform(graduationStudentRecord);
-        if (graduationStudentRecord.getSchoolOfRecordId() != null) {
-            School schoolOfRecord = getSchool(graduationStudentRecord.getSchoolOfRecordId(), accessToken);
-            if (schoolOfRecord != null) {
-                eventPayload.setSchoolOfRecord(schoolOfRecord.getMincode());
-            }
-        }
-        if (graduationStudentRecord.getSchoolAtGradId() != null) {
-            School schoolAtGrad = getSchool(graduationStudentRecord.getSchoolAtGradId(), accessToken);
-            if (schoolAtGrad != null) {
-                eventPayload.setSchoolOfRecord(schoolAtGrad.getMincode());
-            }
-        }
         String jsonString = JsonUtil.getJsonStringFromObject(eventPayload);
         return GradStatusEvent.builder()
                 .createDate(LocalDateTime.now())

diff --git a/api/src/main/resources/application.yaml b/api/src/main/resources/application.yaml
@@ -82,6 +82,11 @@ server:
   #port: ${HTTP_PORT}
   #tomcat:
     #connection-timeout: 200s
+  compression:
+    enabled: ${ENABLE_COMPRESSION}
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain,text/css,text/javascript,application/javascript
+    min-response-size: 2048
+    excluded-user-agents: MSIE 6.0,UCBrowser
 
 #API Documentation
 springdoc:

diff --git a/tools/config/update-configmap.sh b/tools/config/update-configmap.sh
@@ -70,6 +70,7 @@ oc create -n "$GRAD_NAMESPACE"-"$envValue" configmap "$APP_NAME"-config-map \
   --from-literal=MIN_IDLE='20' \
   --from-literal=IDLE_TIMEOUT='300000' \
   --from-literal=MAX_LIFETIME='1500000' \
+  --from-literal=ENABLE_COMPRESSION="true" \
   --dry-run=client -o yaml | oc apply -f -
 
 echo Creating config map "$APP_NAME"-flb-sc-config-map