Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
package com.lft.taskservice.tasks.adapters.persistance;

import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;

import java.time.LocalDate;
import java.util.List;

public interface JpaAssignmentRepository extends JpaRepository<AssignmentEntity, Long> {

@Query("select a.taskId from AssignmentEntity a where a.userId=:userId")
List<Long> findAllTasksIdByUserId(Long userId);

@Modifying
@Query("update AssignmentEntity a set a.deadline = :deadline where a.taskId=:taskId and a.userId = :userId")
void updateDeadline(@Param("deadline") LocalDate deadline, @Param("taskId") Long taskId, @Param("userId") Long userId);

}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.springframework.stereotype.Repository;

import javax.transaction.Transactional;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
import java.util.NoSuchElementException;
Expand Down Expand Up @@ -43,8 +44,15 @@ public Assignment assignTaskToUser(Assignment assignment) {
return assignmentMapper.toDomain(savedAssignmentEntity);
}

@TaskLogging
@Override
public List<Long> getAllIdsOfTasksAssignedToUser(Long userId) {
return assignmentRepository.findAllTasksIdByUserId(userId);
}

@Override
public void changeDeadline(Long userId, Long taskId, LocalDate deadline) {
assignmentRepository.updateDeadline(deadline, taskId, userId);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,18 @@ public ResponseEntity<AssignmentDto> assignTaskToUser(@RequestBody NewAssignment
@GetMapping("/assign/{userId}")
public ResponseEntity<List<TaskDto>> getAllTasksAssignedToUser(@PathVariable("userId") Long userId){
var tasks = taskService.getAllTasksAssignedToUser(userId);
List<TaskDto> taskDtos = tasks.stream().map(task -> taskMapper.toDto(task)).collect(Collectors.toList());
List<TaskDto> taskDtos = tasks.stream()
.map(task -> taskMapper.toDto(task))
.collect(Collectors.toList());
return new ResponseEntity<>(taskDtos, HttpStatus.FOUND);
}

@PutMapping("/assign")
public ResponseEntity changeDeadlineOfExistingAssignment(@RequestBody NewAssignmentDto newAssignmentDto) {
var assignmentWithUpdatedDeadline = assignmentMapper.toDomain(newAssignmentDto);
taskService.changeDeadline(assignmentWithUpdatedDeadline);
return new ResponseEntity<>(HttpStatus.OK);
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,10 @@ public List<Task> getAllTasksAssignedToUser(Long userId) {
}
return tasks;
}

@Override
public void changeDeadline(Assignment assignment) {
taskRepository.changeDeadline(assignment.getUserId(), assignment.getTaskId(), assignment.getDeadline());
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.lft.taskservice.tasks.domain.Assignment;
import com.lft.taskservice.tasks.domain.Task;

import java.time.LocalDate;
import java.util.List;

public interface TaskRepository {
Expand All @@ -15,4 +16,6 @@ public interface TaskRepository {

Task findById(Long id);

void changeDeadline(Long userId, Long taskId, LocalDate deadline);

}
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ public interface TaskService {
Assignment assignTaskToUser(Assignment assignment);

List<Task> getAllTasksAssignedToUser(Long userId);

void changeDeadline(Assignment assignment);

}