Merge remote-tracking branch 'origin/test-failing' into test-failing
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				Java CI with Maven / build (push) Successful in 46s
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	Java CI with Maven / build (push) Successful in 46s
				
			# Conflicts: # backend/src/main/java/core/services/TaskService.java
This commit is contained in:
		
						commit
						2dfb5ab877
					
				@ -11,9 +11,6 @@ import core.repositories.timemanager.TaskgroupRepository;
 | 
			
		||||
import org.springframework.beans.factory.annotation.Autowired;
 | 
			
		||||
import org.springframework.stereotype.Service;
 | 
			
		||||
 | 
			
		||||
import javax.persistence.EntityManager;
 | 
			
		||||
import javax.persistence.PersistenceContext;
 | 
			
		||||
import javax.transaction.Transactional;
 | 
			
		||||
import java.time.LocalDate;
 | 
			
		||||
import java.time.LocalDateTime;
 | 
			
		||||
import java.util.*;
 | 
			
		||||
@ -95,7 +92,6 @@ public class TaskService {
 | 
			
		||||
        return new ServiceResult<>(task);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Transactional
 | 
			
		||||
    public void deleteTask(Task task) {
 | 
			
		||||
        taskScheduleService.deleteScheduleByTask(task);
 | 
			
		||||
        taskRepository.deleteByTaskID(task.getTaskID());
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user