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

OZG-5044: Änderungen an der Postfach Verarbeitung

parent ebc5e560
No related branches found
No related tags found
No related merge requests found
......@@ -21,18 +21,18 @@
*/
package de.ozgcloud.admin;
import io.mongock.runner.springboot.EnableMongock;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.config.server.EnableConfigServer;
import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
import io.mongock.runner.springboot.EnableMongock;
@SpringBootApplication
@EnableConfigServer
@EnableMongock
@EnableMongoRepositories
public class AdministrationApplication {
public static void main(String[] args) {
SpringApplication.run(AdministrationApplication.class, args);
}
......
......@@ -21,22 +21,27 @@
*/
package de.ozgcloud.admin.settings;
import jakarta.validation.Valid;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Document;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
import jakarta.validation.Valid;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.extern.jackson.Jacksonized;
@Builder
@Getter
@Jacksonized
@Document(Setting.COLLECTION_NAME)
@NoArgsConstructor(access = AccessLevel.PACKAGE)
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class Setting {
static final String COLLECTION_NAME = "settings";
......
package de.ozgcloud.admin.settings;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import de.ozgcloud.admin.settings.postfach.PostfachSettingBody;
import lombok.RequiredArgsConstructor;
@Service
@RequiredArgsConstructor
......@@ -11,9 +11,9 @@ public class SettingService {
private static final String POSTFACH_DB_OBJEKT_NAME = "Postfach";
private SettingRepository repository;
private final SettingRepository repository;
private SettingMapper mapper;
private final SettingMapper mapper;
public AlfaKonfiguration getAlfaKonfiguration() {
var postfachData = getPostfachKonfigurationFromDb();
......
package de.ozgcloud.admin.settings.postfach;
import org.springframework.data.annotation.TypeAlias;
import jakarta.validation.Valid;
import de.ozgcloud.admin.settings.SettingBody;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.extern.jackson.Jacksonized;
......@@ -10,6 +13,8 @@ import lombok.extern.jackson.Jacksonized;
@Getter
@Jacksonized
@Builder
@AllArgsConstructor
@TypeAlias("Postfach")
public class PostfachSettingBody implements SettingBody {
@Valid
private Absender absender;
......
......@@ -52,7 +52,7 @@ class SettingEnvironmentITCase {
@Test
@SneakyThrows
void shouldGetVorgangManagerYaml() {
var result = mockMvc.perform(get("/configserver/OzgCloud_VorgangManager-profile.yaml"));
var result = mockMvc.perform(get("/configserver/OzgCloud_VorgangManager/profile"));
assertThat(result.andReturn().getResponse().getContentAsString()).isEqualTo(YamlTestFactory.createVorgangManagerYaml());
}
......@@ -60,7 +60,7 @@ class SettingEnvironmentITCase {
@Test
@SneakyThrows
void shouldGetAlfaYaml() {
var result = mockMvc.perform(get("/configserver/Alfa-any.yaml"));
var result = mockMvc.perform(get("/configserver/Alfa/any"));
assertThat(result.andReturn().getResponse().getContentAsString().replaceAll("\\s+", " "))
.isEqualTo(YamlTestFactory.createAlfaYaml().replaceAll("\\s+", " "));
......
......@@ -25,7 +25,6 @@ import org.springframework.test.web.servlet.ResultActions;
import com.fasterxml.jackson.databind.ObjectMapper;
import de.ozgcloud.admin.settings.Setting;
import de.ozgcloud.admin.settings.SettingBody;
import de.ozgcloud.admin.settings.SettingConstant;
import de.ozgcloud.admin.settings.SettingTestFactory;
import de.ozgcloud.common.test.DataITCase;
......@@ -168,7 +167,7 @@ class PostfachSettingBodyITCase {
}
private Setting createSettingWithPostfach(SettingBody postfach) {
private Setting createSettingWithPostfach(PostfachSettingBody postfach) {
return SettingTestFactory.createBuilder().name(POSTFACH_NAME).settingBody(postfach).build();
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment