From 5b57a5ff0ff10e11903e9e5ea06648106340a7ff Mon Sep 17 00:00:00 2001 From: Marco Villeneuve Date: Fri, 1 Dec 2023 12:25:45 -0800 Subject: [PATCH 1/2] Resources --- .github/workflows/deploy-to.openshift-prod.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-to.openshift-prod.yml b/.github/workflows/deploy-to.openshift-prod.yml index fe5e92cf..93c5e638 100644 --- 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 From e72def3366d5b4c1909c5d9abdc00a3f7ae08020 Mon Sep 17 00:00:00 2001 From: Marco Villeneuve Date: Mon, 4 Dec 2023 16:26:30 -0800 Subject: [PATCH 2/2] Small bug fix --- .../api/edx/service/v1/SecureExchangeService.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 index 98bfe3c6..e53269b3 100644 --- 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 secureExchangeIds, String r final Optional 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); } }