done the integration

apssouza22 · apssouza22 · commit 476b27132f55 · 2017-11-12T23:45:15.000Z
diff --git a/mail-service/src/main/java/com/apssouza/eventsourcing/aggregates/AbstractAggregate.java b/mail-service/src/main/java/com/apssouza/eventsourcing/aggregates/AbstractAggregate.java
@@ -15,7 +15,8 @@
  */
 public abstract class AbstractAggregate implements Aggregate {
 
-    private String uuid;
+    protected String uuid;
+    
     protected List<AppEvent> changes = new CopyOnWriteArrayList();
 
     protected CopyOnWriteArrayList<AppEvent> appendChange(AppEvent event) {
diff --git a/mail-service/src/main/java/com/apssouza/eventsourcing/aggregates/EmailAggregate.java b/mail-service/src/main/java/com/apssouza/eventsourcing/aggregates/EmailAggregate.java
@@ -22,7 +22,6 @@
  */
 public class EmailAggregate extends AbstractAggregate implements Aggregate {
 
-    private final String uuid;
     private final Email state;
 
     public EmailAggregate(String uuid, List<AppEvent> changes) {
diff --git a/mail-service/src/main/java/com/apssouza/eventsourcing/eventstore/EventStoreRepository.java b/mail-service/src/main/java/com/apssouza/eventsourcing/eventstore/EventStoreRepository.java
@@ -12,8 +12,7 @@ public interface EventStoreRepository extends JpaRepository<EventStream, Long> {
     Optional<EventStream> findByAggregateUUID(String uuid);
 
     default EventStream saveEvents(String aggregateId, List<EventDescriptor> events) {
-        final EventStream eventStream = 
-                findByAggregateUUID(aggregateId)
+        final EventStream eventStream = findByAggregateUUID(aggregateId)
                 .orElseGet(() -> new EventStream(aggregateId));
         eventStream.addEvents(events);
         return save(eventStream);
diff --git a/mail-service/src/main/java/com/apssouza/eventsourcing/queries/EmailQueryObject.java b/mail-service/src/main/java/com/apssouza/eventsourcing/queries/EmailQueryObject.java
@@ -5,6 +5,7 @@
 import com.apssouza.eventsourcing.events.EmailDeletedEvent;
 import com.apssouza.mailservice.repository.EmailRepository;
 import java.util.List;
+import java.util.Random;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
@@ -29,6 +30,7 @@ public List<Email> all() {
 
     @EventListener
     public void updateEmail(EmailCreatedEvent event) {
+        System.out.println("event= "+ event.getEmail());
         emailRepository.save(event.getEmail());
     }
 
diff --git a/mail-service/src/main/java/com/apssouza/mailservice/MailserviceApplication.java b/mail-service/src/main/java/com/apssouza/mailservice/MailserviceApplication.java
@@ -2,8 +2,14 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
+@ComponentScan(basePackages = {
+    "com.apssouza.infra", 
+    "com.apssouza.eventsourcing", 
+    "com.apssouza.mailservice"
+})
 public class MailserviceApplication {
 
     public static void main(String[] args) {
diff --git a/mail-service/src/main/java/com/apssouza/mailservice/controllers/EmailController.java b/mail-service/src/main/java/com/apssouza/mailservice/controllers/EmailController.java
@@ -0,0 +1,27 @@
+package com.apssouza.mailservice.controllers;
+
+import com.apssouza.eventsourcing.entities.Email;
+import com.apssouza.mailservice.repository.EmailRepository;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * @author apssouza
+ */
+@RestController
+@RequestMapping("/emails")
+public class EmailController {
+
+    @Autowired
+    EmailRepository repository;
+
+    @GetMapping
+    public List<Email> list() {
+        return repository.findAll();
+    }
+
+}
diff --git a/mail-service/src/main/java/com/apssouza/mailservice/controllers/NotifyController.java b/mail-service/src/main/java/com/apssouza/mailservice/controllers/NotifyController.java
@@ -7,10 +7,13 @@
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executors;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.util.concurrent.Future;
+import java.util.function.Supplier;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ReflectionUtils;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -24,25 +27,26 @@ public class NotifyController {
     @Autowired
     EmailCommandHandler emailCommandHandler;
 
-    @RequestMapping("email")
-    public CompletableFuture<String> sendEmail() {
-        CompletableFuture<String> result = CompletableFuture.completedFuture("Email sent successfully");
-        try {
+    @GetMapping("email")
+    public @ResponseBody Future<String> sendEmail() {
+        Supplier supplier = () -> {
             String uuid = UUID.randomUUID().toString();
             EmailCreateCommand command = new EmailCreateCommand(
                     uuid,
                     new Email("Alexsandro", "apssouza22@gmail.com", EmailState.CREATED)
             );
             Executors.newCachedThreadPool().submit(() -> {
-                emailCommandHandler.create(command);
-                return null;
+                try {
+                    emailCommandHandler.create(command);
+                } catch (Exception ex) {
+                    ReflectionUtils.rethrowRuntimeException(ex);
+                }
             });
-        } catch (Exception ex) {
-            Logger.getLogger(NotifyController.class.getName())
-                    .log(Level.SEVERE, null, ex);
-        }
+            return "Email sent successfully.  - code= " + uuid;
+        };
+
+        return CompletableFuture.supplyAsync(supplier, Executors.newCachedThreadPool());
 
-        return result;
     }
 
 }
diff --git a/mail-service/src/main/java/com/apssouza/mailservice/integration/reminder/EventInput.java b/mail-service/src/main/java/com/apssouza/mailservice/integration/reminder/EventInput.java
@@ -1,6 +1,7 @@
 package com.apssouza.mailservice.integration.reminder;
 
 import com.apssouza.eventsourcing.aggregates.EmailState;
+import com.apssouza.eventsourcing.commands.EmailCommandHandler;
 import com.apssouza.eventsourcing.commands.EmailCreateCommand;
 import com.apssouza.eventsourcing.entities.Email;
 import java.util.UUID;
@@ -20,19 +21,27 @@
 public class EventInput {
 
     Logger LOG = Logger.getLogger(EventInput.class);
+    
+    private final EmailCommandHandler commanderHandler;
+
+    public EventInput(EmailCommandHandler commander) {
+        this.commanderHandler = commander;
+    }
+    
 
     @StreamListener(
             target = Sink.INPUT,
             condition = "headers['type']=='TodoCreatedEvent'"
     )
-    public void todoCreated(@Payload TodoCreatedEvent event) {
+    public void todoCreated(@Payload TodoCreatedEvent event) throws Exception {
         LOG.info("Todo created");
         LOG.info("when = " + event.when());
         LOG.info("todo = " + event.getTodo().toString());
 
         String uuid = UUID.randomUUID().toString();
         Email email = new Email("Alexsandro", "apssouza22@gmail.com", EmailState.CREATED);
         EmailCreateCommand command = new EmailCreateCommand(uuid, email);
+        commanderHandler.create(command);
     }
 
 }
diff --git a/mail-service/src/test/java/com/apssouza/eventsourcing/aggregates/EmailAggregateTest.java b/mail-service/src/test/java/com/apssouza/eventsourcing/aggregates/EmailAggregateTest.java
@@ -36,6 +36,7 @@ public void testCreate() throws Exception {
         assertEquals(email.getEmail(), result.getState().getEmail());
         assertEquals(email.getName(), result.getState().getName());
         AppEvent event = result.getUncommittedChanges().get(0);
+        assertEquals(uuid, result.getUuid());
         assertEquals(uuid, event.uuid());
         assertEquals(EmailState.CREATED, result.getState().getState());
     }
diff --git a/oauth-server/src/main/java/com/apssouza/BasicApplication.java b/oauth-server/src/main/java/com/apssouza/BasicApplication.java
@@ -1,22 +1,9 @@
 package com.apssouza;
 
-import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.cloud.netflix.hystrix.EnableHystrix;
-import org.springframework.context.annotation.Bean;
-import org.springframework.http.HttpStatus;
 
 @SpringBootApplication
 @EnableHystrix

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ public void testCreate() throws Exception {`
`36`	`36`	`assertEquals(email.getEmail(), result.getState().getEmail());`
`37`	`37`	`assertEquals(email.getName(), result.getState().getName());`
`38`	`38`	`AppEvent event = result.getUncommittedChanges().get(0);`
	`39`	`+ assertEquals(uuid, result.getUuid());`
`39`	`40`	`assertEquals(uuid, event.uuid());`
`40`	`41`	`assertEquals(EmailState.CREATED, result.getState().getState());`
`41`	`42`	`}`