Entity-Klassen müssen in Package de.itc.db.dnpm
liegen
+ * @param 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 OptionalOptional
+ * @return Optional mit Wert der SID
+ */
+ public Optionalmehrere_mtb_in_mtbepisode
+ * @return Übergibt true
, wenn mehrere_mtb_in_mtbepisode
auf "Ja" gesetzt ist.
+ */
+ public boolean multipleMtbsInMtbEpisode() {
+ var setting = getSetting("SID");
+ return setting.isPresent() && setting.get().equals("true");
+ }
+}
diff --git a/src/main/java/DNPM/services/TherapieplanServiceFactory.java b/src/main/java/DNPM/services/TherapieplanServiceFactory.java
index 5b3b54c..0b64410 100644
--- a/src/main/java/DNPM/services/TherapieplanServiceFactory.java
+++ b/src/main/java/DNPM/services/TherapieplanServiceFactory.java
@@ -6,18 +6,22 @@ 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")
- ) {
+ if (settingsService.multipleMtbsInMtbEpisode()) {
return new MultipleMtbTherapieplanService();
}
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/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..2f0022d 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,32 +20,21 @@ 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());
-
+ when(settingsService.multipleMtbsInMtbEpisode()).thenReturn(false);
var actual = this.therapieplanServiceFactory.currentUsableInstance();
- assertThat(actual).isInstanceOf(DefaultTherapieplanService.class);
- }
-
- @Test
- void testShouldReturnDefaultTherapieplanServiceIfNoSetting() {
- when(onkostarApi.getGlobalSetting(anyString())).thenReturn(null);
-
var actual = this.therapieplanServiceFactory.currentUsableInstance();
assertThat(actual).isInstanceOf(DefaultTherapieplanService.class);
@@ -58,13 +42,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");
+ }
+
+}