input) {
+ var id = input.get("id");
+
+ if (null == id || 0 == Integer.parseInt(id.toString())) {
+ return "";
+ }
+
+ var procedureId = Integer.parseInt(id.toString());
+ return mtbService.getProtocol(
+ therapieplanServiceFactory
+ .currentUsableInstance()
+ .findReferencedMtbs(procedureId)
+ );
+ }
+
}
diff --git a/src/main/java/DNPM/config/PluginConfiguration.java b/src/main/java/DNPM/config/PluginConfiguration.java
index 36b1875..3f27034 100644
--- a/src/main/java/DNPM/config/PluginConfiguration.java
+++ b/src/main/java/DNPM/config/PluginConfiguration.java
@@ -1,10 +1,14 @@
package DNPM.config;
+import DNPM.database.SettingsRepository;
import DNPM.services.*;
+import DNPM.services.mtb.DefaultMtbService;
+import DNPM.services.mtb.MtbService;
import de.itc.onkostar.api.IOnkostarApi;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import javax.sql.DataSource;
@@ -15,6 +19,7 @@ import javax.sql.DataSource;
*/
@Configuration
@ComponentScan(basePackages = "DNPM.analyzer")
+@EnableJpaRepositories(basePackages = "DNPM.database")
public class PluginConfiguration {
@Bean
@@ -28,8 +33,22 @@ public class PluginConfiguration {
}
@Bean
- public TherapieplanServiceFactory therapieplanServiceFactory(final IOnkostarApi onkostarApi, final FormService formService) {
- return new TherapieplanServiceFactory(onkostarApi, formService);
+ public SettingsService settingsService(final SettingsRepository settingsRepository) {
+ return new SettingsService(settingsRepository);
+ }
+
+ @Bean
+ public MtbService mtbService(final SettingsService settingsService) {
+ return new DefaultMtbService(settingsService);
+ }
+
+ @Bean
+ public TherapieplanServiceFactory therapieplanServiceFactory(
+ final IOnkostarApi onkostarApi,
+ final SettingsService settingsService,
+ final FormService formService
+ ) {
+ return new TherapieplanServiceFactory(onkostarApi, settingsService, formService);
}
}
diff --git a/src/main/java/DNPM/database/ReadOnlyRepository.java b/src/main/java/DNPM/database/ReadOnlyRepository.java
new file mode 100644
index 0000000..775388d
--- /dev/null
+++ b/src/main/java/DNPM/database/ReadOnlyRepository.java
@@ -0,0 +1,20 @@
+package DNPM.database;
+
+import org.springframework.data.repository.NoRepositoryBean;
+import org.springframework.data.repository.Repository;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Basis-Repository for ReadOnly Spring-Data-JPA Repositories
+ * Entity-Klassen müssen in Package de.itc.db.dnpm liegen
+ * @param Typ des Entities
+ * @param Typ der ID
+ */
+@NoRepositoryBean
+public interface ReadOnlyRepository extends Repository {
+
+ List findAll();
+
+}
diff --git a/src/main/java/DNPM/database/SettingsRepository.java b/src/main/java/DNPM/database/SettingsRepository.java
new file mode 100644
index 0000000..9a6e331
--- /dev/null
+++ b/src/main/java/DNPM/database/SettingsRepository.java
@@ -0,0 +1,14 @@
+package DNPM.database;
+
+import de.itc.db.dnpm.Setting;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Spring Data JPA Repository zum Lesen von Einstellungen
+ */
+@Repository("dnpmSettingRepository")
+public interface SettingsRepository extends ReadOnlyRepository {
+
+ Setting findByName(String name);
+
+}
diff --git a/src/main/java/DNPM/services/DefaultTherapieplanService.java b/src/main/java/DNPM/services/DefaultTherapieplanService.java
index f705ce8..eee2041 100644
--- a/src/main/java/DNPM/services/DefaultTherapieplanService.java
+++ b/src/main/java/DNPM/services/DefaultTherapieplanService.java
@@ -6,6 +6,7 @@ import de.itc.onkostar.api.Procedure;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.List;
import java.util.Objects;
import static DNPM.services.FormService.hasValue;
@@ -36,6 +37,40 @@ public class DefaultTherapieplanService implements TherapieplanService {
this.updateMtbInSubforms(procedure);
}
+ /**
+ * Finde verlinkte MTBs in Hauptformular und Unterformularen
+ *
+ * @param procedure Die Prozedur mit Hauptformular
+ * @return Liste mit verlinkten MTBs
+ */
+ @Override
+ public List findReferencedMtbs(Procedure procedure) {
+ if (!hasValue(procedure, "referstemtb")) {
+ return List.of();
+ }
+
+ var mtbProcedure = this.onkostarApi.getProcedure(procedure.getValue("referstemtb").getInt());
+ if (null == mtbProcedure) {
+ return List.of();
+ }
+ return List.of(mtbProcedure);
+ }
+
+ /**
+ * Finde verlinkte MTBs in Hauptformular und Unterformularen
+ *
+ * @param procedureId ID der Prozedur mit Hauptformular
+ * @return Liste mit verlinkten MTBs
+ */
+ @Override
+ public List findReferencedMtbs(int procedureId) {
+ var procedure = this.onkostarApi.getProcedure(procedureId);
+ if (null == procedure) {
+ return List.of();
+ }
+ return findReferencedMtbs(procedure);
+ }
+
private void updateMtbInSections(Procedure procedure) {
if (!isYes(procedure, "humangenberatung") && !isYes(procedure, "reevaluation")) {
return;
diff --git a/src/main/java/DNPM/services/MultipleMtbTherapieplanService.java b/src/main/java/DNPM/services/MultipleMtbTherapieplanService.java
index d4eb297..faded4b 100644
--- a/src/main/java/DNPM/services/MultipleMtbTherapieplanService.java
+++ b/src/main/java/DNPM/services/MultipleMtbTherapieplanService.java
@@ -1,12 +1,75 @@
package DNPM.services;
+import de.itc.onkostar.api.IOnkostarApi;
import de.itc.onkostar.api.Procedure;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+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 MultipleMtbTherapieplanService(final IOnkostarApi onkostarApi, final FormService formService) {
+ this.onkostarApi = onkostarApi;
+ this.formService = formService;
+ }
+
@Override
public void updateRequiredMtbEntries(Procedure procedure) {
// No action required
}
+ @Override
+ public List findReferencedMtbs(Procedure procedure) {
+ var procedureIds = new ArrayList();
+
+ var mtbReference = procedure.getValue("referstemtb").getInt();
+ procedureIds.add(mtbReference);
+
+ if (isYes(procedure, "humangenberatung") && hasValue(procedure, "reftkhumangenber")) {
+ procedureIds.add(procedure.getValue("reftkhumangenber").getInt());
+ }
+
+ if (isYes(procedure, "reevaluation") && hasValue(procedure, "reftkreevaluation")) {
+ procedureIds.add(procedure.getValue("reftkreevaluation").getInt());
+ }
+
+ formService.getSubFormProcedureIds(procedure.getId()).stream()
+ .map(onkostarApi::getProcedure)
+ .filter(Objects::nonNull)
+ .forEach(subform -> {
+ if (subform.getFormName().equals("DNPM UF Einzelempfehlung")) {
+ procedureIds.add(subform.getValue("mtb").getInt());
+ }
+
+ if (subform.getFormName().equals("DNPM UF Rebiopsie")) {
+ procedureIds.add(subform.getValue("reftumorkonferenz").getInt());
+ }
+ });
+
+ return procedureIds.stream()
+ .distinct()
+ .map(onkostarApi::getProcedure)
+ .filter(Objects::nonNull)
+ .sorted(Comparator.comparing(Procedure::getStartDate))
+ .collect(Collectors.toList());
+ }
+
+ @Override
+ public List findReferencedMtbs(int procedureId) {
+ var procedure = this.onkostarApi.getProcedure(procedureId);
+ if (null == procedure) {
+ return List.of();
+ }
+ return findReferencedMtbs(procedure);
+ }
}
diff --git a/src/main/java/DNPM/services/SettingsService.java b/src/main/java/DNPM/services/SettingsService.java
new file mode 100644
index 0000000..7459d4e
--- /dev/null
+++ b/src/main/java/DNPM/services/SettingsService.java
@@ -0,0 +1,47 @@
+package DNPM.services;
+
+import DNPM.database.SettingsRepository;
+
+import java.util.Optional;
+
+/**
+ * Implementiert den Dienst zur Ermittlung von Systemeinstellungen
+ */
+public class SettingsService {
+
+ private final SettingsRepository settingsRepository;
+
+ public SettingsService(final SettingsRepository settingsRepository) {
+ this.settingsRepository = settingsRepository;
+ }
+
+ /**
+ * Übergibt ein Optional für die Einstellung mit angegebenen Namen
+ * @param name Name der Einstellung
+ * @return Optional mit Wert der Einstellung oder ein leeres Optional, wenn Einstellung nicht gefunden
+ */
+ public Optional getSetting(String name) {
+ var sid = settingsRepository.findByName(name);
+ if (null == sid) {
+ return Optional.empty();
+ }
+ return Optional.of(sid.getValue());
+ }
+
+ /**
+ * Übergibt die SID als Optional
+ * @return Optional mit Wert der SID
+ */
+ public Optional getSID() {
+ return getSetting("SID");
+ }
+
+ /**
+ * Übergibt die Einstellung für mehrere_mtb_in_mtbepisode
+ * @return Übergibt true, wenn mehrere_mtb_in_mtbepisode auf "Ja" gesetzt ist.
+ */
+ public boolean multipleMtbsInMtbEpisode() {
+ var setting = getSetting("mehrere_mtb_in_mtbepisode");
+ return setting.isPresent() && setting.get().equals("true");
+ }
+}
diff --git a/src/main/java/DNPM/services/TherapieplanService.java b/src/main/java/DNPM/services/TherapieplanService.java
index e47d75e..7a725fc 100644
--- a/src/main/java/DNPM/services/TherapieplanService.java
+++ b/src/main/java/DNPM/services/TherapieplanService.java
@@ -2,6 +2,8 @@ package DNPM.services;
import de.itc.onkostar.api.Procedure;
+import java.util.List;
+
public interface TherapieplanService {
/**
@@ -12,4 +14,20 @@ public interface TherapieplanService {
*/
void updateRequiredMtbEntries(Procedure procedure);
+ /**
+ * Finde verlinkte MTBs in Hauptformular und Unterformularen
+ *
+ * @param procedure Die Prozedur mit Hauptformular
+ * @return Liste mit verlinkten MTBs
+ */
+ List findReferencedMtbs(Procedure procedure);
+
+ /**
+ * Finde verlinkte MTBs in Hauptformular und Unterformularen
+ *
+ * @param procedureId ID der Prozedur mit Hauptformular
+ * @return Liste mit verlinkten MTBs
+ */
+ List findReferencedMtbs(int procedureId);
+
}
diff --git a/src/main/java/DNPM/services/TherapieplanServiceFactory.java b/src/main/java/DNPM/services/TherapieplanServiceFactory.java
index 5b3b54c..3e05fb4 100644
--- a/src/main/java/DNPM/services/TherapieplanServiceFactory.java
+++ b/src/main/java/DNPM/services/TherapieplanServiceFactory.java
@@ -6,19 +6,23 @@ public class TherapieplanServiceFactory {
private final IOnkostarApi onkostarApi;
+ private final SettingsService settingsService;
+
private final FormService formService;
- public TherapieplanServiceFactory(IOnkostarApi onkostarApi, FormService formService) {
+ public TherapieplanServiceFactory(
+ final IOnkostarApi onkostarApi,
+ final SettingsService settingsService,
+ final FormService formService
+ ) {
this.onkostarApi = onkostarApi;
+ this.settingsService = settingsService;
this.formService = formService;
}
public TherapieplanService currentUsableInstance() {
- if (
- null != onkostarApi.getGlobalSetting("mehrere_mtb_in_mtbepisode")
- && onkostarApi.getGlobalSetting("mehrere_mtb_in_mtbepisode").equals("true")
- ) {
- return new MultipleMtbTherapieplanService();
+ if (settingsService.multipleMtbsInMtbEpisode()) {
+ return new MultipleMtbTherapieplanService(onkostarApi, formService);
}
return new DefaultTherapieplanService(onkostarApi, formService);
diff --git a/src/main/java/DNPM/services/mtb/DefaultMtbService.java b/src/main/java/DNPM/services/mtb/DefaultMtbService.java
new file mode 100644
index 0000000..40d9360
--- /dev/null
+++ b/src/main/java/DNPM/services/mtb/DefaultMtbService.java
@@ -0,0 +1,39 @@
+package DNPM.services.mtb;
+
+import DNPM.services.SettingsService;
+import de.itc.onkostar.api.Procedure;
+
+import java.util.List;
+
+public class DefaultMtbService implements MtbService {
+
+ private final SettingsService settingsService;
+
+ public DefaultMtbService(final SettingsService settingsService) {
+ this.settingsService = settingsService;
+ }
+
+ @Override
+ public String getProtocol(List procedures) {
+ ProcedureToProtocolMapper mapper = null;
+ var sid = settingsService.getSID();
+
+ if (sid.isPresent()) {
+ switch (sid.get()) {
+ case "20119":
+ mapper = new OsTumorkonferenzVarianteUkwToProtocolMapper();
+ default:
+ if (!settingsService.multipleMtbsInMtbEpisode()) {
+ mapper = new OsTumorkonferenzToProtocolMapper();
+ }
+ }
+ }
+
+ if (null == mapper) {
+ return "";
+ }
+
+ return mapper.apply(procedures).orElse("");
+ }
+
+}
diff --git a/src/main/java/DNPM/services/mtb/MtbService.java b/src/main/java/DNPM/services/mtb/MtbService.java
new file mode 100644
index 0000000..b854307
--- /dev/null
+++ b/src/main/java/DNPM/services/mtb/MtbService.java
@@ -0,0 +1,9 @@
+package DNPM.services.mtb;
+
+import de.itc.onkostar.api.Procedure;
+
+import java.util.List;
+
+public interface MtbService {
+ String getProtocol(List procedures);
+}
diff --git a/src/main/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapper.java b/src/main/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapper.java
new file mode 100644
index 0000000..6379ecf
--- /dev/null
+++ b/src/main/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapper.java
@@ -0,0 +1,33 @@
+package DNPM.services.mtb;
+
+import de.itc.onkostar.api.Procedure;
+
+import java.util.List;
+import java.util.Optional;
+
+public class OsTumorkonferenzToProtocolMapper implements ProcedureToProtocolMapper {
+ @Override
+ public Optional apply(List procedures) {
+ assert(procedures.size() == 1);
+
+ var procedure = procedures.get(0);
+
+ assert(procedure.getFormName().equals("OS.Tumorkonferenz"));
+
+ var fragestellung = procedure.getValue("Fragestellung");
+ var empfehlung = procedure.getValue("Empfehlung");
+
+ if (
+ null != fragestellung && !fragestellung.getString().isBlank()
+ && null != empfehlung && !empfehlung.getString().isBlank()
+ ) {
+ return Optional.of(String.format("Fragestellung:\n%s\n\nEmpfehlung:\n%s", fragestellung.getString(), empfehlung.getString()));
+ } else if (null != fragestellung && !fragestellung.getString().isBlank()) {
+ return Optional.of(fragestellung.getString());
+ } else if (null != empfehlung && !empfehlung.getString().isBlank()) {
+ return Optional.of(empfehlung.getString());
+ }
+
+ return Optional.empty();
+ }
+}
diff --git a/src/main/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java b/src/main/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java
new file mode 100644
index 0000000..78a94eb
--- /dev/null
+++ b/src/main/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java
@@ -0,0 +1,42 @@
+package DNPM.services.mtb;
+
+import de.itc.onkostar.api.Procedure;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+public class OsTumorkonferenzVarianteUkwToProtocolMapper implements ProcedureToProtocolMapper {
+ @Override
+ public Optional apply(List procedures) {
+ procedures.forEach(procedure -> {
+ assert (procedure.getFormName().equals("OS.Tumorkonferenz.VarianteUKW"));
+ });
+
+ procedures.sort(Comparator.comparing(Procedure::getStartDate));
+
+ var result = procedures.stream().map(procedure -> {
+ var fragestellung = procedure.getValue("Fragestellung");
+ var empfehlung = procedure.getValue("Empfehlung");
+
+ if (
+ null != fragestellung && !fragestellung.getString().isBlank()
+ && null != empfehlung && !empfehlung.getString().isBlank()
+ ) {
+ return String.format("Fragestellung:\n%s\n\nEmpfehlung:\n%s", fragestellung.getString().trim(), empfehlung.getString().trim());
+ } else if (null != fragestellung && !fragestellung.getString().isBlank()) {
+ return fragestellung.getString().trim();
+ } else if (null != empfehlung && !empfehlung.getString().isBlank()) {
+ return empfehlung.getString().trim();
+ }
+ return "";
+ }).collect(Collectors.joining("\n\n"));
+
+ if (!result.isBlank()) {
+ return Optional.of(result);
+ }
+
+ return Optional.empty();
+ }
+}
diff --git a/src/main/java/DNPM/services/mtb/ProcedureToProtocolMapper.java b/src/main/java/DNPM/services/mtb/ProcedureToProtocolMapper.java
new file mode 100644
index 0000000..54c04d9
--- /dev/null
+++ b/src/main/java/DNPM/services/mtb/ProcedureToProtocolMapper.java
@@ -0,0 +1,10 @@
+package DNPM.services.mtb;
+
+import de.itc.onkostar.api.Procedure;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+
+@FunctionalInterface
+public interface ProcedureToProtocolMapper extends Function, Optional> {}
diff --git a/src/main/java/de/itc/db/dnpm/Setting.java b/src/main/java/de/itc/db/dnpm/Setting.java
new file mode 100644
index 0000000..262d2c9
--- /dev/null
+++ b/src/main/java/de/itc/db/dnpm/Setting.java
@@ -0,0 +1,43 @@
+package de.itc.db.dnpm;
+
+import org.hibernate.annotations.Immutable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Immutable
+@Table(name = "einstellung")
+public class Setting {
+ @Id
+ private Long id;
+
+ private String name;
+
+ @Column(name = "wert")
+ private String value;
+
+ protected Setting() {
+ // No content
+ }
+
+ public Setting(Long id, String name, String value) {
+ this.id = id;
+ this.name = name;
+ this.value = value;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getValue() {
+ return value;
+ }
+}
diff --git a/src/test/java/DNPM/analyzer/TherapieplanAnalyzerTest.java b/src/test/java/DNPM/analyzer/TherapieplanAnalyzerTest.java
index 5c39212..fe3d824 100644
--- a/src/test/java/DNPM/analyzer/TherapieplanAnalyzerTest.java
+++ b/src/test/java/DNPM/analyzer/TherapieplanAnalyzerTest.java
@@ -1,9 +1,9 @@
package DNPM.analyzer;
-import DNPM.services.MultipleMtbTherapieplanService;
-import DNPM.services.StudienService;
-import DNPM.services.TherapieplanServiceFactory;
+import DNPM.services.*;
+import DNPM.services.mtb.MtbService;
import de.itc.onkostar.api.IOnkostarApi;
+import de.itc.onkostar.api.Item;
import de.itc.onkostar.api.Procedure;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -13,6 +13,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
@@ -24,22 +25,32 @@ public class TherapieplanAnalyzerTest {
@Mock
private IOnkostarApi onkostarApi;
+ @Mock
+ private FormService formService;
+
@Mock
private StudienService studienService;
@Mock
private TherapieplanServiceFactory therapieplanServiceFactory;
+ @Mock
+ private TherapieplanService therapieplanService;
+
+ @Mock
+ private MtbService mtbService;
+
private TherapieplanAnalyzer therapieplanAnalyzer;
@BeforeEach
void setUp() {
- this.therapieplanAnalyzer = new TherapieplanAnalyzer(studienService, therapieplanServiceFactory);
+ this.therapieplanAnalyzer = new TherapieplanAnalyzer(studienService, therapieplanServiceFactory, mtbService);
}
@Test
void shouldRunServiceMethodsOnAnalyzeCalled() {
- when(this.therapieplanServiceFactory.currentUsableInstance()).thenReturn(new MultipleMtbTherapieplanService());
+ when(this.therapieplanServiceFactory.currentUsableInstance())
+ .thenReturn(new MultipleMtbTherapieplanService(onkostarApi, formService));
this.therapieplanAnalyzer.analyze(new Procedure(onkostarApi), null);
@@ -72,4 +83,23 @@ public class TherapieplanAnalyzerTest {
assertThat(captor.getValue()).isEqualTo("NCT-123");
}
+ @Test
+ void shouldRequestProtokollauszug() {
+ doAnswer(invocationOnMock -> {
+ var procedure = new Procedure(onkostarApi);
+ procedure.setValue("referstemtb", new Item("referstemtb", 2345));
+ return List.of(procedure);
+ }).when(this.therapieplanService).findReferencedMtbs(anyInt());
+
+ when(this.therapieplanServiceFactory.currentUsableInstance())
+ .thenReturn(therapieplanService);
+
+ var input = Map.of("id", (Object) 1234);
+ this.therapieplanAnalyzer.getProtokollauszug(input);
+
+ var captor = ArgumentCaptor.forClass(List.class);
+ verify(mtbService, times(1)).getProtocol(captor.capture());
+ assertThat(captor.getValue()).hasSize(1);
+ }
+
}
diff --git a/src/test/java/DNPM/config/PluginConfigurationTest.java b/src/test/java/DNPM/config/PluginConfigurationTest.java
index 77c95e7..d94b3c7 100644
--- a/src/test/java/DNPM/config/PluginConfigurationTest.java
+++ b/src/test/java/DNPM/config/PluginConfigurationTest.java
@@ -1,6 +1,7 @@
package DNPM.config;
import DNPM.services.FormService;
+import DNPM.services.SettingsService;
import DNPM.services.TherapieplanServiceFactory;
import de.itc.onkostar.api.IOnkostarApi;
import org.junit.jupiter.api.BeforeEach;
@@ -17,6 +18,9 @@ public class PluginConfigurationTest {
@Mock
private IOnkostarApi onkostarApi;
+ @Mock
+ private SettingsService settingsService;
+
@Mock
private FormService formService;
@@ -29,7 +33,7 @@ public class PluginConfigurationTest {
@Test
void testShouldReturnTherapieplanServiceFactory() {
- var actual = this.configuration.therapieplanServiceFactory(onkostarApi, formService);
+ var actual = this.configuration.therapieplanServiceFactory(onkostarApi, settingsService, formService);
assertThat(actual).isInstanceOf(TherapieplanServiceFactory.class);
}
}
diff --git a/src/test/java/DNPM/config/TherapieplanServiceFactoryTest.java b/src/test/java/DNPM/config/TherapieplanServiceFactoryTest.java
index f974dcf..ea9ff42 100644
--- a/src/test/java/DNPM/config/TherapieplanServiceFactoryTest.java
+++ b/src/test/java/DNPM/config/TherapieplanServiceFactoryTest.java
@@ -1,9 +1,6 @@
package DNPM.config;
-import DNPM.services.DefaultTherapieplanService;
-import DNPM.services.FormService;
-import DNPM.services.MultipleMtbTherapieplanService;
-import DNPM.services.TherapieplanServiceFactory;
+import DNPM.services.*;
import de.itc.onkostar.api.IOnkostarApi;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -12,8 +9,6 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
@@ -25,31 +20,19 @@ public class TherapieplanServiceFactoryTest {
@Mock
private FormService formService;
+ @Mock
+ private SettingsService settingsService;
+
private TherapieplanServiceFactory therapieplanServiceFactory;
@BeforeEach
void setup() {
- this.therapieplanServiceFactory = new TherapieplanServiceFactory(onkostarApi, formService);
+ this.therapieplanServiceFactory = new TherapieplanServiceFactory(onkostarApi, settingsService, formService);
}
@Test
void testShouldReturnDefaultTherapieplanServiceIfSettingIsFalse() {
- doAnswer(invocationOnMock -> {
- var settingName = invocationOnMock.getArgument(0, String.class);
- if (settingName.equals("mehrere_mtb_in_mtbepisode")) {
- return "false";
- }
- return null;
- }).when(onkostarApi).getGlobalSetting(anyString());
-
- var actual = this.therapieplanServiceFactory.currentUsableInstance();
-
- assertThat(actual).isInstanceOf(DefaultTherapieplanService.class);
- }
-
- @Test
- void testShouldReturnDefaultTherapieplanServiceIfNoSetting() {
- when(onkostarApi.getGlobalSetting(anyString())).thenReturn(null);
+ when(settingsService.multipleMtbsInMtbEpisode()).thenReturn(false);
var actual = this.therapieplanServiceFactory.currentUsableInstance();
@@ -58,13 +41,7 @@ public class TherapieplanServiceFactoryTest {
@Test
void testShouldReturnMultipleMtbTherapieplanServiceIfSettingIsTrue() {
- doAnswer(invocationOnMock -> {
- var settingName = invocationOnMock.getArgument(0, String.class);
- if (settingName.equals("mehrere_mtb_in_mtbepisode")) {
- return "true";
- }
- return null;
- }).when(onkostarApi).getGlobalSetting(anyString());
+ when(settingsService.multipleMtbsInMtbEpisode()).thenReturn(true);
var actual = this.therapieplanServiceFactory.currentUsableInstance();
diff --git a/src/test/java/DNPM/services/SettingsServiceTest.java b/src/test/java/DNPM/services/SettingsServiceTest.java
new file mode 100644
index 0000000..65e3f6d
--- /dev/null
+++ b/src/test/java/DNPM/services/SettingsServiceTest.java
@@ -0,0 +1,58 @@
+package DNPM.services;
+
+import DNPM.database.SettingsRepository;
+import de.itc.db.dnpm.Setting;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.doAnswer;
+
+@ExtendWith(MockitoExtension.class)
+public class SettingsServiceTest {
+
+ @Mock
+ private SettingsRepository settingsRepository;
+
+ private SettingsService service;
+
+ @BeforeEach
+ void setUp() {
+ this.service = new SettingsService(settingsRepository);
+ }
+
+ @Test
+ void shouldReturnSID() {
+ doAnswer(invocationOnMock -> {
+ var name = invocationOnMock.getArgument(0, String.class);
+ if (null != name && name.equals("SID")) {
+ return new Setting(1L, "SID", "12345");
+ }
+ return null;
+ }).when(settingsRepository).findByName(anyString());
+
+ var actual = service.getSID();
+ assertThat(actual).isPresent();
+ assertThat(actual.get()).isEqualTo("12345");
+ }
+
+ @Test
+ void shouldReturnSIDByName() {
+ doAnswer(invocationOnMock -> {
+ var name = invocationOnMock.getArgument(0, String.class);
+ if (null != name && name.equals("SID")) {
+ return new Setting(1L, "SID", "12345");
+ }
+ return null;
+ }).when(settingsRepository).findByName(anyString());
+
+ var actual = service.getSetting("SID");
+ assertThat(actual).isPresent();
+ assertThat(actual.get()).isEqualTo("12345");
+ }
+
+}
diff --git a/src/test/java/DNPM/services/mtb/DefaultMtbServiceTest.java b/src/test/java/DNPM/services/mtb/DefaultMtbServiceTest.java
new file mode 100644
index 0000000..073f25c
--- /dev/null
+++ b/src/test/java/DNPM/services/mtb/DefaultMtbServiceTest.java
@@ -0,0 +1,112 @@
+package DNPM.services.mtb;
+
+import DNPM.services.SettingsService;
+import de.itc.onkostar.api.IOnkostarApi;
+import de.itc.onkostar.api.Item;
+import de.itc.onkostar.api.Procedure;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+public class DefaultMtbServiceTest {
+
+ private IOnkostarApi onkostarApi;
+
+ private SettingsService settingsService;
+
+ private DefaultMtbService service;
+
+ @BeforeEach
+ void setup(
+ @Mock IOnkostarApi onkostarApi,
+ @Mock SettingsService settingsService
+ ) {
+ this.onkostarApi = onkostarApi;
+ this.settingsService = settingsService;
+ this.service = new DefaultMtbService(settingsService);
+ }
+
+ @Test
+ void testShouldReturnMtbProtocolForDefaultImplementation() {
+ when(settingsService.getSID()).thenReturn(Optional.of("12345"));
+ when(settingsService.multipleMtbsInMtbEpisode()).thenReturn(false);
+
+ var procedure1 = new Procedure(onkostarApi);
+ procedure1.setFormName("OS.Tumorkonferenz");
+ procedure1.setStartDate(Date.from(Instant.parse("2023-01-01T00:00:00Z")));
+ procedure1.setValue("Fragestellung", new Item("Fragestellung", "Test ok?"));
+ procedure1.setValue("Empfehlung", new Item("Empfehlung", "Rerun Test if not ok!"));
+
+ var procedures = List.of(
+ procedure1
+ );
+
+ var actual = service.getProtocol(procedures);
+
+ assertThat(actual).isEqualTo("Fragestellung:\nTest ok?\n\nEmpfehlung:\nRerun Test if not ok!");
+ }
+
+ @Test
+ void testShouldReturnEmptyMtbProtocolForMultipleMtb() {
+ when(settingsService.getSID()).thenReturn(Optional.of("12345"));
+ when(settingsService.multipleMtbsInMtbEpisode()).thenReturn(true);
+
+ var procedure1 = new Procedure(onkostarApi);
+ procedure1.setFormName("OS.Tumorkonferenz");
+ procedure1.setStartDate(Date.from(Instant.parse("2023-01-01T00:00:00Z")));
+ procedure1.setValue("Fragestellung", new Item("Fragestellung", "Test ok?"));
+ procedure1.setValue("Empfehlung", new Item("Empfehlung", "Rerun Test if not ok!"));
+
+ var procedures = List.of(
+ procedure1
+ );
+
+ var actual = service.getProtocol(procedures);
+
+ assertThat(actual).isEmpty();
+ }
+
+ @Test
+ void testShouldReturnMtbProtocolForSID20119() {
+ when(settingsService.getSID()).thenReturn(Optional.of("20119"));
+ when(settingsService.multipleMtbsInMtbEpisode()).thenReturn(true);
+
+ var procedure1 = new Procedure(onkostarApi);
+ procedure1.setFormName("OS.Tumorkonferenz.VarianteUKW");
+ procedure1.setStartDate(Date.from(Instant.parse("2023-02-01T00:00:00Z")));
+ procedure1.setValue("Fragestellung", new Item("Fragestellung", "Test immer noch ok?"));
+ procedure1.setValue("Empfehlung", new Item("Empfehlung", "Do not rerun Test if ok!"));
+
+ var procedure2 = new Procedure(onkostarApi);
+ procedure2.setFormName("OS.Tumorkonferenz.VarianteUKW");
+ procedure2.setStartDate(Date.from(Instant.parse("2023-01-01T00:00:00Z")));
+ procedure2.setValue("Fragestellung", new Item("Fragestellung", "Test ok?"));
+ procedure2.setValue("Empfehlung", new Item("Empfehlung", "Rerun Test if not ok!"));
+
+
+ var procedures = Arrays.asList(
+ procedure1,
+ procedure2
+ );
+
+ var actual = service.getProtocol(procedures);
+
+ assertThat(actual).isEqualTo(
+ "Fragestellung:\nTest ok?\n\nEmpfehlung:\nRerun Test if not ok!\n\n" +
+ "Fragestellung:\nTest immer noch ok?\n\nEmpfehlung:\nDo not rerun Test if ok!"
+ );
+ }
+
+}