@@ -24,7 +24,6 @@ import ru.soune.nocopy.service.violation.ViolationStatus;
|
||||
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
@@ -81,15 +80,12 @@ public class ComplaintEntityService {
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public List<ComplaintResponse> getComplaintsByViolationId(Long violationId) {
|
||||
public ComplaintResponse getComplaintsByViolationId(Long violationId) {
|
||||
if (!violationRepository.existsById(violationId)) {
|
||||
throw new ViolationNotFoundException("Violation not found: " + violationId);
|
||||
}
|
||||
|
||||
return complaintRepository.findByViolationId(violationId)
|
||||
.stream()
|
||||
.map(this::mapToResponse)
|
||||
.collect(Collectors.toList());
|
||||
return mapToResponse(complaintRepository.findByViolationId(violationId));
|
||||
}
|
||||
|
||||
public List<ComplaintEntity> fetchComplaintByViolation(Long violationId) {
|
||||
@@ -101,10 +97,9 @@ public class ComplaintEntityService {
|
||||
ComplaintStatus.SHOWED.name(), ComplaintStatus.IN_WORK.name()));
|
||||
}
|
||||
|
||||
public ComplaintResponse updateComplaintStatus(Long id, ComplaintStatus status) {
|
||||
ComplaintEntity complaint = complaintRepository.findById(id)
|
||||
.orElseThrow(() -> new ComplaintNotFoundException("Complaint not found: " + id));
|
||||
public ComplaintResponse updateComplaintStatus(ComplaintEntity complaint, ComplaintStatus status) {
|
||||
complaint.setStatus(status);
|
||||
|
||||
return mapToResponse(complaintRepository.save(complaint));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user