diff --git a/src/main/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoAjusteController.java b/src/main/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoAdjustController.java similarity index 73% rename from src/main/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoAjusteController.java rename to src/main/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoAdjustController.java index f4cc60d..59b1f80 100644 --- a/src/main/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoAjusteController.java +++ b/src/main/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoAdjustController.java @@ -1,10 +1,10 @@ package br.com.ae3tecnologia.ms.tangerino.controller; import br.com.ae3tecnologia.ms.tangerino.dto.ResultAdjustDTO; -import br.com.ae3tecnologia.ms.tangerino.model.PtoAjusteModel; -import br.com.ae3tecnologia.ms.tangerino.model.PtoEquipamentoModel; -import br.com.ae3tecnologia.ms.tangerino.service.PtoAjusteService; -import br.com.ae3tecnologia.ms.tangerino.service.PtoEquipamentoService; +import br.com.ae3tecnologia.ms.tangerino.model.PtoAdjustModel; +import br.com.ae3tecnologia.ms.tangerino.model.PtoEquipamentModel; +import br.com.ae3tecnologia.ms.tangerino.service.PtoAdjustService; +import br.com.ae3tecnologia.ms.tangerino.service.PtoEquipamentService; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; @@ -26,56 +26,56 @@ import java.util.concurrent.atomic.AtomicReference; import static br.com.ae3tecnologia.ms.tangerino.utils.Constants.TANGERINO_API_PUNCH; @Controller -public class PtoAjusteController { +public class PtoAdjustController { @Value("${app.token}") private String token; @Value("${app.url.apis}") private String urlApis; - private final PtoAjusteService ajusteService; - private final PtoEquipamentoService equipamentoService; + private final PtoAdjustService adjustService; + private final PtoEquipamentService equipamentService; @Autowired - public PtoAjusteController(PtoEquipamentoService equipamentoService, PtoAjusteService ajusteService) { - this.ajusteService = ajusteService; - this.equipamentoService = equipamentoService; + public PtoAdjustController(PtoEquipamentService equipamentService, PtoAdjustService adjustService) { + this.adjustService = adjustService; + this.equipamentService = equipamentService; } - public void extrair(PtoEquipamentoModel eq, Integer nsr) { + public void extrair(PtoEquipamentModel eq, Integer nsr) { // percorre cada relogio, passando o ultimo nsr do relogio ou a ulima data/hora, tratando para nao duplicar os nsr AtomicReference lastNsr = new AtomicReference<>(nsr); HashMap map = new HashMap<>(); - map.put("serialNumber", eq.getCodigo()); + map.put("serialNumber", eq.getSerialNumber()); map.put("registerType", 4); map.put("nsr", nsr); try { // requisita da API do tangerino os pontos disponiveis, salvando eles na tabela ptoEvento - List ptoModels = obterAjustesPorRelogio(map); + List ptoModels = obterAjustesPorRelogio(map); lastNsr.set(extrairAjustes(lastNsr.get(), ptoModels)); } catch (JsonProcessingException e) { throw new RuntimeException(e); } // ao final, atualiza a ptoEquipamento com o ultimoNSR salvo - eq.setUltimoNsr(lastNsr.get()); - equipamentoService.save(eq); + eq.setLastNsr(lastNsr.get()); + equipamentService.save(eq); } - private Integer extrairAjustes(Integer lastNsr, List ptoEventoModels) { + private Integer extrairAjustes(Integer lastNsr, List ptoEventoModels) { AtomicReference nsr = new AtomicReference<>(lastNsr); - ptoEventoModels.stream().sorted(Comparator.comparing(PtoAjusteModel::getNsr)).forEach(x -> { + ptoEventoModels.stream().sorted(Comparator.comparing(PtoAdjustModel::getNsr)).forEach(x -> { if (x.getNsr() > lastNsr) { - ajusteService.save(x); + adjustService.save(x); nsr.set(x.getNsr()); } }); return nsr.get(); } - public List obterAjustesPorRelogio(HashMap filtros) throws JsonProcessingException { + public List obterAjustesPorRelogio(HashMap filtros) throws JsonProcessingException { RestTemplate restTemplate = new RestTemplate(); @@ -102,8 +102,8 @@ public class PtoAjusteController { ObjectMapper objectMapper = new ObjectMapper(); objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true); ResultAdjustDTO forObject = objectMapper.readValue(jsonStr, ResultAdjustDTO.class); - List eventos = new ArrayList<>(); - forObject.getContent().forEach(x -> eventos.add(new PtoAjusteModel(x))); + List eventos = new ArrayList<>(); + forObject.getContent().forEach(x -> eventos.add(new PtoAdjustModel(x))); return eventos; } } diff --git a/src/main/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoEventoController.java b/src/main/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoExtractRestController.java similarity index 69% rename from src/main/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoEventoController.java rename to src/main/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoExtractRestController.java index f1acccf..63f03db 100644 --- a/src/main/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoEventoController.java +++ b/src/main/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoExtractRestController.java @@ -1,11 +1,11 @@ package br.com.ae3tecnologia.ms.tangerino.controller; import br.com.ae3tecnologia.ms.tangerino.dto.ResultEventDTO; -import br.com.ae3tecnologia.ms.tangerino.model.PtoEquipamentoModel; -import br.com.ae3tecnologia.ms.tangerino.model.PtoEventoModel; -import br.com.ae3tecnologia.ms.tangerino.service.PtoAjusteService; -import br.com.ae3tecnologia.ms.tangerino.service.PtoEquipamentoService; -import br.com.ae3tecnologia.ms.tangerino.service.PtoEventoService; +import br.com.ae3tecnologia.ms.tangerino.model.PtoEquipamentModel; +import br.com.ae3tecnologia.ms.tangerino.model.PtoEventModel; +import br.com.ae3tecnologia.ms.tangerino.service.PtoAdjustService; +import br.com.ae3tecnologia.ms.tangerino.service.PtoEquipamentService; +import br.com.ae3tecnologia.ms.tangerino.service.PtoEventService; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; @@ -34,19 +34,18 @@ import static br.com.ae3tecnologia.ms.tangerino.utils.Constants.TANGERINO_API_PU @RestController @CrossOrigin(maxAge = 3600, origins = "*") @RequestMapping(API_ROUTE + "/${app.version}/run") -public class PtoEventoController { +public class PtoExtractRestController { @Value("${app.token}") private String token; @Value("${app.url.apis}") private String urlApis; - - private final PtoEventoService eventoService; - private final PtoAjusteService ajusteService; - private final PtoEquipamentoService equipamentoService; + private final PtoEventService eventoService; + private final PtoAdjustService ajusteService; + private final PtoEquipamentService equipamentoService; @Autowired - private PtoEventoController(PtoEquipamentoService equipamentoService, PtoEventoService eventoService, PtoAjusteService ajusteService) { + private PtoExtractRestController(PtoEquipamentService equipamentoService, PtoEventService eventoService, PtoAdjustService ajusteService) { this.eventoService = eventoService; this.equipamentoService = equipamentoService; this.ajusteService = ajusteService; @@ -55,40 +54,43 @@ public class PtoEventoController { @GetMapping( produces = MediaType.APPLICATION_JSON_VALUE ) - public void extrairPontos() { + public void extractPunch() { - List equipamentoList = obterRelogios(false); - equipamentoList.forEach(eq -> { + List equipamentList = getWatches(false); + equipamentList.forEach(eq -> { // percorre cada relogio, passando o ultimo nsr do relogio ou a ulima data/hora AtomicReference lastNsr = new AtomicReference<>(0); HashMap map = new HashMap<>(); - map.put("serialNumber", eq.getCodigo()); + map.put("serialNumber", eq.getSerialNumber()); map.put("nsrType", 3); - map.put("nsr", eq.getUltimoNsr()); //precisa pegar o ultimo NSR do relogio para passar como parametro + map.put("nsr", eq.getLastNsr()); //precisa pegar o ultimo NSR do relogio para passar como parametro try { // requisita da API do tangerino os pontos disponiveis, salvando eles na tabela ptoEvento - List ptoEventoModels = obterPontosPorRelogio(map); - lastNsr.set(extrairEventos(lastNsr.get(), ptoEventoModels, eq)); + List ptoEventModels = gePunchTangerinoAPI(map); + lastNsr.set(extractEventsAndReturnLastNsr(lastNsr.get(), ptoEventModels, eq)); } catch (JsonProcessingException e) { throw new RuntimeException(e); } // ao final, atualiza a ptoEquipamento com o ultimoNSR salvo - eq.setUltimoNsr(lastNsr.get()); + eq.setLastNsr(lastNsr.get()); equipamentoService.save(eq); }); + } + public String getToken() { + return token; } - public Integer extrairEventos(Integer lastNsr, List ptoEventoModels, PtoEquipamentoModel equipamentoModel) { + public Integer extractEventsAndReturnLastNsr(Integer lastNsr, List ptoEventModels, PtoEquipamentModel equipamentoModel) { AtomicReference nsr = new AtomicReference<>(0); AtomicInteger nsrForEach = new AtomicInteger(lastNsr); - ptoEventoModels.stream().sorted(Comparator.comparing(PtoEventoModel::getNsr)).forEach(x -> { + ptoEventModels.stream().sorted(Comparator.comparing(PtoEventModel::getNsr)).forEach(x -> { if (x.getNsr() > lastNsr) { // tratando para nao duplicar os nsr eventoService.save(x); nsr.set(x.getNsr()); if(x.getNsr() - nsrForEach.get() > 1){ //se a diferença entre o ultimo nsr e o atual for maior que um, chamará o Ajustes - PtoAjusteController ajusteController = new PtoAjusteController(equipamentoService, ajusteService); + PtoAdjustController ajusteController = new PtoAdjustController(equipamentoService, ajusteService); ajusteController.extrair(equipamentoModel, nsrForEach.get()); } nsrForEach.set(x.getNsr()); @@ -97,12 +99,12 @@ public class PtoEventoController { return nsr.get(); } - public List obterRelogios(Boolean inativo) { + public List getWatches(Boolean inativo) { // pega todos os relogios ativos de PtoEquipamentoModel return equipamentoService.findByInativo(inativo); } - public List obterPontosPorRelogio(HashMap filtros) throws JsonProcessingException { + public List gePunchTangerinoAPI(HashMap filtros) throws JsonProcessingException { RestTemplate restTemplate = new RestTemplate(); @@ -129,8 +131,8 @@ public class PtoEventoController { ObjectMapper objectMapper = new ObjectMapper(); objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true); ResultEventDTO forObject = objectMapper.readValue(jsonStr, ResultEventDTO.class); - List eventos = new ArrayList<>(); - forObject.getContent().forEach(x -> eventos.add(new PtoEventoModel(x))); + List eventos = new ArrayList<>(); + forObject.getContent().forEach(x -> eventos.add(new PtoEventModel(x))); return eventos; } } diff --git a/src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoAjusteModel.java b/src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoAdjustModel.java similarity index 96% rename from src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoAjusteModel.java rename to src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoAdjustModel.java index 3ca0655..493f5cc 100644 --- a/src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoAjusteModel.java +++ b/src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoAdjustModel.java @@ -14,7 +14,7 @@ import java.time.*; @NoArgsConstructor @Entity @Table(name = "pto_ajustes", schema = "rh") -public class PtoAjusteModel { +public class PtoAdjustModel { @Id @Column(name = "id") @@ -49,7 +49,7 @@ public class PtoAjusteModel { @Column(name = "periodo") private String periodo; - public PtoAjusteModel(PtoAjusteDTO dto) { + public PtoAdjustModel(PtoAjusteDTO dto) { this.setNsr(dto.getNsr()); LocalDate localDate = Instant.ofEpochMilli(dto.getDateTimeBeforeAdjustment()).atZone(ZoneId.systemDefault()).toLocalDate(); this.setDataAnterior(localDate); diff --git a/src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEquipamentoModel.java b/src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEquipamentModel.java similarity index 71% rename from src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEquipamentoModel.java rename to src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEquipamentModel.java index 6261c2a..e11ba8d 100644 --- a/src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEquipamentoModel.java +++ b/src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEquipamentModel.java @@ -12,7 +12,7 @@ import java.util.Date; @NoArgsConstructor @Entity @Table(name = "pto_equipamento", schema = "rh") -public class PtoEquipamentoModel { +public class PtoEquipamentModel { @Id @Column(name = "id") @@ -20,24 +20,24 @@ public class PtoEquipamentoModel { private int id; @Column(name = "codigo") - private String codigo; + private String serialNumber; @Column(name = "setor") - private Integer setor; + private Integer local; @Column(name = "ultimo_nsr") - private Integer ultimoNsr; + private Integer lastNsr; @Column(name = "data_ativacao") - private Date dataAtivacao; + private Date activateDate; @Column(name = "data_desativacao") - private Date dataDesativacao; + private Date deactivateDate; @Column(name = "ip") - private String ip; + private String ipAddress; @Column(name = "inativo") - private Boolean inativo; + private Boolean inactive; } diff --git a/src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEventoModel.java b/src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEventModel.java similarity index 64% rename from src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEventoModel.java rename to src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEventModel.java index 2413248..08a8a2b 100644 --- a/src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEventoModel.java +++ b/src/main/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEventModel.java @@ -14,7 +14,7 @@ import java.time.*; @NoArgsConstructor @Entity @Table(name = "pto_evento", schema = "rh") -public class PtoEventoModel { +public class PtoEventModel { @Id @Column(name = "id") @@ -25,48 +25,44 @@ public class PtoEventoModel { private Integer nsr; @Column(name = "tipo") - private Integer tipo; + private Integer registerType; @Column(name = "data_evento") - private LocalDate dataEvento; + private LocalDate eventDate; @Column(name = "hora_evento") - private LocalTime horaEvento; + private LocalTime eventTime; @Column(name = "pis") private String pis; @Column(name = "pessoa") - private Integer pessoa; + private Integer person; @Column(name = "arquivo") - private Integer arquivo; + private Integer file; @Column(name = "processado") - private Boolean processado; - -// @JoinColumn(name = "equipamento") -// @ManyToOne(cascade = CascadeType.REFRESH) -// private PtoEquipamentoModel equipamento; + private Boolean process; @Column(name = "equipamento") - private Integer equipamento; + private Integer equipament; @Column(name = "periodo") - private String periodo; + private String period; @Transient private LocalDateTime lastModifiedDate; - public PtoEventoModel(PtoEventoDTO dto) { + public PtoEventModel(PtoEventoDTO dto) { this.setNsr(dto.getNsr()); LocalDate localDate = Instant.ofEpochMilli(dto.getPunchDate()).atZone(ZoneId.systemDefault()).toLocalDate(); - this.setDataEvento(localDate); - this.setHoraEvento(Instant.ofEpochMilli(dto.getPunchDate()).atZone(ZoneId.systemDefault()).toLocalTime()); + this.setEventDate(localDate); + this.setEventTime(Instant.ofEpochMilli(dto.getPunchDate()).atZone(ZoneId.systemDefault()).toLocalTime()); String periodo = localDate.getYear() + StringUtils.leftPad("0",2, String.valueOf(localDate.getMonthValue())); - this.setPeriodo(periodo); - this.setProcessado(false); - this.setTipo(3); + this.setPeriod(periodo); + this.setProcess(false); + this.setRegisterType(3); this.setPis(dto.getPis()); // this.equipamento = diff --git a/src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoAjusteRepository.java b/src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoAdjustRepository.java similarity index 55% rename from src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoAjusteRepository.java rename to src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoAdjustRepository.java index 2dd10e2..00ccaba 100644 --- a/src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoAjusteRepository.java +++ b/src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoAdjustRepository.java @@ -1,10 +1,10 @@ package br.com.ae3tecnologia.ms.tangerino.repository; -import br.com.ae3tecnologia.ms.tangerino.model.PtoAjusteModel; +import br.com.ae3tecnologia.ms.tangerino.model.PtoAdjustModel; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @Repository -public interface PtoAjusteRepository extends JpaRepository { +public interface PtoAdjustRepository extends JpaRepository { } diff --git a/src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEquipamentoRepository.java b/src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEquipamentRepository.java similarity index 52% rename from src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEquipamentoRepository.java rename to src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEquipamentRepository.java index 0a66785..5a16cb4 100644 --- a/src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEquipamentoRepository.java +++ b/src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEquipamentRepository.java @@ -1,6 +1,6 @@ package br.com.ae3tecnologia.ms.tangerino.repository; -import br.com.ae3tecnologia.ms.tangerino.model.PtoEquipamentoModel; +import br.com.ae3tecnologia.ms.tangerino.model.PtoEquipamentModel; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @@ -8,6 +8,6 @@ import java.util.List; import java.util.Optional; @Repository -public interface PtoEquipamentoRepository extends JpaRepository { - public Optional> findByInativoEquals(Boolean inativo); +public interface PtoEquipamentRepository extends JpaRepository { + public Optional> findByInactiveEquals(Boolean inativo); } diff --git a/src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEventoRepository.java b/src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEventRepository.java similarity index 55% rename from src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEventoRepository.java rename to src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEventRepository.java index 7584e5b..73bd903 100644 --- a/src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEventoRepository.java +++ b/src/main/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEventRepository.java @@ -1,10 +1,10 @@ package br.com.ae3tecnologia.ms.tangerino.repository; -import br.com.ae3tecnologia.ms.tangerino.model.PtoEventoModel; +import br.com.ae3tecnologia.ms.tangerino.model.PtoEventModel; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @Repository -public interface PtoEventoRepository extends JpaRepository { +public interface PtoEventRepository extends JpaRepository { } diff --git a/src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoAjusteService.java b/src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoAdjustService.java similarity index 50% rename from src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoAjusteService.java rename to src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoAdjustService.java index 67fa407..15e47dd 100644 --- a/src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoAjusteService.java +++ b/src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoAdjustService.java @@ -1,7 +1,7 @@ package br.com.ae3tecnologia.ms.tangerino.service; -import br.com.ae3tecnologia.ms.tangerino.model.PtoAjusteModel; -import br.com.ae3tecnologia.ms.tangerino.repository.PtoAjusteRepository; +import br.com.ae3tecnologia.ms.tangerino.model.PtoAdjustModel; +import br.com.ae3tecnologia.ms.tangerino.repository.PtoAdjustRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -9,21 +9,21 @@ import java.util.List; import java.util.Optional; @Service -public class PtoAjusteService { +public class PtoAdjustService { @Autowired - private PtoAjusteRepository repository; + private PtoAdjustRepository repository; - public PtoAjusteModel save(PtoAjusteModel model){ + public PtoAdjustModel save(PtoAdjustModel model){ return repository.save(model); } - public List findAll(){ + public List findAll(){ return repository.findAll(); } - public PtoAjusteModel findById(int id) { - Optional optional = repository.findById(id); + public PtoAdjustModel findById(int id) { + Optional optional = repository.findById(id); return optional.isPresent() ? optional.get() : null; } diff --git a/src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEquipamentService.java b/src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEquipamentService.java new file mode 100644 index 0000000..1cc7742 --- /dev/null +++ b/src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEquipamentService.java @@ -0,0 +1,39 @@ +package br.com.ae3tecnologia.ms.tangerino.service; + +import br.com.ae3tecnologia.ms.tangerino.model.PtoEquipamentModel; +import br.com.ae3tecnologia.ms.tangerino.repository.PtoEquipamentRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; +import java.util.Optional; + +@Service +public class PtoEquipamentService { + + @Autowired + private PtoEquipamentRepository repository; + + public List findByInativo(Boolean inativo){ + Optional optional = repository.findByInactiveEquals(inativo); + if(optional.isPresent() && !optional.isEmpty()){ + return (List) optional.get(); + } + return Arrays.asList(); + } + + public PtoEquipamentModel save(PtoEquipamentModel equipamentoModel){ + return repository.save(equipamentoModel); + } + + public List findAll(){ + return repository.findAll(); + } + + public PtoEquipamentModel findById(int id){ + Optional optional = repository.findById(id); + return optional.isPresent() ? optional.get() : null; + } + +} diff --git a/src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEquipamentoService.java b/src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEquipamentoService.java deleted file mode 100644 index c49ac5c..0000000 --- a/src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEquipamentoService.java +++ /dev/null @@ -1,38 +0,0 @@ -package br.com.ae3tecnologia.ms.tangerino.service; - -import br.com.ae3tecnologia.ms.tangerino.model.PtoEquipamentoModel; -import br.com.ae3tecnologia.ms.tangerino.repository.PtoEquipamentoRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; -import java.util.Optional; - -@Service -public class PtoEquipamentoService { - @Autowired - private PtoEquipamentoRepository repository; - - public List findByInativo(Boolean inativo){ - Optional optional = repository.findByInativoEquals(inativo); - if(optional.isPresent() && !optional.isEmpty()){ - return (List) optional.get(); - } - return Arrays.asList(); - } - - public PtoEquipamentoModel save(PtoEquipamentoModel equipamentoModel){ - return repository.save(equipamentoModel); - } - - public List findAll(){ - return repository.findAll(); - } - - public PtoEquipamentoModel findById(int id){ - Optional optional = repository.findById(id); - return optional.isPresent() ? optional.get() : null; - } - -} diff --git a/src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEventService.java b/src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEventService.java new file mode 100644 index 0000000..1c42984 --- /dev/null +++ b/src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEventService.java @@ -0,0 +1,30 @@ +package br.com.ae3tecnologia.ms.tangerino.service; + +import br.com.ae3tecnologia.ms.tangerino.model.PtoEventModel; +import br.com.ae3tecnologia.ms.tangerino.repository.PtoEventRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +public class PtoEventService { + + @Autowired + private PtoEventRepository repository; + + public PtoEventModel save(PtoEventModel eventoModel){ + return repository.save(eventoModel); + } + + public List findAll(){ + return repository.findAll(); + } + + public PtoEventModel findById(int id){ + Optional optional = repository.findById(id); + return optional.isPresent() ? optional.get() : null; + } + +} diff --git a/src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEventoService.java b/src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEventoService.java deleted file mode 100644 index f4aa73c..0000000 --- a/src/main/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEventoService.java +++ /dev/null @@ -1,31 +0,0 @@ -package br.com.ae3tecnologia.ms.tangerino.service; - -import br.com.ae3tecnologia.ms.tangerino.model.PtoEventoModel; -import br.com.ae3tecnologia.ms.tangerino.repository.PtoEventoRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; -import java.util.Optional; - -@Service -public class PtoEventoService { - - @Autowired - private PtoEventoRepository repository; - - public PtoEventoModel save(PtoEventoModel eventoModel){ - return repository.save(eventoModel); - } - - public List findAll(){ - return repository.findAll(); - } - - public PtoEventoModel findById(int id){ - Optional optional = repository.findById(id); - return optional.isPresent() ? optional.get() : null; - } - -} diff --git a/src/test/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoEventoControllerTest.java b/src/test/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoEventoControllerTest.java deleted file mode 100644 index b783c3f..0000000 --- a/src/test/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoEventoControllerTest.java +++ /dev/null @@ -1,59 +0,0 @@ -package br.com.ae3tecnologia.ms.tangerino.controller; - -import br.com.ae3tecnologia.ms.tangerino.model.PtoEquipamentoModel; -import br.com.ae3tecnologia.ms.tangerino.model.PtoEventoModel; -import br.com.ae3tecnologia.ms.tangerino.service.PtoEquipamentoService; -import br.com.ae3tecnologia.ms.tangerino.service.PtoEventoService; -import com.fasterxml.jackson.core.JsonProcessingException; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -import java.util.HashMap; -import java.util.List; - -class PtoEventoControllerTest { - @Mock - PtoEventoService eventoService; - @Mock - PtoEquipamentoService equipamentoService; - @InjectMocks - PtoEventoController controller; - - @BeforeEach - void setUp() { - MockitoAnnotations.openMocks(this); - } - - @Test - void deveExtrairPontos() { - controller.extrairPontos(); - } - - @Test - void deveObterPontosPorRelogio() throws JsonProcessingException { -// when(eventoService.) - HashMap map = new HashMap<>(); - map.put("employerId", 2775694); - map.put("offset", 1037355); - List ptoEventoModels = controller.obterPontosPorRelogio(map); - Assertions.assertTrue(ptoEventoModels.size() > 0); - } - - @Test - void deveExtrairEventos(){ - - } - - @Test - void deveObterRelogios(){ - List ptoEquipamentoModels = controller.obterRelogios(false); - Assertions.assertNotEquals(null, ptoEquipamentoModels); - Assertions.assertFalse(ptoEquipamentoModels.isEmpty()); - } -} - -//Generated with love by TestMe :) Please report issues and submit feature requests at: http://weirddev.com/forum#!/testme \ No newline at end of file diff --git a/src/test/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoExtractRestControllerTest.java b/src/test/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoExtractRestControllerTest.java new file mode 100644 index 0000000..6b06a7a --- /dev/null +++ b/src/test/java/br/com/ae3tecnologia/ms/tangerino/controller/PtoExtractRestControllerTest.java @@ -0,0 +1,96 @@ +package br.com.ae3tecnologia.ms.tangerino.controller; + +import br.com.ae3tecnologia.ms.tangerino.model.PtoEquipamentModel; +import br.com.ae3tecnologia.ms.tangerino.model.PtoEventModel; +import com.fasterxml.jackson.core.JsonProcessingException; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.Arrays; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.List; + +import static org.mockito.Mockito.when; + +class PtoExtractRestControllerTest { + @Mock + PtoExtractRestController controller; + PtoEquipamentModel equipamento01; + PtoEquipamentModel equipamento02; + PtoEventModel evento01; + + @BeforeEach + void setUp() { + equipamento01 = new PtoEquipamentModel( + 123, + "00004004340003529", + 1, + 1, + GregorianCalendar.getInstance().getTime(), + null, + "default", + true + ); + equipamento02 = new PtoEquipamentModel( + 124, + "00004004330063478", + 1, + 1, + GregorianCalendar.getInstance().getTime(), + null, + "default", + true + ); + evento01 = new PtoEventModel( + 1, + 123, + 1, + LocalDate.now(), + LocalTime.now(), + "123123123123", + 123, + 123, + false, + 1, + "202304", + LocalDateTime.now() + ); + MockitoAnnotations.openMocks(this); + } + + @Test + void mustObteinPunchTangerinoAPIMock() throws JsonProcessingException { + HashMap map = new HashMap<>(); + map.put("serialNumber", equipamento01.getSerialNumber()); + map.put("page", 1); + map.put("size", 50); + when(controller.getToken()).thenReturn("1231231231313"); + when(controller.gePunchTangerinoAPI(map)).thenReturn(Arrays.asList(evento01)); + List ptoEventModels = controller.gePunchTangerinoAPI(map); + Assertions.assertTrue(ptoEventModels.size() > 0); + } + + @Test + void deveExtrairEventosMock() { + when(controller.extractEventsAndReturnLastNsr(evento01.getNsr(), List.of(evento01), equipamento01)).thenReturn(Integer.valueOf("124")); + Integer lastNsr = controller.extractEventsAndReturnLastNsr(evento01.getNsr(), Arrays.asList(evento01), equipamento01); + Assertions.assertEquals(124, lastNsr); + } + + @Test + void deveObterRelogiosAtivosMock() { + when(controller.getWatches(false)).thenReturn(Arrays.asList(equipamento01, equipamento02)); + List ptoEquipamentModels = controller.getWatches(false); + Assertions.assertNotEquals(null, ptoEquipamentModels); + Assertions.assertFalse(ptoEquipamentModels.isEmpty()); + } +} + +//Generated with love by TestMe :) Please report issues and submit feature requests at: http://weirddev.com/forum#!/testme \ No newline at end of file diff --git a/src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoAjusteModelTest.java b/src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoAdjustModelTest.java similarity index 92% rename from src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoAjusteModelTest.java rename to src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoAdjustModelTest.java index 8870796..ee18610 100644 --- a/src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoAjusteModelTest.java +++ b/src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoAdjustModelTest.java @@ -9,15 +9,15 @@ import org.mockito.MockitoAnnotations; import java.time.LocalDate; import java.time.LocalTime; -class PtoAjusteModelTest { +class PtoAdjustModelTest { @InjectMocks - PtoAjusteModel ptoModel; + PtoAdjustModel ptoModel; - PtoAjusteModel other; + PtoAdjustModel other; @BeforeEach void setUp() { - other = new PtoAjusteModel( + other = new PtoAdjustModel( 123, 123, 1, diff --git a/src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEquipamentoModelTest.java b/src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEquipamentModelTest.java similarity index 52% rename from src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEquipamentoModelTest.java rename to src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEquipamentModelTest.java index 129c6f1..edba85f 100644 --- a/src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEquipamentoModelTest.java +++ b/src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEquipamentModelTest.java @@ -9,11 +9,11 @@ import org.mockito.MockitoAnnotations; import java.util.Calendar; import java.util.GregorianCalendar; -class PtoEquipamentoModelTest { +class PtoEquipamentModelTest { @InjectMocks - PtoEquipamentoModel ptoEquipamentoModel; + PtoEquipamentModel ptoEquipamentModel; - PtoEquipamentoModel other = new PtoEquipamentoModel( + PtoEquipamentModel other = new PtoEquipamentModel( 123, "codigo", 1, @@ -31,68 +31,68 @@ class PtoEquipamentoModelTest { @Test void testSetId() { - ptoEquipamentoModel.setId(0); + ptoEquipamentModel.setId(0); } @Test void testSetCodigo() { - ptoEquipamentoModel.setCodigo("codigo"); + ptoEquipamentModel.setSerialNumber("codigo"); } @Test void testSetSetor() { - ptoEquipamentoModel.setSetor(Integer.valueOf(0)); + ptoEquipamentModel.setLocal(Integer.valueOf(0)); } @Test void testSetUltimoNsr() { - ptoEquipamentoModel.setUltimoNsr(Integer.valueOf(0)); + ptoEquipamentModel.setLastNsr(Integer.valueOf(0)); } @Test void testSetDataAtivacao() { - ptoEquipamentoModel.setDataAtivacao(new GregorianCalendar(2023, Calendar.APRIL, 12, 16, 8).getTime()); + ptoEquipamentModel.setActivateDate(new GregorianCalendar(2023, Calendar.APRIL, 12, 16, 8).getTime()); } @Test void testSetDataDesativacao() { - ptoEquipamentoModel.setDataDesativacao(new GregorianCalendar(2023, Calendar.APRIL, 12, 16, 8).getTime()); + ptoEquipamentModel.setDeactivateDate(new GregorianCalendar(2023, Calendar.APRIL, 12, 16, 8).getTime()); } @Test void testSetIp() { - ptoEquipamentoModel.setIp("ip"); + ptoEquipamentModel.setIpAddress("ip"); } @Test void testSetInativo() { - ptoEquipamentoModel.setInativo(Boolean.TRUE); + ptoEquipamentModel.setInactive(Boolean.TRUE); } @Test void testEquals() { - ptoEquipamentoModel = other; - boolean result = ptoEquipamentoModel.equals(other); + ptoEquipamentModel = other; + boolean result = ptoEquipamentModel.equals(other); Assertions.assertTrue(result); } @Test void testCanEqual() { - ptoEquipamentoModel = other; - boolean result = ptoEquipamentoModel.canEqual(other); + ptoEquipamentModel = other; + boolean result = ptoEquipamentModel.canEqual(other); Assertions.assertTrue(result); } @Test void testHashCode() { - ptoEquipamentoModel = other; - Assertions.assertEquals(ptoEquipamentoModel.hashCode(), other.hashCode()); + ptoEquipamentModel = other; + Assertions.assertEquals(ptoEquipamentModel.hashCode(), other.hashCode()); } @Test void testToString() { - ptoEquipamentoModel = other; - Assertions.assertEquals(other.toString(), ptoEquipamentoModel.toString()); + ptoEquipamentModel = other; + Assertions.assertEquals(other.toString(), ptoEquipamentModel.toString()); } } diff --git a/src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEventoModelTest.java b/src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEventModelTest.java similarity index 57% rename from src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEventoModelTest.java rename to src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEventModelTest.java index dfee126..7f57a15 100644 --- a/src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEventoModelTest.java +++ b/src/test/java/br/com/ae3tecnologia/ms/tangerino/model/PtoEventModelTest.java @@ -1,6 +1,5 @@ package br.com.ae3tecnologia.ms.tangerino.model; -import jakarta.persistence.Column; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -11,11 +10,11 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -class PtoEventoModelTest { +class PtoEventModelTest { @InjectMocks - PtoEventoModel ptoEventoModel; + PtoEventModel ptoEventModel; - PtoEventoModel other = new PtoEventoModel( + PtoEventModel other = new PtoEventModel( 1, 123, 1, @@ -37,83 +36,83 @@ class PtoEventoModelTest { @Test void testSetId() { - ptoEventoModel.setId(Integer.valueOf(0)); + ptoEventModel.setId(Integer.valueOf(0)); } @Test void testSetNsr() { - ptoEventoModel.setNsr(Integer.valueOf(0)); + ptoEventModel.setNsr(Integer.valueOf(0)); } @Test void testSetTipo() { - ptoEventoModel.setTipo(Integer.valueOf(0)); + ptoEventModel.setRegisterType(Integer.valueOf(0)); } @Test void testSetDataEvento() { - ptoEventoModel.setDataEvento(LocalDate.now()); + ptoEventModel.setEventDate(LocalDate.now()); } @Test void testSetHoraEvento() { - ptoEventoModel.setHoraEvento(LocalTime.now()); + ptoEventModel.setEventTime(LocalTime.now()); } @Test void testSetPis() { - ptoEventoModel.setPis("pis"); + ptoEventModel.setPis("pis"); } @Test void testSetPessoa() { - ptoEventoModel.setPessoa(Integer.valueOf(0)); + ptoEventModel.setPerson(Integer.valueOf(0)); } @Test void testSetArquivo() { - ptoEventoModel.setArquivo(Integer.valueOf(0)); + ptoEventModel.setFile(Integer.valueOf(0)); } @Test void testSetProcessado() { - ptoEventoModel.setProcessado(Boolean.TRUE); + ptoEventModel.setProcess(Boolean.TRUE); } @Test void testSetEquipamento() { - ptoEventoModel.setEquipamento(Integer.valueOf(0)); + ptoEventModel.setEquipament(Integer.valueOf(0)); } @Test void testSetPeriodo() { - ptoEventoModel.setPeriodo("periodo"); + ptoEventModel.setPeriod("periodo"); } @Test void testEquals() { - ptoEventoModel = other; - boolean result = ptoEventoModel.equals(other); + ptoEventModel = other; + boolean result = ptoEventModel.equals(other); Assertions.assertTrue(result); } @Test void testCanEqual() { - ptoEventoModel = other; - boolean result = ptoEventoModel.canEqual(other); + ptoEventModel = other; + boolean result = ptoEventModel.canEqual(other); Assertions.assertTrue(result); } @Test void testHashCode() { - ptoEventoModel = other; - Assertions.assertEquals(other.hashCode(), ptoEventoModel.hashCode()); + ptoEventModel = other; + Assertions.assertEquals(other.hashCode(), ptoEventModel.hashCode()); } @Test void testToString() { - ptoEventoModel = other; - String result = ptoEventoModel.toString(); + ptoEventModel = other; + String result = ptoEventModel.toString(); Assertions.assertEquals(other.toString(), result); } diff --git a/src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoAjusteRepositoryTest.java b/src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoAdjustRepositoryTest.java similarity index 83% rename from src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoAjusteRepositoryTest.java rename to src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoAdjustRepositoryTest.java index e37a80f..7f0c9c0 100644 --- a/src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoAjusteRepositoryTest.java +++ b/src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoAdjustRepositoryTest.java @@ -1,6 +1,6 @@ package br.com.ae3tecnologia.ms.tangerino.repository; -import br.com.ae3tecnologia.ms.tangerino.model.PtoAjusteModel; +import br.com.ae3tecnologia.ms.tangerino.model.PtoAdjustModel; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -10,25 +10,24 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; import java.time.LocalDate; -import java.time.LocalDateTime; import java.time.LocalTime; import java.util.Optional; @DataJpaTest @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) -public class PtoAjusteRepositoryTest { +public class PtoAdjustRepositoryTest { @Autowired private TestEntityManager em; @Autowired - private PtoAjusteRepository repository; + private PtoAdjustRepository repository; - private PtoAjusteModel obj = null; + private PtoAdjustModel obj = null; @BeforeEach void setUp(){ - obj = new PtoAjusteModel( + obj = new PtoAdjustModel( 123, 123, 1, @@ -52,7 +51,7 @@ public class PtoAjusteRepositoryTest { Assertions.assertNotEquals(null, obj); Assertions.assertTrue(obj.getId() > 0); int id = obj.getId(); - Optional recover = repository.findById(id); + Optional recover = repository.findById(id); Assertions.assertTrue(recover.isPresent()); Assertions.assertFalse(recover.isEmpty()); } @@ -72,7 +71,7 @@ public class PtoAjusteRepositoryTest { int id = obj.getId(); repository.delete(obj); - Optional recover = repository.findById(id); + Optional recover = repository.findById(id); Assertions.assertFalse(recover.isPresent()); Assertions.assertTrue(recover.isEmpty()); } diff --git a/src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEquipamentoRepositoryTest.java b/src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEquipamentRepositoryTest.java similarity index 80% rename from src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEquipamentoRepositoryTest.java rename to src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEquipamentRepositoryTest.java index fd5b3fd..5a3e316 100644 --- a/src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEquipamentoRepositoryTest.java +++ b/src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEquipamentRepositoryTest.java @@ -1,6 +1,6 @@ package br.com.ae3tecnologia.ms.tangerino.repository; -import br.com.ae3tecnologia.ms.tangerino.model.PtoEquipamentoModel; +import br.com.ae3tecnologia.ms.tangerino.model.PtoEquipamentModel; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -14,13 +14,13 @@ import java.util.Optional; @DataJpaTest @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) -public class PtoEquipamentoRepositoryTest { +public class PtoEquipamentRepositoryTest { @Autowired private TestEntityManager em; @Autowired - private PtoEquipamentoRepository repository; + private PtoEquipamentRepository repository; @Test public void contextLoads() { @@ -29,21 +29,21 @@ public class PtoEquipamentoRepositoryTest { @Test public void mustFindByInativoEqualsFalse(){ - Optional> list = repository.findByInativoEquals(false); + Optional> list = repository.findByInactiveEquals(false); Assertions.assertNotEquals(null, list); Assertions.assertFalse(list.isEmpty()); } @Test public void mustFindById(){ - Optional recover = repository.findById(2); + Optional recover = repository.findById(2); Assertions.assertTrue(recover.isPresent()); Assertions.assertFalse(recover.isEmpty()); } @Test public void mustSaveObject(){ - PtoEquipamentoModel obj = new PtoEquipamentoModel( + PtoEquipamentModel obj = new PtoEquipamentModel( 123, "codigo", 1, @@ -60,7 +60,7 @@ public class PtoEquipamentoRepositoryTest { @Test public void mustDeleteObject(){ - PtoEquipamentoModel obj = new PtoEquipamentoModel( + PtoEquipamentModel obj = new PtoEquipamentModel( 123, "codigo", 1, @@ -76,7 +76,7 @@ public class PtoEquipamentoRepositoryTest { int id = obj.getId(); repository.delete(obj); - Optional recover = repository.findById(id); + Optional recover = repository.findById(id); Assertions.assertFalse(recover.isPresent()); Assertions.assertTrue(recover.isEmpty()); } diff --git a/src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEventoRepositoryTest.java b/src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEventRepositoryTest.java similarity index 82% rename from src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEventoRepositoryTest.java rename to src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEventRepositoryTest.java index 5fe1d6a..29581a0 100644 --- a/src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEventoRepositoryTest.java +++ b/src/test/java/br/com/ae3tecnologia/ms/tangerino/repository/PtoEventRepositoryTest.java @@ -1,8 +1,7 @@ package br.com.ae3tecnologia.ms.tangerino.repository; -import br.com.ae3tecnologia.ms.tangerino.model.PtoEventoModel; +import br.com.ae3tecnologia.ms.tangerino.model.PtoEventModel; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -13,24 +12,23 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -import java.util.GregorianCalendar; import java.util.Optional; @DataJpaTest @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) -public class PtoEventoRepositoryTest { +public class PtoEventRepositoryTest { @Autowired private TestEntityManager em; @Autowired - private PtoEventoRepository repository; + private PtoEventRepository repository; - private PtoEventoModel obj = null; + private PtoEventModel obj = null; @BeforeEach void setUp(){ - obj = new PtoEventoModel( + obj = new PtoEventModel( 1, 123, 1, @@ -57,7 +55,7 @@ public class PtoEventoRepositoryTest { Assertions.assertNotEquals(null, obj); Assertions.assertTrue(obj.getId() > 0); int id = obj.getId(); - Optional recover = repository.findById(id); + Optional recover = repository.findById(id); Assertions.assertTrue(recover.isPresent()); Assertions.assertFalse(recover.isEmpty()); } @@ -77,7 +75,7 @@ public class PtoEventoRepositoryTest { int id = obj.getId(); repository.delete(obj); - Optional recover = repository.findById(id); + Optional recover = repository.findById(id); Assertions.assertFalse(recover.isPresent()); Assertions.assertTrue(recover.isEmpty()); } diff --git a/src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoAjusteServiceTest.java b/src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoAdjustServiceTest.java similarity index 74% rename from src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoAjusteServiceTest.java rename to src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoAdjustServiceTest.java index 896e264..2731d59 100644 --- a/src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoAjusteServiceTest.java +++ b/src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoAdjustServiceTest.java @@ -1,9 +1,8 @@ package br.com.ae3tecnologia.ms.tangerino.service; -import br.com.ae3tecnologia.ms.tangerino.model.PtoAjusteModel; -import br.com.ae3tecnologia.ms.tangerino.repository.PtoAjusteRepository; -import br.com.ae3tecnologia.ms.tangerino.repository.PtoEventoRepository; +import br.com.ae3tecnologia.ms.tangerino.model.PtoAdjustModel; +import br.com.ae3tecnologia.ms.tangerino.repository.PtoAdjustRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -12,7 +11,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import java.time.LocalDate; -import java.time.LocalDateTime; import java.time.LocalTime; import java.util.ArrayList; import java.util.List; @@ -23,21 +21,21 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.*; @ExtendWith(MockitoExtension.class) -public class PtoAjusteServiceTest { +public class PtoAdjustServiceTest { @InjectMocks - PtoAjusteService service; + PtoAdjustService service; @Mock - PtoAjusteRepository repository; + PtoAdjustRepository repository; - private PtoAjusteModel obj01; - private PtoAjusteModel obj02; - private PtoAjusteModel obj03; + private PtoAdjustModel obj01; + private PtoAdjustModel obj02; + private PtoAdjustModel obj03; @BeforeEach void setUp() { - obj01 = new PtoAjusteModel( + obj01 = new PtoAdjustModel( 123, 123, 1, @@ -48,7 +46,7 @@ public class PtoAjusteServiceTest { 1, "202304" ); - obj02 = new PtoAjusteModel( + obj02 = new PtoAdjustModel( 124, 123, 1, @@ -59,7 +57,7 @@ public class PtoAjusteServiceTest { 1, "202304" ); - obj03 = new PtoAjusteModel( + obj03 = new PtoAdjustModel( 125, 123, 1, @@ -74,7 +72,7 @@ public class PtoAjusteServiceTest { @Test public void mustFindAll() { - List list = new ArrayList<>(); + List list = new ArrayList<>(); list.add(obj01); list.add(obj02); list.add(obj03); @@ -82,7 +80,7 @@ public class PtoAjusteServiceTest { when(repository.findAll()).thenReturn(list); //test - List empList = service.findAll(); + List empList = service.findAll(); assertEquals(3, empList.size()); verify(repository, times(1)).findAll(); @@ -91,7 +89,7 @@ public class PtoAjusteServiceTest { @Test public void mustFindById(){ when(repository.findById(1)).thenReturn(Optional.of(obj01)); - PtoAjusteModel empList = service.findById(1); + PtoAdjustModel empList = service.findById(1); assertTrue(empList != null); verify(repository, times(1)).findById(1); } diff --git a/src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEquipamentoServiceTest.java b/src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEquipamentServiceTest.java similarity index 70% rename from src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEquipamentoServiceTest.java rename to src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEquipamentServiceTest.java index bf73ff9..f9e4abe 100644 --- a/src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEquipamentoServiceTest.java +++ b/src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEquipamentServiceTest.java @@ -1,8 +1,8 @@ package br.com.ae3tecnologia.ms.tangerino.service; -import br.com.ae3tecnologia.ms.tangerino.model.PtoEquipamentoModel; -import br.com.ae3tecnologia.ms.tangerino.repository.PtoEquipamentoRepository; +import br.com.ae3tecnologia.ms.tangerino.model.PtoEquipamentModel; +import br.com.ae3tecnologia.ms.tangerino.repository.PtoEquipamentRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -20,21 +20,21 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.*; @ExtendWith(MockitoExtension.class) -public class PtoEquipamentoServiceTest { +public class PtoEquipamentServiceTest { @InjectMocks - PtoEquipamentoService service; + PtoEquipamentService service; @Mock - PtoEquipamentoRepository repository; + PtoEquipamentRepository repository; - private PtoEquipamentoModel obj01; - private PtoEquipamentoModel obj02; - private PtoEquipamentoModel obj03; + private PtoEquipamentModel obj01; + private PtoEquipamentModel obj02; + private PtoEquipamentModel obj03; @BeforeEach void setUp() { - obj01 = new PtoEquipamentoModel( + obj01 = new PtoEquipamentModel( 123, "codigo", 1, @@ -44,7 +44,7 @@ public class PtoEquipamentoServiceTest { "default", true ); - obj02 = new PtoEquipamentoModel( + obj02 = new PtoEquipamentModel( 124, "codigo", 1, @@ -54,7 +54,7 @@ public class PtoEquipamentoServiceTest { "default", true ); - obj03 = new PtoEquipamentoModel( + obj03 = new PtoEquipamentModel( 123, "codigo", 1, @@ -68,7 +68,7 @@ public class PtoEquipamentoServiceTest { @Test public void mustFindAll() { - List list = new ArrayList<>(); + List list = new ArrayList<>(); list.add(obj01); list.add(obj02); list.add(obj03); @@ -76,7 +76,7 @@ public class PtoEquipamentoServiceTest { when(repository.findAll()).thenReturn(list); //test - List empList = service.findAll(); + List empList = service.findAll(); assertEquals(3, empList.size()); verify(repository, times(1)).findAll(); @@ -84,19 +84,19 @@ public class PtoEquipamentoServiceTest { @Test public void mustFindByInativo(){ - List list = new ArrayList<>(); + List list = new ArrayList<>(); list.add(obj01); - when(repository.findByInativoEquals(false)).thenReturn(Optional.of(list)); + when(repository.findByInactiveEquals(false)).thenReturn(Optional.of(list)); //test - List empList = service.findByInativo(false); + List empList = service.findByInativo(false); assertEquals(1, empList.size()); - verify(repository, times(1)).findByInativoEquals(false); + verify(repository, times(1)).findByInactiveEquals(false); } @Test public void mustFindById(){ when(repository.findById(1)).thenReturn(Optional.of(obj01)); - PtoEquipamentoModel empList = service.findById(1); + PtoEquipamentModel empList = service.findById(1); assertTrue(empList != null); verify(repository, times(1)).findById(1); } diff --git a/src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEventoServiceTest.java b/src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEventServiceTest.java similarity index 74% rename from src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEventoServiceTest.java rename to src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEventServiceTest.java index 96821ed..0394fcd 100644 --- a/src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEventoServiceTest.java +++ b/src/test/java/br/com/ae3tecnologia/ms/tangerino/service/PtoEventServiceTest.java @@ -1,10 +1,8 @@ package br.com.ae3tecnologia.ms.tangerino.service; -import br.com.ae3tecnologia.ms.tangerino.model.PtoEquipamentoModel; -import br.com.ae3tecnologia.ms.tangerino.model.PtoEventoModel; -import br.com.ae3tecnologia.ms.tangerino.repository.PtoEquipamentoRepository; -import br.com.ae3tecnologia.ms.tangerino.repository.PtoEventoRepository; +import br.com.ae3tecnologia.ms.tangerino.model.PtoEventModel; +import br.com.ae3tecnologia.ms.tangerino.repository.PtoEventRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -16,7 +14,6 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; import java.util.ArrayList; -import java.util.GregorianCalendar; import java.util.List; import java.util.Optional; @@ -25,21 +22,21 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.*; @ExtendWith(MockitoExtension.class) -public class PtoEventoServiceTest { +public class PtoEventServiceTest { @InjectMocks - PtoEventoService service; + PtoEventService service; @Mock - PtoEventoRepository repository; + PtoEventRepository repository; - private PtoEventoModel obj01; - private PtoEventoModel obj02; - private PtoEventoModel obj03; + private PtoEventModel obj01; + private PtoEventModel obj02; + private PtoEventModel obj03; @BeforeEach void setUp() { - obj01 = new PtoEventoModel( + obj01 = new PtoEventModel( 1, 123, 1, @@ -53,7 +50,7 @@ public class PtoEventoServiceTest { "202304", LocalDateTime.now() ); - obj02 = new PtoEventoModel( + obj02 = new PtoEventModel( 2, 123, 1, @@ -67,7 +64,7 @@ public class PtoEventoServiceTest { "202304", LocalDateTime.now() ); - obj03 = new PtoEventoModel( + obj03 = new PtoEventModel( 3, 123, 1, @@ -85,7 +82,7 @@ public class PtoEventoServiceTest { @Test public void mustFindAll() { - List list = new ArrayList<>(); + List list = new ArrayList<>(); list.add(obj01); list.add(obj02); list.add(obj03); @@ -93,7 +90,7 @@ public class PtoEventoServiceTest { when(repository.findAll()).thenReturn(list); //test - List empList = service.findAll(); + List empList = service.findAll(); assertEquals(3, empList.size()); verify(repository, times(1)).findAll(); @@ -102,7 +99,7 @@ public class PtoEventoServiceTest { @Test public void mustFindById(){ when(repository.findById(1)).thenReturn(Optional.of(obj01)); - PtoEventoModel empList = service.findById(1); + PtoEventModel empList = service.findById(1); assertTrue(empList != null); verify(repository, times(1)).findById(1); }