Fix:Tests, modules User and TaskStatus

VictorGotsenko · VictorGotsenko · commit 6493fdd005e7 · 2025-12-01T21:03:31.000+05:00
diff --git a/src/main/java/hexlet/code/model/TaskStatus.java b/src/main/java/hexlet/code/model/TaskStatus.java
@@ -1,5 +1,6 @@
 package hexlet.code.model;
 
+import java.time.LocalDate;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -10,27 +11,28 @@
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
+import lombok.EqualsAndHashCode;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import lombok.Getter;
 import lombok.Setter;
 
-import java.time.LocalDate;
-
 @Getter
 @Setter
-
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @EntityListeners(AuditingEntityListener.class)
 @Entity
 @Table(name = "taskstatuses")
 public class TaskStatus {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @EqualsAndHashCode.Include
     private Long id;
 
     @NotBlank
     @Size(min = 1)
+    @EqualsAndHashCode.Include
     private String name;
 
     @NotBlank
diff --git a/src/main/java/hexlet/code/model/User.java b/src/main/java/hexlet/code/model/User.java
@@ -10,6 +10,7 @@
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -27,22 +28,25 @@
 @Getter
 @Setter
 @RequiredArgsConstructor
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @EntityListeners(AuditingEntityListener.class)
 @Table(name = "users")
 @Schema(description = "User data model")
-public class User implements BaseEntity,  UserDetails {
+public class User implements BaseEntity, UserDetails {
 
     @Id
     @Schema(description = "User ID",
             example = "123")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @EqualsAndHashCode.Include
     @Column(name = "id", nullable = false)
     private Long id;
 
     @Schema(description = "User first name",
             example = "Tom",
             requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank
+    @EqualsAndHashCode.Include
     private String firstName;
     @NotBlank
     private String lastName;
@@ -65,7 +69,6 @@ public class User implements BaseEntity,  UserDetails {
     private LocalDate updatedAt;
 
     /**
-     *
      * @return String
      */
     @Override
@@ -74,7 +77,6 @@ public String getPassword() {
     }
 
     /**
-     *
      * @return String
      */
     @Override
@@ -83,7 +85,6 @@ public String getUsername() {
     }
 
     /**
-     *
      * @return GrantedAuthority
      */
     @Override
diff --git a/src/test/java/hexlet/code/controller/TestLabelController.java b/src/test/java/hexlet/code/controller/TestLabelController.java
@@ -9,7 +9,6 @@
 import org.assertj.core.api.Assertions;
 import org.instancio.Instancio;
 import org.instancio.Select;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -34,15 +33,13 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 
-
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 @SpringBootTest(webEnvironment = RANDOM_PORT)
 @AutoConfigureMockMvc
 class TestLabelController {
     @LocalServerPort
     private int port;
-
     @Autowired
     private MockMvc mockMvc;
     @Autowired
@@ -59,6 +56,7 @@ class TestLabelController {
      */
     @BeforeEach
     void initTests() {
+        labelRepository.deleteAll();
         testLabel = Instancio.of(Label.class)
                 .ignore(Select.field(Label::getId))
                 .set(Select.field("name"), "testLabel")
@@ -67,14 +65,6 @@ void initTests() {
         labelRepository.save(testLabel);
     }
 
-    /**
-     * afterEach.
-     */
-    @AfterEach
-    void clean() {
-        labelRepository.deleteAll();
-    }
-
     @Test
     @DisplayName("R - Test get all")
     void testIndex() throws Exception {
@@ -87,7 +77,6 @@ void testIndex() throws Exception {
         var actual = labelDTOS.stream().map(labelMapper::map).toList();
         var expected = labelRepository.findAll();
         Assertions.assertThat(actual).containsExactlyInAnyOrderElementsOf(expected);
-
     }
 
     @Test
diff --git a/src/test/java/hexlet/code/controller/TestTaskController.java b/src/test/java/hexlet/code/controller/TestTaskController.java
@@ -15,7 +15,6 @@
 import org.assertj.core.api.Assertions;
 import org.instancio.Instancio;
 import org.instancio.Select;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -61,12 +60,13 @@ class TestTaskController {
     private Task testTask;
     private TaskStatus taskStatus;
 
-
     /**
      * setUp.
      */
     @BeforeEach
     void setUp() {
+        taskRepository.deleteAll();
+        taskStatusRepository.deleteAll();
         taskStatus = Instancio.of(TaskStatus.class)
                 .ignore(Select.field(TaskStatus::getId))
                 .supply(Select.field(TaskStatus::getName), () -> "Move1")
@@ -86,15 +86,6 @@ void setUp() {
         taskRepository.save(testTask);
     }
 
-    /**
-     * afterEach.
-     */
-    @AfterEach
-    void clean() {
-        taskRepository.deleteAll();
-        taskStatusRepository.deleteAll();
-    }
-
     @Test
     @DisplayName("R - Test get all")
     void testIndex() throws Exception {
diff --git a/src/test/java/hexlet/code/controller/TestTaskStatusController.java b/src/test/java/hexlet/code/controller/TestTaskStatusController.java
@@ -6,11 +6,11 @@
 import hexlet.code.exeption.ResourceNotFoundException;
 import hexlet.code.mapper.TaskStatusMapper;
 import hexlet.code.model.TaskStatus;
+import hexlet.code.repository.TaskRepository;
 import hexlet.code.repository.TaskStatusRepository;
 import org.assertj.core.api.Assertions;
 import org.instancio.Instancio;
 import org.instancio.Select;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -50,13 +50,17 @@ class TestTaskStatusController {
     private TaskStatusRepository taskStatusRepository;
     @Autowired
     private TaskStatusMapper taskStatusMapper;
+    @Autowired
+    private TaskRepository taskRepository;
+
     private TaskStatus testTaskStatus;
 
     /**
      * setUp.
      */
     @BeforeEach
     void setUp() {
+        taskRepository.deleteAll();
         taskStatusRepository.deleteAll();
         testTaskStatus = Instancio.of(TaskStatus.class)
                 .ignore(Select.field(TaskStatus::getId))
@@ -67,14 +71,6 @@ void setUp() {
         taskStatusRepository.save(testTaskStatus);
     }
 
-    /**
-     * afterEach.
-     */
-    @AfterEach
-    void clean() {
-        taskStatusRepository.deleteAll();
-    }
-
     @Test
     @DisplayName("R - Test get all")
     void testIndex() throws Exception {
@@ -88,11 +84,7 @@ void testIndex() throws Exception {
         var actual = taskStatusDTOS.stream().map(taskStatusMapper::map).toList();
         var expected = taskStatusRepository.findAll();
 
-        Assertions.assertThat(actual)
-                .usingRecursiveComparison()
-                .ignoringFields("createdAt")
-                .isEqualTo(expected);
-//        Assertions.assertThat(actual).containsExactlyInAnyOrderElementsOf(expected);
+        Assertions.assertThat(actual).containsExactlyInAnyOrderElementsOf(expected);
     }
 
     @Test
diff --git a/src/test/java/hexlet/code/controller/TestUserController.java b/src/test/java/hexlet/code/controller/TestUserController.java
@@ -11,9 +11,9 @@
 import hexlet.code.repository.UserRepository;
 import hexlet.code.util.JWTUtils;
 import net.datafaker.Faker;
+import org.assertj.core.api.Assertions;
 import org.instancio.Instancio;
 import org.instancio.Select;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -67,6 +67,7 @@ class TestUserController {
      */
     @BeforeEach
     void setUp() {
+        userRepository.deleteAll();
         testUser = new User();
         testUser = Instancio.of(User.class)
                 .ignore(Select.field(User::getId))
@@ -78,14 +79,6 @@ void setUp() {
         token = jwtUtils.generateToken("hexlet@example.com");
     }
 
-    /**
-     * afterEach.
-     */
-    @AfterEach
-    void clean() {
-        userRepository.deleteAll();
-    }
-
     @Test
     @DisplayName("R - Test Welcome endpoint")
     void testWelcome() {
@@ -173,11 +166,7 @@ void testIndex() throws Exception {
         var actual = userDTOS.stream().map(userMapper::map).toList();
         var expected = userRepository.findAll();
 
-        assertThat(actual)
-                .usingRecursiveComparison()
-                .ignoringFields("passwordDigest", "createdAt", "updatedAt")
-                .isEqualTo(expected);
-//        Assertions.assertThat(actual).containsExactlyInAnyOrderElementsOf(expected);
+        Assertions.assertThat(actual).containsExactlyInAnyOrderElementsOf(expected);
     }
 
     @Test
