From f18e3360a22b71a5b40a0c2535b9558cd932019a Mon Sep 17 00:00:00 2001 From: Arun Kumar Madesh <56151567+arunkumar461@users.noreply.github.com> Date: Wed, 26 Feb 2025 15:09:46 +0000 Subject: [PATCH 1/3] CCMSPUI-596 | Add is_additional_information_prompt_required field --- data-api/open-api-specification.yml | 2 ++ .../main/java/uk/gov/laa/ccms/data/mapper/LookupMapper.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/data-api/open-api-specification.yml b/data-api/open-api-specification.yml index caa43ad7..110b991b 100644 --- a/data-api/open-api-specification.yml +++ b/data-api/open-api-specification.yml @@ -1911,6 +1911,8 @@ components: type: 'boolean' additional_information_prompt: type: 'string' + is_additional_information_prompt_required: + type: 'boolean' task_type_id: type: 'string' is_claim_upload_enabled: diff --git a/data-service/src/main/java/uk/gov/laa/ccms/data/mapper/LookupMapper.java b/data-service/src/main/java/uk/gov/laa/ccms/data/mapper/LookupMapper.java index 92e29962..4f6da086 100644 --- a/data-service/src/main/java/uk/gov/laa/ccms/data/mapper/LookupMapper.java +++ b/data-service/src/main/java/uk/gov/laa/ccms/data/mapper/LookupMapper.java @@ -184,6 +184,9 @@ ProviderRequestTypeLookupDetail toProviderRequestTypeLookupDetail( @Mapping(source = "additionalInformationPrompt", target = "additionalInformationPrompt") @Mapping(source = "claimUploadEnabled", target = "isClaimUploadEnabled") @Mapping(source = "providerRequestData", target = "dataItems") + @Mapping(target = "isAdditionalInformationPromptRequired", + expression = "java(!providerRequestType.getClaimUploadEnabled() " + + "&& providerRequestType.getProviderRequestData().isEmpty())") ProviderRequestTypeLookupValueDetail toProviderRequestTypeLookupValueDetail( ProviderRequestType providerRequestType); From 61fcdd7ad69a2816e9ec1f30736983ccb6b21189 Mon Sep 17 00:00:00 2001 From: Arun Kumar Madesh <56151567+arunkumar461@users.noreply.github.com> Date: Wed, 26 Feb 2025 15:12:45 +0000 Subject: [PATCH 2/3] CCMSPUI-596 | Add test --- .../gov/laa/ccms/data/mapper/LookupMapperImplTest.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/data-service/src/test/java/uk/gov/laa/ccms/data/mapper/LookupMapperImplTest.java b/data-service/src/test/java/uk/gov/laa/ccms/data/mapper/LookupMapperImplTest.java index 76e68691..7ec8705d 100644 --- a/data-service/src/test/java/uk/gov/laa/ccms/data/mapper/LookupMapperImplTest.java +++ b/data-service/src/test/java/uk/gov/laa/ccms/data/mapper/LookupMapperImplTest.java @@ -8,6 +8,7 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -1060,10 +1061,15 @@ void toProviderRequestTypeLookupDetail_returnsCorrectDetail() { ProviderRequestType providerRequestType1 = new ProviderRequestType(); providerRequestType1.setType("type1"); providerRequestType1.setName("name1"); + providerRequestType1.setClaimUploadEnabled(false); + providerRequestType1.setProviderRequestData(Collections.emptyList()); + ProviderRequestType providerRequestType2 = new ProviderRequestType(); providerRequestType2.setType("type2"); providerRequestType2.setName("name2"); + providerRequestType2.setClaimUploadEnabled(true); + providerRequestType2.setProviderRequestData(Collections.emptyList()); Page page = new PageImpl<>(List.of(providerRequestType1, providerRequestType2)); @@ -1091,7 +1097,7 @@ void toProviderRequestTypeLookupValueDetail_returnsCorrectDetail() { ProviderRequestType providerRequestType = new ProviderRequestType(); providerRequestType.setCaseRelated(true); providerRequestType.setAdditionalInformationPrompt("Additional info"); - providerRequestType.setClaimUploadEnabled(true); + providerRequestType.setClaimUploadEnabled(false); providerRequestType.setType("type1"); providerRequestType.setName("name1"); providerRequestType.setTaskTypeId("123"); @@ -1108,6 +1114,7 @@ void toProviderRequestTypeLookupValueDetail_returnsCorrectDetail() { expected.setTaskTypeId(providerRequestType.getTaskTypeId()); expected.setAccessFunctionCode(providerRequestType.getAccessFunctionCode()); expected.setClaimUploadPrompt(providerRequestType.getClaimUploadPrompt()); + expected.setIsAdditionalInformationPromptRequired(true); ProviderRequestTypeLookupValueDetail actual = mapper.toProviderRequestTypeLookupValueDetail(providerRequestType); From fdf8edcd07fa3d55ec894be49e9cbdb50388b0e4 Mon Sep 17 00:00:00 2001 From: Arun Kumar Madesh <56151567+arunkumar461@users.noreply.github.com> Date: Wed, 26 Feb 2025 15:30:38 +0000 Subject: [PATCH 3/3] CCMSPUI-596 | Fix checkstyle --- .../main/java/uk/gov/laa/ccms/data/mapper/LookupMapper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data-service/src/main/java/uk/gov/laa/ccms/data/mapper/LookupMapper.java b/data-service/src/main/java/uk/gov/laa/ccms/data/mapper/LookupMapper.java index 4f6da086..f2ea7f47 100644 --- a/data-service/src/main/java/uk/gov/laa/ccms/data/mapper/LookupMapper.java +++ b/data-service/src/main/java/uk/gov/laa/ccms/data/mapper/LookupMapper.java @@ -185,10 +185,10 @@ ProviderRequestTypeLookupDetail toProviderRequestTypeLookupDetail( @Mapping(source = "claimUploadEnabled", target = "isClaimUploadEnabled") @Mapping(source = "providerRequestData", target = "dataItems") @Mapping(target = "isAdditionalInformationPromptRequired", - expression = "java(!providerRequestType.getClaimUploadEnabled() " + - "&& providerRequestType.getProviderRequestData().isEmpty())") + expression = "java(!providerRequestType.getClaimUploadEnabled() " + + "&& providerRequestType.getProviderRequestData().isEmpty())") ProviderRequestTypeLookupValueDetail toProviderRequestTypeLookupValueDetail( - ProviderRequestType providerRequestType); + ProviderRequestType providerRequestType); @Mapping(source = "id.dataItemCode", target = "code") @Mapping(source = "dataItemLabel", target = "label")