From 4badc105c08ed33a9dafe9760257a8971fbbe8af Mon Sep 17 00:00:00 2001 From: Ismael Neto <114830206+otaldoneto@users.noreply.github.com> Date: Wed, 23 Sep 2026 15:13:16 -0300 Subject: [PATCH] refactor: rename OrderService to ServiceOrder --- ...oller.java => ServiceOrderController.java} | 28 ++++---- ...ateDTO.java => ServiceOrderCreateDTO.java} | 2 +- ...erServiceDTO.java => ServiceOrderDTO.java} | 6 +- ...ishDTO.java => ServiceOrderFinishDTO.java} | 2 +- .../{OrderService.java => ServiceOrder.java} | 4 +- ...itory.java => ServiceOrderRepository.java} | 10 +-- ...s.java => ServiceOrderSpecifications.java} | 18 ++--- .../Management/services/ClientService.java | 6 +- .../Management/services/PdfReportService.java | 4 +- ...eService.java => ServiceOrderService.java} | 54 +++++++-------- .../services/TechnicianService.java | 6 +- .../controllers/ApiTestSupport.java | 14 ++-- .../Management/controllers/AuditingTest.java | 4 +- .../controllers/OptimisticLockingTest.java | 6 +- ...t.java => ServiceOrderControllerTest.java} | 26 +++---- .../controllers/TechnicianControllerTest.java | 4 +- .../ResourceExceptionHandlerTest.java | 4 +- .../services/ClientServiceTest.java | 4 +- .../services/PdfReportServiceTest.java | 4 +- ...Test.java => ServiceOrderServiceTest.java} | 68 +++++++++---------- .../services/TechnicianServiceTest.java | 4 +- 21 files changed, 139 insertions(+), 139 deletions(-) rename src/main/java/com/serviceOrder/Management/controllers/{OrderServiceController.java => ServiceOrderController.java} (86%) rename src/main/java/com/serviceOrder/Management/dtos/{OrderServiceCreateDTO.java => ServiceOrderCreateDTO.java} (93%) rename src/main/java/com/serviceOrder/Management/dtos/{OrderServiceDTO.java => ServiceOrderDTO.java} (89%) rename src/main/java/com/serviceOrder/Management/dtos/{OrderServiceFinishDTO.java => ServiceOrderFinishDTO.java} (85%) rename src/main/java/com/serviceOrder/Management/entities/{OrderService.java => ServiceOrder.java} (95%) rename src/main/java/com/serviceOrder/Management/repositories/{OrderServiceRepository.java => ServiceOrderRepository.java} (69%) rename src/main/java/com/serviceOrder/Management/repositories/{OrderServiceSpecifications.java => ServiceOrderSpecifications.java} (79%) rename src/main/java/com/serviceOrder/Management/services/{OrderServiceService.java => ServiceOrderService.java} (69%) rename src/test/java/com/serviceOrder/Management/controllers/{OrderServiceControllerTest.java => ServiceOrderControllerTest.java} (95%) rename src/test/java/com/serviceOrder/Management/services/{OrderServiceServiceTest.java => ServiceOrderServiceTest.java} (75%) diff --git a/src/main/java/com/serviceOrder/Management/controllers/OrderServiceController.java b/src/main/java/com/serviceOrder/Management/controllers/ServiceOrderController.java similarity index 86% rename from src/main/java/com/serviceOrder/Management/controllers/OrderServiceController.java rename to src/main/java/com/serviceOrder/Management/controllers/ServiceOrderController.java index f3e4d15..a5990d4 100644 --- a/src/main/java/com/serviceOrder/Management/controllers/OrderServiceController.java +++ b/src/main/java/com/serviceOrder/Management/controllers/ServiceOrderController.java @@ -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; @@ -30,11 +30,11 @@ @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; } @@ -42,7 +42,7 @@ public OrderServiceController(OrderServiceService service, PdfReportService pdfR @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> findAll( + public ResponseEntity> findAll( @RequestParam(required = false) OrderStatus status, @RequestParam(required = false) OrderPriority priority, @RequestParam(required = false) Long clientId, @@ -54,7 +54,7 @@ public ResponseEntity> findAll( } @GetMapping(value = "/{id}") - public ResponseEntity findById(@PathVariable Long id) { + public ResponseEntity findById(@PathVariable Long id) { return ResponseEntity.ok(service.findById(id)); } @@ -65,8 +65,8 @@ public ResponseEntity findById(@PathVariable Long id) { @ApiResponse(responseCode = "404", description = "Client not found") }) @PostMapping - public ResponseEntity create(@Valid @RequestBody OrderServiceCreateDTO dto) { - OrderServiceDTO createdDto = service.create(dto); + public ResponseEntity 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); @@ -80,7 +80,7 @@ public ResponseEntity create(@Valid @RequestBody OrderServiceCr @ApiResponse(responseCode = "409", description = "Order status does not allow assignment") }) @PutMapping(value = "/{id}/assign/{technicianId}") - public ResponseEntity assignTechnician(@PathVariable Long id, @PathVariable Long technicianId) { + public ResponseEntity assignTechnician(@PathVariable Long id, @PathVariable Long technicianId) { return ResponseEntity.ok(service.assignTechnician(id, technicianId)); } @@ -93,7 +93,7 @@ public ResponseEntity assignTechnician(@PathVariable Long id, @ @ApiResponse(responseCode = "409", description = "Order status does not allow finishing") }) @PutMapping(value = "/{id}/finish") - public ResponseEntity finish(@PathVariable Long id, @Valid @RequestBody OrderServiceFinishDTO dto) { + public ResponseEntity finish(@PathVariable Long id, @Valid @RequestBody ServiceOrderFinishDTO dto) { return ResponseEntity.ok(service.finish(id, dto)); } @@ -105,7 +105,7 @@ public ResponseEntity finish(@PathVariable Long id, @Valid @Req @ApiResponse(responseCode = "409", description = "Order status does not allow cancellation") }) @PutMapping(value = "/{id}/cancel") - public ResponseEntity cancel(@PathVariable Long id) { + public ResponseEntity cancel(@PathVariable Long id) { return ResponseEntity.ok(service.cancel(id)); } diff --git a/src/main/java/com/serviceOrder/Management/dtos/OrderServiceCreateDTO.java b/src/main/java/com/serviceOrder/Management/dtos/ServiceOrderCreateDTO.java similarity index 93% rename from src/main/java/com/serviceOrder/Management/dtos/OrderServiceCreateDTO.java rename to src/main/java/com/serviceOrder/Management/dtos/ServiceOrderCreateDTO.java index 68e0b7a..b3bab24 100644 --- a/src/main/java/com/serviceOrder/Management/dtos/OrderServiceCreateDTO.java +++ b/src/main/java/com/serviceOrder/Management/dtos/ServiceOrderCreateDTO.java @@ -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, diff --git a/src/main/java/com/serviceOrder/Management/dtos/OrderServiceDTO.java b/src/main/java/com/serviceOrder/Management/dtos/ServiceOrderDTO.java similarity index 89% rename from src/main/java/com/serviceOrder/Management/dtos/OrderServiceDTO.java rename to src/main/java/com/serviceOrder/Management/dtos/ServiceOrderDTO.java index 26ed95c..b3b98ae 100644 --- a/src/main/java/com/serviceOrder/Management/dtos/OrderServiceDTO.java +++ b/src/main/java/com/serviceOrder/Management/dtos/ServiceOrderDTO.java @@ -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, @@ -21,7 +21,7 @@ public record OrderServiceDTO( ClientDTO client, TechnicianDTO technician ) { - public OrderServiceDTO(OrderService entity) { + public ServiceOrderDTO(ServiceOrder entity) { this( entity.getId(), entity.getTitle(), diff --git a/src/main/java/com/serviceOrder/Management/dtos/OrderServiceFinishDTO.java b/src/main/java/com/serviceOrder/Management/dtos/ServiceOrderFinishDTO.java similarity index 85% rename from src/main/java/com/serviceOrder/Management/dtos/OrderServiceFinishDTO.java rename to src/main/java/com/serviceOrder/Management/dtos/ServiceOrderFinishDTO.java index 836648d..562271a 100644 --- a/src/main/java/com/serviceOrder/Management/dtos/OrderServiceFinishDTO.java +++ b/src/main/java/com/serviceOrder/Management/dtos/ServiceOrderFinishDTO.java @@ -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 ) { diff --git a/src/main/java/com/serviceOrder/Management/entities/OrderService.java b/src/main/java/com/serviceOrder/Management/entities/ServiceOrder.java similarity index 95% rename from src/main/java/com/serviceOrder/Management/entities/OrderService.java rename to src/main/java/com/serviceOrder/Management/entities/ServiceOrder.java index eb3dc35..7a0a74e 100644 --- a/src/main/java/com/serviceOrder/Management/entities/OrderService.java +++ b/src/main/java/com/serviceOrder/Management/entities/ServiceOrder.java @@ -21,7 +21,7 @@ @Setter @NoArgsConstructor @EqualsAndHashCode(onlyExplicitlyIncluded = true) -public class OrderService { +public class ServiceOrder { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -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; diff --git a/src/main/java/com/serviceOrder/Management/repositories/OrderServiceRepository.java b/src/main/java/com/serviceOrder/Management/repositories/ServiceOrderRepository.java similarity index 69% rename from src/main/java/com/serviceOrder/Management/repositories/OrderServiceRepository.java rename to src/main/java/com/serviceOrder/Management/repositories/ServiceOrderRepository.java index 8aa7c9a..e533cdf 100644 --- a/src/main/java/com/serviceOrder/Management/repositories/OrderServiceRepository.java +++ b/src/main/java/com/serviceOrder/Management/repositories/ServiceOrderRepository.java @@ -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; @@ -10,16 +10,16 @@ import java.util.Optional; -public interface OrderServiceRepository - extends JpaRepository, JpaSpecificationExecutor { +public interface ServiceOrderRepository + extends JpaRepository, JpaSpecificationExecutor { @Override @EntityGraph(attributePaths = {"client", "technician"}) - Page findAll(Specification spec, Pageable pageable); + Page findAll(Specification spec, Pageable pageable); @Override @EntityGraph(attributePaths = {"client", "technician"}) - Optional findById(Long id); + Optional findById(Long id); boolean existsByClientId(Long clientId); diff --git a/src/main/java/com/serviceOrder/Management/repositories/OrderServiceSpecifications.java b/src/main/java/com/serviceOrder/Management/repositories/ServiceOrderSpecifications.java similarity index 79% rename from src/main/java/com/serviceOrder/Management/repositories/OrderServiceSpecifications.java rename to src/main/java/com/serviceOrder/Management/repositories/ServiceOrderSpecifications.java index 56b9b6e..229baea 100644 --- a/src/main/java/com/serviceOrder/Management/repositories/OrderServiceSpecifications.java +++ b/src/main/java/com/serviceOrder/Management/repositories/ServiceOrderSpecifications.java @@ -1,7 +1,7 @@ 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; @@ -9,13 +9,13 @@ 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 from(OrderFilterDTO filter) { + public static Specification from(OrderFilterDTO filter) { return Specification.allOf(List.of( hasStatus(filter.status()), hasPriority(filter.priority()), @@ -25,35 +25,35 @@ public static Specification from(OrderFilterDTO filter) { )); } - private static Specification hasStatus(OrderStatus status) { + private static Specification hasStatus(OrderStatus status) { if (status == null) { return Specification.unrestricted(); } return (root, query, cb) -> cb.equal(root.get("status"), status); } - private static Specification hasPriority(OrderPriority priority) { + private static Specification hasPriority(OrderPriority priority) { if (priority == null) { return Specification.unrestricted(); } return (root, query, cb) -> cb.equal(root.get("priority"), priority); } - private static Specification belongsToClient(Long clientId) { + private static Specification belongsToClient(Long clientId) { if (clientId == null) { return Specification.unrestricted(); } return (root, query, cb) -> cb.equal(root.get("client").get("id"), clientId); } - private static Specification assignedTo(Long technicianId) { + private static Specification assignedTo(Long technicianId) { if (technicianId == null) { return Specification.unrestricted(); } return (root, query, cb) -> cb.equal(root.get("technician").get("id"), technicianId); } - private static Specification titleContains(String title) { + private static Specification titleContains(String title) { if (title == null || title.isBlank()) { return Specification.unrestricted(); } diff --git a/src/main/java/com/serviceOrder/Management/services/ClientService.java b/src/main/java/com/serviceOrder/Management/services/ClientService.java index fe6ce4d..521bb45 100644 --- a/src/main/java/com/serviceOrder/Management/services/ClientService.java +++ b/src/main/java/com/serviceOrder/Management/services/ClientService.java @@ -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; @@ -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; } diff --git a/src/main/java/com/serviceOrder/Management/services/PdfReportService.java b/src/main/java/com/serviceOrder/Management/services/PdfReportService.java index 664ab29..502236c 100644 --- a/src/main/java/com/serviceOrder/Management/services/PdfReportService.java +++ b/src/main/java/com/serviceOrder/Management/services/PdfReportService.java @@ -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; @@ -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); diff --git a/src/main/java/com/serviceOrder/Management/services/OrderServiceService.java b/src/main/java/com/serviceOrder/Management/services/ServiceOrderService.java similarity index 69% rename from src/main/java/com/serviceOrder/Management/services/OrderServiceService.java rename to src/main/java/com/serviceOrder/Management/services/ServiceOrderService.java index 5a3e542..a2c44c9 100644 --- a/src/main/java/com/serviceOrder/Management/services/OrderServiceService.java +++ b/src/main/java/com/serviceOrder/Management/services/ServiceOrderService.java @@ -3,16 +3,16 @@ import com.serviceOrder.Management.controllers.exceptions.BusinessRuleException; import com.serviceOrder.Management.controllers.exceptions.ResourceNotFoundException; import com.serviceOrder.Management.dtos.OrderFilterDTO; -import com.serviceOrder.Management.dtos.OrderServiceCreateDTO; -import com.serviceOrder.Management.dtos.OrderServiceDTO; -import com.serviceOrder.Management.dtos.OrderServiceFinishDTO; +import com.serviceOrder.Management.dtos.ServiceOrderCreateDTO; +import com.serviceOrder.Management.dtos.ServiceOrderDTO; +import com.serviceOrder.Management.dtos.ServiceOrderFinishDTO; import com.serviceOrder.Management.entities.Client; -import com.serviceOrder.Management.entities.OrderService; +import com.serviceOrder.Management.entities.ServiceOrder; import com.serviceOrder.Management.entities.Technician; import com.serviceOrder.Management.enums.OrderStatus; import com.serviceOrder.Management.repositories.ClientRepository; -import com.serviceOrder.Management.repositories.OrderServiceRepository; -import com.serviceOrder.Management.repositories.OrderServiceSpecifications; +import com.serviceOrder.Management.repositories.ServiceOrderRepository; +import com.serviceOrder.Management.repositories.ServiceOrderSpecifications; import com.serviceOrder.Management.repositories.TechnicianRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -24,12 +24,12 @@ @Service -public class OrderServiceService { - private final OrderServiceRepository repository; +public class ServiceOrderService { + private final ServiceOrderRepository repository; private final ClientRepository clientRepository; private final TechnicianRepository technicianRepository; - public OrderServiceService(OrderServiceRepository repository, + public ServiceOrderService(ServiceOrderRepository repository, ClientRepository clientRepository, TechnicianRepository technicianRepository) { this.repository = repository; @@ -38,27 +38,27 @@ public OrderServiceService(OrderServiceRepository repository, } @Transactional(readOnly = true) - public Page findAll(OrderFilterDTO filter, Pageable pageable) { - return repository.findAll(OrderServiceSpecifications.from(filter), pageable).map(OrderServiceDTO::new); + public Page findAll(OrderFilterDTO filter, Pageable pageable) { + return repository.findAll(ServiceOrderSpecifications.from(filter), pageable).map(ServiceOrderDTO::new); } @Transactional(readOnly = true) - public OrderServiceDTO findById(Long id) { - return new OrderServiceDTO(findOrder(id)); + public ServiceOrderDTO findById(Long id) { + return new ServiceOrderDTO(findOrder(id)); } @Transactional - public OrderServiceDTO create(OrderServiceCreateDTO dto) { + public ServiceOrderDTO create(ServiceOrderCreateDTO dto) { Client client = clientRepository.findById(dto.clientId()) .orElseThrow(() -> new ResourceNotFoundException("Client not found with id: " + dto.clientId())); - OrderService entity = new OrderService(null, dto.title(), dto.description(), dto.priority(), client); + ServiceOrder entity = new ServiceOrder(null, dto.title(), dto.description(), dto.priority(), client); entity = repository.save(entity); - return new OrderServiceDTO(entity); + return new ServiceOrderDTO(entity); } @Transactional - public OrderServiceDTO assignTechnician(Long orderId, Long technicianId) { - OrderService entity = findOrder(orderId); + public ServiceOrderDTO assignTechnician(Long orderId, Long technicianId) { + ServiceOrder entity = findOrder(orderId); ensureStatusIn(entity, "assign a technician to", OrderStatus.OPEN, OrderStatus.IN_PROGRESS); Technician technician = technicianRepository.findById(technicianId) .orElseThrow(() -> new ResourceNotFoundException("Technician not found with id: " + technicianId)); @@ -68,38 +68,38 @@ public OrderServiceDTO assignTechnician(Long orderId, Long technicianId) { // Forces the UPDATE now, so the @PreUpdate auditing listener sets lastModifiedBy/lastModifiedAt // before we read them into the response DTO (an UPDATE is otherwise deferred to the transaction's flush). repository.flush(); - return new OrderServiceDTO(entity); + return new ServiceOrderDTO(entity); } @Transactional - public OrderServiceDTO finish(Long orderId, OrderServiceFinishDTO dto) { - OrderService entity = findOrder(orderId); + public ServiceOrderDTO finish(Long orderId, ServiceOrderFinishDTO dto) { + ServiceOrder entity = findOrder(orderId); ensureStatusIn(entity, "finish", OrderStatus.IN_PROGRESS); entity.setRootCauseReport(dto.rootCauseReport()); entity.setStatus(OrderStatus.FINISHED); entity.setFinishedAt(Instant.now()); entity = repository.save(entity); repository.flush(); - return new OrderServiceDTO(entity); + return new ServiceOrderDTO(entity); } @Transactional - public OrderServiceDTO cancel(Long orderId) { - OrderService entity = findOrder(orderId); + public ServiceOrderDTO cancel(Long orderId) { + ServiceOrder entity = findOrder(orderId); ensureStatusIn(entity, "cancel", OrderStatus.OPEN, OrderStatus.IN_PROGRESS); entity.setStatus(OrderStatus.CANCELED); entity = repository.save(entity); repository.flush(); - return new OrderServiceDTO(entity); + return new ServiceOrderDTO(entity); } - private OrderService findOrder(Long id) { + private ServiceOrder findOrder(Long id) { return repository.findById(id) .orElseThrow(() -> new ResourceNotFoundException("Service Order not found with id: " + id)); } // Allowed transitions: OPEN -> IN_PROGRESS -> FINISHED, and OPEN/IN_PROGRESS -> CANCELED. - private void ensureStatusIn(OrderService order, String action, OrderStatus... allowed) { + private void ensureStatusIn(ServiceOrder order, String action, OrderStatus... allowed) { if (!Arrays.asList(allowed).contains(order.getStatus())) { throw new BusinessRuleException( "Cannot " + action + " a service order with status " + order.getStatus()); diff --git a/src/main/java/com/serviceOrder/Management/services/TechnicianService.java b/src/main/java/com/serviceOrder/Management/services/TechnicianService.java index 71af43d..27c586e 100644 --- a/src/main/java/com/serviceOrder/Management/services/TechnicianService.java +++ b/src/main/java/com/serviceOrder/Management/services/TechnicianService.java @@ -4,7 +4,7 @@ import com.serviceOrder.Management.controllers.exceptions.ResourceNotFoundException; import com.serviceOrder.Management.dtos.TechnicianDTO; import com.serviceOrder.Management.entities.Technician; -import com.serviceOrder.Management.repositories.OrderServiceRepository; +import com.serviceOrder.Management.repositories.ServiceOrderRepository; import com.serviceOrder.Management.repositories.TechnicianRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -16,9 +16,9 @@ @Service public class TechnicianService { private final TechnicianRepository repository; - private final OrderServiceRepository orderRepository; + private final ServiceOrderRepository orderRepository; - public TechnicianService(TechnicianRepository repository, OrderServiceRepository orderRepository) { + public TechnicianService(TechnicianRepository repository, ServiceOrderRepository orderRepository) { this.repository = repository; this.orderRepository = orderRepository; } diff --git a/src/test/java/com/serviceOrder/Management/controllers/ApiTestSupport.java b/src/test/java/com/serviceOrder/Management/controllers/ApiTestSupport.java index 758b019..e52905a 100644 --- a/src/test/java/com/serviceOrder/Management/controllers/ApiTestSupport.java +++ b/src/test/java/com/serviceOrder/Management/controllers/ApiTestSupport.java @@ -1,12 +1,12 @@ package com.serviceOrder.Management.controllers; import com.serviceOrder.Management.entities.Client; -import com.serviceOrder.Management.entities.OrderService; +import com.serviceOrder.Management.entities.ServiceOrder; import com.serviceOrder.Management.entities.Technician; import com.serviceOrder.Management.enums.OrderPriority; import com.serviceOrder.Management.enums.OrderStatus; import com.serviceOrder.Management.repositories.ClientRepository; -import com.serviceOrder.Management.repositories.OrderServiceRepository; +import com.serviceOrder.Management.repositories.ServiceOrderRepository; import com.serviceOrder.Management.repositories.TechnicianRepository; import com.serviceOrder.Management.repositories.RefreshTokenRepository; import com.serviceOrder.Management.repositories.UserRepository; @@ -39,7 +39,7 @@ abstract class ApiTestSupport { protected MockMvc mockMvc; @Autowired - protected OrderServiceRepository orderRepository; + protected ServiceOrderRepository orderRepository; @Autowired protected ClientRepository clientRepository; @@ -76,15 +76,15 @@ protected Technician saveTechnician() { } // Each order gets a later createdAt than the previous one, so sorting is deterministic. - protected OrderService saveOrder(Client client, String title, OrderStatus status) { - OrderService order = new OrderService(null, title, "Does not turn on", OrderPriority.HIGH, client); + protected ServiceOrder saveOrder(Client client, String title, OrderStatus status) { + ServiceOrder order = new ServiceOrder(null, title, "Does not turn on", OrderPriority.HIGH, client); order.setStatus(status); order.setCreatedAt(Instant.parse("2026-01-01T00:00:00Z").plusSeconds(tick++)); return orderRepository.save(order); } - protected OrderService saveOrder(Client client, String title, OrderStatus status, OrderPriority priority) { - OrderService order = saveOrder(client, title, status); + protected ServiceOrder saveOrder(Client client, String title, OrderStatus status, OrderPriority priority) { + ServiceOrder order = saveOrder(client, title, status); order.setPriority(priority); return orderRepository.save(order); } diff --git a/src/test/java/com/serviceOrder/Management/controllers/AuditingTest.java b/src/test/java/com/serviceOrder/Management/controllers/AuditingTest.java index f14644e..601d1c6 100644 --- a/src/test/java/com/serviceOrder/Management/controllers/AuditingTest.java +++ b/src/test/java/com/serviceOrder/Management/controllers/AuditingTest.java @@ -1,7 +1,7 @@ package com.serviceOrder.Management.controllers; import com.serviceOrder.Management.entities.Client; -import com.serviceOrder.Management.entities.OrderService; +import com.serviceOrder.Management.entities.ServiceOrder; import com.serviceOrder.Management.entities.Technician; import com.serviceOrder.Management.enums.OrderStatus; import com.serviceOrder.Management.enums.UserRole; @@ -67,7 +67,7 @@ void laterChangeShouldUpdateLastModifiedByOnly() throws Exception { @DisplayName("Direct repository saves are also audited using the current authenticated user") void directSaveShouldAlsoBeAudited() { Client client = saveClient(); - OrderService order = saveOrder(client, "Printer down", OrderStatus.OPEN); + ServiceOrder order = saveOrder(client, "Printer down", OrderStatus.OPEN); Assertions.assertEquals("user", order.getCreatedBy()); Assertions.assertEquals("user", order.getLastModifiedBy()); diff --git a/src/test/java/com/serviceOrder/Management/controllers/OptimisticLockingTest.java b/src/test/java/com/serviceOrder/Management/controllers/OptimisticLockingTest.java index f191a0e..eee7512 100644 --- a/src/test/java/com/serviceOrder/Management/controllers/OptimisticLockingTest.java +++ b/src/test/java/com/serviceOrder/Management/controllers/OptimisticLockingTest.java @@ -1,6 +1,6 @@ package com.serviceOrder.Management.controllers; -import com.serviceOrder.Management.entities.OrderService; +import com.serviceOrder.Management.entities.ServiceOrder; import com.serviceOrder.Management.enums.OrderStatus; import org.junit.jupiter.api.DisplayName; @@ -18,8 +18,8 @@ void staleCopyShouldNotOverwriteNewerChange() { Long id = saveOrder(saveClient(), "Printer down", OrderStatus.IN_PROGRESS).getId(); // Two requests read the same order before either of them writes. - OrderService first = orderRepository.findById(id).orElseThrow(); - OrderService second = orderRepository.findById(id).orElseThrow(); + ServiceOrder first = orderRepository.findById(id).orElseThrow(); + ServiceOrder second = orderRepository.findById(id).orElseThrow(); first.setStatus(OrderStatus.CANCELED); orderRepository.save(first); diff --git a/src/test/java/com/serviceOrder/Management/controllers/OrderServiceControllerTest.java b/src/test/java/com/serviceOrder/Management/controllers/ServiceOrderControllerTest.java similarity index 95% rename from src/test/java/com/serviceOrder/Management/controllers/OrderServiceControllerTest.java rename to src/test/java/com/serviceOrder/Management/controllers/ServiceOrderControllerTest.java index 466002b..5e8d177 100644 --- a/src/test/java/com/serviceOrder/Management/controllers/OrderServiceControllerTest.java +++ b/src/test/java/com/serviceOrder/Management/controllers/ServiceOrderControllerTest.java @@ -1,7 +1,7 @@ package com.serviceOrder.Management.controllers; import com.serviceOrder.Management.entities.Client; -import com.serviceOrder.Management.entities.OrderService; +import com.serviceOrder.Management.entities.ServiceOrder; import com.serviceOrder.Management.entities.Technician; import com.serviceOrder.Management.enums.OrderPriority; import com.serviceOrder.Management.enums.OrderStatus; @@ -22,7 +22,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -class OrderServiceControllerTest extends ApiTestSupport { +class ServiceOrderControllerTest extends ApiTestSupport { // ---------- create ---------- @@ -88,7 +88,7 @@ void createShouldReturn400WhenPriorityIsInvalid() throws Exception { @Test @DisplayName("GET /orders/{id} should return the order with its client") void findByIdShouldReturnOrderWithClient() throws Exception { - OrderService order = saveOrder(saveClient(), "Printer down", OrderStatus.OPEN); + ServiceOrder order = saveOrder(saveClient(), "Printer down", OrderStatus.OPEN); mockMvc.perform(get("/orders/{id}", order.getId())) .andExpect(status().isOk()) @@ -153,7 +153,7 @@ void findAllShouldAcceptValidSort() throws Exception { @Test @DisplayName("PUT /orders/{id}/assign/{technicianId} should move the order to IN_PROGRESS") void assignShouldMoveOrderToInProgress() throws Exception { - OrderService order = saveOrder(saveClient(), "Printer down", OrderStatus.OPEN); + ServiceOrder order = saveOrder(saveClient(), "Printer down", OrderStatus.OPEN); Technician technician = saveTechnician(); mockMvc.perform(put("/orders/{id}/assign/{technicianId}", order.getId(), technician.getId())) @@ -165,7 +165,7 @@ void assignShouldMoveOrderToInProgress() throws Exception { @Test @DisplayName("PUT /orders/{id}/assign/{technicianId} should return 404 when the technician does not exist") void assignShouldReturn404WhenTechnicianNotFound() throws Exception { - OrderService order = saveOrder(saveClient(), "Printer down", OrderStatus.OPEN); + ServiceOrder order = saveOrder(saveClient(), "Printer down", OrderStatus.OPEN); mockMvc.perform(put("/orders/{id}/assign/{technicianId}", order.getId(), 999999)) .andExpect(status().isNotFound()) @@ -175,7 +175,7 @@ void assignShouldReturn404WhenTechnicianNotFound() throws Exception { @Test @DisplayName("PUT /orders/{id}/assign/{technicianId} should return 409 when the order is FINISHED") void assignShouldReturn409WhenOrderIsFinished() throws Exception { - OrderService order = saveOrder(saveClient(), "Printer down", OrderStatus.FINISHED); + ServiceOrder order = saveOrder(saveClient(), "Printer down", OrderStatus.FINISHED); mockMvc.perform(put("/orders/{id}/assign/{technicianId}", order.getId(), 1)) .andExpect(status().isConflict()) @@ -188,7 +188,7 @@ void assignShouldReturn409WhenOrderIsFinished() throws Exception { @Test @DisplayName("PUT /orders/{id}/finish should store the report and finish an IN_PROGRESS order") void finishShouldStoreReport() throws Exception { - OrderService order = saveOrder(saveClient(), "Printer down", OrderStatus.IN_PROGRESS); + ServiceOrder order = saveOrder(saveClient(), "Printer down", OrderStatus.IN_PROGRESS); mockMvc.perform(put("/orders/{id}/finish", order.getId()) .contentType(MediaType.APPLICATION_JSON) @@ -204,7 +204,7 @@ void finishShouldStoreReport() throws Exception { @Test @DisplayName("PUT /orders/{id}/finish should return 409 when the order is still OPEN") void finishShouldReturn409WhenOrderIsOpen() throws Exception { - OrderService order = saveOrder(saveClient(), "Printer down", OrderStatus.OPEN); + ServiceOrder order = saveOrder(saveClient(), "Printer down", OrderStatus.OPEN); mockMvc.perform(put("/orders/{id}/finish", order.getId()) .contentType(MediaType.APPLICATION_JSON) @@ -218,7 +218,7 @@ void finishShouldReturn409WhenOrderIsOpen() throws Exception { @Test @DisplayName("PUT /orders/{id}/finish should return 400 when the report is blank") void finishShouldReturn400WhenReportIsBlank() throws Exception { - OrderService order = saveOrder(saveClient(), "Printer down", OrderStatus.IN_PROGRESS); + ServiceOrder order = saveOrder(saveClient(), "Printer down", OrderStatus.IN_PROGRESS); mockMvc.perform(put("/orders/{id}/finish", order.getId()) .contentType(MediaType.APPLICATION_JSON) @@ -235,7 +235,7 @@ void finishShouldReturn400WhenReportIsBlank() throws Exception { @Test @DisplayName("PUT /orders/{id}/cancel should cancel an OPEN order") void cancelShouldCancelOpenOrder() throws Exception { - OrderService order = saveOrder(saveClient(), "Printer down", OrderStatus.OPEN); + ServiceOrder order = saveOrder(saveClient(), "Printer down", OrderStatus.OPEN); mockMvc.perform(put("/orders/{id}/cancel", order.getId())) .andExpect(status().isOk()) @@ -245,7 +245,7 @@ void cancelShouldCancelOpenOrder() throws Exception { @Test @DisplayName("PUT /orders/{id}/cancel should return 409 when the order is FINISHED") void cancelShouldReturn409WhenOrderIsFinished() throws Exception { - OrderService order = saveOrder(saveClient(), "Printer down", OrderStatus.FINISHED); + ServiceOrder order = saveOrder(saveClient(), "Printer down", OrderStatus.FINISHED); mockMvc.perform(put("/orders/{id}/cancel", order.getId())) .andExpect(status().isConflict()) @@ -257,7 +257,7 @@ void cancelShouldReturn409WhenOrderIsFinished() throws Exception { @Test @DisplayName("GET /orders/{id}/report should return a PDF") void reportShouldReturnPdf() throws Exception { - OrderService order = saveOrder(saveClient(), "Printer down", OrderStatus.OPEN); + ServiceOrder order = saveOrder(saveClient(), "Printer down", OrderStatus.OPEN); MvcResult result = mockMvc.perform(get("/orders/{id}/report", order.getId())) .andExpect(status().isOk()) @@ -326,7 +326,7 @@ void findAllShouldFilterByClient() throws Exception { void findAllShouldFilterByTechnician() throws Exception { Client client = saveClient(); Technician technician = saveTechnician(); - OrderService assigned = saveOrder(client, "Assigned order", OrderStatus.IN_PROGRESS); + ServiceOrder assigned = saveOrder(client, "Assigned order", OrderStatus.IN_PROGRESS); assigned.setTechnician(technician); orderRepository.save(assigned); saveOrder(client, "Unassigned order", OrderStatus.OPEN); diff --git a/src/test/java/com/serviceOrder/Management/controllers/TechnicianControllerTest.java b/src/test/java/com/serviceOrder/Management/controllers/TechnicianControllerTest.java index e6f6f72..a6654c8 100644 --- a/src/test/java/com/serviceOrder/Management/controllers/TechnicianControllerTest.java +++ b/src/test/java/com/serviceOrder/Management/controllers/TechnicianControllerTest.java @@ -10,7 +10,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import com.serviceOrder.Management.entities.OrderService; +import com.serviceOrder.Management.entities.ServiceOrder; import com.serviceOrder.Management.enums.OrderStatus; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; @@ -149,7 +149,7 @@ void deleteShouldReturn204() throws Exception { @DisplayName("DELETE /technicians/{id} should return 409 when the technician has service orders") void deleteShouldReturn409WhenTechnicianHasOrders() throws Exception { Technician technician = saveTechnician(); - OrderService order = saveOrder(saveClient(), "Printer down", OrderStatus.IN_PROGRESS); + ServiceOrder order = saveOrder(saveClient(), "Printer down", OrderStatus.IN_PROGRESS); order.setTechnician(technician); orderRepository.save(order); diff --git a/src/test/java/com/serviceOrder/Management/controllers/exceptions/ResourceExceptionHandlerTest.java b/src/test/java/com/serviceOrder/Management/controllers/exceptions/ResourceExceptionHandlerTest.java index 644697c..0089f1c 100644 --- a/src/test/java/com/serviceOrder/Management/controllers/exceptions/ResourceExceptionHandlerTest.java +++ b/src/test/java/com/serviceOrder/Management/controllers/exceptions/ResourceExceptionHandlerTest.java @@ -1,6 +1,6 @@ package com.serviceOrder.Management.controllers.exceptions; -import com.serviceOrder.Management.entities.OrderService; +import com.serviceOrder.Management.entities.ServiceOrder; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -18,7 +18,7 @@ void optimisticLockShouldReturn409() { MockHttpServletRequest request = new MockHttpServletRequest("PUT", "/orders/1/finish"); ResponseEntity response = new ResourceExceptionHandler() - .optimisticLock(new ObjectOptimisticLockingFailureException(OrderService.class, 1L), request); + .optimisticLock(new ObjectOptimisticLockingFailureException(ServiceOrder.class, 1L), request); assertEquals(409, response.getStatusCode().value()); assertEquals("Concurrent modification", response.getBody().error()); diff --git a/src/test/java/com/serviceOrder/Management/services/ClientServiceTest.java b/src/test/java/com/serviceOrder/Management/services/ClientServiceTest.java index 9cf6da7..37055a2 100644 --- a/src/test/java/com/serviceOrder/Management/services/ClientServiceTest.java +++ b/src/test/java/com/serviceOrder/Management/services/ClientServiceTest.java @@ -6,7 +6,7 @@ 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.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -38,7 +38,7 @@ class ClientServiceTest { private ClientRepository clientRepository; @Mock - private OrderServiceRepository orderRepository; + private ServiceOrderRepository orderRepository; private ClientDTO newClient() { return new ClientDTO(null, "Acme Ltda", "acme@mail.com", "11222333000181"); diff --git a/src/test/java/com/serviceOrder/Management/services/PdfReportServiceTest.java b/src/test/java/com/serviceOrder/Management/services/PdfReportServiceTest.java index c6d2dc3..72795cc 100644 --- a/src/test/java/com/serviceOrder/Management/services/PdfReportServiceTest.java +++ b/src/test/java/com/serviceOrder/Management/services/PdfReportServiceTest.java @@ -1,6 +1,6 @@ package com.serviceOrder.Management.services; -import com.serviceOrder.Management.dtos.OrderServiceDTO; +import com.serviceOrder.Management.dtos.ServiceOrderDTO; import com.serviceOrder.Management.enums.OrderPriority; import com.serviceOrder.Management.enums.OrderStatus; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ class PdfReportServiceTest { @Test void shouldGenerateValidPdfBytes() { - OrderServiceDTO order = new OrderServiceDTO(1L, "Printer down", "Does not print", + ServiceOrderDTO order = new ServiceOrderDTO(1L, "Printer down", "Does not print", OrderStatus.OPEN, OrderPriority.HIGH, Instant.now(), null, null, null, null, null, null, null); byte[] pdf = service.generateOrderReport(order); diff --git a/src/test/java/com/serviceOrder/Management/services/OrderServiceServiceTest.java b/src/test/java/com/serviceOrder/Management/services/ServiceOrderServiceTest.java similarity index 75% rename from src/test/java/com/serviceOrder/Management/services/OrderServiceServiceTest.java rename to src/test/java/com/serviceOrder/Management/services/ServiceOrderServiceTest.java index 2872aaf..e672961 100644 --- a/src/test/java/com/serviceOrder/Management/services/OrderServiceServiceTest.java +++ b/src/test/java/com/serviceOrder/Management/services/ServiceOrderServiceTest.java @@ -3,16 +3,16 @@ import com.serviceOrder.Management.controllers.exceptions.BusinessRuleException; import com.serviceOrder.Management.controllers.exceptions.ResourceNotFoundException; import com.serviceOrder.Management.dtos.OrderFilterDTO; -import com.serviceOrder.Management.dtos.OrderServiceCreateDTO; -import com.serviceOrder.Management.dtos.OrderServiceDTO; -import com.serviceOrder.Management.dtos.OrderServiceFinishDTO; +import com.serviceOrder.Management.dtos.ServiceOrderCreateDTO; +import com.serviceOrder.Management.dtos.ServiceOrderDTO; +import com.serviceOrder.Management.dtos.ServiceOrderFinishDTO; import com.serviceOrder.Management.entities.Client; -import com.serviceOrder.Management.entities.OrderService; +import com.serviceOrder.Management.entities.ServiceOrder; import com.serviceOrder.Management.entities.Technician; import com.serviceOrder.Management.enums.OrderPriority; import com.serviceOrder.Management.enums.OrderStatus; import com.serviceOrder.Management.repositories.ClientRepository; -import com.serviceOrder.Management.repositories.OrderServiceRepository; +import com.serviceOrder.Management.repositories.ServiceOrderRepository; import com.serviceOrder.Management.repositories.TechnicianRepository; import org.junit.jupiter.api.BeforeEach; @@ -40,7 +40,7 @@ import static org.mockito.Mockito.*; @ExtendWith(MockitoExtension.class) -class OrderServiceServiceTest { +class ServiceOrderServiceTest { private static final Long ORDER_ID = 1L; private static final Long MISSING_ID = 999L; @@ -48,10 +48,10 @@ class OrderServiceServiceTest { private static final Long CLIENT_ID = 1L; @InjectMocks - private OrderServiceService orderService; + private ServiceOrderService serviceOrderService; @Mock - private OrderServiceRepository orderRepository; + private ServiceOrderRepository orderRepository; @Mock private ClientRepository clientRepository; @@ -68,8 +68,8 @@ void setUp() { technician.setName("Carlos Silva"); } - private OrderService orderWithStatus(OrderStatus status) { - OrderService order = new OrderService(); + private ServiceOrder orderWithStatus(OrderStatus status) { + ServiceOrder order = new ServiceOrder(); order.setId(ORDER_ID); order.setStatus(status); return order; @@ -82,7 +82,7 @@ private OrderService orderWithStatus(OrderStatus status) { void findByIdShouldThrowWhenNotFound() { when(orderRepository.findById(MISSING_ID)).thenReturn(Optional.empty()); - assertThrows(ResourceNotFoundException.class, () -> orderService.findById(MISSING_ID)); + assertThrows(ResourceNotFoundException.class, () -> serviceOrderService.findById(MISSING_ID)); } // ---------- findAll ---------- @@ -91,10 +91,10 @@ void findByIdShouldThrowWhenNotFound() { @DisplayName("findAll should return a page of DTOs") void findAllShouldReturnPageOfDtos() { Pageable pageable = PageRequest.of(0, 10); - Page page = new PageImpl<>(List.of(orderWithStatus(OrderStatus.OPEN)), pageable, 1); + Page page = new PageImpl<>(List.of(orderWithStatus(OrderStatus.OPEN)), pageable, 1); when(orderRepository.findAll(any(Specification.class), eq(pageable))).thenReturn(page); - Page result = orderService.findAll(new OrderFilterDTO(null, null, null, null, null), pageable); + Page result = serviceOrderService.findAll(new OrderFilterDTO(null, null, null, null, null), pageable); assertEquals(1, result.getTotalElements()); assertEquals(ORDER_ID, result.getContent().get(0).id()); @@ -106,11 +106,11 @@ void findAllShouldReturnPageOfDtos() { @DisplayName("create should open a new order for an existing client") void createShouldOpenOrderWhenClientExists() { Client client = new Client(CLIENT_ID, "Acme", "acme@mail.com", "12345678900"); - OrderServiceCreateDTO dto = new OrderServiceCreateDTO("Printer down", "Does not print", OrderPriority.HIGH, CLIENT_ID); + ServiceOrderCreateDTO dto = new ServiceOrderCreateDTO("Printer down", "Does not print", OrderPriority.HIGH, CLIENT_ID); when(clientRepository.findById(CLIENT_ID)).thenReturn(Optional.of(client)); - when(orderRepository.save(any(OrderService.class))).thenAnswer(invocation -> invocation.getArgument(0)); + when(orderRepository.save(any(ServiceOrder.class))).thenAnswer(invocation -> invocation.getArgument(0)); - OrderServiceDTO result = orderService.create(dto); + ServiceOrderDTO result = serviceOrderService.create(dto); assertEquals(OrderStatus.OPEN, result.status()); assertEquals(OrderPriority.HIGH, result.priority()); @@ -121,10 +121,10 @@ void createShouldOpenOrderWhenClientExists() { @Test @DisplayName("create should throw ResourceNotFoundException when client does not exist") void createShouldThrowWhenClientNotFound() { - OrderServiceCreateDTO dto = new OrderServiceCreateDTO("Printer down", "Does not print", OrderPriority.LOW, MISSING_ID); + ServiceOrderCreateDTO dto = new ServiceOrderCreateDTO("Printer down", "Does not print", OrderPriority.LOW, MISSING_ID); when(clientRepository.findById(MISSING_ID)).thenReturn(Optional.empty()); - assertThrows(ResourceNotFoundException.class, () -> orderService.create(dto)); + assertThrows(ResourceNotFoundException.class, () -> serviceOrderService.create(dto)); verify(orderRepository, never()).save(any()); } @@ -133,12 +133,12 @@ void createShouldThrowWhenClientNotFound() { @Test @DisplayName("assignTechnician should set technician and status IN_PROGRESS when IDs exist") void assignTechnicianShouldUpdateStatusWhenIdsExist() { - OrderService order = orderWithStatus(OrderStatus.OPEN); + ServiceOrder order = orderWithStatus(OrderStatus.OPEN); when(orderRepository.findById(ORDER_ID)).thenReturn(Optional.of(order)); when(technicianRepository.findById(TECH_ID)).thenReturn(Optional.of(technician)); - when(orderRepository.save(any(OrderService.class))).thenAnswer(invocation -> invocation.getArgument(0)); + when(orderRepository.save(any(ServiceOrder.class))).thenAnswer(invocation -> invocation.getArgument(0)); - OrderServiceDTO result = orderService.assignTechnician(ORDER_ID, TECH_ID); + ServiceOrderDTO result = serviceOrderService.assignTechnician(ORDER_ID, TECH_ID); assertNotNull(result); assertEquals(OrderStatus.IN_PROGRESS, order.getStatus()); @@ -151,7 +151,7 @@ void assignTechnicianShouldUpdateStatusWhenIdsExist() { void assignTechnicianShouldThrowWhenOrderNotFound() { when(orderRepository.findById(MISSING_ID)).thenReturn(Optional.empty()); - assertThrows(ResourceNotFoundException.class, () -> orderService.assignTechnician(MISSING_ID, TECH_ID)); + assertThrows(ResourceNotFoundException.class, () -> serviceOrderService.assignTechnician(MISSING_ID, TECH_ID)); verify(orderRepository, never()).save(any()); } @@ -161,7 +161,7 @@ void assignTechnicianShouldThrowWhenTechnicianNotFound() { when(orderRepository.findById(ORDER_ID)).thenReturn(Optional.of(orderWithStatus(OrderStatus.OPEN))); when(technicianRepository.findById(MISSING_ID)).thenReturn(Optional.empty()); - assertThrows(ResourceNotFoundException.class, () -> orderService.assignTechnician(ORDER_ID, MISSING_ID)); + assertThrows(ResourceNotFoundException.class, () -> serviceOrderService.assignTechnician(ORDER_ID, MISSING_ID)); verify(orderRepository, never()).save(any()); } @@ -170,7 +170,7 @@ void assignTechnicianShouldThrowWhenTechnicianNotFound() { void assignTechnicianShouldThrowWhenOrderFinished() { when(orderRepository.findById(ORDER_ID)).thenReturn(Optional.of(orderWithStatus(OrderStatus.FINISHED))); - assertThrows(BusinessRuleException.class, () -> orderService.assignTechnician(ORDER_ID, TECH_ID)); + assertThrows(BusinessRuleException.class, () -> serviceOrderService.assignTechnician(ORDER_ID, TECH_ID)); verify(orderRepository, never()).save(any()); } @@ -179,11 +179,11 @@ void assignTechnicianShouldThrowWhenOrderFinished() { @Test @DisplayName("finish should store report and finishedAt when order is IN_PROGRESS") void finishShouldCloseOrderWhenInProgress() { - OrderService order = orderWithStatus(OrderStatus.IN_PROGRESS); + ServiceOrder order = orderWithStatus(OrderStatus.IN_PROGRESS); when(orderRepository.findById(ORDER_ID)).thenReturn(Optional.of(order)); - when(orderRepository.save(any(OrderService.class))).thenAnswer(invocation -> invocation.getArgument(0)); + when(orderRepository.save(any(ServiceOrder.class))).thenAnswer(invocation -> invocation.getArgument(0)); - OrderServiceDTO result = orderService.finish(ORDER_ID, new OrderServiceFinishDTO("Power supply replaced")); + ServiceOrderDTO result = serviceOrderService.finish(ORDER_ID, new ServiceOrderFinishDTO("Power supply replaced")); assertEquals(OrderStatus.FINISHED, result.status()); assertEquals("Power supply replaced", result.rootCauseReport()); @@ -196,7 +196,7 @@ void finishShouldThrowWhenOrderOpen() { when(orderRepository.findById(ORDER_ID)).thenReturn(Optional.of(orderWithStatus(OrderStatus.OPEN))); assertThrows(BusinessRuleException.class, - () -> orderService.finish(ORDER_ID, new OrderServiceFinishDTO("report"))); + () -> serviceOrderService.finish(ORDER_ID, new ServiceOrderFinishDTO("report"))); verify(orderRepository, never()).save(any()); } @@ -206,7 +206,7 @@ void finishShouldThrowWhenAlreadyFinished() { when(orderRepository.findById(ORDER_ID)).thenReturn(Optional.of(orderWithStatus(OrderStatus.FINISHED))); assertThrows(BusinessRuleException.class, - () -> orderService.finish(ORDER_ID, new OrderServiceFinishDTO("report"))); + () -> serviceOrderService.finish(ORDER_ID, new ServiceOrderFinishDTO("report"))); verify(orderRepository, never()).save(any()); } @@ -216,7 +216,7 @@ void finishShouldThrowWhenOrderNotFound() { when(orderRepository.findById(MISSING_ID)).thenReturn(Optional.empty()); assertThrows(ResourceNotFoundException.class, - () -> orderService.finish(MISSING_ID, new OrderServiceFinishDTO("report"))); + () -> serviceOrderService.finish(MISSING_ID, new ServiceOrderFinishDTO("report"))); } // ---------- cancel ---------- @@ -224,11 +224,11 @@ void finishShouldThrowWhenOrderNotFound() { @Test @DisplayName("cancel should set status CANCELED when order is OPEN") void cancelShouldCancelOpenOrder() { - OrderService order = orderWithStatus(OrderStatus.OPEN); + ServiceOrder order = orderWithStatus(OrderStatus.OPEN); when(orderRepository.findById(ORDER_ID)).thenReturn(Optional.of(order)); - when(orderRepository.save(any(OrderService.class))).thenAnswer(invocation -> invocation.getArgument(0)); + when(orderRepository.save(any(ServiceOrder.class))).thenAnswer(invocation -> invocation.getArgument(0)); - OrderServiceDTO result = orderService.cancel(ORDER_ID); + ServiceOrderDTO result = serviceOrderService.cancel(ORDER_ID); assertEquals(OrderStatus.CANCELED, result.status()); } @@ -238,7 +238,7 @@ void cancelShouldCancelOpenOrder() { void cancelShouldThrowWhenOrderFinished() { when(orderRepository.findById(ORDER_ID)).thenReturn(Optional.of(orderWithStatus(OrderStatus.FINISHED))); - assertThrows(BusinessRuleException.class, () -> orderService.cancel(ORDER_ID)); + assertThrows(BusinessRuleException.class, () -> serviceOrderService.cancel(ORDER_ID)); verify(orderRepository, never()).save(any()); } } \ No newline at end of file diff --git a/src/test/java/com/serviceOrder/Management/services/TechnicianServiceTest.java b/src/test/java/com/serviceOrder/Management/services/TechnicianServiceTest.java index c6febb0..f42f4db 100644 --- a/src/test/java/com/serviceOrder/Management/services/TechnicianServiceTest.java +++ b/src/test/java/com/serviceOrder/Management/services/TechnicianServiceTest.java @@ -4,7 +4,7 @@ import com.serviceOrder.Management.controllers.exceptions.ResourceNotFoundException; import com.serviceOrder.Management.dtos.TechnicianDTO; import com.serviceOrder.Management.entities.Technician; -import com.serviceOrder.Management.repositories.OrderServiceRepository; +import com.serviceOrder.Management.repositories.ServiceOrderRepository; import com.serviceOrder.Management.repositories.TechnicianRepository; import org.springframework.data.domain.Page; @@ -38,7 +38,7 @@ class TechnicianServiceTest { private TechnicianRepository technicianRepository; @Mock - private OrderServiceRepository orderRepository; + private ServiceOrderRepository orderRepository; @Test @DisplayName("insert should normalize email before saving")