Find users query fixes

Throyer · Throyer · commit 28ad37349888 · 2022-01-16T12:24:50.000-03:00
diff --git a/src/main/java/com/github/throyer/common/springboot/domain/repositories/RoleRepository.java b/src/main/java/com/github/throyer/common/springboot/domain/repositories/RoleRepository.java
@@ -28,7 +28,7 @@ public interface RoleRepository extends SoftDeleteRepository<Role> {
             ),
             initials = NULL,
             deleted_at = CURRENT_TIMESTAMP,
-            active = 0,
+            active = false,
             deleted_by = ?#{principal?.id}
         WHERE id = ?1
     """)
diff --git a/src/main/java/com/github/throyer/common/springboot/domain/services/email/MailService.java b/src/main/java/com/github/throyer/common/springboot/domain/services/email/MailService.java
@@ -22,7 +22,7 @@ public class MailService {
     private JavaMailSender sender;
 
     private static Logger LOGGER = LoggerFactory.getLogger(MailService.class);
-    private static String ERROR_MESSAGE = "Erro ao enviar email.";
+    private static String ERROR_MESSAGE = "Error sending email.";
     private static final Boolean CONTENT_IS_HTML = true;
 
     public void send(Email email) {
@@ -33,7 +33,7 @@ public void send(Email email) {
             helper.setSubject(email.getSubject());
             helper.setText(engine.process(email.getTemplate(), email.getContext()), CONTENT_IS_HTML);
             sender.send(message);
-            LOGGER.info("Email enviado com sucesso para: {}", email.getDestination());
+            LOGGER.info("Email successfully sent to: {}", email.getDestination());
         } catch (MessagingException | MailException exception) {
             LOGGER.error(ERROR_MESSAGE, exception);
             throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, ERROR_MESSAGE);
diff --git a/src/main/java/com/github/throyer/common/springboot/domain/services/security/dto/RefreshTokenRequest.java b/src/main/java/com/github/throyer/common/springboot/domain/services/security/dto/RefreshTokenRequest.java
@@ -1,14 +1,12 @@
 package com.github.throyer.common.springboot.domain.services.security.dto;
 
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class RefreshTokenRequest {
 
-    @NotNull(message = "refresh_token não pode NULO.")
-    @NotEmpty(message = "refresh_token invalido.")
+    @NotEmpty(message = "Invalid refresh_token.")
     @JsonProperty("refresh_token")
     private String refresh;
 
diff --git a/src/main/java/com/github/throyer/common/springboot/domain/services/security/dto/TokenRequest.java b/src/main/java/com/github/throyer/common/springboot/domain/services/security/dto/TokenRequest.java
@@ -2,16 +2,13 @@
 
 import java.util.Objects;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 
 public class TokenRequest {
 
-    @NotNull(message = "O Email não pode ser NULO.")
-    @NotEmpty(message = "Email invalido.")
+    @NotEmpty(message = "Invalid email.")
     private String email;
 
-    @NotNull(message = "A Senha não pode ser NULA.")
-    @NotEmpty(message = "Senha invalida.")
+    @NotEmpty(message = "Invalid password.")
     private String password;
 
     public void setEmail(String email) {
diff --git a/src/main/java/com/github/throyer/common/springboot/domain/services/user/FindUserService.java b/src/main/java/com/github/throyer/common/springboot/domain/services/user/FindUserService.java
@@ -51,6 +51,7 @@ ur.user_id, string_agg(r.initials, ',') roles
             from 
                 "user" u
             left join user_roles as urs on urs.user_id = u.id
+            where u.deleted_at is null
         """;
         
         var query = manager.createNativeQuery(sql, Tuple.class);
diff --git a/src/main/java/com/github/throyer/common/springboot/domain/services/user/UpdateUserService.java b/src/main/java/com/github/throyer/common/springboot/domain/services/user/UpdateUserService.java
@@ -24,11 +24,11 @@ public ResponseEntity<UserDetails> update(Long id, UpdateUser body) {
 
         authorized()
             .filter(authorized -> authorized.cantModify(id))
-                .orElseThrow(() -> unauthorized("Permissão invalida atualização de recurso"));
+                .orElseThrow(() -> unauthorized("Permission invalidates resource update"));
 
         var actual = repository
             .findOptionalByIdAndDeletedAtIsNullFetchRoles(id)
-                .orElseThrow(() -> notFound("Usuário não encontrado"));
+                .orElseThrow(() -> notFound("User not found"));
         
         validateEmailUniquenessOnModify(body, actual);
 
diff --git a/src/main/java/com/github/throyer/common/springboot/domain/services/user/dto/CreateUserApi.java b/src/main/java/com/github/throyer/common/springboot/domain/services/user/dto/CreateUserApi.java
@@ -9,25 +9,22 @@
 import com.github.throyer.common.springboot.domain.builders.UserBuilder;
 import com.github.throyer.common.springboot.domain.models.entity.User;
 import com.github.throyer.common.springboot.domain.models.shared.HasEmail;
+import javax.validation.constraints.Size;
 import lombok.Data;
 
 @Data
 public class CreateUserApi implements HasEmail {
 
-    public static final String DEFAULT_PASSWORD = "mudar123";
-    public static final String STRONG_PASSWORD = "^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$ %^&*-]).{8,}$";
-    public static final String STRONG_PASSWORD_MESSAGE = "No mínimo 8 caracteres, com no mínimo um número, um caractere especial, uma letra maiúscula e uma letra minúscula.";
-
-    @NotEmpty(message = "Por favor, forneça um nome.")
+    @NotEmpty(message = "email is a required field.")
     private String name;
-    
-    @NotEmpty(message = "Por favor, forneça um e-mail.")
-    @Email(message = "Por favor, forneça um e-mail valido.")
+
+    @NotEmpty(message = "email is a required field.")
+    @Email(message = "invalid email.")
     private String email;
 
-    @NotEmpty(message = "Por favor, forneça uma senha.")
-    @Pattern(regexp = STRONG_PASSWORD, message = STRONG_PASSWORD_MESSAGE)
-    private String password = DEFAULT_PASSWORD;
+    @NotEmpty(message = "password is a required field.")
+    @Size(min = 8, max = 155, message = "The password must contain at least {min} characters.")
+    private String password;
 
     public CreateUserApi(String name, String email, String password) {
         setName(name);
diff --git a/src/main/java/com/github/throyer/common/springboot/domain/services/user/dto/CreateUserApp.java b/src/main/java/com/github/throyer/common/springboot/domain/services/user/dto/CreateUserApp.java
@@ -7,13 +7,9 @@
 import com.github.throyer.common.springboot.domain.models.entity.User;
 import com.github.throyer.common.springboot.domain.models.shared.HasEmail;
 
-import static com.github.throyer.common.springboot.domain.services.user.dto.CreateUserApi.STRONG_PASSWORD;
-import static com.github.throyer.common.springboot.domain.services.user.dto.CreateUserApi.STRONG_PASSWORD_MESSAGE;
 
 import javax.validation.constraints.Email;
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
 import lombok.Data;
diff --git a/src/main/java/com/github/throyer/common/springboot/domain/validation/EmailValidations.java b/src/main/java/com/github/throyer/common/springboot/domain/validation/EmailValidations.java
@@ -16,7 +16,7 @@ public class EmailValidations {
     private static UserRepository repository;
 
     private static String FIELD = "email";
-    private static String MESSAGE = "Este email já foi utilizado por outro usuário. Por favor utilize um email diferente.";
+    private static String MESSAGE = "This email has already been used by another user. Please use a different email.";
 
     private static final List<SimpleError> EMAIL_ERROR = List.of(new SimpleError(FIELD, MESSAGE));
 
diff --git a/src/test/java/com/github/throyer/common/springboot/controllers/UsersTests.java b/src/test/java/com/github/throyer/common/springboot/controllers/UsersTests.java
@@ -5,15 +5,20 @@
 import static com.github.throyer.common.springboot.utils.Random.password;
 import static com.github.throyer.common.springboot.utils.Random.randomUser;
 import static com.github.throyer.common.springboot.utils.TokenUtils.token;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.Matchers.hasSize;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import static org.springframework.http.HttpHeaders.AUTHORIZATION;
+import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+
+import static java.lang.String.format;
+import static org.hamcrest.Matchers.*;
+
 import java.util.List;
 import java.util.Map;
 
@@ -29,8 +34,7 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
+
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.web.servlet.MockMvc;
@@ -75,7 +79,7 @@ public void should_save_a_new_user() throws Exception {
 
         var request = post("/api/users")
             .content(json)
-            .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
+            .header(CONTENT_TYPE, APPLICATION_JSON);
 
         api.perform(request)
             .andDo(print())
@@ -95,7 +99,7 @@ public void should_return_400_saving_user_without_required_fields() throws Excep
         
         var request = post("/api/users")
             .content(payload)
-                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
+                .header(CONTENT_TYPE, APPLICATION_JSON);
 
         api.perform(request)
             .andDo(print())
@@ -111,7 +115,7 @@ public void should_list_users() throws Exception {
         repository.saveAll(List.of(randomUser(), randomUser(), randomUser(), randomUser()));
         
         var request = get("/api/users")
-            .header(HttpHeaders.AUTHORIZATION, header)
+            .header(AUTHORIZATION, header)
                 .queryParam("page", "0")
                 .queryParam("size", "10");
 
@@ -120,6 +124,39 @@ public void should_list_users() throws Exception {
                 .andExpect(jsonPath("$.content").isArray())
                 .andExpect(jsonPath("$.content", hasSize(greaterThan(3))));
     }
+    
+    @Test
+    @DisplayName("Must not list deleted users.")
+    public void must_not_list_deleted_users() throws Exception {
+
+        var user = repository.save(randomUser());
+        var id = user.getId();
+        var expression = format("$.content[?(@.id == %s)].id", id);
+        
+        var first = get("/api/users")
+            .header(AUTHORIZATION, header)
+                .queryParam("page", "0")
+                .queryParam("size", "10");
+
+        api.perform(first).andDo(print())
+                .andExpect(status().isOk())
+                .andExpect(jsonPath(expression, hasItem(id.intValue())));
+        
+        var second = delete(String.format("/api/users/%s", id))
+            .header(AUTHORIZATION, header);
+
+        api.perform(second).andDo(print())
+                .andExpect(status().isNoContent());
+        
+        var third = get("/api/users")
+            .header(AUTHORIZATION, header)
+                .queryParam("page", "0")
+                .queryParam("size", "10");
+
+        api.perform(third).andDo(print())
+                .andExpect(status().isOk())
+                .andExpect(jsonPath(format("$.content[?(@.id == %s)].id", id.intValue())).isEmpty());
+    }
 
     @Test
     @DisplayName("Deve deletar usuário.")
@@ -128,7 +165,7 @@ public void should_delete_user() throws Exception {
         var user = repository.save(randomUser());
         
         var request = delete(String.format("/api/users/%s", user.getId()))
-            .header(HttpHeaders.AUTHORIZATION, header);
+            .header(AUTHORIZATION, header);
 
         api.perform(request).andDo(print())
                 .andExpect(status().isNoContent());
@@ -140,13 +177,13 @@ public void should_return_404_after_delete_user() throws Exception {
         var user = repository.save(randomUser());
 
         var fist = delete(String.format("/api/users/%s", user.getId()))
-            .header(HttpHeaders.AUTHORIZATION, header);
+            .header(AUTHORIZATION, header);
 
         api.perform(fist).andDo(print())
                 .andExpect(status().isNoContent());
 
         var second = delete(String.format("/api/users/%s", user.getId()))
-            .header(HttpHeaders.AUTHORIZATION, header);
+            .header(AUTHORIZATION, header);
 
         api.perform(second).andDo(print())
                 .andExpect(status().isNotFound());
@@ -164,7 +201,7 @@ public void should_return_400_after_save_same_email() throws Exception {
 
         var first = post("/api/users")
             .content(json)
-            .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
+            .header(CONTENT_TYPE, APPLICATION_JSON);
 
         api.perform(first)
             .andDo(print())
@@ -174,7 +211,7 @@ public void should_return_400_after_save_same_email() throws Exception {
 
         var second = post("/api/users")
             .content(json)
-            .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
+            .header(CONTENT_TYPE, APPLICATION_JSON);
 
         api.perform(second)
             .andDo(print())
