piair/MyINPulse
2
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

feat: more tests
All checks were successful
Format / formatting (push) Successful in 6s
Details
Build / build (push) Successful in 41s
Details
CI / build (push) Successful in 11s
Details

Browse Source
This commit is contained in:
Pierre Tellier 2025-04-23 11:52:00 +02:00
parent 32557f8f87
commit e7739af80b
3 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MyINPulse-back/src/main/java/enseirb/myinpulse/model/Entrepreneur.java
View File

@ -61,7 +61,7 @@ public class Entrepreneur extends User {
String school,
String course,
boolean sneeStatus) {
super(userSurname, username, primaryMail, secondaryMail, phoneNumber, false);
super(userSurname, username, primaryMail, secondaryMail, phoneNumber, true);
this.school = school;
this.course = course;
this.sneeStatus = sneeStatus;

2
MyINPulse-back/src/main/java/enseirb/myinpulse/service/UtilsService.java
View File

@ -61,7 +61,7 @@ public class UtilsService {
}
// TODO: test
Boolean isAnAdmin(String mail) {
public Boolean isAnAdmin(String mail) {
try {
long userId = this.userService.getUserByEmail(mail).getIdUser();
Administrator a = this.administratorService.getAdministratorById(userId);

36
MyINPulse-back/src/test/java/enseirb/myinpulse/AdminApiServiceTest.java
View File

@ -6,10 +6,8 @@ import static org.junit.jupiter.api.Assertions.*;
import enseirb.myinpulse.model.*;
import enseirb.myinpulse.service.AdminApiService;
import enseirb.myinpulse.service.database.AdministratorService;
import enseirb.myinpulse.service.database.AppointmentService;
import enseirb.myinpulse.service.database.EntrepreneurService;
import enseirb.myinpulse.service.database.ProjectService;
import enseirb.myinpulse.service.UtilsService;
import enseirb.myinpulse.service.database.*;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@ -19,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.server.ResponseStatusException;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.List;
@ -30,16 +29,21 @@ public class AdminApiServiceTest {
private static Administrator administrator;
private static Entrepreneur entrepreneur;
private static Appointment appt;
private static Project p;
@Autowired private AdminApiService adminApiService;
@Autowired private ProjectService projectService;
@Autowired private EntrepreneurService entrepreneurService;
@Autowired private SectionCellService sectionCellService;
@Autowired private AppointmentService appointmentService;
@Autowired private UtilsService utilsService;
@BeforeAll
static void setup(
@Autowired AdministratorService administratorService,
@Autowired ProjectService projectService,
@Autowired EntrepreneurService entrepreneurService,
@Autowired AppointmentService appoitmentService) {
@Autowired AppointmentService appoitmentService,
@Autowired SectionCellService sectionCellService) {
administratorService.addAdministrator(
new Administrator(
"admin",
@ -74,7 +78,7 @@ public class AdminApiServiceTest {
"GDProjets", "", "Entrepreneur2@inpulse.com", "", "", "", "info ofc", true);
entrepreneurService.addEntrepreneur(entrepreneur2);
Project p =
p =
projectService.addNewProject(
new Project(
"sampleProjectAdminApiService",
@ -92,9 +96,8 @@ public class AdminApiServiceTest {
LocalDate.now(),
LocalTime.now(),
LocalTime.now(),
"Salle TD 15",
"Salle TD 03",
"Discussion importante");
appoitmentService.addNewAppointment(appt);
}
private <T> List<T> IterableToList(Iterable<T> iterable) {
@ -297,15 +300,32 @@ public class AdminApiServiceTest {
@Test
void validateEntrepreneurAccount() {
assertTrue(entrepreneurService.getEntrepreneurById(entrepreneur.getIdUser()).isPending());
assertEquals(2, IterableToList(adminApiService.getPendingUsers()).size());
adminApiService.validateEntrepreneurAccount(entrepreneur.getIdUser(), "");
assertFalse(entrepreneurService.getEntrepreneurById(entrepreneur.getIdUser()).isPending());
assertEquals(1, IterableToList(adminApiService.getPendingUsers()).size());
}
@Test
void testCreateApptRepport() {
System.err.println(appt.getIdAppointment());
SectionCell s =
sectionCellService.addNewSectionCell(
new SectionCell(null, 1L, "jaja", LocalDateTime.now(), p));
appointmentService.addNewAppointment(appt);
appointmentService.updateAppointmentListSectionCell(appt.getIdAppointment(), s);
projectService.updateProjectListSectionCell(p.getIdProject(), s);
this.adminApiService.createAppointmentReport(
appt.getIdAppointment(),
new Report(null, "je rapporte de fou"),
"testAdminFull@example.com");
}
@Test
void testSetAdmin() {
assertFalse(utilsService.isAnAdmin(entrepreneur.getPrimaryMail()));
adminApiService.setAdmin(entrepreneur.getIdUser(), "");
assertTrue(utilsService.isAnAdmin(entrepreneur.getPrimaryMail()));
}
}