From 3c0b38ea6a232c1c3f39babc3d86b75754785890 Mon Sep 17 00:00:00 2001 From: David Jones Date: Mon, 10 Jun 2024 07:14:43 +0100 Subject: [PATCH 1/5] PAY-6433: IAC Flow Id update --- .../resources/application-functional-tests.properties | 1 + api/src/main/resources/application-local.properties | 1 + api/src/main/resources/application.properties | 1 + api/src/test/resources/application-componenttest.properties | 1 + charts/payment-api/Chart.yaml | 2 +- charts/payment-api/values.preview.template.yaml | 2 ++ charts/payment-api/values.yaml | 2 ++ .../uk/gov/hmcts/payment/api/service/PciPalPaymentService.java | 3 +++ 8 files changed, 12 insertions(+), 1 deletion(-) diff --git a/api/src/functionalTest/resources/application-functional-tests.properties b/api/src/functionalTest/resources/application-functional-tests.properties index f12b5e3cce..d85def5089 100644 --- a/api/src/functionalTest/resources/application-functional-tests.properties +++ b/api/src/functionalTest/resources/application-functional-tests.properties @@ -69,6 +69,7 @@ pci-pal.antenna.return.url=${PCI_PAL_ANTENNA_RETURN_URL:http://localhost} pci-pal.antenna.probate.flow.id=${PCI_PAL_ANTENNA_PROBATE_FLOW_ID:1356} pci-pal.antenna.divorce.flow.id=${PCI_PAL_ANTENNA_DIVORCE_FLOW_ID:1356} pci-pal.antenna.prl.flow.id=${PCI_PAL_ANTENNA_PRL_FLOW_ID:1356} +pci-pal.antenna.IAC.flow.id=${PCI_PAL_ANTENNA_IAC_FLOW_ID:1356} pci-pal.antenna.strategic.flow.id=${PCI_PAL_ANTENNA_STRATEGIC_FLOW_ID:1356} auth.idam.client.baseUrl=${AUTH_IDAM_CLIENT_BASEURL:https://idam-api.aat.platform.hmcts.net} diff --git a/api/src/main/resources/application-local.properties b/api/src/main/resources/application-local.properties index 92c84331d8..4348263298 100644 --- a/api/src/main/resources/application-local.properties +++ b/api/src/main/resources/application-local.properties @@ -135,6 +135,7 @@ pci-pal.antenna.return.url=${PCI_PAL_ANTENNA_RETURN_URL:http://localhost} pci-pal.antenna.probate.flow.id=${PCI_PAL_ANTENNA_PROBATE_FLOW_ID:1356} pci-pal.antenna.divorce.flow.id=${PCI_PAL_ANTENNA_DIVORCE_FLOW_ID:1356} pci-pal.antenna.prl.flow.id=${PCI_PAL_ANTENNA_PRL_FLOW_ID:1356} +pci-pal.antenna.iac.flow.id=${PCI_PAL_ANTENNA_IAC_FLOW_ID:1356} pci-pal.antenna.strategic.flow.id=${PCI_PAL_ANTENNA_STRATEGIC_FLOW_ID:1356} diff --git a/api/src/main/resources/application.properties b/api/src/main/resources/application.properties index 946cdfb422..c22f6b74ce 100644 --- a/api/src/main/resources/application.properties +++ b/api/src/main/resources/application.properties @@ -44,6 +44,7 @@ pci-pal.antenna.return.url=${PCI_PAL_ANTENNA_RETURN_URL:dummy} pci-pal.antenna.probate.flow.id=${PCI_PAL_ANTENNA_PROBATE_FLOW_ID:dummy} pci-pal.antenna.divorce.flow.id=${PCI_PAL_ANTENNA_DIVORCE_FLOW_ID:dummy} pci-pal.antenna.prl.flow.id=${PCI_PAL_ANTENNA_PRL_FLOW_ID:dummy} +pci-pal.antenna.iac.flow.id=${PCI_PAL_ANTENNA_IAC_FLOW_ID:dummy} pci-pal.antenna.strategic.flow.id=${PCI_PAL_ANTENNA_STRATEGIC_FLOW_ID:1423} diff --git a/api/src/test/resources/application-componenttest.properties b/api/src/test/resources/application-componenttest.properties index a755310794..76ed1e6468 100644 --- a/api/src/test/resources/application-componenttest.properties +++ b/api/src/test/resources/application-componenttest.properties @@ -126,6 +126,7 @@ pci-pal.antenna.return.url=${PCI_PAL_ANTENNA_RETURN_URL:http://localhost} pci-pal.antenna.probate.flow.id=${PCI_PAL_ANTENNA_PROBATE_FLOW_ID:1356} pci-pal.antenna.divorce.flow.id=${PCI_PAL_ANTENNA_DIVORCE_FLOW_ID:1356} pci-pal.antenna.prl.flow.id=${PCI_PAL_ANTENNA_PRL_FLOW_ID:1356} +pci-pal.antenna.iac.flow.id=${PCI_PAL_ANTENNA_IAC_FLOW_ID:1356} pci-pal.antenna.strategic.flow.id=${PCI_PAL_ANTENNA_STRATEGIC_FLOW_ID:1356} auth.idam.client.baseurl=${AUTH_IDAM_CLIENT_BASEURL:http://localhost:5000} diff --git a/charts/payment-api/Chart.yaml b/charts/payment-api/Chart.yaml index 78dd773f48..5ef065c2ba 100644 --- a/charts/payment-api/Chart.yaml +++ b/charts/payment-api/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.0" description: Helm chart for the HMCTS payment api name: payment-api home: https://github.com/hmcts/ccpay-payment-app -version: 2.3.34 +version: 2.3.35 maintainers: - name: HMCTS Fees & Payments Dev Team email: ccpay@hmcts.net diff --git a/charts/payment-api/values.preview.template.yaml b/charts/payment-api/values.preview.template.yaml index 0f6fa92768..9697f3b0f6 100644 --- a/charts/payment-api/values.preview.template.yaml +++ b/charts/payment-api/values.preview.template.yaml @@ -55,6 +55,8 @@ java: alias: pci-pal.antenna.divorce.flow.id - name: pci-pal-antenna-prl-flow-id alias: pci-pal.antenna.prl.flow.id + - name: pci-pal-antenna-iac-flow-id + alias: pci-pal.antenna.iac.flow.id - name: pci-pal-antenna-strategic-flow-id alias: pci-pal.antenna.strategic.flow.id - name: spring-mail-password diff --git a/charts/payment-api/values.yaml b/charts/payment-api/values.yaml index 7e068f49bc..4467678f5d 100644 --- a/charts/payment-api/values.yaml +++ b/charts/payment-api/values.yaml @@ -216,6 +216,8 @@ java: alias: pci-pal.antenna.divorce.flow.id - name: pci-pal-antenna-prl-flow-id alias: pci-pal.antenna.prl.flow.id + - name: pci-pal-antenna-iac-flow-id + alias: pci-pal.antenna.iac.flow.id - name: pci-pal-antenna-strategic-flow-id alias: pci-pal.antenna.strategic.flow.id - name: spring-mail-password diff --git a/model/src/main/java/uk/gov/hmcts/payment/api/service/PciPalPaymentService.java b/model/src/main/java/uk/gov/hmcts/payment/api/service/PciPalPaymentService.java index 390c4a5b2c..3c9ebfcc0b 100644 --- a/model/src/main/java/uk/gov/hmcts/payment/api/service/PciPalPaymentService.java +++ b/model/src/main/java/uk/gov/hmcts/payment/api/service/PciPalPaymentService.java @@ -83,6 +83,8 @@ public class PciPalPaymentService implements DelegatingPaymentService Date: Mon, 10 Jun 2024 08:30:26 +0100 Subject: [PATCH 2/5] PAY-7141: Minor update to pack lib. --- api/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/build.gradle b/api/build.gradle index 5bbd9afbba..3cd51f2eed 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -71,7 +71,7 @@ def versions = [ gradlePitest : '1.3.0', sonarPitest : '0.5', lombok : '1.18.32', - pact_version : '4.6.10', + pact_version : '4.1.7', reformS2sClient : '3.1.4', serenity : '4.1.17', serenityCucumber: '4.1.20', From fcd03e8142bd7daea1398cd0ccef5cd44ec71d39 Mon Sep 17 00:00:00 2001 From: David Jones Date: Mon, 10 Jun 2024 08:54:05 +0100 Subject: [PATCH 3/5] PAY-7141: Update s2s client. --- api/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/build.gradle b/api/build.gradle index 3cd51f2eed..34d3b797b6 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -72,7 +72,7 @@ def versions = [ sonarPitest : '0.5', lombok : '1.18.32', pact_version : '4.1.7', - reformS2sClient : '3.1.4', + reformS2sClient : '5.1.2', serenity : '4.1.17', serenityCucumber: '4.1.20', ] From 1c0b7d6c501642732407e5ef7877db393fabef90 Mon Sep 17 00:00:00 2001 From: David Jones Date: Mon, 10 Jun 2024 09:13:59 +0100 Subject: [PATCH 4/5] Update s2s client. --- api/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/api/build.gradle b/api/build.gradle index 34d3b797b6..e5d96d6ae3 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -89,6 +89,7 @@ dependencies { implementation group: 'com.github.hmcts.java-logging', name: 'logging-appinsights', version: javaLoggingVersion implementation group: 'com.github.hmcts', name: 'auth-checker-lib', version: '2.3.0' implementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: versions.reformS2sClient + implementation group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '6.1.0-M2' implementation group: 'org.springframework.boot', name: 'spring-boot-autoconfigure' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-security' From c226838b2d4091ee574a30f6df15d1644b8ad30d Mon Sep 17 00:00:00 2001 From: Dave Jones <38425925+davejones74@users.noreply.github.com> Date: Mon, 10 Jun 2024 15:11:08 +0100 Subject: [PATCH 5/5] Update build.gradle remove unwanted lib --- api/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/api/build.gradle b/api/build.gradle index e44da064e8..762c92f4d5 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -89,7 +89,6 @@ dependencies { implementation group: 'com.github.hmcts.java-logging', name: 'logging-appinsights', version: javaLoggingVersion implementation group: 'com.github.hmcts', name: 'auth-checker-lib', version: '2.1.5' implementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: versions.reformS2sClient - implementation group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '6.1.0-M2' implementation group: 'org.springframework.boot', name: 'spring-boot-autoconfigure' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-security'