diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/EntrepreneurService.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/EntrepreneurService.java index 67dbddf..84f1613 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/EntrepreneurService.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/EntrepreneurService.java @@ -124,6 +124,7 @@ public class EntrepreneurService { } public void validateEntrepreneurById(Long id) { + System.out.println("\nVALIDATING\n"); Optional e = this.entrepreneurRepository.findById(id); if (e.isEmpty()) { throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Entrepreneur n'existe pas"); diff --git a/MyINPulse-back/src/test/java/enseirb/myinpulse/AdminApiServiceTest.java b/MyINPulse-back/src/test/java/enseirb/myinpulse/AdminApiServiceTest.java index b287b97..5630699 100644 --- a/MyINPulse-back/src/test/java/enseirb/myinpulse/AdminApiServiceTest.java +++ b/MyINPulse-back/src/test/java/enseirb/myinpulse/AdminApiServiceTest.java @@ -29,8 +29,10 @@ public class AdminApiServiceTest { private static long administratorid; private static Administrator administrator; private static Entrepreneur entrepreneur; + private static Appointment appt; @Autowired private AdminApiService adminApiService; @Autowired private ProjectService projectService; + @Autowired private EntrepreneurService entrepreneurService; @BeforeAll static void setup( @@ -84,7 +86,7 @@ public class AdminApiServiceTest { entrepreneurService.updateEntrepreneurProjectParticipation(entrepreneur2.getIdUser(), p); - Appointment a = + appt = new Appointment( null, LocalDate.now(), @@ -92,7 +94,7 @@ public class AdminApiServiceTest { LocalTime.now(), "Salle TD 15", "Discussion importante"); - appoitmentService.addNewAppointment(a); + appoitmentService.addNewAppointment(appt); } private List IterableToList(Iterable iterable) { @@ -291,4 +293,19 @@ public class AdminApiServiceTest { this.adminApiService.getUpcomingAppointments("Entrepreneur2@inpulse.com"); assertEquals(0, IterableToList(a).size()); } + + @Test + void validateEntrepreneurAccount() { + assertTrue(entrepreneurService.getEntrepreneurById(entrepreneur.getIdUser()).isPending()); + adminApiService.validateEntrepreneurAccount(entrepreneur.getIdUser(), ""); + assertFalse(entrepreneurService.getEntrepreneurById(entrepreneur.getIdUser()).isPending()); + } + + @Test + void testCreateApptRepport() { + this.adminApiService.createAppointmentReport( + appt.getIdAppointment(), + new Report(null, "je rapporte de fou"), + "testAdminFull@example.com"); + } }