pcvolkmer/onkostar-plugin-dnpm
1
0
Fork 0
mirror of https://github.com/pcvolkmer/onkostar-plugin-dnpm.git synced 2025-07-01 17:02:53 +00:00
Code Issues Activity

Issue #33: Methoden zum Auffinden von relevanten Follow-Up-Formularen

Browse Source
This commit is contained in:
Paul-Christian Volkmer
2023-12-04 12:03:30 +01:00
parent e451b00237
commit 3e0a26485c
5 changed files with 112 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/DNPM/services/therapieplan/AbstractTherapieplanService.java Normal file
View File

@ -0,0 +1,42 @@
package DNPM.services.therapieplan;
import DNPM.services.FormService;
import de.itc.onkostar.api.IOnkostarApi;
import de.itc.onkostar.api.Procedure;
import java.util.List;
import java.util.stream.Collectors;
public abstract class AbstractTherapieplanService implements TherapieplanService {
protected final IOnkostarApi onkostarApi;
protected final FormService formService;
public AbstractTherapieplanService(final IOnkostarApi onkostarApi, final FormService formService) {
this.onkostarApi = onkostarApi;
this.formService = formService;
}
@Override
public List<Procedure> findReferencedFollowUpsForSubform(Procedure procedure) {
if (null == procedure || !"DNPM UF Einzelempfehlung".equals(procedure.getFormName())) {
return List.of();
}
return procedure.getDiseaseIds().stream()
.flatMap(diseaseId -> onkostarApi.getProceduresForDiseaseByForm(diseaseId, "DNPM FollowUp").stream())
.filter(p -> p.getValue("LinkTherapieempfehlung").getInt() == procedure.getId())
.collect(Collectors.toList());
}
@Override
public List<Procedure> findReferencedFollowUpsForSubform(int procedureId) {
var procedure = this.onkostarApi.getProcedure(procedureId);
if (null == procedure || !"DNPM UF Einzelempfehlung".equals(procedure.getFormName())) {
return List.of();
}
return findReferencedFollowUpsForSubform(procedure);
}
}

34
src/main/java/DNPM/services/therapieplan/DefaultTherapieplanService.java
View File

@ -1,27 +1,3 @@
/*
* MIT License
*
* 2023 Comprehensive Cancer Center Mainfranken
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package DNPM.services.therapieplan;
import DNPM.services.FormService;
@ -37,17 +13,12 @@ import java.util.Objects;
import static DNPM.services.FormService.hasValue;
import static DNPM.services.FormService.isYes;
public class DefaultTherapieplanService implements TherapieplanService {
public class DefaultTherapieplanService extends AbstractTherapieplanService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
private final IOnkostarApi onkostarApi;
private final FormService formService;
public DefaultTherapieplanService(final IOnkostarApi onkostarApi, final FormService formService) {
this.onkostarApi = onkostarApi;
this.formService = formService;
super(onkostarApi, formService);
}
/**
@ -198,5 +169,4 @@ public class DefaultTherapieplanService implements TherapieplanService {
});
}
}

9
src/main/java/DNPM/services/therapieplan/MultipleMtbTherapieplanService.java
View File

@ -37,15 +37,10 @@ import java.util.stream.Collectors;
import static DNPM.services.FormService.hasValue;
import static DNPM.services.FormService.isYes;
public class MultipleMtbTherapieplanService implements TherapieplanService {
private final IOnkostarApi onkostarApi;
private final FormService formService;
public class MultipleMtbTherapieplanService extends AbstractTherapieplanService {
public MultipleMtbTherapieplanService(final IOnkostarApi onkostarApi, final FormService formService) {
this.onkostarApi = onkostarApi;
this.formService = formService;
super(onkostarApi, formService);
}
@Override

40
src/main/java/DNPM/services/therapieplan/TherapieplanService.java
View File

@ -1,27 +1,3 @@
/*
* MIT License
*
* 2023 Comprehensive Cancer Center Mainfranken
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package DNPM.services.therapieplan;
import de.itc.onkostar.api.Procedure;
@ -54,4 +30,20 @@ public interface TherapieplanService {
*/
List<Procedure> findReferencedMtbs(int procedureId);
/**
* Finde verlinkte FollowUps für DNPM UF Einzelempfehlung
*
* @param procedure Die DNPM UF Einzelempfehlung Prozedur
* @return Liste mit verlinkten FollowUps
*/
List<Procedure> findReferencedFollowUpsForSubform(Procedure procedure);
/**
* Finde verlinkte FollowUps für DNPM UF Einzelempfehlung
*
* @param procedureId ID der Prozedur
* @return Liste mit verlinkten FollowUps
*/
List<Procedure> findReferencedFollowUpsForSubform(int procedureId);
}

76
src/test/java/DNPM/services/therapieplan/DefaultTherapieplanServiceTest.java
View File

@ -1,32 +1,6 @@
/*
* MIT License
*
* 2023 Comprehensive Cancer Center Mainfranken
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package DNPM.services.therapieplan;
import DNPM.services.FormService;
import DNPM.services.therapieplan.DefaultTherapieplanService;
import DNPM.services.therapieplan.TherapieplanService;
import de.itc.onkostar.api.IOnkostarApi;
import de.itc.onkostar.api.Item;
import de.itc.onkostar.api.Procedure;
@ -40,6 +14,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import java.time.Instant;
import java.util.Date;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
@ -130,6 +105,55 @@ class DefaultTherapieplanServiceTest {
assertThat(capturedProcedure.getValue("datumtkreevaluation").getDate()).isEqualTo(testDate);
}
@Test
void shouldFindFollowUps() {
doAnswer(invocationOnMock -> {
var testProcedure = baseProcedure(onkostarApi);
testProcedure.setId(procedureId);
testProcedure.setFormName("DNPM UF Einzelempfehlung");
testProcedure.addDiseaseId(123);
return testProcedure;
}).when(onkostarApi).getProcedure(anyInt());
doAnswer(invocationOnMock -> {
var diseaseId = invocationOnMock.getArgument(0, Integer.class);
var formName = invocationOnMock.getArgument(1, String.class);
var procedure = baseProcedure(onkostarApi);
procedure.addDiseaseId(diseaseId);
procedure.setFormName(formName);
procedure.setValue("LinkTherapieempfehlung", new Item("LinkTherapieempfehlung", procedureId));
return List.of(procedure);
}).when(onkostarApi).getProceduresForDiseaseByForm(anyInt(), anyString());
var followUps = this.service.findReferencedFollowUpsForSubform(1);
assertThat(followUps).hasSize(1)
.allSatisfy(procedure -> assertThat(procedure.getFormName()).isEqualTo("DNPM FollowUp"));
}
@Test
void shouldFindFollowUpsById() {
var testProcedure = baseProcedure(onkostarApi);
testProcedure.setId(procedureId);
testProcedure.setFormName("DNPM UF Einzelempfehlung");
testProcedure.addDiseaseId(123);
doAnswer(invocationOnMock -> {
var diseaseId = invocationOnMock.getArgument(0, Integer.class);
var formName = invocationOnMock.getArgument(1, String.class);
var procedure = baseProcedure(onkostarApi);
procedure.addDiseaseId(diseaseId);
procedure.setFormName(formName);
procedure.setValue("LinkTherapieempfehlung", new Item("LinkTherapieempfehlung", procedureId));
return List.of(procedure);
}).when(onkostarApi).getProceduresForDiseaseByForm(anyInt(), anyString());
var followUps = this.service.findReferencedFollowUpsForSubform(testProcedure);
assertThat(followUps).hasSize(1)
.allSatisfy(procedure -> assertThat(procedure.getFormName()).isEqualTo("DNPM FollowUp"));
}
private static final int procedureId = 1234;
private static final Date testDate = Date.from(Instant.parse("2023-03-15T09:43:00Z"));