Complete and join task

src/main/java/br/com/ages/mutiraodobemback/controller/EventController.java

@@ -59,11 +59,11 @@ public class EventController {
     }
 
     @PutMapping("/join-task/{id}")
-    public void joinTask(@PathVariable String id, @RequestBody String taskId) { this.taskService.joinTask(id, taskId);
+    public void joinTask(@PathVariable String id, @RequestBody TaskDTO dto) { this.taskService.joinTask(id, dto);
     }
 
     @PutMapping("/complete-task/{id}")
-    public void completeTask(@PathVariable String id, @RequestBody String taskId) { this.taskService.completeTask(id, taskId);
+    public void completeTask(@PathVariable String id, @RequestBody TaskDTO dto) { this.taskService.completeTask(id, dto);
     }
 
     @GetMapping("/event-details/{id}")

src/main/java/br/com/ages/mutiraodobemback/service/task/ITaskService.java

@@ -7,7 +7,7 @@ public interface ITaskService {
 
     void deleteTask(String id, TaskDTO dto);
 
-    void joinTask(String id, String taskId);
+    void joinTask(String id, TaskDTO dto);
 
-    void completeTask(String id, String taskId);
+    void completeTask(String id, TaskDTO dto);
 }

src/main/java/br/com/ages/mutiraodobemback/service/task/TaskServiceImpl.java

@@ -15,7 +15,6 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.ListIterator;
 
 import static br.com.ages.mutiraodobemback.message.Message.*;
 import static br.com.ages.mutiraodobemback.message.Message.NAO_FOI_POSSIVEL_REMOVER_A_TAREFA;
@@ -75,7 +74,7 @@ public class TaskServiceImpl implements ITaskService {
 
 
     @Override
-    public void joinTask(String id, String taskId) {
+    public void joinTask(String id, TaskDTO dto) {
         if (Validations.isNull(id))
             throw new CustomIllegalArgumentException(ID_EH_OBRIGATORIO);
 
@@ -84,7 +83,7 @@ public class TaskServiceImpl implements ITaskService {
 
         TaskEntity taskToJoin = event.getTasks()
                 .stream()
-                .filter(task -> Validations.isNull(task.getVolunteer()) && taskId.equalsIgnoreCase(task.getId()))
+                .filter(task -> Validations.isNull(task.getVolunteer()) && dto.getId().equalsIgnoreCase(task.getId()))
                 .findFirst()
                 .orElseThrow(() -> new UserAlreadyParticipate(TAREFA_JA_POSSUI_VOLUNTARIO));
 
@@ -93,7 +92,7 @@ public class TaskServiceImpl implements ITaskService {
     }
 
     @Override
-    public void completeTask(String id, String taskId) {
+    public void completeTask(String id, TaskDTO dto) {
         if (Validations.isNull(id))
             throw new CustomIllegalArgumentException(ID_EH_OBRIGATORIO);
 
@@ -103,7 +102,7 @@ public class TaskServiceImpl implements ITaskService {
 
         TaskEntity taskToComplete = event.getTasks()
                 .stream()
-                .filter(task -> (isEventOwner || loggedUserId.equalsIgnoreCase(task.getOwner().getId())) && taskId.equalsIgnoreCase(task.getId()))
+                .filter(task -> (isEventOwner || loggedUserId.equalsIgnoreCase(task.getOwner().getId())) && dto.getId().equalsIgnoreCase(task.getId()))
                 .findFirst()
                 .orElseThrow(() -> new UserAlreadyParticipate(TAREFA_NAO_PODE_SER_CONCLUIDA));