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

OZG-6721 OZG-6915 Map settings to OrganisationsEinheitSettings

parent 53d86cc9
No related branches found
No related tags found
No related merge requests found
...@@ -46,6 +46,6 @@ public class PostfachProperties { ...@@ -46,6 +46,6 @@ public class PostfachProperties {
/** /**
* Settings that are linked to an Organisationseinheit. Configured by administration config server. * Settings that are linked to an Organisationseinheit. Configured by administration config server.
*/ */
private Map<String, OrganisationsEinheitSettings> organisationsEinheitSettings = Map.of(); private Map<String, Map<String, Object>> organisationsEinheitSettings = Map.of();
} }
...@@ -77,7 +77,7 @@ class PostfachSettingsService { ...@@ -77,7 +77,7 @@ class PostfachSettingsService {
} }
Optional<OrganisationsEinheitSettings> getOrganisationsEinheitSettings(final String organisationId) { Optional<OrganisationsEinheitSettings> getOrganisationsEinheitSettings(final String organisationId) {
return Optional.ofNullable(postfachProperties.getOrganisationsEinheitSettings().get(organisationId)); return Optional.ofNullable(postfachProperties.getOrganisationsEinheitSettings().get(organisationId)).map(this::mapOrganisationsEinheitSettings);
} }
OrganisationsEinheitSettings mapOrganisationsEinheitSettings(Map<String, Object> organisationsEinheitSettings) { OrganisationsEinheitSettings mapOrganisationsEinheitSettings(Map<String, Object> organisationsEinheitSettings) {
......
...@@ -362,12 +362,12 @@ class PostfachSettingsServiceTest { ...@@ -362,12 +362,12 @@ class PostfachSettingsServiceTest {
class TestGetOrganisationsEinheitSettings { class TestGetOrganisationsEinheitSettings {
private final OrganisationsEinheitSettings organisationsEinheitSettings = OrganisationsEinheitSettingsTestFactory.create(); private final OrganisationsEinheitSettings organisationsEinheitSettings = OrganisationsEinheitSettingsTestFactory.create();
private final Map<String, Object> organisationsEinheitSettingsMap = Map.of(PostfachSettingsService.FIELD_SIGNATUR, signatur); private final Map<String, Object> organisationsEinheitSettingsMap = Map.of(PostfachSettingsService.FIELD_SIGNATUR, OrganisationsEinheitSettingsTestFactory.TEST_SIGNATUR);
@BeforeEach @BeforeEach
void setUp() { void setUp() {
when(postfachProperties.getOrganisationsEinheitSettings()).thenReturn( when(postfachProperties.getOrganisationsEinheitSettings()).thenReturn(
Map.of(OrganisationsEinheitTestFactory.ID, organisationsEinheitSettings)); Map.of(OrganisationsEinheitTestFactory.ID, organisationsEinheitSettingsMap));
} }
@Test @Test
...@@ -381,14 +381,14 @@ class PostfachSettingsServiceTest { ...@@ -381,14 +381,14 @@ class PostfachSettingsServiceTest {
void shouldMapToOrganisationsEinheitSettings() { void shouldMapToOrganisationsEinheitSettings() {
service.getOrganisationsEinheitSettings(OrganisationsEinheitTestFactory.ID); service.getOrganisationsEinheitSettings(OrganisationsEinheitTestFactory.ID);
verify(service).mapOrganisationsEinheitSettings() verify(service).mapOrganisationsEinheitSettings(organisationsEinheitSettingsMap);
} }
@Test @Test
void shouldReturnSettings() { void shouldReturnSettings() {
var settings = service.getOrganisationsEinheitSettings(OrganisationsEinheitTestFactory.ID); var settings = service.getOrganisationsEinheitSettings(OrganisationsEinheitTestFactory.ID);
assertThat(settings).hasValue(organisationsEinheitSettings); assertThat(settings).isPresent().get().usingRecursiveComparison().isEqualTo(organisationsEinheitSettings);
} }
@Test @Test
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment