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

INTYGFV-16784: Should not include issuedByStaffId if not set. #1091

Merged
merged 1 commit into from
Aug 20, 2024
Merged

INTYGFV-16784: Should not include issuedByStaffId if not set. #1091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion .../se/inera/intyg/webcert/web/csintegration/certificate/ListCertificateQuestionsFromCS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,11 @@ public QueryFragaSvarResponse list(QueryFragaSvarParameter queryFragaSvarParamet
private MessageQueryCriteriaDTO convertFilter(QueryFragaSvarParameter queryFragaSvarParameter) {
final var userUnits = webCertUserService.getUser().getIdsOfSelectedVardenhet();
return MessageQueryCriteriaDTO.builder()
.issuedByStaffId(queryFragaSvarParameter.getHsaId())
.issuedByStaffId(
queryFragaSvarParameter.getHsaId() != null && !queryFragaSvarParameter.getHsaId().isEmpty()
? queryFragaSvarParameter.getHsaId()
: null
)
.forwarded(queryFragaSvarParameter.getVidarebefordrad())
.sentDateFrom(queryFragaSvarParameter.getChangedFrom())
.sentDateTo(queryFragaSvarParameter.getChangedTo())
Expand Down
68 changes: 47 additions & 21 deletions ...inera/intyg/webcert/web/csintegration/certificate/ListCertificateQuestionsFromCSTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package se.inera.intyg.webcert.web.csintegration.certificate;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
Expand Down Expand Up @@ -64,6 +65,7 @@ class ListCertificateQuestionsFromCSTest {
private static final ArendeListItem ARENDE_LIST_ITEM = new ArendeListItem();
private static final ArendeListItem ARENDE_LIST_NOT_INCLUDED_IN_STATUS = new ArendeListItem();
private static final GetUnitQuestionsRequestDTO GET_UNIT_QUESTIONS_REQUEST_DTO = GetUnitQuestionsRequestDTO.builder().build();
private static final String HSA_ID = "hsaId";
private static QueryFragaSvarParameter queryFragaSvarParameter;

@InjectMocks
Expand All @@ -87,7 +89,7 @@ class ListCertificateQuestionsFromCSTest {
@BeforeEach
void setUp() {
queryFragaSvarParameter = buildQueryFragaSvarParameter(false, true,
"SVAR_FRAN_VARDEN");
"SVAR_FRAN_VARDEN", HSA_ID);
}

@Test
Expand Down Expand Up @@ -155,7 +157,7 @@ void setUp() {

@Test
void shouldConvertSignedById() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "");
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "", HSA_ID);
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(MessageQueryCriteriaDTO.class);

Expand All @@ -165,9 +167,33 @@ void shouldConvertSignedById() {
argumentCaptor.getValue().getIssuedByStaffId());
}

@Test
void shouldExcludeSignedByIdIfEmpty() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "", "");
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(MessageQueryCriteriaDTO.class);

verify(csIntegrationRequestFactory).getUnitQuestionsRequestDTO(
argumentCaptor.capture()
);
assertNull(argumentCaptor.getValue().getIssuedByStaffId());
}

@Test
void shouldExcludeSignedByIdIfNull() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "", null);
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(MessageQueryCriteriaDTO.class);

verify(csIntegrationRequestFactory).getUnitQuestionsRequestDTO(
argumentCaptor.capture()
);
assertNull(argumentCaptor.getValue().getIssuedByStaffId());
}

@Test
void shouldConvertUnitIdIfSet() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "");
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "", HSA_ID);
queryFragaSvarParameter.setEnhetId("unitId");
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(MessageQueryCriteriaDTO.class);
Expand All @@ -186,7 +212,7 @@ void shouldSetUnitFromUserServiceIfUnitIdIsNull() {
when(webCertUserService.getUser()).thenReturn(user);
when(user.getIdsOfSelectedVardenhet()).thenReturn(expected);

final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "");
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "", HSA_ID);
queryFragaSvarParameter.setEnhetId(null);

listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
Expand All @@ -199,7 +225,7 @@ void shouldSetUnitFromUserServiceIfUnitIdIsNull() {

@Test
void shouldConvertChangedFrom() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "");
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "", HSA_ID);
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(MessageQueryCriteriaDTO.class);

Expand All @@ -211,7 +237,7 @@ void shouldConvertChangedFrom() {

@Test
void shouldConvertChangedTo() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "");
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "", HSA_ID);
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(MessageQueryCriteriaDTO.class);

Expand All @@ -223,7 +249,7 @@ void shouldConvertChangedTo() {

@Test
void shouldConvertForwarded() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "");
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "", HSA_ID);
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(MessageQueryCriteriaDTO.class);

Expand All @@ -235,7 +261,7 @@ void shouldConvertForwarded() {

@Test
void shouldConvertPatientID() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "");
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "", HSA_ID);
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(MessageQueryCriteriaDTO.class);

Expand All @@ -247,7 +273,7 @@ void shouldConvertPatientID() {

@Test
void shouldSetSenderToShowAllIfBothSendersAreFalse() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(false, false, "");
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(false, false, "", HSA_ID);
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(MessageQueryCriteriaDTO.class);

Expand All @@ -258,7 +284,7 @@ void shouldSetSenderToShowAllIfBothSendersAreFalse() {

@Test
void shouldSetSenderToFKIfFKIsTrue() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "");
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(true, false, "", HSA_ID);
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(MessageQueryCriteriaDTO.class);

Expand All @@ -269,7 +295,7 @@ void shouldSetSenderToFKIfFKIsTrue() {

@Test
void shouldSetSenderToWCIfWCIsTrue() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(false, true, "");
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(false, true, "", HSA_ID);
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(MessageQueryCriteriaDTO.class);

Expand All @@ -281,7 +307,7 @@ void shouldSetSenderToWCIfWCIsTrue() {
@Test
void shouldSetQuestionStatusTypeToComplement() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(false, true,
"KOMPLETTERING_FRAN_VARDEN");
"KOMPLETTERING_FRAN_VARDEN", HSA_ID);
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(QuestionStatusType.class);

Expand All @@ -292,7 +318,7 @@ void shouldSetQuestionStatusTypeToComplement() {
@Test
void shouldSetQuestionStatusTypeToHandled() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(false, true,
"HANTERAD");
"HANTERAD", HSA_ID);
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(QuestionStatusType.class);

Expand All @@ -303,7 +329,7 @@ void shouldSetQuestionStatusTypeToHandled() {
@Test
void shouldSetQuestionStatusTypeToNotHandled() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(false, true,
"ALLA_OHANTERADE");
"ALLA_OHANTERADE", HSA_ID);
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(QuestionStatusType.class);

Expand All @@ -314,7 +340,7 @@ void shouldSetQuestionStatusTypeToNotHandled() {
@Test
void shouldSetQuestionStatusTypeToAnswer() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(false, true,
"SVAR_FRAN_VARDEN");
"SVAR_FRAN_VARDEN", HSA_ID);
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(QuestionStatusType.class);

Expand All @@ -325,7 +351,7 @@ void shouldSetQuestionStatusTypeToAnswer() {
@Test
void shouldSetQuestionStatusTypeToReadAnswer() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(false, true,
"MARKERA_SOM_HANTERAD");
"MARKERA_SOM_HANTERAD", HSA_ID);
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(QuestionStatusType.class);

Expand All @@ -336,7 +362,7 @@ void shouldSetQuestionStatusTypeToReadAnswer() {
@Test
void shouldSetQuestionStatusTypeToWait() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(false, true,
"SVAR_FRAN_FK");
"SVAR_FRAN_FK", HSA_ID);
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(QuestionStatusType.class);

Expand All @@ -347,7 +373,7 @@ void shouldSetQuestionStatusTypeToWait() {
@Test
void shouldSetQuestionStatusTypeToShowAll() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(false, true,
"ALLA");
"ALLA", HSA_ID);
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(QuestionStatusType.class);

Expand All @@ -357,7 +383,7 @@ void shouldSetQuestionStatusTypeToShowAll() {

@Test
void shouldSetQuestionStatusTypeToShowAllIfNull() {
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(false, true, null);
final var queryFragaSvarParameter = buildQueryFragaSvarParameter(false, true, null, HSA_ID);
listCertificateQuestionsFromCS.list(queryFragaSvarParameter);
final var argumentCaptor = ArgumentCaptor.forClass(QuestionStatusType.class);

Expand All @@ -368,12 +394,12 @@ void shouldSetQuestionStatusTypeToShowAllIfNull() {
}

private QueryFragaSvarParameter buildQueryFragaSvarParameter(Boolean fromFK, Boolean fromWC,
String vantarPa) {
String vantarPa, String hsaId) {
return QueryFragaSvarParameter.builder()
.questionFromWC(fromWC)
.questionFromFK(fromFK)
.vantarPa(vantarPa)
.hsaId("hsaId")
.hsaId(hsaId)
.enhetId(null)
.changedFrom(LocalDateTime.now())
.changedTo(LocalDateTime.now())
Expand Down
Loading