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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ No Windows, confirme que o Java está disponível no `PATH` e execute
| Método | Rota | Descrição |
| --- | --- | --- |
| `POST` | `/ordens` | Cria uma ordem de serviço |
| `GET` | `/ordens` | Lista as ordens cadastradas |
| `GET` | `/ordens?cliente=nome` | Filtra ordens pelo nome do cliente, ignorando maiúsculas e minúsculas |
| `GET` | `/ordens?page=0&size=20&sort=cliente,asc` | Lista as ordens com paginação e ordenação |
| `GET` | `/ordens?cliente=nome&page=0&size=20` | Filtra ordens pelo cliente e mantém a paginação |
| `GET` | `/ordens/{id}` | Consulta uma ordem pelo ID |
| `PUT` | `/ordens/{id}` | Atualiza uma ordem existente |
| `DELETE` | `/ordens/{id}` | Exclui uma ordem existente |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package com.exemplo.ordem_servico.controller;

import org.springframework.http.HttpStatus;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.web.PageableDefault;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PathVariable;
Expand All @@ -16,7 +19,6 @@
import com.exemplo.ordem_servico.service.OrdemServicoService;

import jakarta.validation.Valid;
import java.util.List;

@RestController
@RequestMapping("/ordens")
Expand All @@ -34,9 +36,10 @@ public OrdemServico criar(@Valid @RequestBody OrdemServico ordem) {
}

@GetMapping
public List<OrdemServico> listar(
@RequestParam(required = false) String cliente) {
return service.listar(cliente);
public Page<OrdemServico> listar(
@RequestParam(required = false) String cliente,
@PageableDefault(size = 20, sort = "cliente") Pageable pageable) {
return service.listar(cliente, pageable);
}

@GetMapping("/{id}")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.exemplo.ordem_servico.repository;

import java.util.List;

import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

Expand All @@ -11,6 +11,7 @@
public interface OrdemServicoRepository
extends JpaRepository<OrdemServico, Long> {

List<OrdemServico> findByClienteContainingIgnoreCaseOrderByClienteAscIdAsc(
String cliente);
Page<OrdemServico> findByClienteContainingIgnoreCase(
String cliente,
Pageable pageable);
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.exemplo.ordem_servico.service;

import java.util.List;

import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

import com.exemplo.ordem_servico.exception.OrdemServicoNaoEncontradaException;
Expand All @@ -21,13 +21,13 @@ public OrdemServico criar(OrdemServico ordem) {
return repository.save(ordem);
}

public List<OrdemServico> listar(String cliente) {
public Page<OrdemServico> listar(String cliente, Pageable pageable) {
if (cliente != null && !cliente.isBlank()) {
return repository
.findByClienteContainingIgnoreCaseOrderByClienteAscIdAsc(
cliente.trim());
.findByClienteContainingIgnoreCase(
cliente.trim(), pageable);
}
return repository.findAll();
return repository.findAll(pageable);
}

public OrdemServico buscarPorId(Long id) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
import static org.mockito.Mockito.when;

import java.math.BigDecimal;
import java.util.List;
import java.util.Optional;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
Expand All @@ -30,26 +33,27 @@ class OrdemServicoServiceTests {

@Test
void deveListarTodasAsOrdensQuandoClienteNaoForInformado() {
List<OrdemServico> ordens = List.of(novaOrdem(
"Cliente", "Servico", "1", "0"));
when(repository.findAll()).thenReturn(ordens);
Pageable pagina = PageRequest.of(0, 20);
Page<OrdemServico> ordens = new PageImpl<>(java.util.List.of(novaOrdem(
"Cliente", "Servico", "1", "0")));
when(repository.findAll(pagina)).thenReturn(ordens);

assertEquals(ordens, service.listar(null));
verify(repository).findAll();
assertEquals(ordens, service.listar(null, pagina));
verify(repository).findAll(pagina);
}

@Test
void deveBuscarOrdensPorTrechoDoNomeDoCliente() {
List<OrdemServico> ordens = List.of(novaOrdem(
"Maria Silva", "Servico", "1", "0"));
when(repository.findByClienteContainingIgnoreCaseOrderByClienteAscIdAsc(
"maria"))
Pageable pagina = PageRequest.of(0, 10);
Page<OrdemServico> ordens = new PageImpl<>(java.util.List.of(novaOrdem(
"Maria Silva", "Servico", "1", "0")));
when(repository.findByClienteContainingIgnoreCase(
"maria", pagina))
.thenReturn(ordens);

assertEquals(ordens, service.listar(" maria "));
assertEquals(ordens, service.listar(" maria ", pagina));
verify(repository)
.findByClienteContainingIgnoreCaseOrderByClienteAscIdAsc(
"maria");
.findByClienteContainingIgnoreCase("maria", pagina);
}

@Test
Expand Down
Loading