Skip to content
Merged
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
Expand Up @@ -4,10 +4,10 @@
import org.springframework.http.ContentDisposition;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import com.serviceOrder.Management.dtos.OrderServiceCreateDTO;
import com.serviceOrder.Management.dtos.OrderServiceDTO;
import com.serviceOrder.Management.dtos.OrderServiceFinishDTO;
import com.serviceOrder.Management.services.OrderServiceService;
import com.serviceOrder.Management.dtos.ServiceOrderCreateDTO;
import com.serviceOrder.Management.dtos.ServiceOrderDTO;
import com.serviceOrder.Management.dtos.ServiceOrderFinishDTO;
import com.serviceOrder.Management.services.ServiceOrderService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
Expand All @@ -30,19 +30,19 @@
@Tag(name = "Service Orders", description = "Endpoints to manage the service order lifecycle")
@RestController
@RequestMapping(value = "/orders")
public class OrderServiceController {
private final OrderServiceService service;
public class ServiceOrderController {
private final ServiceOrderService service;
private final PdfReportService pdfReportService;

public OrderServiceController(OrderServiceService service, PdfReportService pdfReportService) {
public ServiceOrderController(ServiceOrderService service, PdfReportService pdfReportService) {
this.service = service;
this.pdfReportService = pdfReportService;
}

@Operation(summary = "Lists service orders",
description = "Paginated list, newest first. The filters are optional and combined with AND: status, priority, clientId, technicianId and title (case-insensitive, matches part of the title)")
@GetMapping
public ResponseEntity<PageResponseDTO<OrderServiceDTO>> findAll(
public ResponseEntity<PageResponseDTO<ServiceOrderDTO>> findAll(
@RequestParam(required = false) OrderStatus status,
@RequestParam(required = false) OrderPriority priority,
@RequestParam(required = false) Long clientId,
Expand All @@ -54,7 +54,7 @@ public ResponseEntity<PageResponseDTO<OrderServiceDTO>> findAll(
}

@GetMapping(value = "/{id}")
public ResponseEntity<OrderServiceDTO> findById(@PathVariable Long id) {
public ResponseEntity<ServiceOrderDTO> findById(@PathVariable Long id) {
return ResponseEntity.ok(service.findById(id));
}

Expand All @@ -65,8 +65,8 @@ public ResponseEntity<OrderServiceDTO> findById(@PathVariable Long id) {
@ApiResponse(responseCode = "404", description = "Client not found")
})
@PostMapping
public ResponseEntity<OrderServiceDTO> create(@Valid @RequestBody OrderServiceCreateDTO dto) {
OrderServiceDTO createdDto = service.create(dto);
public ResponseEntity<ServiceOrderDTO> create(@Valid @RequestBody ServiceOrderCreateDTO dto) {
ServiceOrderDTO createdDto = service.create(dto);
URI uri = ServletUriComponentsBuilder.fromCurrentRequest().path("/{id}")
.buildAndExpand(createdDto.id()).toUri();
return ResponseEntity.created(uri).body(createdDto);
Expand All @@ -80,7 +80,7 @@ public ResponseEntity<OrderServiceDTO> create(@Valid @RequestBody OrderServiceCr
@ApiResponse(responseCode = "409", description = "Order status does not allow assignment")
})
@PutMapping(value = "/{id}/assign/{technicianId}")
public ResponseEntity<OrderServiceDTO> assignTechnician(@PathVariable Long id, @PathVariable Long technicianId) {
public ResponseEntity<ServiceOrderDTO> assignTechnician(@PathVariable Long id, @PathVariable Long technicianId) {
return ResponseEntity.ok(service.assignTechnician(id, technicianId));
}

Expand All @@ -93,7 +93,7 @@ public ResponseEntity<OrderServiceDTO> assignTechnician(@PathVariable Long id, @
@ApiResponse(responseCode = "409", description = "Order status does not allow finishing")
})
@PutMapping(value = "/{id}/finish")
public ResponseEntity<OrderServiceDTO> finish(@PathVariable Long id, @Valid @RequestBody OrderServiceFinishDTO dto) {
public ResponseEntity<ServiceOrderDTO> finish(@PathVariable Long id, @Valid @RequestBody ServiceOrderFinishDTO dto) {
return ResponseEntity.ok(service.finish(id, dto));
}

Expand All @@ -105,7 +105,7 @@ public ResponseEntity<OrderServiceDTO> finish(@PathVariable Long id, @Valid @Req
@ApiResponse(responseCode = "409", description = "Order status does not allow cancellation")
})
@PutMapping(value = "/{id}/cancel")
public ResponseEntity<OrderServiceDTO> cancel(@PathVariable Long id) {
public ResponseEntity<ServiceOrderDTO> cancel(@PathVariable Long id) {
return ResponseEntity.ok(service.cancel(id));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;

public record OrderServiceCreateDTO(
public record ServiceOrderCreateDTO(
@NotBlank(message = "Title is required")
String title,

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.serviceOrder.Management.dtos;

import com.serviceOrder.Management.entities.OrderService;
import com.serviceOrder.Management.entities.ServiceOrder;
import com.serviceOrder.Management.enums.OrderPriority;
import com.serviceOrder.Management.enums.OrderStatus;

import java.time.Instant;

public record OrderServiceDTO(
public record ServiceOrderDTO(
Long id,
String title,
String description,
Expand All @@ -21,7 +21,7 @@ public record OrderServiceDTO(
ClientDTO client,
TechnicianDTO technician
) {
public OrderServiceDTO(OrderService entity) {
public ServiceOrderDTO(ServiceOrder entity) {
this(
entity.getId(),
entity.getTitle(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import jakarta.validation.constraints.NotBlank;

public record OrderServiceFinishDTO(
public record ServiceOrderFinishDTO(
@NotBlank(message = "Root cause report is required to finish the service order")
String rootCauseReport
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@Setter
@NoArgsConstructor
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
public class OrderService {
public class ServiceOrder {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Expand Down Expand Up @@ -70,7 +70,7 @@ public class OrderService {
@JoinColumn(name = "technician_id")
private Technician technician;

public OrderService(Long id, String title, String description, OrderPriority priority, Client client) {
public ServiceOrder(Long id, String title, String description, OrderPriority priority, Client client) {
this.id = id;
this.title = title;
this.description = description;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.serviceOrder.Management.repositories;

import com.serviceOrder.Management.entities.OrderService;
import com.serviceOrder.Management.entities.ServiceOrder;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
Expand All @@ -10,16 +10,16 @@

import java.util.Optional;

public interface OrderServiceRepository
extends JpaRepository<OrderService, Long>, JpaSpecificationExecutor<OrderService> {
public interface ServiceOrderRepository
extends JpaRepository<ServiceOrder, Long>, JpaSpecificationExecutor<ServiceOrder> {

@Override
@EntityGraph(attributePaths = {"client", "technician"})
Page<OrderService> findAll(Specification<OrderService> spec, Pageable pageable);
Page<ServiceOrder> findAll(Specification<ServiceOrder> spec, Pageable pageable);

@Override
@EntityGraph(attributePaths = {"client", "technician"})
Optional<OrderService> findById(Long id);
Optional<ServiceOrder> findById(Long id);

boolean existsByClientId(Long clientId);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
package com.serviceOrder.Management.repositories;

import com.serviceOrder.Management.dtos.OrderFilterDTO;
import com.serviceOrder.Management.entities.OrderService;
import com.serviceOrder.Management.entities.ServiceOrder;
import com.serviceOrder.Management.enums.OrderPriority;
import com.serviceOrder.Management.enums.OrderStatus;
import org.springframework.data.jpa.domain.Specification;

import java.util.List;
import java.util.Locale;

public final class OrderServiceSpecifications {
public final class ServiceOrderSpecifications {

private OrderServiceSpecifications() {
private ServiceOrderSpecifications() {
}

// Combines the filters that were sent with AND; the ones that were not sent do not restrict anything
public static Specification<OrderService> from(OrderFilterDTO filter) {
public static Specification<ServiceOrder> from(OrderFilterDTO filter) {
return Specification.allOf(List.of(
hasStatus(filter.status()),
hasPriority(filter.priority()),
Expand All @@ -25,35 +25,35 @@ public static Specification<OrderService> from(OrderFilterDTO filter) {
));
}

private static Specification<OrderService> hasStatus(OrderStatus status) {
private static Specification<ServiceOrder> hasStatus(OrderStatus status) {
if (status == null) {
return Specification.unrestricted();
}
return (root, query, cb) -> cb.equal(root.get("status"), status);
}

private static Specification<OrderService> hasPriority(OrderPriority priority) {
private static Specification<ServiceOrder> hasPriority(OrderPriority priority) {
if (priority == null) {
return Specification.unrestricted();
}
return (root, query, cb) -> cb.equal(root.get("priority"), priority);
}

private static Specification<OrderService> belongsToClient(Long clientId) {
private static Specification<ServiceOrder> belongsToClient(Long clientId) {
if (clientId == null) {
return Specification.unrestricted();
}
return (root, query, cb) -> cb.equal(root.get("client").get("id"), clientId);
}

private static Specification<OrderService> assignedTo(Long technicianId) {
private static Specification<ServiceOrder> assignedTo(Long technicianId) {
if (technicianId == null) {
return Specification.unrestricted();
}
return (root, query, cb) -> cb.equal(root.get("technician").get("id"), technicianId);
}

private static Specification<OrderService> titleContains(String title) {
private static Specification<ServiceOrder> titleContains(String title) {
if (title == null || title.isBlank()) {
return Specification.unrestricted();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.serviceOrder.Management.dtos.ClientDTO;
import com.serviceOrder.Management.entities.Client;
import com.serviceOrder.Management.repositories.ClientRepository;
import com.serviceOrder.Management.repositories.OrderServiceRepository;
import com.serviceOrder.Management.repositories.ServiceOrderRepository;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
Expand All @@ -16,9 +16,9 @@
@Service
public class ClientService {
private final ClientRepository repository;
private final OrderServiceRepository orderRepository;
private final ServiceOrderRepository orderRepository;

public ClientService(ClientRepository repository, OrderServiceRepository orderRepository) {
public ClientService(ClientRepository repository, ServiceOrderRepository orderRepository) {
this.repository = repository;
this.orderRepository = orderRepository;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import com.lowagie.text.pdf.PdfPCell;
import com.lowagie.text.pdf.PdfPTable;
import com.lowagie.text.pdf.PdfWriter;
import com.serviceOrder.Management.dtos.OrderServiceDTO;
import com.serviceOrder.Management.dtos.ServiceOrderDTO;
import org.springframework.stereotype.Service;

import java.awt.Color;
Expand All @@ -25,7 +25,7 @@ public class PdfReportService {
private static final DateTimeFormatter DATE_FORMAT =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm").withZone(ZoneId.systemDefault());

public byte[] generateOrderReport(OrderServiceDTO order) {
public byte[] generateOrderReport(ServiceOrderDTO order) {
ByteArrayOutputStream out = new ByteArrayOutputStream();
try {
Document document = new Document(PageSize.A4);
Expand Down
Loading
Loading