OZG-582 send mail and listen for sent event

mail-service/pom.xml

@@ -59,6 +59,17 @@
 					<skip>true</skip>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

mail-service/src/main/java/de/itvsh/ozg/mail/MailSendRequest.java

@@ -22,5 +22,5 @@ public class MailSendRequest {
 	@Singular
 	private Map<String, InputStreamSource> attachments;
 
-	private String requestReference;
+	private Object requestReference;
 }

mail-service/src/main/java/de/itvsh/ozg/mail/MailSentEvent.java

@@ -6,7 +6,7 @@ public class MailSentEvent extends ApplicationEvent {
 
 	private static final long serialVersionUID = 1L;
 
-	public MailSentEvent(MailSendRequest source) {
+	MailSentEvent(MailSendRequest source) {
 		super(source);
 	}
 

mail-service/src/test/java/de/itvsh/ozg/mail/MailSentEventTestFactory.java

+package de.itvsh.ozg.mail;
+
+public class MailSentEventTestFactory {
+
+	public static MailSentEvent create(Object reference) {
+
+		return new MailSentEvent(MailSendRequestTestFactory.createBuilder().requestReference(reference).build());
+	}
+
+}

pluto-server/pom.xml

@@ -115,6 +115,14 @@
 		</dependency>
 
 		<!-- Test -->
+		<dependency>
+			<groupId>de.itvsh.ozg.mail</groupId>
+			<artifactId>mail-service</artifactId>
+			<version>${project.version}</version>
+			<type>test-jar</type>
+			<scope>test</scope>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

pluto-server/src/main/java/de/itvsh/ozg/pluto/PlutoServerApplication.java

@@ -6,7 +6,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableAsync;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = "de.itvsh.ozg")
 @EnableAsync
 public class PlutoServerApplication {
 

pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/RedirectListener.java

+package de.itvsh.ozg.pluto.vorgang.redirect;
+
+import java.util.function.Predicate;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+import de.itvsh.ozg.mail.MailSendRequest;
+import de.itvsh.ozg.mail.MailSentEvent;
+import de.itvsh.ozg.pluto.command.Command;
+import de.itvsh.ozg.pluto.command.Order;
+
+@Component
+public class RedirectListener {
+
+	public static final Predicate<MailSendRequest> IS_REDIRECT_MAIL_REQ = req -> req.getRequestReference() instanceof Command
+			&& ((Command) req.getRequestReference()).getOrder() == Order.REDIRECT_VORGANG;
+
+	@Autowired
+	private RedirectService service;
+
+	@EventListener(condition = "{T(de.itvsh.ozg.pluto.vorgang.redirect.RedirectListener).IS_REDIRECT_MAIL_REQ.test(event.getSource())}")
+	public void publishCommandExecutedEvent(MailSentEvent event) {
+		Command command = (Command) event.getSource().getRequestReference();
+
+		service.onRedirectMailSent(command);
+	}
+}

pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/RedirectService.java

@@ -8,9 +8,12 @@ import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 
 import de.itvsh.ozg.mail.MailSendRequest;
+import de.itvsh.ozg.mail.MailService;
+import de.itvsh.ozg.pluto.command.Command;
 import de.itvsh.ozg.pluto.common.errorhandling.TechnicalException;
 import de.itvsh.ozg.pluto.vorgang.Vorgang;
 import freemarker.template.Configuration;
@@ -27,17 +30,28 @@ public class RedirectService {
 
 	@Autowired
 	private Configuration freemarkerCfg;
+	@Autowired
+	private MailService emailService;
+
+	@Autowired
+	private ApplicationEventPublisher publisher;
 
 	@Value("${pluto.redirect.mail-from}")
 	private String mailFrom;
 
-	MailSendRequest createRedirectMail(Vorgang vorgang, RedirectRequest request) {
-		// FIXME set command id
+	public void redirectVorgang(Vorgang vorgang, Command command) {
+		var mailRequest = createRedirectMail(vorgang, command);
+
+		emailService.sendMail(mailRequest);
+	}
+
+	MailSendRequest createRedirectMail(Vorgang vorgang, Command command) {
 		// TODO add attachments
 		return MailSendRequest.builder()
 				.fromAddress(mailFrom)
-				.toAddress(request.getEmail())
+				.toAddress(command.getRedirectRequest().getEmail())
 				.body(fillMailTemplate(vorgang))
+				.requestReference(command)
 				.build();
 	}
 
@@ -71,4 +85,7 @@ public class RedirectService {
 		}
 	}
 
+	public void onRedirectMailSent(Command command) {
+		publisher.publishEvent(new VorgangRedirectedEvent(command));
+	}
 }

pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/VorgangRedirectedEvent.java

+package de.itvsh.ozg.pluto.vorgang.redirect;
+
+import de.itvsh.ozg.pluto.command.Command;
+import de.itvsh.ozg.pluto.command.CommandExecutedEvent;
+
+public class VorgangRedirectedEvent extends CommandExecutedEvent {
+
+	private static final long serialVersionUID = 1L;
+
+	VorgangRedirectedEvent(Command source) {
+		super(source);
+	}
+}

pluto-server/src/test/java/de/itvsh/ozg/pluto/TestConfiguration.java

+package de.itvsh.ozg.pluto;
+
+import static org.mockito.Mockito.*;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.mail.javamail.JavaMailSender;
+
+@Configuration
+public class TestConfiguration {
+
+	@Bean
+	public JavaMailSender mockMailSender() {
+		return mock(JavaMailSender.class);
+	}
+}

pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/RedirectListenerTest.java

+package de.itvsh.ozg.pluto.vorgang.redirect;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+
+import de.itvsh.ozg.mail.MailSentEventTestFactory;
+import de.itvsh.ozg.pluto.command.Command;
+import de.itvsh.ozg.pluto.command.CommandTestFactory;
+
+class RedirectListenerTest {
+
+	@InjectMocks
+	private RedirectListener listener;
+
+	@Mock
+	private RedirectService redirectService;
+
+	@Nested
+	class onMailSentEvent {
+
+		private Command command = CommandTestFactory.create();
+
+		@Test
+		void shouldCallRedirectService() {
+			listener.publishCommandExecutedEvent(MailSentEventTestFactory.create(command));
+
+			redirectService.onRedirectMailSent(command);
+		}
+	}
+}

pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/RedirectServiceTest.java

@@ -9,20 +9,29 @@ import java.util.Map;
 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.Spy;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.test.util.ReflectionTestUtils;
 
+import de.itvsh.ozg.pluto.command.Command;
+import de.itvsh.ozg.pluto.command.CommandTestFactory;
 import de.itvsh.ozg.pluto.vorgang.EingangHeaderTestFactory;
 import de.itvsh.ozg.pluto.vorgang.Vorgang;
 import de.itvsh.ozg.pluto.vorgang.VorgangTestFactory;
 
 class RedirectServiceTest {
 
-	@Spy
+	@Spy // NOSONAR
 	@InjectMocks
 	private RedirectService service;
 
+	@Mock
+	private ApplicationEventPublisher publisher;
+
 	@Nested
 	class TestFillingTemplate {
 
@@ -62,6 +71,7 @@ class RedirectServiceTest {
 
 		private Vorgang vorgang = VorgangTestFactory.create();
 		private RedirectRequest request = RedirectRequestTestFactory.create();
+		private Command command = CommandTestFactory.createBuilder().redirectRequest(request).build();;
 
 		@BeforeEach
 		void initTest() {
@@ -72,25 +82,42 @@ class RedirectServiceTest {
 
 		@Test
 		void shouldSetFromAddress() {
-			var mailSendRequest = service.createRedirectMail(vorgang, request);
+			var mailSendRequest = service.createRedirectMail(vorgang, command);
 
 			assertThat(mailSendRequest.getFromAddress()).isEqualTo(MAIL_FROM);
 		}
 
 		@Test
 		void shouldSetToAddress() {
-			var mailSendRequest = service.createRedirectMail(vorgang, request);
+			var mailSendRequest = service.createRedirectMail(vorgang, command);
 
 			assertThat(mailSendRequest.getToAddresses()).containsExactly(RedirectRequestTestFactory.E_MAIL);
 		}
 
 		@Test
 		void shouldSetBody() {
-			var mailSendRequest = service.createRedirectMail(vorgang, request);
+			var mailSendRequest = service.createRedirectMail(vorgang, command);
 
 			verify(service).fillMailTemplate(vorgang);
 			assertThat(mailSendRequest.getBody()).isEqualTo(BODY);
 		}
 	}
 
+	@Nested
+	class TestOnRedirectMailSent {
+
+		@Captor // NOSONAR
+		private ArgumentCaptor<VorgangRedirectedEvent> eventCaptor;
+
+		private Command command = CommandTestFactory.create();
+
+		@Test
+		void shouldPublishEvent() {
+			service.onRedirectMailSent(command);
+
+			verify(publisher).publishEvent(eventCaptor.capture());
+			assertThat(eventCaptor.getValue()).isInstanceOf(VorgangRedirectedEvent.class)
+					.extracting(VorgangRedirectedEvent::getSource).isSameAs(command);
+		}
+	}
 }