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

Merge pull request 'OZG-6499-Signatur-in-Nachrichten-anzeigen' (#48) from...

Merge pull request 'OZG-6499-Signatur-in-Nachrichten-anzeigen' (#48) from OZG-6499-Signatur-in-Nachrichten-anzeigen into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/administration/pulls/48


Reviewed-by: default avatarOZGCloud <ozgcloud@mgm-tp.com>
parents 52db9542 8f65d005
Branches
Tags
No related merge requests found
package de.ozgcloud.admin.setting;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonUnwrapped;
import de.ozgcloud.admin.setting.postfach.AbsenderVorgangManager;
......@@ -12,4 +13,8 @@ class VorgangManagerSettingDTO implements ApplicationSettingDTO {
@JsonUnwrapped(prefix = "ozgcloud.postfach.absender.")
@Builder.Default
private AbsenderVorgangManager absender = AbsenderVorgangManager.builder().build();
@JsonProperty("ozgcloud.postfach.signatur")
@Builder.Default
private String signatur = "";
}
spring:
data:
mongodb:
uri: mongodb://mongodb:27017/administration
server:
port: 8080
management:
server:
port: 8081
\ No newline at end of file
......@@ -21,9 +21,9 @@ import lombok.SneakyThrows;
@AutoConfigureMockMvc
@WithMockUser
class SettingEnvironmentITCase {
@Autowired
private MockMvc mockMvc;
@Autowired
private SettingRepository settingRepository;
......@@ -54,7 +54,7 @@ class SettingEnvironmentITCase {
void shouldReturnValuesForVorgangManager() {
var result = mockMvc.perform(get("/configserver/OzgCloud_VorgangManager-profile.yaml"));
assertThat(result.andReturn().getResponse().getContentAsString()).isEqualTo(YamlTestFactory.createVorgangManagerYaml());
assertThat(formatLineBreaks(result.andReturn().getResponse().getContentAsString())).isEqualTo(YamlTestFactory.createVorgangManagerYaml());
}
@Test
......@@ -62,8 +62,11 @@ class SettingEnvironmentITCase {
void shouldReturnValuesForAlfa() {
var result = mockMvc.perform(get("/configserver/Alfa-any.yaml"));
assertThat(result.andReturn().getResponse().getContentAsString().replaceAll("\\s+", " "))
.isEqualTo(YamlTestFactory.createAlfaYaml().replaceAll("\\s+", " "));
assertThat(formatLineBreaks(result.andReturn().getResponse().getContentAsString())).isEqualTo(YamlTestFactory.createAlfaYaml());
}
private String formatLineBreaks(String text) {
return text.replaceAll("\\\\\\s+\\\\", "").replace("\\n", "\n");
}
}
}
\ No newline at end of file
......@@ -28,7 +28,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import java.util.List;
import de.ozgcloud.admin.common.user.UserRole;
import org.apache.commons.lang3.StringUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
......@@ -47,6 +46,7 @@ import org.springframework.test.web.servlet.ResultActions;
import com.fasterxml.jackson.databind.ObjectMapper;
import de.ozgcloud.admin.common.user.UserRole;
import de.ozgcloud.admin.setting.postfach.Absender;
import de.ozgcloud.admin.setting.postfach.AbsenderTestFactory;
import de.ozgcloud.admin.setting.postfach.PostfachSettingBody;
......
......@@ -2,15 +2,19 @@ package de.ozgcloud.admin.setting;
import de.ozgcloud.admin.setting.postfach.AbsenderVorgangManager;
import de.ozgcloud.admin.setting.postfach.AbsenderVorgangManagerTestFactory;
import de.ozgcloud.admin.setting.postfach.PostfachSettingBodyTestFactory;
public class VorgangManagerSettingDTOTestFactory {
public static AbsenderVorgangManager ABSENDER_VM = AbsenderVorgangManagerTestFactory.create();
public static final AbsenderVorgangManager ABSENDER = AbsenderVorgangManagerTestFactory.create();
public static final String SIGNATUR = PostfachSettingBodyTestFactory.SIGNATUR;
public static VorgangManagerSettingDTO create() {
return createBuilder().build();
}
public static VorgangManagerSettingDTO.VorgangManagerSettingDTOBuilder createBuilder() {
return VorgangManagerSettingDTO.builder().absender(ABSENDER_VM);
return VorgangManagerSettingDTO.builder()
.absender(ABSENDER)
.signatur(SIGNATUR);
}
}
......@@ -5,18 +5,19 @@ import de.ozgcloud.admin.setting.postfach.PostfachSettingBodyTestFactory;
import de.ozgcloud.common.test.TestUtils;
public class YamlTestFactory {
public static PostfachSettingBody postfach = PostfachSettingBodyTestFactory.create();
public static final PostfachSettingBody POSTFACH = PostfachSettingBodyTestFactory.create();
public static String createVorgangManagerYaml() {
return TestUtils.loadTextFile("yamlTemplates/settings/vorgangManager.yaml.tmpl",
postfach.getAbsender().getName(),
postfach.getAbsender().getAnschrift(),
postfach.getAbsender().getDienst(),
postfach.getAbsender().getMandant(),
postfach.getAbsender().getGemeindeschluessel());
POSTFACH.getAbsender().getName(),
POSTFACH.getAbsender().getAnschrift(),
POSTFACH.getAbsender().getDienst(),
POSTFACH.getAbsender().getMandant(),
POSTFACH.getAbsender().getGemeindeschluessel(),
POSTFACH.getSignatur());
}
public static String createAlfaYaml() {
return TestUtils.loadTextFile("yamlTemplates/settings/alfa.yaml.tmpl", postfach.getSignatur());
return TestUtils.loadTextFile("yamlTemplates/settings/alfa.yaml.tmpl", POSTFACH.getSignatur());
}
}
......@@ -8,7 +8,7 @@ import de.ozgcloud.common.test.TestUtils;
public class PostfachSettingBodyTestFactory {
public static final Absender ABSENDER = AbsenderTestFactory.create();
public static final String SIGNATUR = LoremIpsum.getInstance().getHtmlParagraphs(1, 2);
public static final String SIGNATUR = LoremIpsum.getInstance().getParagraphs(2, 2);
public static PostfachSettingBody create() {
return createBuilder().build();
......@@ -23,7 +23,7 @@ public class PostfachSettingBodyTestFactory {
public static String buildPostfachJson(PostfachSettingBody postfach) {
return TestUtils.loadTextFile("jsonTemplates/settings/createPostfach.json.tmpl", postfach.getAbsender().getName(),
postfach.getAbsender().getAnschrift(), postfach.getAbsender().getDienst(), postfach.getAbsender().getMandant(),
postfach.getAbsender().getGemeindeschluessel(), postfach.getSignatur());
postfach.getAbsender().getGemeindeschluessel(), postfach.getSignatur().replaceAll("\n", "\\\\n"));
}
public static Map<String, Object> createPostfachAsFlattenedMapVorgangManager() {
......
ozgcloud:
postfach:
signatur: %s
signatur: "%s"
......@@ -6,3 +6,4 @@ ozgcloud:
dienst: %s
mandant: %s
gemeinde-schluessel: '%s'
signatur: "%s"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment