Skip to content
Snippets Groups Projects
Commit c17d0cdf authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6721 OZG-6914 provide organisationseinheit settings via config server

parent 7107487d
No related branches found
No related tags found
No related merge requests found
Showing
with 116 additions and 278 deletions
package de.ozgcloud.admin.common.organisationseinheit;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitSettings;
import java.util.Collections;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
public class OrganisationsEinheitSettingsService {
private final OrganisationsEinheitSettingsRepository settingsRepository;
public Map<String, OrganisationsEinheitSettings> getSettings() {
return getSettingsMap(settingsRepository.getSettings());
}
Map<String, OrganisationsEinheitSettings> getSettingsMap(Stream<OrganisationsEinheitWithSettings> settings) {
if(settings == null){
return Collections.emptyMap();
}
return settings.collect(
Collectors.toMap(
entry -> entry.organisationsEinheitId(),
entry -> entry.settings()
)
);
}
}
package de.ozgcloud.admin.setting;
import com.fasterxml.jackson.annotation.JsonProperty;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitSettings;
import java.util.HashMap;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonProperty;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitSettings;
import lombok.Builder;
import lombok.Getter;
......@@ -15,7 +17,7 @@ class AlfaSettingDTO implements ApplicationSettingDTO {
@Builder.Default
private String signatur = "";
@JsonProperty("ozgcloud.postfach.organisationsEinheitSettings")
@JsonProperty("ozgcloud.organisationsEinheitSettings")
@Builder.Default
private Map<String, OrganisationsEinheitSettings> organisationsEinheitSettingsMap = new HashMap<>();
private Map<String, OrganisationsEinheitSettings> organisationsEinheitSettings = new HashMap<>();
}
package de.ozgcloud.admin.common.organisationseinheit;
package de.ozgcloud.admin.setting;
import java.util.stream.Stream;
......
package de.ozgcloud.admin.common.organisationseinheit;
package de.ozgcloud.admin.setting;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitSettings;
......@@ -6,5 +6,4 @@ record OrganisationsEinheitWithSettings(
String organisationsEinheitId,
OrganisationsEinheitSettings settings
) {
}
package de.ozgcloud.admin.setting;
import org.mapstruct.Mapper;
import org.mapstruct.MappingTarget;
import org.mapstruct.ReportingPolicy;
import de.ozgcloud.admin.setting.postfach.Absender;
import de.ozgcloud.admin.setting.postfach.AbsenderVorgangManager;
import de.ozgcloud.admin.setting.postfach.PostfachSettingBody;
@Mapper(unmappedTargetPolicy = ReportingPolicy.WARN)
interface SettingMapper {
@Deprecated
AlfaSettingDTO.AlfaSettingDTOBuilder mapAlfaPostfach(@MappingTarget AlfaSettingDTO.AlfaSettingDTOBuilder builder,
PostfachSettingBody postfachData);
@Deprecated
VorgangManagerSettingDTO.VorgangManagerSettingDTOBuilder mapVorgangManagerPostfach(
@MappingTarget VorgangManagerSettingDTO.VorgangManagerSettingDTOBuilder builder, PostfachSettingBody postfachData);
AbsenderVorgangManager mapAbsenderToAbsenderVorgangManager(Absender absender);
}
package de.ozgcloud.admin.setting;
import de.ozgcloud.admin.common.organisationseinheit.OrganisationsEinheitSettingsService;
import java.util.Map;
import java.util.stream.Collectors;
import org.springframework.stereotype.Service;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitSettings;
import de.ozgcloud.admin.setting.postfach.PostfachSettingBody;
import java.util.Map;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class SettingService {
private static final String POSTFACH_SETTING_ITEM_NAME = "Postfach";
private final OrganisationsEinheitSettingsRepository organisationsEinheitSettingsRepository;
private final SettingRepository repository;
private final SettingMapper mapper;
private final OrganisationsEinheitSettingsService oeService;
private final SettingMapper mapper;
public AlfaSettingDTO getAlfaSettingDTO() {
var postfachData = getSettingWithPostfachFromDb();
Map<String, OrganisationsEinheitSettings> settings = oeService.getSettings();
Map<String, OrganisationsEinheitSettings> settings = getOrganisationsEinheitSettings();
return AlfaSettingDTO.builder()
.signatur(postfachData.getSignatur())
.organisationsEinheitSettingsMap(settings)
.organisationsEinheitSettings(settings)
.build();
}
public VorgangManagerSettingDTO getVorgangManagerSettingDTO() {
var postfachData = getSettingWithPostfachFromDb();
Map<String, OrganisationsEinheitSettings> settings = oeService.getSettings();
Map<String, OrganisationsEinheitSettings> settings = getOrganisationsEinheitSettings();
return VorgangManagerSettingDTO.builder()
.absender(mapper.mapAbsenderToAbsenderVorgangManager(postfachData.getAbsender()))
.signatur(postfachData.getSignatur())
.organisationsEinheitSettingsMap(settings)
.organisationsEinheitSettings(settings)
.build();
}
......@@ -42,4 +44,10 @@ class SettingService {
var postfach = repository.findOneByName(POSTFACH_SETTING_ITEM_NAME);
return postfach.isPresent() ? (PostfachSettingBody) postfach.get().getSettingBody() : PostfachSettingBody.builder().build();
}
Map<String, OrganisationsEinheitSettings> getOrganisationsEinheitSettings() {
return organisationsEinheitSettingsRepository.getSettings().collect(Collectors.toMap(
OrganisationsEinheitWithSettings::organisationsEinheitId,
OrganisationsEinheitWithSettings::settings));
}
}
package de.ozgcloud.admin.setting;
import java.util.HashMap;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonUnwrapped;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitSettings;
import de.ozgcloud.admin.setting.postfach.AbsenderVorgangManager;
import java.util.HashMap;
import java.util.Map;
import lombok.Builder;
import lombok.Getter;
......@@ -21,7 +22,7 @@ class VorgangManagerSettingDTO implements ApplicationSettingDTO {
@Builder.Default
private String signatur = "";
@JsonProperty("ozgcloud.postfach.organisationsEinheitSettings")
@JsonProperty("ozgcloud.organisationsEinheitSettings")
@Builder.Default
private Map<String, OrganisationsEinheitSettings> organisationsEinheitSettingsMap = new HashMap<>();
private Map<String, OrganisationsEinheitSettings> organisationsEinheitSettings = new HashMap<>();
}
package de.ozgcloud.admin.common.organisationseinheit;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitSettings;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitSettingsTestFactory;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitTestFactory;
import java.util.Map;
import java.util.stream.Stream;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.Spy;
class OrganisationsEinheitSettingsServiceTest {
@Mock
private OrganisationsEinheitSettingsRepository settingsRepository;
@Spy
@InjectMocks
private OrganisationsEinheitSettingsService service;
private final OrganisationsEinheitWithSettings withSettings1 = mockWith(OrganisationsEinheitTestFactory.ID,
OrganisationsEinheitSettingsTestFactory.create());
@Nested
class TestGetSettings {
@BeforeEach
void init2() {
when(settingsRepository.getSettings()).thenReturn(Stream.of(withSettings1));
}
private final Map<String, OrganisationsEinheitSettings> settingsMap = Map.of(
OrganisationsEinheitTestFactory.ORGANISATIONS_EINHEIT_ID, OrganisationsEinheitSettingsTestFactory.create()
);
@Captor
private ArgumentCaptor<Stream<OrganisationsEinheitWithSettings>> streamArgumentCaptor;
@BeforeEach
void init() {
doReturn(settingsMap).when(service).getSettingsMap(any());
}
@Test
void shouldGetSettings() {
callService();
verify(settingsRepository).getSettings();
}
@Test
void shouldGetSettingsMap() {
callService();
verify(service).getSettingsMap(streamArgumentCaptor.capture());
assertThat(streamArgumentCaptor.getValue()).containsExactly(withSettings1);
}
private Map<String, OrganisationsEinheitSettings> callService() {
return service.getSettings();
}
}
@Nested
class TestGetSettingsMap {
@Test
void shouldUseGetterWhenMapping() {
OrganisationsEinheitWithSettings settings = Mockito.mock(OrganisationsEinheitWithSettings.class);
doReturn(OrganisationsEinheitTestFactory.ORGANISATIONS_EINHEIT_ID).when(settings).organisationsEinheitId();
doReturn(OrganisationsEinheitSettingsTestFactory.create()).when(settings).settings();
callService(Stream.of(settings));
verify(settings, times(1)).organisationsEinheitId();
verify(settings, times(1)).settings();
}
@Test
void shouldConvertToMap() {
OrganisationsEinheitWithSettings oews = OrganisationsEinheitWithSettingsTestFactory.create();
var settingsMap = callService(Stream.of(oews));
assertThat(settingsMap).containsEntry(OrganisationsEinheitTestFactory.ORGANISATIONS_EINHEIT_ID, oews.settings());
}
@Test
void shouldGetEmptyMapIfStreamEmpty() {
var settingsMap = callService(Stream.of());
assertThat(settingsMap).size().isEqualTo(0);
}
@Test
void shouldGetEmptyMapIfNull() {
var settingsMap = callService(null);
assertThat(settingsMap).size().isEqualTo(0);
}
@Test
void shouldHaveAllEntries() {
OrganisationsEinheitWithSettings owes = OrganisationsEinheitWithSettingsTestFactory.create();
OrganisationsEinheitWithSettings owes2 = OrganisationsEinheitWithSettingsTestFactory.createAnother();
var settingsMap = callService(Stream.of(owes, owes2));
assertThat(settingsMap).containsExactly(
entry(owes.organisationsEinheitId(), owes.settings()),
entry(owes2.organisationsEinheitId(), owes2.settings()));
}
Map<String, OrganisationsEinheitSettings> callService(Stream<OrganisationsEinheitWithSettings> settings) {
return service.getSettingsMap(settings);
}
}
private OrganisationsEinheitWithSettings mockWith(String organisationsEinheitId, OrganisationsEinheitSettings settings) {
var withSettings = mock(OrganisationsEinheitWithSettings.class);
when(withSettings.organisationsEinheitId()).thenReturn(organisationsEinheitId);
when(withSettings.settings()).thenReturn(settings);
return withSettings;
}
}
package de.ozgcloud.admin.setting;
import java.util.Map;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitSettings;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitSettingsTestFactory;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitTestFactory;
import de.ozgcloud.admin.setting.postfach.PostfachSettingBodyTestFactory;
import java.util.Map;
public class AlfaSettingDTOTestFactory {
public static AlfaSettingDTO create() {
return createBuilder().build();
}
public static Map<String, OrganisationsEinheitSettings> organisationsEinheitSettingsMap = Map.of(OrganisationsEinheitTestFactory.ORGANISATIONS_EINHEIT_ID,
public static Map<String, OrganisationsEinheitSettings> organisationsEinheitSettings = Map.of(
OrganisationsEinheitTestFactory.ORGANISATIONS_EINHEIT_ID,
OrganisationsEinheitSettingsTestFactory.create());
public static AlfaSettingDTO.AlfaSettingDTOBuilder createBuilder() {
return AlfaSettingDTO.builder()
.signatur(PostfachSettingBodyTestFactory.SIGNATUR)
.organisationsEinheitSettingsMap(organisationsEinheitSettingsMap);
.organisationsEinheitSettings(organisationsEinheitSettings);
}
}
package de.ozgcloud.admin.common.organisationseinheit;
package de.ozgcloud.admin.setting;
import static org.assertj.core.api.Assertions.*;
......
package de.ozgcloud.admin.common.organisationseinheit;
package de.ozgcloud.admin.setting;
import java.util.UUID;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitSettingsTestFactory;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitTestFactory;
import java.util.UUID;
public class OrganisationsEinheitWithSettingsTestFactory {
......
package de.ozgcloud.admin.setting;
import static org.assertj.core.api.Assertions.*;
......@@ -10,9 +9,12 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.web.servlet.MockMvc;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheit;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitTestFactory;
import de.ozgcloud.admin.setting.postfach.PostfachSettingBodyTestFactory;
import de.ozgcloud.common.test.DataITCase;
import lombok.SneakyThrows;
......@@ -25,7 +27,7 @@ class SettingEnvironmentITCase {
@Autowired
private MockMvc mockMvc;
@Autowired
private SettingRepository settingRepository;
private MongoOperations mongoOperations;
private Setting settingWithPostfach = SettingTestFactory.createBuilder()
.name("Postfach")
......@@ -42,11 +44,13 @@ class SettingEnvironmentITCase {
@Nested
class TestFindOne {
@BeforeEach
void fillDb() {
settingRepository.deleteAll();
settingRepository.save(settingWithPostfach);
mongoOperations.dropCollection(Setting.class);
mongoOperations.dropCollection(OrganisationsEinheit.class);
mongoOperations.save(settingWithPostfach);
mongoOperations.save(OrganisationsEinheitTestFactory.create());
}
@Test
......
package de.ozgcloud.admin.setting;
import static org.assertj.core.api.Assertions.*;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers;
import org.mockito.Spy;
import de.ozgcloud.admin.setting.postfach.PostfachSettingBody;
import de.ozgcloud.admin.setting.postfach.PostfachSettingBodyTestFactory;
class SettingMapperTest {
private final PostfachSettingBody postfach = PostfachSettingBodyTestFactory.create();
private final AlfaSettingDTO alfaSettingDTO = AlfaSettingDTOTestFactory.create();
private final VorgangManagerSettingDTO vorgangManagerSettingDTO = VorgangManagerSettingDTOTestFactory.create();
@Spy
private final SettingMapper mapper = Mappers.getMapper(SettingMapper.class);
@Nested
class TestMapPostfachToAlfaSetting {
@Test
void shouldReturnFlattenedAlfaMap() {
var resultAlfaSetting = mapper.mapAlfaPostfach(AlfaSettingDTO.builder(), postfach).build();
assertThat(resultAlfaSetting).usingRecursiveComparison().isEqualTo(alfaSettingDTO);
}
}
@Nested
class TestMapPostfachToVorgangManagerSetting {
@Test
void shouldReturnFlattenedVorgangManagerMap() {
var resultVorgangmanagerSetting = mapper.mapVorgangManagerPostfach(VorgangManagerSettingDTO.builder(), postfach).build();
assertThat(resultVorgangmanagerSetting).usingRecursiveComparison().isEqualTo(vorgangManagerSettingDTO);
}
}
}
package de.ozgcloud.admin.setting;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Stream;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
......@@ -15,6 +16,10 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitSettings;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitSettingsTestFactory;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitTestFactory;
import de.ozgcloud.admin.setting.postfach.AbsenderVorgangManagerTestFactory;
import de.ozgcloud.admin.setting.postfach.PostfachSettingBody;
import de.ozgcloud.admin.setting.postfach.PostfachSettingBodyTestFactory;
......@@ -26,6 +31,8 @@ class SettingServiceTest {
@Mock
private SettingRepository repository;
@Mock
private OrganisationsEinheitSettingsRepository organisationsEinheitSettingsRepository;
@Mock
private SettingMapper mapper;
......@@ -37,39 +44,37 @@ class SettingServiceTest {
@Nested
class TestGetAlfaSettingDTO {
@Captor
private ArgumentCaptor<AlfaSettingDTO.AlfaSettingDTOBuilder> alfaBuilderCaptor;
private final AlfaSettingDTO alfaSetting = AlfaSettingDTOTestFactory.create();
private final Map<String, OrganisationsEinheitSettings> organisationsEinheitSettings = Map.of(
OrganisationsEinheitTestFactory.ORGANISATIONS_EINHEIT_ID,
OrganisationsEinheitSettingsTestFactory.create());
@BeforeEach
void mockGetSettingWithPostfachFromDb() {
void init() {
doReturn(organisationsEinheitSettings).when(service).getOrganisationsEinheitSettings();
doReturn(postfach).when(service).getSettingWithPostfachFromDb();
}
@Test
void shouldCallGetSettingWithPostfachFromDb() {
when(mapper.mapAlfaPostfach(any(), any())).thenReturn(AlfaSettingDTOTestFactory.createBuilder());
service.getAlfaSettingDTO();
verify(service).getSettingWithPostfachFromDb();
}
@Test
void shouldCallMapperWithEmptyBuilderAndPostfach() {
when(mapper.mapAlfaPostfach(any(), any())).thenReturn(AlfaSettingDTOTestFactory.createBuilder());
void shouldGetOrganisationsEinheitSettings() {
service.getAlfaSettingDTO();
verify(mapper).mapAlfaPostfach(alfaBuilderCaptor.capture(), eq(postfach));
assertThat(alfaBuilderCaptor.getValue()).usingRecursiveComparison().isEqualTo(AlfaSettingDTO.builder());
verify(service).getOrganisationsEinheitSettings();
}
@Test
void shouldReturnBuiltAlfaSettingDTO() {
when(mapper.mapAlfaPostfach(any(), any())).thenReturn(AlfaSettingDTOTestFactory.createBuilder());
var resultSettingDTO = service.getAlfaSettingDTO();
assertThat(resultSettingDTO).usingRecursiveComparison().isEqualTo(alfaSetting);
......@@ -78,19 +83,20 @@ class SettingServiceTest {
@Nested
class TestGetVorgangManagerSettingDTO {
@Captor
private ArgumentCaptor<VorgangManagerSettingDTO.VorgangManagerSettingDTOBuilder> vorgangManagerBuilderCaptor;
private final VorgangManagerSettingDTO vorgangManagerSetting = VorgangManagerSettingDTOTestFactory.create();
private final Map<String, OrganisationsEinheitSettings> organisationsEinheitSettings = Map.of(
OrganisationsEinheitTestFactory.ORGANISATIONS_EINHEIT_ID,
OrganisationsEinheitSettingsTestFactory.create());
@BeforeEach
void mockGetSettingWithPostfachFromDb() {
void init() {
doReturn(organisationsEinheitSettings).when(service).getOrganisationsEinheitSettings();
doReturn(postfach).when(service).getSettingWithPostfachFromDb();
}
@BeforeEach
void mockMapper() {
when(mapper.mapVorgangManagerPostfach(any(), any())).thenReturn(VorgangManagerSettingDTOTestFactory.createBuilder());
when(mapper.mapAbsenderToAbsenderVorgangManager(postfach.getAbsender())).thenReturn(AbsenderVorgangManagerTestFactory.create());
}
@Test
......@@ -101,11 +107,10 @@ class SettingServiceTest {
}
@Test
void shouldCallMapperWithEmptyBuilderAndPostfach() {
void shouldGetOrganisationsEinheitSettings() {
service.getVorgangManagerSettingDTO();
verify(mapper).mapVorgangManagerPostfach(vorgangManagerBuilderCaptor.capture(), eq(postfach));
assertThat(vorgangManagerBuilderCaptor.getValue()).usingRecursiveComparison().isEqualTo(VorgangManagerSettingDTO.builder());
verify(service).getOrganisationsEinheitSettings();
}
@Test
......@@ -147,4 +152,28 @@ class SettingServiceTest {
}
}
@Nested
class TestGetOrganisationsEinheitSettings {
private final OrganisationsEinheitWithSettings organisationsEinheitWithSettings = OrganisationsEinheitWithSettingsTestFactory.create();
@Test
void shouldReturnOrganisationsEinheitSettingsByOrganisationsEinheitId() {
when(organisationsEinheitSettingsRepository.getSettings()).thenReturn(Stream.of(organisationsEinheitWithSettings));
var got = service.getOrganisationsEinheitSettings();
assertThat(got).contains(entry(organisationsEinheitWithSettings.organisationsEinheitId(), organisationsEinheitWithSettings.settings()));
}
@Test
void shouldReturnEmpty() {
when(organisationsEinheitSettingsRepository.getSettings()).thenReturn(Stream.of());
var got = service.getOrganisationsEinheitSettings();
assertThat(got).isEmpty();
}
}
}
package de.ozgcloud.admin.setting;
import static de.ozgcloud.admin.setting.AlfaSettingDTOTestFactory.organisationsEinheitSettingsMap;
import static de.ozgcloud.admin.setting.AlfaSettingDTOTestFactory.*;
import de.ozgcloud.admin.setting.postfach.AbsenderVorgangManager;
import de.ozgcloud.admin.setting.postfach.AbsenderVorgangManagerTestFactory;
......@@ -18,6 +18,6 @@ public class VorgangManagerSettingDTOTestFactory {
return VorgangManagerSettingDTO.builder()
.absender(ABSENDER)
.signatur(SIGNATUR)
.organisationsEinheitSettingsMap(organisationsEinheitSettingsMap);
.organisationsEinheitSettings(organisationsEinheitSettings);
}
}
package de.ozgcloud.admin.setting;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitSettingsTestFactory;
import de.ozgcloud.admin.organisationseinheit.OrganisationsEinheitTestFactory;
import de.ozgcloud.admin.setting.postfach.PostfachSettingBody;
import de.ozgcloud.admin.setting.postfach.PostfachSettingBodyTestFactory;
import de.ozgcloud.common.test.TestUtils;
public class YamlTestFactory {
public static final PostfachSettingBody POSTFACH = PostfachSettingBodyTestFactory.create();
public static String createVorgangManagerYaml() {
......@@ -14,10 +17,15 @@ public class YamlTestFactory {
POSTFACH.getAbsender().getDienst(),
POSTFACH.getAbsender().getMandant(),
POSTFACH.getAbsender().getGemeindeschluessel(),
POSTFACH.getSignatur());
POSTFACH.getSignatur(),
OrganisationsEinheitTestFactory.ORGANISATIONS_EINHEIT_ID,
OrganisationsEinheitSettingsTestFactory.SIGNATUR);
}
public static String createAlfaYaml() {
return TestUtils.loadTextFile("yamlTemplates/settings/alfa.yaml.tmpl", POSTFACH.getSignatur());
return TestUtils.loadTextFile("yamlTemplates/settings/alfa.yaml.tmpl",
POSTFACH.getSignatur(),
OrganisationsEinheitTestFactory.ORGANISATIONS_EINHEIT_ID,
OrganisationsEinheitSettingsTestFactory.SIGNATUR);
}
}
ozgcloud:
postfach:
signatur: "%s"
organisationsEinheitSettings:
%s:
signatur: %s
......@@ -7,3 +7,6 @@ ozgcloud:
mandant: %s
gemeinde-schluessel: '%s'
signatur: "%s"
organisationsEinheitSettings:
%s:
signatur: %s
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment