From 332bf2c566f96bcb142c61b8bc2aa5721d16e6e8 Mon Sep 17 00:00:00 2001 From: vanderleik Date: Thu, 21 Mar 2024 09:20:20 -0300 Subject: [PATCH] feat: VIN-391 - refatorando as classes que recebem AddressInputDTO --- .../dtos/inputs/cadastro/AddressInputDTO.java | 4 +- .../cadastro/impl/AddressServiceImplTest.java | 6 +-- .../cadastro/AdressControllerTest.java | 21 +--------- .../cadastro/PersonControllerTest.java | 22 +--------- .../cadastro/UserControllerTest.java | 19 +-------- .../converters/AddressConverter.java | 22 ++++++---- .../services/impl/AddressServiceImpl.java | 10 ++--- .../services/impl/PersonServiceImpl.java | 18 ++++---- .../dtos/inputs/AddressInputDTO.java | 4 +- .../converters/AddressConverterTest.java | 42 +++++++++++++++---- .../converters/PersonConverterTest.java | 6 +-- .../services/impl/AddressServiceImplTest.java | 12 +++--- .../services/impl/PersonServiceImplTest.java | 18 ++++---- .../services/impl/UserServiceImplTest.java | 4 +- .../controllers/AddressControllerTest.java | 5 +-- .../controllers/PersonControllerTest.java | 4 +- .../controllers/UserControllerTest.java | 4 +- 17 files changed, 98 insertions(+), 123 deletions(-) diff --git a/bff/src/main/java/com/vinhonotas/bff/interfaces/dtos/inputs/cadastro/AddressInputDTO.java b/bff/src/main/java/com/vinhonotas/bff/interfaces/dtos/inputs/cadastro/AddressInputDTO.java index 3c24d32b..3ae2058d 100644 --- a/bff/src/main/java/com/vinhonotas/bff/interfaces/dtos/inputs/cadastro/AddressInputDTO.java +++ b/bff/src/main/java/com/vinhonotas/bff/interfaces/dtos/inputs/cadastro/AddressInputDTO.java @@ -15,8 +15,8 @@ public class AddressInputDTO { private String district; private String zipCode; private String city; - private StateInputDTO uf; - private CountryInputDTO country; + private String uf; + private String country; private String phoneNumber; private LocalDateTime dthreg; private String userreg; diff --git a/bff/src/test/java/com/vinhonotas/bff/application/services/cadastro/impl/AddressServiceImplTest.java b/bff/src/test/java/com/vinhonotas/bff/application/services/cadastro/impl/AddressServiceImplTest.java index 2a4cb6e0..551590d1 100644 --- a/bff/src/test/java/com/vinhonotas/bff/application/services/cadastro/impl/AddressServiceImplTest.java +++ b/bff/src/test/java/com/vinhonotas/bff/application/services/cadastro/impl/AddressServiceImplTest.java @@ -3,8 +3,6 @@ import com.vinhonotas.bff.application.services.exceptions.BadRequestException; import com.vinhonotas.bff.client.cadastro.AddressClient; import com.vinhonotas.bff.interfaces.dtos.inputs.cadastro.AddressInputDTO; -import com.vinhonotas.bff.interfaces.dtos.inputs.cadastro.CountryInputDTO; -import com.vinhonotas.bff.interfaces.dtos.inputs.cadastro.StateInputDTO; import com.vinhonotas.bff.interfaces.dtos.outputs.cadastro.AddressOutputDTO; import com.vinhonotas.bff.interfaces.dtos.outputs.cadastro.CountryOutputDTO; import com.vinhonotas.bff.interfaces.dtos.outputs.cadastro.StateOutputDTO; @@ -198,8 +196,8 @@ private AddressInputDTO createAddressInputDTO() { .district("district") .zipCode("00000-000") .city("Blumenau") - .uf(Mockito.mock(StateInputDTO.class)) - .country(Mockito.mock(CountryInputDTO.class)) + .uf("SC") + .country("Brasil") .phoneNumber("0000000000") .build(); } diff --git a/bff/src/test/java/com/vinhonotas/bff/interfaces/controllers/cadastro/AdressControllerTest.java b/bff/src/test/java/com/vinhonotas/bff/interfaces/controllers/cadastro/AdressControllerTest.java index ca83c8e9..605e3da6 100644 --- a/bff/src/test/java/com/vinhonotas/bff/interfaces/controllers/cadastro/AdressControllerTest.java +++ b/bff/src/test/java/com/vinhonotas/bff/interfaces/controllers/cadastro/AdressControllerTest.java @@ -4,8 +4,6 @@ import com.vinhonotas.bff.application.services.cadastro.AddressService; import com.vinhonotas.bff.application.services.exceptions.BadRequestException; import com.vinhonotas.bff.interfaces.dtos.inputs.cadastro.AddressInputDTO; -import com.vinhonotas.bff.interfaces.dtos.inputs.cadastro.CountryInputDTO; -import com.vinhonotas.bff.interfaces.dtos.inputs.cadastro.StateInputDTO; import com.vinhonotas.bff.interfaces.dtos.outputs.cadastro.AddressOutputDTO; import com.vinhonotas.bff.interfaces.dtos.outputs.cadastro.CountryOutputDTO; import com.vinhonotas.bff.interfaces.dtos.outputs.cadastro.StateOutputDTO; @@ -208,24 +206,9 @@ private AddressInputDTO createAddressInputDTO() { .district("Bairro 1") .zipCode("00000-000") .city("Cidade 1") - .uf(createStateInputDTO()) - .country(createCountryInputDTO()) - .phoneNumber("00000000000") - .build(); - } - - private StateInputDTO createStateInputDTO() { - return StateInputDTO.builder() - .stateName("Santa Catarina") .uf("SC") - .country(createCountryInputDTO()) - .build(); - } - - private CountryInputDTO createCountryInputDTO() { - return CountryInputDTO.builder() - .countryName("Brasil") - .continentName("América do Sul") + .country("Brasil") + .phoneNumber("00000000000") .build(); } diff --git a/bff/src/test/java/com/vinhonotas/bff/interfaces/controllers/cadastro/PersonControllerTest.java b/bff/src/test/java/com/vinhonotas/bff/interfaces/controllers/cadastro/PersonControllerTest.java index 094d92f2..4d9c4ce7 100644 --- a/bff/src/test/java/com/vinhonotas/bff/interfaces/controllers/cadastro/PersonControllerTest.java +++ b/bff/src/test/java/com/vinhonotas/bff/interfaces/controllers/cadastro/PersonControllerTest.java @@ -3,11 +3,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.vinhonotas.bff.application.services.cadastro.PersonService; import com.vinhonotas.bff.application.services.exceptions.BadRequestException; -import com.vinhonotas.bff.interfaces.controllers.cadastro.PersonController; import com.vinhonotas.bff.interfaces.dtos.inputs.cadastro.AddressInputDTO; -import com.vinhonotas.bff.interfaces.dtos.inputs.cadastro.CountryInputDTO; import com.vinhonotas.bff.interfaces.dtos.inputs.cadastro.PersonInputDTO; -import com.vinhonotas.bff.interfaces.dtos.inputs.cadastro.StateInputDTO; import com.vinhonotas.bff.interfaces.dtos.outputs.cadastro.AddressOutputDTO; import com.vinhonotas.bff.interfaces.dtos.outputs.cadastro.CountryOutputDTO; import com.vinhonotas.bff.interfaces.dtos.outputs.cadastro.PersonOutputDTO; @@ -232,28 +229,13 @@ private AddressInputDTO createAddressInputDTO() { .complement("Complemento da pessoa") .district("Bairro da pessoa") .city("Cidade da pessoa") - .uf(createStateInputDTO()) - .country(createCountryInputDTO()) + .uf("SC") + .country("Brasil") .zipCode("12345678") .phoneNumber("12345678910") .build(); } - private CountryInputDTO createCountryInputDTO() { - return CountryInputDTO.builder() - .countryName("Brasil") - .continentName("América do Sul") - .build(); - } - - private StateInputDTO createStateInputDTO() { - return StateInputDTO.builder() - .stateName("Nome do estado") - .uf("UF") - .country(createCountryInputDTO()) - .build(); - } - private PersonOutputDTO createPersonOutputDTO() { return PersonOutputDTO.builder() .id(UUID.fromString("123e4567-e89b-12d3-a456-426614174000")) diff --git a/bff/src/test/java/com/vinhonotas/bff/interfaces/controllers/cadastro/UserControllerTest.java b/bff/src/test/java/com/vinhonotas/bff/interfaces/controllers/cadastro/UserControllerTest.java index 016164bf..927c63fc 100644 --- a/bff/src/test/java/com/vinhonotas/bff/interfaces/controllers/cadastro/UserControllerTest.java +++ b/bff/src/test/java/com/vinhonotas/bff/interfaces/controllers/cadastro/UserControllerTest.java @@ -232,30 +232,15 @@ private AddressInputDTO createAddressInputDTO() { .addressDescription("Rua Teste") .addressNumber(123) .city("Cidade Teste") - .uf(createStateInputDTO()) + .uf("SC") .complement("Complemento Teste") - .country(createCountryInputDTO()) + .country("Brasil") .district("Bairro Teste") .phoneNumber("123456789") .zipCode("12345678") .build(); } - private StateInputDTO createStateInputDTO() { - return StateInputDTO.builder() - .stateName("São Paulo") - .uf("SP") - .country(createCountryInputDTO()) - .build(); - } - - private CountryInputDTO createCountryInputDTO() { - return CountryInputDTO.builder() - .countryName("Brasil") - .continentName("América do Sul") - .build(); - } - private UserOutputDTO createUserOutputDTO() { return UserOutputDTO.builder() .id(UUID.fromString("8d39bcba-cb01-4103-b562-93c84a89c972")) diff --git a/cadastro/src/main/java/com/vinhonotas/cadastro/application/converters/AddressConverter.java b/cadastro/src/main/java/com/vinhonotas/cadastro/application/converters/AddressConverter.java index c5f0abcc..4a7f5b6f 100644 --- a/cadastro/src/main/java/com/vinhonotas/cadastro/application/converters/AddressConverter.java +++ b/cadastro/src/main/java/com/vinhonotas/cadastro/application/converters/AddressConverter.java @@ -1,6 +1,10 @@ package com.vinhonotas.cadastro.application.converters; import com.vinhonotas.cadastro.domain.entities.AddressEntity; +import com.vinhonotas.cadastro.domain.entities.CountryEntity; +import com.vinhonotas.cadastro.domain.entities.StateEntity; +import com.vinhonotas.cadastro.infrastructure.CountryRepository; +import com.vinhonotas.cadastro.infrastructure.StateRepository; import com.vinhonotas.cadastro.interfaces.dtos.inputs.AddressInputDTO; import com.vinhonotas.cadastro.interfaces.dtos.outputs.AddressOutputDTO; import lombok.RequiredArgsConstructor; @@ -16,8 +20,12 @@ public class AddressConverter { private final StateConverter stateConverter; private final CountryConverter countryConverter; + private final StateRepository stateRepository; + private final CountryRepository countryRepository; public AddressEntity convertToEntity(AddressInputDTO addressInputDTO) { + StateEntity state = stateRepository.findByUf(addressInputDTO.getUf()); + CountryEntity country = countryRepository.findByCountryName(addressInputDTO.getCountry()); return AddressEntity.builder() .addressDescription(addressInputDTO.getAddressDescription()) .addressNumber(addressInputDTO.getAddressNumber()) @@ -25,8 +33,8 @@ public AddressEntity convertToEntity(AddressInputDTO addressInputDTO) { .district(addressInputDTO.getDistrict()) .zipCode(addressInputDTO.getZipCode()) .city(addressInputDTO.getCity()) - .uf(stateConverter.convertToEntity(addressInputDTO.getUf())) - .country(countryConverter.convertToEntity(addressInputDTO.getCountry())) + .uf(state) + .country(country) .phoneNumber(addressInputDTO.getPhoneNumber()) .userreg(addressInputDTO.getUserreg()) .dthreg(LocalDateTime.now()) @@ -47,10 +55,8 @@ public AddressEntity convertToEntityUpdate(AddressEntity entity, UUID id, Addres .district(addressInputDTO.getDistrict() != null ? addressInputDTO.getDistrict() : entity.getDistrict()) .zipCode(addressInputDTO.getZipCode() != null ? addressInputDTO.getZipCode() : entity.getZipCode()) .city(addressInputDTO.getCity() != null ? addressInputDTO.getCity() : entity.getCity()) - .uf(addressInputDTO.getUf() != null ? stateConverter.convertToEntity(addressInputDTO.getUf()) : entity - .getUf()) - .country(addressInputDTO.getCountry() != null ? countryConverter.convertToEntity(addressInputDTO - .getCountry()) : entity.getCountry()) + .uf(entity.getUf()) + .country(entity.getCountry()) .phoneNumber(addressInputDTO.getPhoneNumber() != null ? addressInputDTO.getPhoneNumber() : entity .getPhoneNumber()) .userreg(addressInputDTO.getUserreg() != null ? addressInputDTO.getUserreg() : entity.getUserreg()) @@ -104,8 +110,8 @@ public AddressInputDTO convertToInputDTO(AddressEntity address) { .district(address.getDistrict()) .zipCode(address.getZipCode()) .city(address.getCity()) - .uf(stateConverter.convertToInputDTO(address.getUf())) - .country(countryConverter.convertToInputDTO(address.getCountry())) + .uf(address.getUf().getUf()) + .country(address.getCountry().getCountryName()) .phoneNumber(address.getPhoneNumber()) .userreg(address.getUserreg()) .dthreg(address.getDthreg()) diff --git a/cadastro/src/main/java/com/vinhonotas/cadastro/application/services/impl/AddressServiceImpl.java b/cadastro/src/main/java/com/vinhonotas/cadastro/application/services/impl/AddressServiceImpl.java index 08c238cc..3055753d 100644 --- a/cadastro/src/main/java/com/vinhonotas/cadastro/application/services/impl/AddressServiceImpl.java +++ b/cadastro/src/main/java/com/vinhonotas/cadastro/application/services/impl/AddressServiceImpl.java @@ -55,17 +55,15 @@ public AddressEntity create(AddressInputDTO addressInputDTO) { } private CountryEntity getCountryEntity(AddressInputDTO addressInputDTO) { - log.info("Buscando país pelo id: {}", addressInputDTO.getCountry().getId()); - CountryEntity country = countryRepository.findById(UUID.fromString(addressInputDTO.getCountry().getId())) - .orElseThrow(() -> new BadRequestException(MessagesConstants.COUNTRY_NOT_FOUND_WITH_ID + addressInputDTO.getCountry().getId())); + log.info("Buscando país pelo nome: {}", addressInputDTO.getCountry()); + CountryEntity country = countryRepository.findByCountryName(addressInputDTO.getCountry()); log.info("País encontrado: {}", country.toString()); return country; } private StateEntity getStateEntity(AddressInputDTO addressInputDTO) { - log.info("Buscando estado pelo id: {}", addressInputDTO.getUf().getId()); - StateEntity state = stateRepository.findById(UUID.fromString(addressInputDTO.getUf().getId())) - .orElseThrow(() -> new BadRequestException(MessagesConstants.STATE_NOT_FOUND_WITH_ID + addressInputDTO.getUf().getId())); + log.info("Buscando estado pela UF: {}", addressInputDTO.getUf()); + StateEntity state = stateRepository.findByUf(addressInputDTO.getUf()); log.info("Estado encontrado: {}", state.toString()); return state; } diff --git a/cadastro/src/main/java/com/vinhonotas/cadastro/application/services/impl/PersonServiceImpl.java b/cadastro/src/main/java/com/vinhonotas/cadastro/application/services/impl/PersonServiceImpl.java index fba2e99b..ae2280f2 100644 --- a/cadastro/src/main/java/com/vinhonotas/cadastro/application/services/impl/PersonServiceImpl.java +++ b/cadastro/src/main/java/com/vinhonotas/cadastro/application/services/impl/PersonServiceImpl.java @@ -49,24 +49,22 @@ public PersonEntity create(PersonInputDTO personInputDTO) { } private void existsCountryByCountryName(PersonInputDTO personInputDTO) { - CountryEntity country = countryService.getByName(personInputDTO.getAddress().getCountry().getCountryName()); + CountryEntity country = countryService.getByName(personInputDTO.getAddress().getCountry()); if (Objects.isNull(country)) { - throw new BadRequestException(MessagesConstants.COUNTRY_NOT_FOUND_WITH_NAME + personInputDTO.getAddress().getCountry().getCountryName()); + throw new BadRequestException(MessagesConstants.COUNTRY_NOT_FOUND_WITH_NAME + personInputDTO.getAddress().getCountry()); } log.info("Salvando um país com os dados: {}", country.toString()); - personInputDTO.getAddress().setCountry(countryConverter.convertToInputDTO(country)); - personInputDTO.getAddress().getUf().setCountry(countryConverter.convertToInputDTO(country)); + personInputDTO.getAddress().setCountry(countryConverter.convertToInputDTO(country).getCountryName()); } private void existsStateByUf(PersonInputDTO personInputDTO) { - StateEntity state = stateService.getByUf(personInputDTO.getAddress().getUf().getUf()); + StateEntity state = stateService.getByUf(personInputDTO.getAddress().getUf()); if (Objects.isNull(state)) { log.error("create :: Ocorreu um erro: {}", MessagesConstants.STATE_NOT_FOUND); throw new BadRequestException(MessagesConstants.STATE_NOT_FOUND); } else { log.info("Salvando um estado com os dados: {}", state.toString()); - personInputDTO.getAddress().getUf().setId(state.getId().toString()); - personInputDTO.getAddress().getUf().setStateName(state.getStateName()); + personInputDTO.getAddress().setUf(state.getUf()); } } @@ -142,15 +140,15 @@ private void updatePersonAddress(PersonInputDTO personInputDTO, PersonEntity exi address.setCity(personInputDTO.getAddress().getCity()); address.setPhoneNumber(personInputDTO.getAddress().getPhoneNumber()); - StateEntity state = stateService.getByUf(personInputDTO.getAddress().getUf().getUf()); + StateEntity state = stateService.getByUf(personInputDTO.getAddress().getUf()); if (state == null) { throw new BadRequestException(MessagesConstants.STATE_NOT_FOUND); } address.setUf(state); - CountryEntity country = countryService.getByName(personInputDTO.getAddress().getCountry().getCountryName()); + CountryEntity country = countryService.getByName(personInputDTO.getAddress().getCountry()); if (country == null) { - throw new BadRequestException(MessagesConstants.COUNTRY_NOT_FOUND_WITH_NAME + personInputDTO.getAddress().getCountry().getCountryName()); + throw new BadRequestException(MessagesConstants.COUNTRY_NOT_FOUND_WITH_NAME + personInputDTO.getAddress().getCountry()); } address.setCountry(country); } diff --git a/cadastro/src/main/java/com/vinhonotas/cadastro/interfaces/dtos/inputs/AddressInputDTO.java b/cadastro/src/main/java/com/vinhonotas/cadastro/interfaces/dtos/inputs/AddressInputDTO.java index c941dd8e..3360aeec 100644 --- a/cadastro/src/main/java/com/vinhonotas/cadastro/interfaces/dtos/inputs/AddressInputDTO.java +++ b/cadastro/src/main/java/com/vinhonotas/cadastro/interfaces/dtos/inputs/AddressInputDTO.java @@ -15,8 +15,8 @@ public class AddressInputDTO { private String district; private String zipCode; private String city; - private StateInputDTO uf; - private CountryInputDTO country; + private String uf; + private String country; private String phoneNumber; private LocalDateTime dthreg; private String userreg; diff --git a/cadastro/src/test/java/com/vinhonotas/cadastro/application/converters/AddressConverterTest.java b/cadastro/src/test/java/com/vinhonotas/cadastro/application/converters/AddressConverterTest.java index bab69904..30500811 100644 --- a/cadastro/src/test/java/com/vinhonotas/cadastro/application/converters/AddressConverterTest.java +++ b/cadastro/src/test/java/com/vinhonotas/cadastro/application/converters/AddressConverterTest.java @@ -3,6 +3,8 @@ import com.vinhonotas.cadastro.domain.entities.AddressEntity; import com.vinhonotas.cadastro.domain.entities.CountryEntity; import com.vinhonotas.cadastro.domain.entities.StateEntity; +import com.vinhonotas.cadastro.infrastructure.CountryRepository; +import com.vinhonotas.cadastro.infrastructure.StateRepository; import com.vinhonotas.cadastro.interfaces.dtos.inputs.AddressInputDTO; import com.vinhonotas.cadastro.interfaces.dtos.inputs.CountryInputDTO; import com.vinhonotas.cadastro.interfaces.dtos.inputs.StateInputDTO; @@ -34,6 +36,10 @@ class AddressConverterTest { private StateConverter stateConverter; @Mock private CountryConverter countryConverter; + @Mock + private StateRepository stateRepository; + @Mock + private CountryRepository countryRepository; private AddressInputDTO addressInputDTO; private AddressEntity addressEntity; @@ -49,6 +55,9 @@ void setUp() { @Test @DisplayName("Teste de conversão de AddressInputDTO para AddressEntity") void testToEntity() { + when(stateRepository.findByUf(Mockito.anyString())).thenReturn(createStateEntity()); + when(countryRepository.findByCountryName(Mockito.anyString())).thenReturn(createCountryEntity()); + AddressEntity addressEntity = assertDoesNotThrow(()-> addressConverter.convertToEntity(addressInputDTO)); assertNotNull(addressEntity); assertEquals(addressInputDTO.getAddressDescription(), addressEntity.getAddressDescription()); @@ -57,8 +66,8 @@ void testToEntity() { assertEquals(addressInputDTO.getDistrict(), addressEntity.getDistrict()); assertEquals(addressInputDTO.getZipCode(), addressEntity.getZipCode()); assertEquals(addressInputDTO.getCity(), addressEntity.getCity()); - assertEquals(stateConverter.convertToEntity(addressInputDTO.getUf()), addressEntity.getUf()); - assertEquals(countryConverter.convertToEntity(addressInputDTO.getCountry()), addressEntity.getCountry()); + assertEquals(createStateEntity(), addressEntity.getUf()); + assertEquals(createCountryEntity(), addressEntity.getCountry()); assertEquals(addressInputDTO.getPhoneNumber(), addressEntity.getPhoneNumber()); } @@ -75,8 +84,8 @@ void testToEntityUpdate() { assertEquals(addressInputDTO.getDistrict(), addressEntityUpdate.getDistrict()); assertEquals(addressInputDTO.getZipCode(), addressEntityUpdate.getZipCode()); assertEquals(addressInputDTO.getCity(), addressEntityUpdate.getCity()); - assertEquals(stateConverter.convertToEntity(addressInputDTO.getUf()), addressEntityUpdate.getUf()); - assertEquals(countryConverter.convertToEntity(addressInputDTO.getCountry()), addressEntityUpdate.getCountry()); + assertEquals(createStateEntity(), addressEntityUpdate.getUf()); + assertEquals(createCountryEntity(), addressEntityUpdate.getCountry()); assertEquals(addressInputDTO.getPhoneNumber(), addressEntityUpdate.getPhoneNumber()); } @@ -161,8 +170,8 @@ private AddressEntity createAddressEntity() { .district("district") .zipCode("00000-000") .city("Blumenau") - .uf(Mockito.mock(StateEntity.class)) - .country(Mockito.mock(CountryEntity.class)) + .uf(createStateEntity()) + .country(createCountryEntity()) .phoneNumber("0000000000") .build(); } @@ -175,8 +184,8 @@ private AddressInputDTO createAddressInputDTO() { .district("district") .zipCode("00000-000") .city("Blumenau") - .uf(createStateInputDTO()) - .country(createCountryInputDTO()) + .uf("SC") + .country("Brasil") .phoneNumber("0000000000") .build(); } @@ -189,6 +198,23 @@ private StateInputDTO createStateInputDTO() { .build(); } + private StateEntity createStateEntity() { + return StateEntity.builder() + .id(UUID.fromString("f5d2e9e0-0b7e-4b1e-9b0a-0e9f5b9b6b1a")) + .stateName("Santa Catarina") + .uf("SC") + .country(createCountryEntity()) + .build(); + } + + private CountryEntity createCountryEntity() { + return CountryEntity.builder() + .id(UUID.fromString("f5d2e9e0-0b7e-4b1e-9b0a-0e9f5b9b6b1a")) + .countryName("Brasil") + .continentName("America do Sul") + .build(); + } + private CountryInputDTO createCountryInputDTO() { return CountryInputDTO.builder() .countryName("Brasil") diff --git a/cadastro/src/test/java/com/vinhonotas/cadastro/application/converters/PersonConverterTest.java b/cadastro/src/test/java/com/vinhonotas/cadastro/application/converters/PersonConverterTest.java index a4c2149d..c435ffa3 100644 --- a/cadastro/src/test/java/com/vinhonotas/cadastro/application/converters/PersonConverterTest.java +++ b/cadastro/src/test/java/com/vinhonotas/cadastro/application/converters/PersonConverterTest.java @@ -5,9 +5,7 @@ import com.vinhonotas.cadastro.domain.entities.PersonEntity; import com.vinhonotas.cadastro.domain.entities.StateEntity; import com.vinhonotas.cadastro.interfaces.dtos.inputs.AddressInputDTO; -import com.vinhonotas.cadastro.interfaces.dtos.inputs.CountryInputDTO; import com.vinhonotas.cadastro.interfaces.dtos.inputs.PersonInputDTO; -import com.vinhonotas.cadastro.interfaces.dtos.inputs.StateInputDTO; import com.vinhonotas.cadastro.interfaces.dtos.outputs.AddressOutputDTO; import com.vinhonotas.cadastro.interfaces.dtos.outputs.CountryOutputDTO; import com.vinhonotas.cadastro.interfaces.dtos.outputs.PersonOutputDTO; @@ -164,8 +162,8 @@ private AddressInputDTO createAddressInputDTO() { .district("Bairro 1") .zipCode("00000-000") .city("Cidade 1") - .uf(Mockito.mock(StateInputDTO.class)) - .country(Mockito.mock(CountryInputDTO.class)) + .uf("SC") + .country("Brasil") .phoneNumber("00000000000") .build(); } diff --git a/cadastro/src/test/java/com/vinhonotas/cadastro/application/services/impl/AddressServiceImplTest.java b/cadastro/src/test/java/com/vinhonotas/cadastro/application/services/impl/AddressServiceImplTest.java index f16a40b0..caed5de8 100644 --- a/cadastro/src/test/java/com/vinhonotas/cadastro/application/services/impl/AddressServiceImplTest.java +++ b/cadastro/src/test/java/com/vinhonotas/cadastro/application/services/impl/AddressServiceImplTest.java @@ -62,8 +62,8 @@ void setUp() { @Test @DisplayName("Teste de criação de endereço") void testCreateSucesso() { - when(countryRepository.findById(UUID.fromString(addressInputDTO.getCountry().getId()))).thenReturn(Optional.of(brasilEntity)); - when(stateRepository.findById(UUID.fromString(addressInputDTO.getUf().getId()))).thenReturn(Optional.of(createSaoPauloEntity())); + when(countryRepository.findByCountryName(addressInputDTO.getCountry())).thenReturn(brasilEntity); + when(stateRepository.findByUf(addressInputDTO.getUf())).thenReturn(createSaoPauloEntity()); when(addressConverter.convertToEntity(addressInputDTO)).thenReturn(addressEntity); when(addressRepository.save(addressEntity)).thenReturn(addressEntity); @@ -147,8 +147,8 @@ void testGetByIdErro() { @Test @DisplayName("Teste de atualização de endereço") void testUpdateSucesso() { - when(stateRepository.findById(UUID.fromString(addressInputDTO.getUf().getId()))).thenReturn(Optional.of(createSaoPauloEntity())); - when(countryRepository.findById(UUID.fromString(addressInputDTO.getCountry().getId()))).thenReturn(Optional.of(brasilEntity)); + when(stateRepository.findByUf(addressInputDTO.getUf())).thenReturn(createSaoPauloEntity()); + when(countryRepository.findByCountryName(addressInputDTO.getCountry())).thenReturn(brasilEntity); when(addressRepository.findById(addressEntity.getId())).thenReturn(Optional.of(addressEntity)); when(addressConverter.convertToEntityUpdate(addressEntity, addressEntity.getId(), addressInputDTO)).thenReturn(addressEntity); when(addressRepository.save(addressEntity)).thenReturn(addressEntity); @@ -221,8 +221,8 @@ private AddressInputDTO createAddressInputDTO() { .district("Centro") .zipCode("00000-000") .city("São Paulo") - .uf(createStateInputDTO()) - .country(createCountryInputDTO()) + .uf("SC") + .country("Brasil") .phoneNumber("11999999999") .build(); } diff --git a/cadastro/src/test/java/com/vinhonotas/cadastro/application/services/impl/PersonServiceImplTest.java b/cadastro/src/test/java/com/vinhonotas/cadastro/application/services/impl/PersonServiceImplTest.java index 1015ec1e..1743218e 100644 --- a/cadastro/src/test/java/com/vinhonotas/cadastro/application/services/impl/PersonServiceImplTest.java +++ b/cadastro/src/test/java/com/vinhonotas/cadastro/application/services/impl/PersonServiceImplTest.java @@ -63,8 +63,9 @@ void setUp() { @Test @DisplayName("Teste de criação de pessoa com sucesso") void testCreateSuccess() { - when(stateService.getByUf(inputDTO.getAddress().getUf().getUf())).thenReturn(state); - when(countryService.getByName(inputDTO.getAddress().getCountry().getCountryName())).thenReturn(createCountry()); + when(stateService.getByUf(inputDTO.getAddress().getUf())).thenReturn(state); + when(countryService.getByName(inputDTO.getAddress().getCountry())).thenReturn(createCountry()); + when(countryConverter.convertToInputDTO(createCountry())).thenReturn(createCountryInputDTO()); when(personConverter.convertToEntity(inputDTO)).thenReturn(entity); when(personRepository.save(entity)).thenReturn(entity); @@ -81,8 +82,9 @@ void testCreateSuccess() { @Test @DisplayName("Teste de criação de pessoa com exceção") void testCreateException() { - when(stateService.getByUf(inputDTO.getAddress().getUf().getUf())).thenReturn(state); - when(countryService.getByName(inputDTO.getAddress().getCountry().getCountryName())).thenReturn(createCountry()); + when(countryConverter.convertToInputDTO(createCountry())).thenReturn(createCountryInputDTO()); + when(stateService.getByUf(inputDTO.getAddress().getUf())).thenReturn(state); + when(countryService.getByName(inputDTO.getAddress().getCountry())).thenReturn(createCountry()); when(personConverter.convertToEntity(inputDTO)).thenReturn(entity); when(personRepository.save(entity)).thenThrow(BadRequestException.class); @@ -159,8 +161,8 @@ void testGetByNameException() { @DisplayName("Deve atualizar uma pessoa") void testUpdate() { when(personRepository.findById(UUID.fromString("24690839-a007-4af7-b4fe-9e81e42b7465"))).thenReturn(Optional.of(entity)); - when(stateService.getByUf(inputDTO.getAddress().getUf().getUf())).thenReturn(state); - when(countryService.getByName(inputDTO.getAddress().getCountry().getCountryName())).thenReturn(createCountry()); + when(stateService.getByUf(inputDTO.getAddress().getUf())).thenReturn(state); + when(countryService.getByName(inputDTO.getAddress().getCountry())).thenReturn(createCountry()); when(personRepository.save(entity)).thenReturn(entity); PersonEntity entity = assertDoesNotThrow(() -> personService.update(UUID.fromString("24690839-a007-4af7-b4fe-9e81e42b7465"), inputDTO)); @@ -244,8 +246,8 @@ private AddressInputDTO createAddressInputDTO() { .district("Bairro 1") .zipCode("99999999") .city("Cidade 1") - .uf(createUfInputDTO()) - .country(createCountryInputDTO()) + .uf("SC") + .country("Brasil") .phoneNumber("47999999999") .build(); } diff --git a/cadastro/src/test/java/com/vinhonotas/cadastro/application/services/impl/UserServiceImplTest.java b/cadastro/src/test/java/com/vinhonotas/cadastro/application/services/impl/UserServiceImplTest.java index d23aa689..052c919d 100644 --- a/cadastro/src/test/java/com/vinhonotas/cadastro/application/services/impl/UserServiceImplTest.java +++ b/cadastro/src/test/java/com/vinhonotas/cadastro/application/services/impl/UserServiceImplTest.java @@ -253,8 +253,8 @@ private AddressInputDTO createAddressInputDTO() { .district("Bairro 1") .zipCode("99999999") .city("Cidade 1") - .uf(createUfInputDTO()) - .country(createCountryInputDTO()) + .uf("SC") + .country("Brasil") .phoneNumber("47999999999") .build(); } diff --git a/cadastro/src/test/java/com/vinhonotas/cadastro/interfaces/controllers/AddressControllerTest.java b/cadastro/src/test/java/com/vinhonotas/cadastro/interfaces/controllers/AddressControllerTest.java index 9d012e59..81cdc640 100644 --- a/cadastro/src/test/java/com/vinhonotas/cadastro/interfaces/controllers/AddressControllerTest.java +++ b/cadastro/src/test/java/com/vinhonotas/cadastro/interfaces/controllers/AddressControllerTest.java @@ -17,7 +17,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; @@ -250,8 +249,8 @@ private AddressInputDTO createAddressInputDTO() { .district("Bairro 1") .zipCode("00000-000") .city("Cidade 1") - .uf(createStateInputDTO()) - .country(createCountryInputDTO()) + .uf("SC") + .country("Brasil") .phoneNumber("00000000000") .build(); } diff --git a/cadastro/src/test/java/com/vinhonotas/cadastro/interfaces/controllers/PersonControllerTest.java b/cadastro/src/test/java/com/vinhonotas/cadastro/interfaces/controllers/PersonControllerTest.java index a90c2b05..183de5d2 100644 --- a/cadastro/src/test/java/com/vinhonotas/cadastro/interfaces/controllers/PersonControllerTest.java +++ b/cadastro/src/test/java/com/vinhonotas/cadastro/interfaces/controllers/PersonControllerTest.java @@ -311,8 +311,8 @@ private AddressInputDTO createAddressInputDTO() { .complement("Complemento da pessoa") .district("Bairro da pessoa") .city("Cidade da pessoa") - .uf(createStateInputDTO()) - .country(createCountryInputDTO()) + .uf("SC") + .country("Brasil") .zipCode("12345678") .phoneNumber("12345678910") .build(); diff --git a/cadastro/src/test/java/com/vinhonotas/cadastro/interfaces/controllers/UserControllerTest.java b/cadastro/src/test/java/com/vinhonotas/cadastro/interfaces/controllers/UserControllerTest.java index b980b3e7..ad7f1f4f 100644 --- a/cadastro/src/test/java/com/vinhonotas/cadastro/interfaces/controllers/UserControllerTest.java +++ b/cadastro/src/test/java/com/vinhonotas/cadastro/interfaces/controllers/UserControllerTest.java @@ -313,9 +313,9 @@ private AddressInputDTO createAddressInputDTO() { .addressDescription("Rua Teste") .addressNumber(123) .city("Cidade Teste") - .uf(Mockito.mock(StateInputDTO.class)) + .uf("SC") .complement("Complemento Teste") - .country(Mockito.mock(CountryInputDTO.class)) + .country("Brasil") .district("Bairro Teste") .phoneNumber("123456789") .zipCode("12345678")