Merge pull request #309 from bcgov/feature/activationFix

EDX API reviewer fix
bcgov · Dec 5, 2023 · 4d2a959 · 4d2a959
2 parents 29e88bd + e72def3
commit 4d2a959
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/deploy-to.openshift-prod.yml b/.github/workflows/deploy-to.openshift-prod.yml
@@ -37,10 +37,10 @@ env:
   TARGET_ENV: "prod"
   MIN_REPLICAS: "3"
   MAX_REPLICAS: "3"
-  MIN_CPU: "75m"
-  MAX_CPU: "150m"
-  MIN_MEM: "400Mi"
-  MAX_MEM: "800Mi"
+  MIN_CPU: "200m"
+  MAX_CPU: "400m"
+  MIN_MEM: "800Mi"
+  MAX_MEM: "1Gi"
 
 on:
   # https://docs.github.com/en/actions/reference/events-that-trigger-workflows

diff --git a/api/src/main/java/ca/bc/gov/educ/api/edx/service/v1/SecureExchangeService.java b/api/src/main/java/ca/bc/gov/educ/api/edx/service/v1/SecureExchangeService.java
@@ -5,6 +5,7 @@
 import ca.bc.gov.educ.api.edx.model.v1.SecureExchangeContactTypeCodeEntity;
 import ca.bc.gov.educ.api.edx.model.v1.SecureExchangeEntity;
 import ca.bc.gov.educ.api.edx.model.v1.SecureExchangeStatusCodeEntity;
+import ca.bc.gov.educ.api.edx.props.ApplicationProperties;
 import ca.bc.gov.educ.api.edx.repository.*;
 import ca.bc.gov.educ.api.edx.struct.v1.SecureExchange;
 import ca.bc.gov.educ.api.edx.utils.TransformUtil;
@@ -114,9 +115,15 @@ public void claimAllSecureExchanges(final List<UUID> secureExchangeIds, String r
       final Optional<SecureExchangeEntity> curSecureExchange = this.getSecureExchangeRequestRepository().findById(secureExchangeId);
       if (curSecureExchange.isPresent()) {
         final SecureExchangeEntity secureExchange = curSecureExchange.get();
-        secureExchange.setReviewer(reviewer);
+        if(StringUtils.isNotEmpty(reviewer)) {
+          secureExchange.setReviewer(reviewer);
+          secureExchange.setUpdateUser(reviewer);
+        }else{
+          secureExchange.setReviewer(null);
+          secureExchange.setUpdateUser(ApplicationProperties.CLIENT_ID);
+        }
         secureExchange.setUpdateDate(LocalDateTime.now());
-        secureExchange.setUpdateUser(reviewer);
+
         this.secureExchangeRequestRepository.save(secureExchange);
       }
     }