From 918a1418caf734d626c5f8c26c5ee513aa6912b6 Mon Sep 17 00:00:00 2001 From: LeonardoPalmeiro Date: Thu, 30 Jan 2025 14:07:00 +0000 Subject: [PATCH 1/5] add language --- .../reform/civil/controllers/FeesPaymentController.java | 7 ++++--- .../gov/hmcts/reform/civil/service/FeesPaymentService.java | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/civil/controllers/FeesPaymentController.java b/src/main/java/uk/gov/hmcts/reform/civil/controllers/FeesPaymentController.java index 46d36fb7a..5b31abb33 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/controllers/FeesPaymentController.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/controllers/FeesPaymentController.java @@ -23,7 +23,7 @@ @RequiredArgsConstructor public class FeesPaymentController { - public static final String FEES_PAYMENT_REQUEST_URL = "/fees/case/{caseReference}/payment"; + public static final String FEES_PAYMENT_REQUEST_URL = "/fees/case/{caseReference}/{language}payment"; public static final String FEES_PAYMENT_STATUS_URL = "/fees/case/{caseReference}/payment/{paymentReference}/status"; private final FeesPaymentService feesPaymentService; @@ -34,10 +34,11 @@ public class FeesPaymentController { @ApiResponse(responseCode = "400", description = "Bad Request")}) public ResponseEntity createGovPaymentRequest( @RequestHeader(HttpHeaders.AUTHORIZATION) String authorization, - @PathVariable("caseReference") String caseReference) { + @PathVariable("caseReference") String caseReference, + @PathVariable("language") String language) { return new ResponseEntity<>( - feesPaymentService.createGovPaymentRequest(caseReference, authorization), + feesPaymentService.createGovPaymentRequest(caseReference, language, authorization), HttpStatus.OK ); } diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/FeesPaymentService.java b/src/main/java/uk/gov/hmcts/reform/civil/service/FeesPaymentService.java index 8b6369568..d014f2f26 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/service/FeesPaymentService.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/service/FeesPaymentService.java @@ -30,9 +30,9 @@ public class FeesPaymentService { private final UpdatePaymentStatusService updatePaymentStatusService; @Value("${cui-front-end.url}") String cuiFrontEndUrl; - public CardPaymentStatusResponse createGovPaymentRequest(String caseReference, String authorization) { + public CardPaymentStatusResponse createGovPaymentRequest(String caseReference,String language, String authorization) { - log.info("Creating gov Payment request url for caseId {}", caseReference); + log.info("Creating gov Payment request url for caseId {} {}", caseReference, language); CaseDetails caseDetails = coreCaseDataService.getCase(Long.valueOf(caseReference)); CaseData caseData = caseDetailsConverter.toCaseData(caseDetails); String parentCaseRef = caseData.getParentCaseReference(); @@ -48,7 +48,7 @@ public CardPaymentStatusResponse createGovPaymentRequest(String caseReference, S .divide(BigDecimal.valueOf(100), RoundingMode.CEILING) .setScale(2, RoundingMode.CEILING)) .currency("GBP") - .language(caseData.isApplicantBilingual() ? "cy" : "En") + .language(language) .returnUrl(cuiFrontEndUrl + returnUrlSubPath + caseReference) .build(); CardPaymentServiceRequestResponse govPayCardPaymentRequest = paymentStatusService From 2554b9de12ba9d58e74ea57d0ddadf89bc5fa14e Mon Sep 17 00:00:00 2001 From: LeonardoPalmeiro Date: Thu, 30 Jan 2025 14:38:10 +0000 Subject: [PATCH 2/5] fix unit test --- .../reform/civil/controllers/FeesPaymentController.java | 2 +- .../reform/civil/service/FeesPaymentServiceTest.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/civil/controllers/FeesPaymentController.java b/src/main/java/uk/gov/hmcts/reform/civil/controllers/FeesPaymentController.java index 5b31abb33..a456d9127 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/controllers/FeesPaymentController.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/controllers/FeesPaymentController.java @@ -23,7 +23,7 @@ @RequiredArgsConstructor public class FeesPaymentController { - public static final String FEES_PAYMENT_REQUEST_URL = "/fees/case/{caseReference}/{language}payment"; + public static final String FEES_PAYMENT_REQUEST_URL = "/fees/case/{caseReference}/{language}/payment"; public static final String FEES_PAYMENT_STATUS_URL = "/fees/case/{caseReference}/payment/{paymentReference}/status"; private final FeesPaymentService feesPaymentService; diff --git a/src/test/java/uk/gov/hmcts/reform/civil/service/FeesPaymentServiceTest.java b/src/test/java/uk/gov/hmcts/reform/civil/service/FeesPaymentServiceTest.java index 394861b6a..4d06b8777 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/service/FeesPaymentServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/service/FeesPaymentServiceTest.java @@ -107,6 +107,7 @@ void shouldCreateGovPayPaymentUrlForServiceRequestPayment() { CardPaymentStatusResponse govPaymentRequest = feesPaymentService.createGovPaymentRequest( "2801090368574910", + "en", BEARER_TOKEN ); assertThat(govPaymentRequest).isEqualTo(CardPaymentStatusResponse.from(response)); @@ -129,6 +130,7 @@ void shouldCreateGovPayPaymentUrlForServiceRequestAdditionalPayment() { CardPaymentStatusResponse govPaymentRequest = feesPaymentService.createGovPaymentRequest( "2801090368574910", + "en", BEARER_TOKEN ); assertThat(govPaymentRequest).isEqualTo(CardPaymentStatusResponse.from(response)); @@ -148,6 +150,7 @@ void shouldNotCreateGovPayPaymentUrlForMissingPbaDetails() { assertThatThrownBy( () -> feesPaymentService.createGovPaymentRequest( "2801090368574910", + "en", BEARER_TOKEN ) ).isInstanceOf(NullPointerException.class) @@ -170,6 +173,7 @@ void shouldNotCreateGovPayPaymentUrlForMissingServiceRequest() { assertThatThrownBy( () -> feesPaymentService.createGovPaymentRequest( "2801090368574910", + "en", BEARER_TOKEN ) ).isInstanceOf(NullPointerException.class) @@ -190,6 +194,7 @@ void shouldRetryCreatePaymentsApiWhenInternalServerErrorThrown() { PaymentsApiException.class, () -> feesPaymentService.createGovPaymentRequest( "2801090368574910", + "en", BEARER_TOKEN ) ); @@ -213,6 +218,7 @@ void shouldNotRetryCreatePaymentsApiWhenExceptionOtherThanInternalServerIsThrown PaymentsApiException.class, () -> feesPaymentService.createGovPaymentRequest( "2801090368574910", + "en", BEARER_TOKEN ) ); @@ -239,6 +245,7 @@ void shouldFailOnCreatePaymentsApiTwiceThenHaveSuccessfulRetry() { CardPaymentStatusResponse govPaymentRequest = feesPaymentService.createGovPaymentRequest( "2801090368574910", + "en", BEARER_TOKEN ); @@ -246,6 +253,7 @@ void shouldFailOnCreatePaymentsApiTwiceThenHaveSuccessfulRetry() { verify(paymentsClient, times(3)).createGovPayCardPaymentRequest( "2023-1701090705688", + BEARER_TOKEN, CARD_PAYMENT_SERVICE_REQUEST ); From e3b272e1f0cc18756cf3fc47346050edcc7616fa Mon Sep 17 00:00:00 2001 From: LeonardoPalmeiro Date: Thu, 30 Jan 2025 14:44:36 +0000 Subject: [PATCH 3/5] fix checkstyle --- .../uk/gov/hmcts/reform/civil/service/FeesPaymentService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/civil/service/FeesPaymentService.java b/src/main/java/uk/gov/hmcts/reform/civil/service/FeesPaymentService.java index d014f2f26..a853424f1 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/service/FeesPaymentService.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/service/FeesPaymentService.java @@ -30,7 +30,7 @@ public class FeesPaymentService { private final UpdatePaymentStatusService updatePaymentStatusService; @Value("${cui-front-end.url}") String cuiFrontEndUrl; - public CardPaymentStatusResponse createGovPaymentRequest(String caseReference,String language, String authorization) { + public CardPaymentStatusResponse createGovPaymentRequest(String caseReference, String language, String authorization) { log.info("Creating gov Payment request url for caseId {} {}", caseReference, language); CaseDetails caseDetails = coreCaseDataService.getCase(Long.valueOf(caseReference)); From 6141f079e0ff216255ad1ceb331a22ce98cdbed1 Mon Sep 17 00:00:00 2001 From: LeonardoPalmeiro Date: Fri, 31 Jan 2025 08:33:21 +0000 Subject: [PATCH 4/5] fix unit test --- .../gov/hmcts/reform/civil/service/FeesPaymentServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/civil/service/FeesPaymentServiceTest.java b/src/test/java/uk/gov/hmcts/reform/civil/service/FeesPaymentServiceTest.java index 4d06b8777..4766f4674 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/service/FeesPaymentServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/service/FeesPaymentServiceTest.java @@ -62,7 +62,7 @@ class FeesPaymentServiceTest { private static final CardPaymentServiceRequestDTO CARD_PAYMENT_SERVICE_REQUEST = CardPaymentServiceRequestDTO.builder() .returnUrl("${cui-front-end.url}/general-application/payment-confirmation/1701090368574910/gaid/2801090368574910") - .language("En") + .language("en") .amount(new BigDecimal("232.00")).currency("GBP").build(); @Autowired From 4dfe6fb06167a5365a8b0bdfe67640c51a366456 Mon Sep 17 00:00:00 2001 From: LeonardoPalmeiro Date: Fri, 31 Jan 2025 08:42:25 +0000 Subject: [PATCH 5/5] fix unit test --- .../reform/civil/controllers/FeesPaymentControllerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/FeesPaymentControllerTest.java b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/FeesPaymentControllerTest.java index 670be71ef..c0e82f4ae 100644 --- a/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/FeesPaymentControllerTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/reform/civil/controllers/FeesPaymentControllerTest.java @@ -38,7 +38,7 @@ public class FeesPaymentControllerTest extends BaseIntegrationTest { private static final CardPaymentServiceRequestDTO CARD_PAYMENT_SERVICE_REQUEST = CardPaymentServiceRequestDTO.builder() .returnUrl("http://localhost:3001/general-application/payment-confirmation/1701090368574910/gaid/2801090368574910") - .language("En") + .language("en") .amount(new BigDecimal("232.00")).currency("GBP").build(); @MockBean @@ -76,7 +76,7 @@ void shouldCreateGovPayPaymentUrlForServiceRequestPayment() { CARD_PAYMENT_SERVICE_REQUEST )).thenReturn(response); - doPost(BEARER_TOKEN, "", FEES_PAYMENT_REQUEST_URL, "2801090368574910") + doPost(BEARER_TOKEN, "", FEES_PAYMENT_REQUEST_URL, "2801090368574910", "en") .andExpect(content().json(toJson(CardPaymentStatusResponse.from(response)))) .andExpect(status().isOk()); }