Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CCMSPUI-596 | Add is_additional_information_prompt_required field #156

Closed
wants to merge 3 commits into from
Closed

CCMSPUI-596 | Add is_additional_information_prompt_required field #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f18e336
CCMSPUI-596 | Add is_additional_information_prompt_required field
arunkumar461 Feb 26, 2025
61fcdd7
CCMSPUI-596 | Add test
arunkumar461 Feb 26, 2025
fdf8edc
CCMSPUI-596 | Fix checkstyle
arunkumar461 Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions data-api/open-api-specification.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 4 additions & 1 deletion data-service/src/main/java/uk/gov/laa/ccms/data/mapper/LookupMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,11 @@ 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);
ProviderRequestType providerRequestType);

@Mapping(source = "id.dataItemCode", target = "code")
@Mapping(source = "dataItemLabel", target = "label")
Expand Down
9 changes: 8 additions & 1 deletion data-service/src/test/java/uk/gov/laa/ccms/data/mapper/LookupMapperImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<ProviderRequestType> page = new PageImpl<>(List.of(providerRequestType1, providerRequestType2));

Expand Down Expand Up @@ -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");
Expand All @@ -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);

Expand Down