Step09 - done

Author: VictorGotsenko

src/main/java/hexlet/code/controller/AuthenticationController.java

@@ -1,9 +1,8 @@
 package hexlet.code.controller;
 
-
 import hexlet.code.dto.AuthRequest;
 import hexlet.code.util.JWTUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -13,12 +12,10 @@
 
 @RestController
 @RequestMapping("/api/login")
+@AllArgsConstructor
 public class AuthenticationController {
-    @Autowired
-    private JWTUtils jwtUtils;
-
-    @Autowired
-    private AuthenticationManager authenticationManager;
+    private final JWTUtils jwtUtils;
+    private final AuthenticationManager authenticationManager;
 
     /**
      *

src/main/java/hexlet/code/controller/TaskController.java

@@ -1,10 +1,11 @@
 package hexlet.code.controller;
 
-
 import hexlet.code.dto.task.TaskCreateDTO;
 import hexlet.code.dto.task.TaskDTO;
+import hexlet.code.dto.task.TaskParamsDTO;
 import hexlet.code.dto.task.TaskUpdateDTO;
 import hexlet.code.service.TaskService;
+import hexlet.code.specification.TaskSpecification;
 import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
@@ -27,13 +28,16 @@
 public class TaskController {
 
     private final TaskService taskService;
+    private final TaskSpecification specBuilder;
 
     /**
+     * @param dto
      * @return List<TaskDTO>
      */
     @GetMapping(path = "")
-    public ResponseEntity<List<TaskDTO>> index() {
-        var result = taskService.getAll();
+    public ResponseEntity<List<TaskDTO>> index(TaskParamsDTO dto) {
+        // repository.findAll(/* спецификация */, PageRequest.of(/* текущая страница */, 10));
+        var result = taskService.getAll(dto);
         return ResponseEntity.ok().header("X-Total-Count", String.valueOf(result.size())).body(result);
     }
 

src/main/java/hexlet/code/controller/TaskStatusController.java

@@ -7,7 +7,7 @@
 import hexlet.code.repository.TaskStatusRepository;
 import hexlet.code.service.TaskStatusService;
 import jakarta.validation.Valid;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -24,12 +24,10 @@
 
 @RestController
 @RequestMapping("/api/task_statuses")
+@AllArgsConstructor
 public class TaskStatusController {
-    @Autowired
-    private TaskStatusRepository taskStatusRepository;
-
-    @Autowired
-    private TaskStatusService taskStatusService;
+    private final TaskStatusRepository taskStatusRepository;
+    private final TaskStatusService taskStatusService;
 
     /**
      * @return List<TaskStatusDTO>

src/main/java/hexlet/code/controller/UserController.java

@@ -27,12 +27,12 @@
 @RestController
 @RequestMapping("/api/users")
 @AllArgsConstructor
+//@RequredArgsConstructor
 public class UserController {
 //    private static final String ONLY_OWNER_BY_ID = """
 //                @userRepository.findById(#id).get().getEmail() == authentication.getName()
 //            """;
 
-
     private final UserRepository userRepository;
     private final UserService userService;
 

src/main/java/hexlet/code/dto/label/LabelCreateDTO.java

@@ -10,5 +10,5 @@
 public class LabelCreateDTO {
     @NotNull
     @Size(min = 3, max = 1000)
-    String name;
+    private String name;
 }

src/main/java/hexlet/code/dto/label/LabelDTO.java

@@ -8,8 +8,8 @@
 @Getter
 @Setter
 public class LabelDTO {
-    Long id;
-    String name;
+    private Long id;
+    private String name;
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime createdAt;
 }

src/main/java/hexlet/code/dto/task/TaskCreateDTO.java

@@ -14,17 +14,17 @@ public class TaskCreateDTO {
 
     @NotNull
     @Size(min = 1)
-    String title;
+    private String title;
 
-    String content;
-    Integer index;
+    private String content;
+    private Integer index;
 
     @NotNull
     @JsonProperty("status")
-    String status;
+    private String status;
 
     @JsonProperty("assignee_id")
-    Long assigneeId;
+    private Long assigneeId;
 
     private Set<Long> taskLabelIds;
 

src/main/java/hexlet/code/dto/task/TaskParamsDTO.java

@@ -0,0 +1,16 @@
+package hexlet.code.dto.task;
+
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class TaskParamsDTO {
+
+    private String titleCont; // название задачи содержит подстроку
+    private Long assigneeId; // идентификатор исполнителя задачи
+    private String status; // слаг статуса задачи
+    private Long labelId; // идентификатор метки задачи
+
+}

src/main/java/hexlet/code/mapper/LabelMapper.java

@@ -1,6 +1,5 @@
 package hexlet.code.mapper;
 
-
 import hexlet.code.dto.label.LabelCreateDTO;
 import hexlet.code.dto.label.LabelDTO;
 import hexlet.code.dto.label.LabelUpdateDTO;

src/main/java/hexlet/code/mapper/ReferenceMapper.java

@@ -7,7 +7,6 @@
 import org.mapstruct.TargetType;
 import org.springframework.beans.factory.annotation.Autowired;
 
-
 @Mapper(
     componentModel = MappingConstants.ComponentModel.SPRING
 )