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

OZG-6523 [refactor] fill template

parent 631724d7
Branches
Tags
No related merge requests found
......@@ -53,6 +53,7 @@ public class CollaborationService {
static final String CREATE_ATTACHED_ITEM_ORDER = "CREATE_ATTACHED_ITEM";
static final String SUBCOMMANDS_EXECUTION_MODE = "PARALLEL";
public static final String KEY_TEMPLATE_URL = "url";
public static final String COLLABORATION_NACHRICHT_TEMPLATE = "collaboration.nachrichtTemplate.txt.ftlh";
static final String SEND_POSTFACH_NACHRICHT_ORDER = "SEND_POSTFACH_NACHRICHT";
......@@ -155,7 +156,10 @@ public class CollaborationService {
}
String getAnfrageText() {
return templateHandler.fillTemplate(COLLABORATION_NACHRICHT_TEMPLATE, Collections.emptyMap());
return templateHandler.fillTemplate(COLLABORATION_NACHRICHT_TEMPLATE, getTemplateParameters());
}
Map<String, Object> getTemplateParameters() {
return Collections.emptyMap();
}
}
\ No newline at end of file
......@@ -39,8 +39,6 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public class TemplateHandler {
public static final String KEY_URL = "url";
private final Configuration freemarkerConfig;
public String getRawTemplate(String templateName) {
......
......@@ -28,7 +28,6 @@ import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.io.OutputStream;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.UUID;
......@@ -588,11 +587,21 @@ class CollaborationServiceTest {
when(templateHandler.fillTemplate(anyString(), any())).thenReturn(DEFAULT_MAIL_TEXT);
}
@Test
void shouldCallGetTemplateParameters() {
service.getAnfrageText();
verify(service).getTemplateParameters();
}
@Test
void shouldCallTemplateHandler() {
var templateParameters = Map.<String, Object>of("key", "value ");
doReturn(templateParameters).when(service).getTemplateParameters();
service.getAnfrageText();
verify(templateHandler).fillTemplate(CollaborationService.COLLABORATION_NACHRICHT_TEMPLATE, Collections.emptyMap());
verify(templateHandler).fillTemplate(CollaborationService.COLLABORATION_NACHRICHT_TEMPLATE, templateParameters);
}
@Test
......@@ -602,4 +611,15 @@ class CollaborationServiceTest {
assertThat(result).isEqualTo(DEFAULT_MAIL_TEXT);
}
}
@Nested
class TestGetTemplateParameters {
@Test
void shouldReturnTemplateParameters() {
var result = service.getTemplateParameters();
assertThat(result).isEmpty();
}
}
}
\ No newline at end of file
......@@ -66,7 +66,8 @@ class TemplateHandlerITCase {
@Test
void shouldReturnFilledTemplate() {
var value = "http://test.url";
var content = handler.fillTemplate(CollaborationService.COLLABORATION_NACHRICHT_TEMPLATE, Map.of(TemplateHandler.KEY_URL, value));
var content = handler.fillTemplate(CollaborationService.COLLABORATION_NACHRICHT_TEMPLATE,
Map.of(CollaborationService.KEY_TEMPLATE_URL, value));
assertThat(content)
.contains("Hallo Fachstelle,")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment