Grad release (#690)

* GRAD2-2905: fixed the equal interim issue for OPEN program in xml preview. GRAD2-2905: fixed the equal interim issue for OPEN program in xml preview. * Added hikari settings * Bumped maxlifetime --------- Co-authored-by: Jinil Sung <[email protected]> Co-authored-by: chris.ditcher <[email protected]>
bcgov · Oct 18, 2024 · 457293c · 457293c
1 parent d346725
commit 457293c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/grad/report/dto/impl/TranscriptCourseImpl.java b/api/src/main/java/ca/bc/gov/educ/grad/report/dto/impl/TranscriptCourseImpl.java
@@ -247,7 +247,12 @@ public boolean compareCourse(final TranscriptCourse compareCourse) {
 
         // Removes duplication of courses by comparing and finding course with
         // highest percentage.
-        return percentage <= comparePercentage && comparePercentage != 0;
+        // GRAD2-2905
+        if (this.isCompletedCourseUsedForGrad() && !compareCourse.isCompletedCourseUsedForGrad()) {
+            return percentage < comparePercentage && comparePercentage != 0;
+        } else {
+            return percentage <= comparePercentage && comparePercentage != 0;
+        }
     }
 
     public boolean isCompletedCourseUsedForGrad() {

diff --git a/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/StudentTranscriptServiceImpl.java b/api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/StudentTranscriptServiceImpl.java
@@ -715,6 +715,7 @@ private TranscriptCourse getInterimCourse(
             final List<TranscriptCourse> results, boolean openGradProgram) {
         //Check for duplicate courses
         for (final TranscriptCourse compareCourse : results) {
+            if (course.equals(compareCourse)) continue;
             //Check and compare two courses for duplication and if required
             //replace course based on requirement.
             if (isInterimCourse(course, compareCourse, openGradProgram)) {

diff --git a/tools/config/update-configmap.sh b/tools/config/update-configmap.sh
@@ -59,7 +59,11 @@ oc create -n "$GRAD_NAMESPACE"-"$envValue" configmap "$APP_NAME"-config-map \
  --from-literal=GRAD_STUDENT_API="http://educ-grad-student-api.$GRAD_NAMESPACE-$envValue.svc.cluster.local:8080/" \
  --from-literal=GRAD_TRAX_API="http://educ-grad-trax-api.$GRAD_NAMESPACE-$envValue.svc.cluster.local:8080/" \
  --from-literal=PEN_API="http://student-api-master.$COMMON_NAMESPACE-$envValue.svc.cluster.local:8080/" \
- --from-literal=MAXIMUM_POOL_SIZE="10" \
+ --from-literal=CONNECTION_TIMEOUT='30000' \
+ --from-literal=MAXIMUM_POOL_SIZE='10' \
+ --from-literal=MIN_IDLE='10' \
+ --from-literal=IDLE_TIMEOUT='300000' \
+ --from-literal=MAX_LIFETIME='1500000' \
  --dry-run=client -o yaml | oc apply -f -
 echo