diff --git a/src/main/java/fr/eni/demo/bll/ClientService.java b/src/main/java/fr/eni/demo/bll/ClientService.java index 25d0d82..0d699c2 100644 --- a/src/main/java/fr/eni/demo/bll/ClientService.java +++ b/src/main/java/fr/eni/demo/bll/ClientService.java @@ -12,14 +12,6 @@ public class ClientService { private ClientRepository clientRepository; public void add(Client client) { - if (client.getPrenom() == null) { - Client clientTest = new Client(); - clientTest.setPrenom("Olivier"); - clientTest.setNom("Parpaillon"); - clientTest.setEmail("olivier@test.fr"); - clientRepository.save(clientTest); - } else { - clientRepository.save(client); - } + clientRepository.save(client); } } diff --git a/src/main/java/fr/eni/demo/bll/LocationService.java b/src/main/java/fr/eni/demo/bll/LocationService.java index 2d91aca..e3b0375 100644 --- a/src/main/java/fr/eni/demo/bll/LocationService.java +++ b/src/main/java/fr/eni/demo/bll/LocationService.java @@ -12,14 +12,6 @@ public class LocationService { LocationRepository locationRepository; public void add(Location location) { - if (location.getRue() == null || location.getCodePostal() == null || location.getVille() == null) { - Location locationTest = new Location(); - locationTest.setRue("18 Rue de la Paix"); - locationTest.setCodePostal("75000"); - locationTest.setVille("Paris"); - locationRepository.save(locationTest); - } else { - locationRepository.save(location); - } + locationRepository.save(location); } } diff --git a/src/test/java/fr/eni/demo/DemoApplicationTests.java b/src/test/java/fr/eni/demo/DemoApplicationTests.java index 67d8620..8956d23 100644 --- a/src/test/java/fr/eni/demo/DemoApplicationTests.java +++ b/src/test/java/fr/eni/demo/DemoApplicationTests.java @@ -3,6 +3,7 @@ package fr.eni.demo; import fr.eni.demo.bll.ClientService; import fr.eni.demo.bll.LocationService; import fr.eni.demo.bo.Client; +import fr.eni.demo.bo.Location; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +28,43 @@ class DemoApplicationTests { client.setPrenom("Olivier"); clientService.add(client); + System.out.println(client); + } + + @Test + @DisplayName("-- Test add Location --") + void testAddLocation() { + Location location = new Location(); + location.setRue("18 Rue de la Paix"); + location.setCodePostal("75000"); + location.setVille("Paris"); + + locationService.add(location); + System.out.println(location); + } + + @Test + @DisplayName("-- Test add Client with Location --") + void testAddClientWithLocation() { + // Création du client + Client client = new Client(); + client.setEmail("julien@test.fr"); + client.setNom("Chateau"); + client.setPrenom("Julien"); + + //Création de la location + Location location = new Location(); + location.setRue("666 Rue des Enfers"); + location.setCodePostal("44000"); + location.setVille("Nantes"); + locationService.add(location); + + //Ajout de la location au client + client.setLocation(location); + clientService.add(client); + + System.out.println(client); + System.out.println(location); } }