Merge branch 'main' of github.com:helpdeveloper/java-modular-architecture into main

Author: AlissonMedeiros

README.md

@@ -1,5 +1,9 @@
+![Issues](https://img.shields.io/github/issues/helpdeveloper/java-modular-architecture.svg)
+![Forks](https://img.shields.io/github/forks/helpdeveloper/java-modular-architecture.svg)
+![Stars](https://img.shields.io/github/stars/helpdeveloper/java-modular-architecturei.svg)
+![Release Version](https://img.shields.io/github/release/helpdeveloper/java-modular-architecture.svg)
 # Arquitetura modular
-### Projeto em desenvolvimento...
+### Projeto em desenvolvimento
 
 <p align="center">
     <img src="./images/arch.png" height="350">
@@ -26,21 +30,21 @@ Todo acesso a dados seja banco e/ou api's expostos pelas interfaces do Use Case
 Facilidade na execução dos testes com uma melhor granularidade.
 
 ### Unitários
-- JUnit5
-- Mockito
-- AssertJ
-- Mutação
-- Cobertura de código (linha e condições)
+- [JUnit5](https://junit.org/junit5/)
+- [Mockito](https://site.mockito.org)
+- [AssertJ](https://assertj.github.io/doc/)
+- [Mutação](https://pitest.org)
+- [Cobertura de código (linha e condições)](https://www.eclemma.org/jacoco/)
 
 ### Aceitação (acceptance-test)
 Teste do ponto de vista de quem irá consumir, sempre buscando o mais perto de produção.
 
 #### O que tem:
-- Docker
-- TestContainers
-- RestAssured
-- WireMock
-- Flyway
+- [Docker](https://www.docker.com)
+- [TestContainers](https://www.testcontainers.org)
+- [RestAssured](https://rest-assured.io)
+- [WireMock](http://wiremock.org)
+- [Flyway](https://flywaydb.org)
 
 #### O que não tem:
 - Framework (Spring ou quarkus)

acceptance-test/src/test/java/br/com/helpdev/atdd/ApplicationIT.java

@@ -55,7 +55,7 @@ public void whenGetWithInvalidIdThenReturnError() {
         .then()
         .statusCode(404)
         .body("message",
-            equalTo("Mensagem com o id: 123123 não foi encontrada, confira se o identificador está correto e tente novamente."));
+            equalTo("Message with Id 123123 not found"));
   }
 
   @Test

core/use-case/src/main/java/br/com/helpdev/usecase/FindRequestNotification.java

@@ -23,8 +23,7 @@ public class FindRequestNotification {
 
   public Message find(final MessageId id) throws NotificationException {
     return repository.find(id).orElseThrow(() ->
-        new MessageNotFoundException(
-            "Mensagem com o id: " + id + " não foi encontrada, confira se o identificador está correto e tente novamente.")
+        new MessageNotFoundException("Message with Id " + id + " not found")
     );
   }
 

core/use-case/src/main/java/br/com/helpdev/usecase/PushRequestNotification.java

@@ -24,10 +24,15 @@ public class PushRequestNotification {
 
   public Message push(final Message message) throws NotificationException {
     return repository.create(message.toBuilder()
-        .chats(List.of(Chat.builder()
-            .date(ZonedDateTime.now())
-            .status(Status.WAITING)
-            .build())).build());
+        .chats(getSingleListWithCurrentTimesAndWaitingStatus())
+        .build());
+  }
+
+  private List<Chat> getSingleListWithCurrentTimesAndWaitingStatus() {
+    return List.of(Chat.builder()
+        .date(ZonedDateTime.now())
+        .status(Status.WAITING)
+        .build());
   }
 
 }

core/use-case/src/test/java/br/com/helpdev/usecase/DeleteRequestNotificationTest.java

@@ -48,7 +48,6 @@ void shouldThrowsMessageNotFoundExceptionWhenNotFoundId() {
     assertThatThrownBy(() -> deleteRequestNotification.delete(messageId))
         .hasMessage("Message id: " + messageId.value() + " dont exists");
 
-
     verify(repository, times(1))
         .exists(messageId);
   }

core/use-case/src/test/java/br/com/helpdev/usecase/FindRequestNotificationTest.java

@@ -1,6 +1,17 @@
 package br.com.helpdev.usecase;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import br.com.helpdev.domain.Message;
+import br.com.helpdev.domain.vo.MessageId;
 import br.com.helpdev.usecase.port.MessageRepository;
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
@@ -13,5 +24,33 @@ class FindRequestNotificationTest {
   private MessageRepository repository;
 
   @InjectMocks
-  private FindRequestNotification deleteRequestNotification;
+  private FindRequestNotification findRequestNotification;
+
+  @Test
+  void shouldBeFindMessageWhenMessageIdExists() {
+    final var messageId = MessageId.from(12L);
+    final var message = mock(Message.class);
+
+    when(repository.find(messageId)).thenReturn(Optional.of(message));
+
+    final var response = findRequestNotification.find(messageId);
+
+    verify(repository, times(1))
+        .find(messageId);
+    assertThat(response)
+        .isEqualTo(message);
+  }
+
+  @Test
+  void shouldThrowsMessageNotFoundExceptionWhenNotFoundId() {
+    final var messageId = MessageId.from(12L);
+
+    when(repository.find(messageId)).thenReturn(Optional.empty());
+
+    assertThatThrownBy(() -> findRequestNotification.find(messageId))
+        .hasMessage("Message with Id " + messageId.value() + " not found");
+
+    verify(repository, times(1))
+        .find(messageId);
+  }
 }

core/use-case/src/test/java/br/com/helpdev/usecase/PushRequestNotificationTest.java

@@ -1,6 +1,17 @@
 package br.com.helpdev.usecase;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import br.com.helpdev.domain.Message;
+import br.com.helpdev.domain.Recipient;
+import br.com.helpdev.domain.Status;
+import br.com.helpdev.domain.vo.MessageBody;
+import br.com.helpdev.domain.vo.MessageId;
+import br.com.helpdev.domain.vo.Phone;
 import br.com.helpdev.usecase.port.MessageRepository;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
@@ -14,4 +25,33 @@ class PushRequestNotificationTest {
 
   @InjectMocks
   private PushRequestNotification deleteRequestNotification;
+
+  @Test
+  void shouldBeCreateMessageWithSuccess() {
+    final var message = fakeBuilder().build();
+    final var requiredResponse = mock(Message.class);
+
+    when(repository.create(message))
+        .then(invocationOnMock -> {
+          Message messageInCreate = invocationOnMock.getArgument(0);
+          assertThat(messageInCreate.getChats())
+              .isNotNull()
+              .allMatch(x -> x.getStatus().equals(Status.WAITING))
+              .hasSize(1);
+          return requiredResponse;
+        });
+
+    final var response = deleteRequestNotification.push(message);
+
+    assertThat(response)
+        .isEqualTo(requiredResponse);
+  }
+
+  private Message.MessageBuilder fakeBuilder() {
+    return Message.builder().body(MessageBody.from("empty"))
+        .recipient(Recipient.builder()
+            .phone(Phone.newNumber("123123"))
+            .build())
+        .id(MessageId.from(1L));
+  }
 }