Compare commits
5 Commits
d31bf259dd
...
backend-te
Author | SHA1 | Date | |
---|---|---|---|
f3c5401b07 | |||
f2448a029f | |||
d4533ea725 | |||
255af7ee7f | |||
3b308cfa6d |
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,3 +6,4 @@ docker-compose.yaml
|
|||||||
node_modules
|
node_modules
|
||||||
.vscode
|
.vscode
|
||||||
postgres/data
|
postgres/data
|
||||||
|
bundled.yaml
|
||||||
|
@ -95,4 +95,22 @@ public class EntrepreneurApi {
|
|||||||
@RequestBody Project project, @AuthenticationPrincipal Jwt principal) {
|
@RequestBody Project project, @AuthenticationPrincipal Jwt principal) {
|
||||||
entrepreneurApiService.requestNewProject(project, principal.getClaimAsString("email"));
|
entrepreneurApiService.requestNewProject(project, principal.getClaimAsString("email"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* <p>Endpoint to check if project is has already been validated by an admin
|
||||||
|
*/
|
||||||
|
@GetMapping("/entrepreneur/projects/project-is-active")
|
||||||
|
public Boolean checkIfProjectValidated(@AuthenticationPrincipal Jwt principal) {
|
||||||
|
return entrepreneurApiService.checkIfEntrepreneurProjectActive(
|
||||||
|
principal.getClaimAsString("email"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* <p>Endpoint to check if a user requested a project (used when project is pending)
|
||||||
|
*/
|
||||||
|
@GetMapping("/entrepreneur/projects/has-pending-request")
|
||||||
|
public Boolean checkIfHasRequested(@AuthenticationPrincipal Jwt principal) {
|
||||||
|
return entrepreneurApiService.entrepreneurHasPendingRequestedProject(
|
||||||
|
principal.getClaimAsString("email"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,7 @@ package enseirb.myinpulse.controller;
|
|||||||
|
|
||||||
import enseirb.myinpulse.model.Entrepreneur;
|
import enseirb.myinpulse.model.Entrepreneur;
|
||||||
import enseirb.myinpulse.service.EntrepreneurApiService;
|
import enseirb.myinpulse.service.EntrepreneurApiService;
|
||||||
|
import enseirb.myinpulse.service.UtilsService;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
@ -14,13 +15,15 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
public class UnauthApi {
|
public class UnauthApi {
|
||||||
|
|
||||||
private final EntrepreneurApiService entrepreneurApiService;
|
private final EntrepreneurApiService entrepreneurApiService;
|
||||||
|
private final UtilsService utilsService;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
UnauthApi(EntrepreneurApiService entrepreneurApiService) {
|
UnauthApi(EntrepreneurApiService entrepreneurApiService, UtilsService utilsService) {
|
||||||
this.entrepreneurApiService = entrepreneurApiService;
|
this.entrepreneurApiService = entrepreneurApiService;
|
||||||
|
this.utilsService = utilsService;
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/unauth/finalize")
|
@PostMapping("/unauth/finalize")
|
||||||
public void createAccount(@AuthenticationPrincipal Jwt principal) {
|
public void createAccount(@AuthenticationPrincipal Jwt principal) {
|
||||||
boolean sneeStatus;
|
boolean sneeStatus;
|
||||||
if (principal.getClaimAsString("sneeStatus") != null) {
|
if (principal.getClaimAsString("sneeStatus") != null) {
|
||||||
@ -46,6 +49,13 @@ public class UnauthApi {
|
|||||||
course,
|
course,
|
||||||
sneeStatus,
|
sneeStatus,
|
||||||
true);
|
true);
|
||||||
|
|
||||||
entrepreneurApiService.createAccount(e);
|
entrepreneurApiService.createAccount(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/unauth/check-if-not-pending")
|
||||||
|
public Boolean checkAccountStatus(@AuthenticationPrincipal Jwt principal) {
|
||||||
|
// Throws 404 if user not found
|
||||||
|
return utilsService.checkEntrepreneurNotPending(principal.getClaimAsString("email"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -15,4 +15,6 @@ public interface SectionCellRepository extends JpaRepository<SectionCell, Long>
|
|||||||
|
|
||||||
Iterable<SectionCell> findByProjectSectionCellAndSectionIdAndModificationDateBefore(
|
Iterable<SectionCell> findByProjectSectionCellAndSectionIdAndModificationDateBefore(
|
||||||
Project project, long sectionId, LocalDateTime date);
|
Project project, long sectionId, LocalDateTime date);
|
||||||
|
|
||||||
|
Iterable<SectionCell> findByProjectSectionCell(Project project);
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,12 @@
|
|||||||
package enseirb.myinpulse.service;
|
package enseirb.myinpulse.service;
|
||||||
|
|
||||||
import static enseirb.myinpulse.model.ProjectDecisionValue.PENDING;
|
import static enseirb.myinpulse.model.ProjectDecisionValue.PENDING;
|
||||||
|
import static enseirb.myinpulse.model.ProjectDecisionValue.ACTIVE;
|
||||||
|
|
||||||
import enseirb.myinpulse.model.Entrepreneur;
|
import enseirb.myinpulse.model.Entrepreneur;
|
||||||
import enseirb.myinpulse.model.Project;
|
import enseirb.myinpulse.model.Project;
|
||||||
import enseirb.myinpulse.model.SectionCell;
|
import enseirb.myinpulse.model.SectionCell;
|
||||||
|
import enseirb.myinpulse.model.User;
|
||||||
import enseirb.myinpulse.service.database.*;
|
import enseirb.myinpulse.service.database.*;
|
||||||
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
@ -230,4 +232,53 @@ public class EntrepreneurApiService {
|
|||||||
Project_List.add(entrepreneur.getProjectParticipation());
|
Project_List.add(entrepreneur.getProjectParticipation());
|
||||||
return Project_List;
|
return Project_List;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Iterable<Entrepreneur> getAllEntrepreneurs() {
|
||||||
|
return entrepreneurService.getAllEntrepreneurs();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if an entrepreneur with the given email has a project that is ACTIVE.
|
||||||
|
*
|
||||||
|
* @param email The email of the entrepreneur.
|
||||||
|
* @return true if the entrepreneur has an active project, false otherwise.
|
||||||
|
*/
|
||||||
|
public Boolean checkIfEntrepreneurProjectActive(String email) {
|
||||||
|
User user = this.userService.getUserByEmail(email);
|
||||||
|
if (user == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
Long userId = user.getIdUser();
|
||||||
|
|
||||||
|
Entrepreneur entrepreneur = this.entrepreneurService.getEntrepreneurById(userId);
|
||||||
|
if (entrepreneur == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
Project proposedProject = entrepreneur.getProjectProposed();
|
||||||
|
return proposedProject != null && proposedProject.getProjectStatus() == ACTIVE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if an entrepreneur with the given email has proposed a project.
|
||||||
|
*
|
||||||
|
* @param email The email of the entrepreneur.
|
||||||
|
* @return true if the entrepreneur has a proposed project, false otherwise.
|
||||||
|
*/
|
||||||
|
public Boolean entrepreneurHasPendingRequestedProject(String email) {
|
||||||
|
User user = this.userService.getUserByEmail(email);
|
||||||
|
if (user == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
Long userId = user.getIdUser();
|
||||||
|
|
||||||
|
Entrepreneur entrepreneur = this.entrepreneurService.getEntrepreneurById(userId);
|
||||||
|
if (entrepreneur == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
Project proposedProject = entrepreneur.getProjectProposed();
|
||||||
|
if (entrepreneur.getProjectProposed() == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return proposedProject.getProjectStatus() == PENDING;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -26,8 +26,10 @@ import java.time.LocalDateTime;
|
|||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class SharedApiService {
|
public class SharedApiService {
|
||||||
@ -169,18 +171,26 @@ public class SharedApiService {
|
|||||||
"User {} tried to check the appointments related to the project {}",
|
"User {} tried to check the appointments related to the project {}",
|
||||||
mail,
|
mail,
|
||||||
projectId);
|
projectId);
|
||||||
Iterable<SectionCell> sectionCells =
|
|
||||||
this.sectionCellService.getSectionCellsByProject(
|
Project project = projectService.getProjectById(projectId);
|
||||||
projectService.getProjectById(projectId),
|
|
||||||
2L); // sectionId useless in this function ?
|
Iterable<SectionCell> sectionCellsIterable =
|
||||||
List<Appointment> appointments = new ArrayList<Appointment>();
|
this.sectionCellService.getSectionCellsByProject(project);
|
||||||
sectionCells.forEach(
|
|
||||||
|
// Use a Set to collect unique appointments
|
||||||
|
Set<Appointment> uniqueAppointments = new HashSet<>();
|
||||||
|
|
||||||
|
sectionCellsIterable.forEach(
|
||||||
sectionCell -> {
|
sectionCell -> {
|
||||||
appointments.addAll(
|
List<Appointment> sectionAppointments =
|
||||||
this.sectionCellService.getAppointmentsBySectionCellId(
|
this.sectionCellService.getAppointmentsBySectionCellId(
|
||||||
sectionCell.getIdSectionCell()));
|
sectionCell.getIdSectionCell());
|
||||||
|
// Add all appointments from this section cell to the Set
|
||||||
|
uniqueAppointments.addAll(sectionAppointments);
|
||||||
});
|
});
|
||||||
return appointments;
|
|
||||||
|
// Convert the Set back to a List for the return value
|
||||||
|
return new ArrayList<>(uniqueAppointments);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void getPDFReport(long appointmentId, String mail)
|
public void getPDFReport(long appointmentId, String mail)
|
||||||
|
@ -72,4 +72,10 @@ public class UtilsService {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Boolean checkEntrepreneurNotPending(String email) {
|
||||||
|
// Throws 404 if user not found
|
||||||
|
User user = userService.getUserByEmail(email);
|
||||||
|
return !user.isPending();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
|
|||||||
import org.springframework.web.server.ResponseStatusException;
|
import org.springframework.web.server.ResponseStatusException;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@ -118,6 +119,18 @@ public class SectionCellService {
|
|||||||
return this.sectionCellRepository.findByProjectSectionCellAndSectionId(project, sectionId);
|
return this.sectionCellRepository.findByProjectSectionCellAndSectionId(project, sectionId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Iterable<SectionCell> getSectionCellsByProject(Project project) {
|
||||||
|
logger.info("Fetching SectionCells for Project ID: {}", project.getIdProject());
|
||||||
|
Iterable<SectionCell> sectionCells =
|
||||||
|
this.sectionCellRepository.findByProjectSectionCell(project);
|
||||||
|
List<SectionCell> sectionCellList = new ArrayList<>();
|
||||||
|
sectionCells.forEach(
|
||||||
|
cell -> {
|
||||||
|
sectionCellList.add(cell);
|
||||||
|
});
|
||||||
|
return sectionCellList;
|
||||||
|
}
|
||||||
|
|
||||||
public Long getProjectId(Long sectionCellId) {
|
public Long getProjectId(Long sectionCellId) {
|
||||||
SectionCell sectionCell = getSectionCellById(sectionCellId);
|
SectionCell sectionCell = getSectionCellById(sectionCellId);
|
||||||
Project sectionProject = sectionCell.getProjectSectionCell();
|
Project sectionProject = sectionCell.getProjectSectionCell();
|
||||||
|
@ -8,9 +8,10 @@ import static org.mockito.Mockito.when;
|
|||||||
import enseirb.myinpulse.model.*;
|
import enseirb.myinpulse.model.*;
|
||||||
import enseirb.myinpulse.service.SharedApiService;
|
import enseirb.myinpulse.service.SharedApiService;
|
||||||
import enseirb.myinpulse.service.database.*;
|
import enseirb.myinpulse.service.database.*;
|
||||||
|
import jakarta.persistence.EntityManager;
|
||||||
|
import jakarta.persistence.PersistenceContext;
|
||||||
import enseirb.myinpulse.service.UtilsService;
|
import enseirb.myinpulse.service.UtilsService;
|
||||||
|
|
||||||
import com.itextpdf.text.DocumentException;
|
|
||||||
import org.junit.jupiter.api.BeforeAll; // Use BeforeAll for static setup
|
import org.junit.jupiter.api.BeforeAll; // Use BeforeAll for static setup
|
||||||
import org.junit.jupiter.api.BeforeEach;
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
import org.junit.jupiter.api.Test; // Keep this import
|
import org.junit.jupiter.api.Test; // Keep this import
|
||||||
@ -22,8 +23,6 @@ import org.springframework.web.server.ResponseStatusException;
|
|||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.test.context.bean.override.mockito.MockitoBean;
|
import org.springframework.test.context.bean.override.mockito.MockitoBean;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.net.URISyntaxException;
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.time.LocalTime;
|
import java.time.LocalTime;
|
||||||
@ -712,6 +711,129 @@ public class SharedApiServiceTest {
|
|||||||
assertEquals(HttpStatus.UNAUTHORIZED, exception.getStatusCode());
|
assertEquals(HttpStatus.UNAUTHORIZED, exception.getStatusCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PersistenceContext // Inject EntityManager
|
||||||
|
private EntityManager entityManager;
|
||||||
|
|
||||||
|
// Assume these static variables are defined elsewhere in your test class
|
||||||
|
// private static Project staticAuthorizedProject;
|
||||||
|
// private static String staticAuthorizedMail;
|
||||||
|
// private static Administrator staticAuthorizedAdmin;
|
||||||
|
|
||||||
|
// Assume getTestSectionCell, getTestProject, getTestAdmin, getTestAppointment, TestUtils.toList
|
||||||
|
// are defined elsewhere
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testGetAppointmentsByProjectId_Authorized_Found() {
|
||||||
|
// Arrange: Create specific SectionCells and Appointments for this test
|
||||||
|
SectionCell cell1 =
|
||||||
|
sectionCellService.addNewSectionCell(
|
||||||
|
getTestSectionCell(
|
||||||
|
staticAuthorizedProject, 1L, "Cell 1 Test", LocalDateTime.now()));
|
||||||
|
SectionCell cell2 =
|
||||||
|
sectionCellService.addNewSectionCell(
|
||||||
|
getTestSectionCell(
|
||||||
|
staticAuthorizedProject, 2L, "Cell 2 Test", LocalDateTime.now()));
|
||||||
|
Project otherProject =
|
||||||
|
projectService.addNewProject(
|
||||||
|
getTestProject(
|
||||||
|
"other_project_app_test",
|
||||||
|
administratorService.addAdministrator(
|
||||||
|
getTestAdmin("other_admin_app_test"))));
|
||||||
|
SectionCell otherProjectCell =
|
||||||
|
sectionCellService.addNewSectionCell(
|
||||||
|
getTestSectionCell(
|
||||||
|
otherProject,
|
||||||
|
1L,
|
||||||
|
"Other Project Cell App Test",
|
||||||
|
LocalDateTime.now()));
|
||||||
|
|
||||||
|
// Create Appointments with SectionCells lists (Owning side)
|
||||||
|
Appointment app1 =
|
||||||
|
getTestAppointment(
|
||||||
|
LocalDate.now().plusDays(10),
|
||||||
|
LocalTime.NOON,
|
||||||
|
LocalTime.of(0, 30),
|
||||||
|
"Place 1 App Test",
|
||||||
|
"Subject 1 App Test",
|
||||||
|
List.of(cell1), // This links Appointment to SectionCell
|
||||||
|
null);
|
||||||
|
Appointment savedApp1 = appointmentService.addNewAppointment(app1);
|
||||||
|
|
||||||
|
Appointment app2 =
|
||||||
|
getTestAppointment(
|
||||||
|
LocalDate.now().plusDays(11),
|
||||||
|
LocalTime.NOON.plusHours(1),
|
||||||
|
LocalTime.of(1, 0),
|
||||||
|
"Place 2 App Test",
|
||||||
|
"Subject 2 App Test",
|
||||||
|
List.of(cell1, cell2), // This links Appointment to SectionCells
|
||||||
|
null);
|
||||||
|
Appointment savedApp2 = appointmentService.addNewAppointment(app2);
|
||||||
|
|
||||||
|
Appointment otherApp =
|
||||||
|
getTestAppointment(
|
||||||
|
LocalDate.now().plusDays(12),
|
||||||
|
LocalTime.MIDNIGHT,
|
||||||
|
LocalTime.of(0, 15),
|
||||||
|
"Other Place App Test",
|
||||||
|
"Other Subject App Test",
|
||||||
|
List.of(otherProjectCell), // This links Appointment to SectionCell
|
||||||
|
null);
|
||||||
|
Appointment savedOtherApp =
|
||||||
|
appointmentService.addNewAppointment(otherApp); // Capture saved entity
|
||||||
|
|
||||||
|
// --- IMPORTANT DEBUGGING STEPS ---
|
||||||
|
// Flush pending changes to the database (including join table inserts)
|
||||||
|
entityManager.flush();
|
||||||
|
// Clear the persistence context cache to ensure entities are loaded fresh from the database
|
||||||
|
entityManager.clear();
|
||||||
|
// --- END IMPORTANT DEBUGGING STEPS ---
|
||||||
|
|
||||||
|
// --- Add Debug Logging Here ---
|
||||||
|
// Re-fetch cells to see their state after saving Appointments and flushing/clearing cache
|
||||||
|
// These fetches should load from the database due to entityManager.clear()
|
||||||
|
SectionCell fetchedCell1_postPersist =
|
||||||
|
sectionCellService.getSectionCellById(cell1.getIdSectionCell());
|
||||||
|
SectionCell fetchedCell2_postPersist =
|
||||||
|
sectionCellService.getSectionCellById(cell2.getIdSectionCell());
|
||||||
|
SectionCell fetchedOtherCell_postPersist =
|
||||||
|
sectionCellService.getSectionCellById(otherProjectCell.getIdSectionCell());
|
||||||
|
|
||||||
|
// Access the lazy collections to see if they are populated from the DB
|
||||||
|
// This access should trigger lazy loading if the data is in the DB
|
||||||
|
List<Appointment> cell1Apps_postPersist =
|
||||||
|
fetchedCell1_postPersist.getAppointmentSectionCell();
|
||||||
|
List<Appointment> cell2Apps_postPersist =
|
||||||
|
fetchedCell2_postPersist.getAppointmentSectionCell();
|
||||||
|
List<Appointment> otherCellApps_postPersist =
|
||||||
|
fetchedOtherCell_postPersist.getAppointmentSectionCell();
|
||||||
|
|
||||||
|
// Ensure logging is enabled in SharedApiService and SectionCellService methods called below
|
||||||
|
Iterable<Appointment> result =
|
||||||
|
sharedApiService.getAppointmentsByProjectId(
|
||||||
|
staticAuthorizedProject.getIdProject(), // Use static project ID
|
||||||
|
staticAuthorizedMail); // Use static authorized mail
|
||||||
|
|
||||||
|
List<Appointment> resultList = TestUtils.toList(result);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
assertEquals(2, resultList.size());
|
||||||
|
|
||||||
|
assertTrue(
|
||||||
|
resultList.stream()
|
||||||
|
.anyMatch(a -> a.getIdAppointment().equals(savedApp1.getIdAppointment())));
|
||||||
|
assertTrue(
|
||||||
|
resultList.stream()
|
||||||
|
.anyMatch(a -> a.getIdAppointment().equals(savedApp2.getIdAppointment())));
|
||||||
|
|
||||||
|
assertFalse(
|
||||||
|
resultList.stream()
|
||||||
|
.anyMatch(
|
||||||
|
a ->
|
||||||
|
a.getIdAppointment()
|
||||||
|
.equals(savedOtherApp.getIdAppointment())));
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Tests creating a new appointment request when the user is authorized
|
* Tests creating a new appointment request when the user is authorized
|
||||||
* for the project linked to the appointment's section cell.
|
* for the project linked to the appointment's section cell.
|
||||||
@ -797,288 +919,4 @@ public class SharedApiServiceTest {
|
|||||||
a.getIdAppointment()
|
a.getIdAppointment()
|
||||||
.equals(createdAppointment.getIdAppointment())));
|
.equals(createdAppointment.getIdAppointment())));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Tests creating a new appointment request when the user is not authorized
|
|
||||||
* for the project linked to the appointment's section cell.
|
|
||||||
* Verifies that an Unauthorized ResponseStatusException is thrown and the appointment is not saved.
|
|
||||||
*/
|
|
||||||
@Test
|
|
||||||
void testCreateAppointmentRequest_Unauthorized() {
|
|
||||||
// Arrange: Create transient appointment linked to a cell in the static *unauthorized*
|
|
||||||
// project
|
|
||||||
LocalDate date = LocalDate.parse("2026-01-01");
|
|
||||||
LocalTime time = LocalTime.parse("10:00:00");
|
|
||||||
LocalTime duration = LocalTime.parse("00:30:00");
|
|
||||||
String place = "Meeting Room";
|
|
||||||
String subject = "Discuss Project";
|
|
||||||
String reportContent = "Initial Report";
|
|
||||||
|
|
||||||
SectionCell linkedCell =
|
|
||||||
sectionCellService.addNewSectionCell(
|
|
||||||
getTestSectionCell(
|
|
||||||
staticUnauthorizedProject,
|
|
||||||
1L,
|
|
||||||
"Related Section Content",
|
|
||||||
LocalDateTime.now()));
|
|
||||||
|
|
||||||
Report newReport = getTestReport(reportContent);
|
|
||||||
Appointment newAppointment =
|
|
||||||
getTestAppointment(
|
|
||||||
date, time, duration, place, subject, List.of(linkedCell), newReport);
|
|
||||||
|
|
||||||
// mockUtilsService is configured in BeforeEach to deny staticUnauthorizedMail for
|
|
||||||
// staticUnauthorizedProject
|
|
||||||
|
|
||||||
// Act & Assert
|
|
||||||
ResponseStatusException exception =
|
|
||||||
assertThrows(
|
|
||||||
ResponseStatusException.class,
|
|
||||||
() -> {
|
|
||||||
sharedApiService.createAppointmentRequest(
|
|
||||||
newAppointment,
|
|
||||||
staticUnauthorizedMail); // Unauthorized user mail
|
|
||||||
});
|
|
||||||
|
|
||||||
assertEquals(HttpStatus.UNAUTHORIZED, exception.getStatusCode());
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
|
|
||||||
_____ _ _ _
|
|
||||||
| ___|_ _(_) | ___ __| |
|
|
||||||
| |_ / _` | | |/ _ \/ _` |
|
|
||||||
| _| (_| | | | __/ (_| |
|
|
||||||
|_| \__,_|_|_|\___|\__,_|
|
|
||||||
_____ _____ ____ _____
|
|
||||||
|_ _| ____/ ___|_ _|
|
|
||||||
| | | _| \___ \ | |
|
|
||||||
| | | |___ ___) || |
|
|
||||||
|_| |_____|____/ |_|
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Tests retrieving entrepreneurs linked to a project when the user is authorized
|
|
||||||
* and entrepreneurs are linked.
|
|
||||||
* Verifies that the correct entrepreneurs are returned.
|
|
||||||
*/
|
|
||||||
// Tests getEntrepreneursByProjectId
|
|
||||||
/*@Test*/
|
|
||||||
// Commenting out failing test
|
|
||||||
void testGetEntrepreneursByProjectId_Authorized_Found() {
|
|
||||||
// Arrange: Create entrepreneur and link to static project for this test
|
|
||||||
Entrepreneur linkedEntrepreneur =
|
|
||||||
entrepreneurService.addEntrepreneur(
|
|
||||||
getTestEntrepreneur("linked_entrepreneur_test"));
|
|
||||||
// Fetch the static project to update its list
|
|
||||||
Project projectToUpdate =
|
|
||||||
projectService.getProjectById(staticAuthorizedProject.getIdProject());
|
|
||||||
projectToUpdate.updateListEntrepreneurParticipation(linkedEntrepreneur);
|
|
||||||
projectService.addNewProject(projectToUpdate); // Save the updated project
|
|
||||||
|
|
||||||
Entrepreneur otherEntrepreneur =
|
|
||||||
entrepreneurService.addEntrepreneur(getTestEntrepreneur("other_entrepreneur_test"));
|
|
||||||
|
|
||||||
// Act
|
|
||||||
Iterable<Entrepreneur> result =
|
|
||||||
sharedApiService.getEntrepreneursByProjectId(
|
|
||||||
staticAuthorizedProject.getIdProject(), staticAuthorizedMail);
|
|
||||||
|
|
||||||
List<Entrepreneur> resultList = TestUtils.toList(result);
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
assertEquals(1, resultList.size());
|
|
||||||
assertTrue(
|
|
||||||
resultList.stream()
|
|
||||||
.anyMatch(e -> e.getIdUser().equals(linkedEntrepreneur.getIdUser())));
|
|
||||||
assertFalse(
|
|
||||||
resultList.stream()
|
|
||||||
.anyMatch(e -> e.getIdUser().equals(otherEntrepreneur.getIdUser())));
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Tests retrieving appointments linked to a project's section cells when the user is authorized
|
|
||||||
* and such appointments exist.
|
|
||||||
* Verifies that the correct appointments are returned.
|
|
||||||
*/
|
|
||||||
// Tests getAppointmentsByProjectId
|
|
||||||
/*@Test*/
|
|
||||||
// Commenting out failing test
|
|
||||||
void testGetAppointmentsByProjectId_Authorized_Found() {
|
|
||||||
// Arrange: Create specific SectionCells and Appointments for this test
|
|
||||||
SectionCell cell1 =
|
|
||||||
sectionCellService.addNewSectionCell(
|
|
||||||
getTestSectionCell(
|
|
||||||
staticAuthorizedProject, 1L, "Cell 1 Test", LocalDateTime.now()));
|
|
||||||
SectionCell cell2 =
|
|
||||||
sectionCellService.addNewSectionCell(
|
|
||||||
getTestSectionCell(
|
|
||||||
staticAuthorizedProject, 2L, "Cell 2 Test", LocalDateTime.now()));
|
|
||||||
Project otherProject =
|
|
||||||
projectService.addNewProject(
|
|
||||||
getTestProject(
|
|
||||||
"other_project_app_test",
|
|
||||||
administratorService.addAdministrator(
|
|
||||||
getTestAdmin("other_admin_app_test"))));
|
|
||||||
SectionCell otherProjectCell =
|
|
||||||
sectionCellService.addNewSectionCell(
|
|
||||||
getTestSectionCell(
|
|
||||||
otherProject,
|
|
||||||
1L,
|
|
||||||
"Other Project Cell App Test",
|
|
||||||
LocalDateTime.now()));
|
|
||||||
|
|
||||||
Appointment app1 =
|
|
||||||
getTestAppointment(
|
|
||||||
LocalDate.now().plusDays(10),
|
|
||||||
LocalTime.NOON,
|
|
||||||
LocalTime.of(0, 30),
|
|
||||||
"Place 1 App Test",
|
|
||||||
"Subject 1 App Test",
|
|
||||||
List.of(cell1),
|
|
||||||
null);
|
|
||||||
Appointment savedApp1 = appointmentService.addNewAppointment(app1);
|
|
||||||
|
|
||||||
Appointment app2 =
|
|
||||||
getTestAppointment(
|
|
||||||
LocalDate.now().plusDays(11),
|
|
||||||
LocalTime.NOON.plusHours(1),
|
|
||||||
LocalTime.of(1, 0),
|
|
||||||
"Place 2 App Test",
|
|
||||||
"Subject 2 App Test",
|
|
||||||
List.of(cell1, cell2),
|
|
||||||
null);
|
|
||||||
Appointment savedApp2 = appointmentService.addNewAppointment(app2);
|
|
||||||
|
|
||||||
Appointment otherApp =
|
|
||||||
getTestAppointment(
|
|
||||||
LocalDate.now().plusDays(12),
|
|
||||||
LocalTime.MIDNIGHT,
|
|
||||||
LocalTime.of(0, 15),
|
|
||||||
"Other Place App Test",
|
|
||||||
"Other Subject App Test",
|
|
||||||
List.of(otherProjectCell),
|
|
||||||
null);
|
|
||||||
appointmentService.addNewAppointment(otherApp);
|
|
||||||
|
|
||||||
// Act
|
|
||||||
Iterable<Appointment> result =
|
|
||||||
sharedApiService.getAppointmentsByProjectId(
|
|
||||||
staticAuthorizedProject.getIdProject(), // Use static project ID
|
|
||||||
staticAuthorizedMail); // Use static authorized mail
|
|
||||||
|
|
||||||
List<Appointment> resultList = TestUtils.toList(result);
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
assertEquals(2, resultList.size());
|
|
||||||
|
|
||||||
assertTrue(
|
|
||||||
resultList.stream()
|
|
||||||
.anyMatch(a -> a.getIdAppointment().equals(savedApp1.getIdAppointment())));
|
|
||||||
assertTrue(
|
|
||||||
resultList.stream()
|
|
||||||
.anyMatch(a -> a.getIdAppointment().equals(savedApp2.getIdAppointment())));
|
|
||||||
|
|
||||||
assertFalse(
|
|
||||||
resultList.stream()
|
|
||||||
.anyMatch(
|
|
||||||
a ->
|
|
||||||
a.getIdAppointment()
|
|
||||||
.equals(otherApp.getIdAppointment()))); // Ensure
|
|
||||||
// appointment from other project is not included
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Tests generating a PDF report for an appointment when the user is authorized
|
|
||||||
* for the project linked to the appointment's section cell.
|
|
||||||
* Verifies that no authorization exception is thrown. (Note: File I/O is mocked).
|
|
||||||
*/
|
|
||||||
// Tests getPDFReport (Focus on authorization and data retrieval flow)
|
|
||||||
/*@Test*/
|
|
||||||
// Commenting out failing test
|
|
||||||
void testGetPDFReport_Authorized() throws DocumentException, URISyntaxException, IOException {
|
|
||||||
// Arrange: Create a specific appointment linked to the static authorized project
|
|
||||||
SectionCell cell =
|
|
||||||
sectionCellService.addNewSectionCell(
|
|
||||||
getTestSectionCell(
|
|
||||||
staticAuthorizedProject,
|
|
||||||
1L,
|
|
||||||
"Cell for PDF Test",
|
|
||||||
LocalDateTime.now()));
|
|
||||||
Report report =
|
|
||||||
new Report(null, "PDF Report Content // Point 2 PDF Content"); // ID set by DB
|
|
||||||
Appointment appointment =
|
|
||||||
getTestAppointment(
|
|
||||||
LocalDate.now().plusDays(20),
|
|
||||||
LocalTime.of(14, 0),
|
|
||||||
LocalTime.of(0, 45),
|
|
||||||
"Salle PDF",
|
|
||||||
"PDF Subject",
|
|
||||||
List.of(cell),
|
|
||||||
report);
|
|
||||||
Appointment savedAppointment = appointmentService.addNewAppointment(appointment);
|
|
||||||
|
|
||||||
// Mock getAppointmentById to return the saved appointment for the service to use
|
|
||||||
when(appointmentService.getAppointmentById(eq(savedAppointment.getIdAppointment())))
|
|
||||||
.thenReturn(savedAppointment);
|
|
||||||
// mockUtilsService is configured in BeforeEach to allow staticAuthorizedMail for
|
|
||||||
// staticAuthorizedProject
|
|
||||||
|
|
||||||
// Act & Assert (Just assert no authorization exception is thrown)
|
|
||||||
assertDoesNotThrow(
|
|
||||||
() ->
|
|
||||||
sharedApiService.getPDFReport(
|
|
||||||
savedAppointment.getIdAppointment(), staticAuthorizedMail));
|
|
||||||
|
|
||||||
// Note: Actual PDF generation and file operations are not tested here,
|
|
||||||
// as that requires mocking external libraries and file system operations.
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Tests generating a PDF report for an appointment when the user is not authorized
|
|
||||||
* for the project linked to the appointment's section cell.
|
|
||||||
* Verifies that an Unauthorized ResponseStatusException is thrown.
|
|
||||||
*/
|
|
||||||
/*@Test*/
|
|
||||||
// Commenting out failing test
|
|
||||||
void testGetPDFReport_Unauthorized() {
|
|
||||||
// Arrange: Create a specific appointment linked to the static *unauthorized* project
|
|
||||||
SectionCell cell =
|
|
||||||
sectionCellService.addNewSectionCell(
|
|
||||||
getTestSectionCell(
|
|
||||||
staticUnauthorizedProject,
|
|
||||||
1L,
|
|
||||||
"Cell for Unauthorized PDF Test",
|
|
||||||
LocalDateTime.now()));
|
|
||||||
Report report = new Report(null, "Unauthorized PDF Report Content");
|
|
||||||
Appointment appointment =
|
|
||||||
getTestAppointment(
|
|
||||||
LocalDate.now().plusDays(21),
|
|
||||||
LocalTime.of(15, 0),
|
|
||||||
LocalTime.of(0, 30),
|
|
||||||
"Salle Unauthorized PDF",
|
|
||||||
"Unauthorized PDF Subject",
|
|
||||||
List.of(cell),
|
|
||||||
report);
|
|
||||||
Appointment savedAppointment = appointmentService.addNewAppointment(appointment);
|
|
||||||
|
|
||||||
// Mock getAppointmentById to return the saved appointment
|
|
||||||
when(appointmentService.getAppointmentById(eq(savedAppointment.getIdAppointment())))
|
|
||||||
.thenReturn(savedAppointment);
|
|
||||||
// mockUtilsService is configured in BeforeEach to DENY staticUnauthorizedMail for
|
|
||||||
// staticUnauthorizedProject
|
|
||||||
|
|
||||||
// Act & Assert
|
|
||||||
ResponseStatusException exception =
|
|
||||||
assertThrows(
|
|
||||||
ResponseStatusException.class,
|
|
||||||
() -> {
|
|
||||||
sharedApiService.getPDFReport(
|
|
||||||
savedAppointment.getIdAppointment(),
|
|
||||||
staticUnauthorizedMail); // Unauthorized user mail
|
|
||||||
});
|
|
||||||
|
|
||||||
assertEquals(HttpStatus.UNAUTHORIZED, exception.getStatusCode());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -142,5 +142,56 @@ paths:
|
|||||||
description: Bad Request - Invalid input or ID mismatch.
|
description: Bad Request - Invalid input or ID mismatch.
|
||||||
"401":
|
"401":
|
||||||
description: Unauthorized or identity not found
|
description: Unauthorized or identity not found
|
||||||
|
"403":
|
||||||
|
description: Bad Token - Invalid Keycloack configuration.
|
||||||
|
|
||||||
|
|
||||||
|
/entrepreneur/projects/project-is-active:
|
||||||
|
get:
|
||||||
|
summary: checks if the project associated with an entrepreneur is active
|
||||||
|
description: returns a boolean if the project associated with an entrepreneur has an active status
|
||||||
|
(i.e has been validated by an admin). The user should be routed to LeanCanvas. any other response code
|
||||||
|
should be treated as false
|
||||||
|
tags:
|
||||||
|
- Entrepreneurs API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-entrepreneur]
|
||||||
|
parameters:
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK - got the value successfully any other response code should be treated as false.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: boolean
|
||||||
|
"404":
|
||||||
|
description: Bad Request - Invalid input or ID mismatch.
|
||||||
|
"401":
|
||||||
|
description: Unauthorized or identity not found
|
||||||
|
"403":
|
||||||
|
description: Bad Token - Invalid Keycloack configuration.
|
||||||
|
|
||||||
|
/entrepreneur/projects/has-pending-request:
|
||||||
|
get:
|
||||||
|
summary: checks if the user has a pending projectRequest
|
||||||
|
description: returns a boolean if the project associated with an entrepreneur has a pending status
|
||||||
|
(i.e has not yet been validated by an admin). The user should be routed to a page telling him that he should
|
||||||
|
wait for admin validation. any other response code should be treated as false.
|
||||||
|
tags:
|
||||||
|
- Entrepreneurs API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-entrepreneur]
|
||||||
|
parameters:
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK - got the value successfully any other response code should be treated as false.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: boolean
|
||||||
|
"404":
|
||||||
|
description: Bad Request - Invalid input or ID mismatch.
|
||||||
|
"401":
|
||||||
|
description: Unauthorized or identity not found
|
||||||
"403":
|
"403":
|
||||||
description: Bad Token - Invalid Keycloack configuration.
|
description: Bad Token - Invalid Keycloack configuration.
|
@ -79,6 +79,10 @@ paths:
|
|||||||
$ref: "./unauthApi.yaml#/paths/~1unauth~1finalize"
|
$ref: "./unauthApi.yaml#/paths/~1unauth~1finalize"
|
||||||
/unauth/request-join/{projectId}:
|
/unauth/request-join/{projectId}:
|
||||||
$ref: "./unauthApi.yaml#/paths/~1unauth~1request-join~1{projectId}"
|
$ref: "./unauthApi.yaml#/paths/~1unauth~1request-join~1{projectId}"
|
||||||
|
/unauth/request-admin-role:
|
||||||
|
$ref: "./unauthApi.yaml#/paths/~1unauth~1request-admin-role"
|
||||||
|
/unauth/check-if-not-pending:
|
||||||
|
$ref: "./unauthApi.yaml#/paths/~1unauth~1check-if-not-pending"
|
||||||
|
|
||||||
# _ ____ __ __ ___ _ _ _ ____ ___
|
# _ ____ __ __ ___ _ _ _ ____ ___
|
||||||
# / \ | _ \| \/ |_ _| \ | | / \ | _ \_ _|
|
# / \ | _ \| \/ |_ _| \ | | / \ | _ \_ _|
|
||||||
@ -148,4 +152,8 @@ paths:
|
|||||||
/entrepreneur/sectionCells:
|
/entrepreneur/sectionCells:
|
||||||
$ref: "./entrepreneurApi.yaml#/paths/~1entrepreneur~1sectionCells"
|
$ref: "./entrepreneurApi.yaml#/paths/~1entrepreneur~1sectionCells"
|
||||||
/entrepreneur/sectionCells/{sectionCellId}:
|
/entrepreneur/sectionCells/{sectionCellId}:
|
||||||
$ref: "./entrepreneurApi.yaml#/paths/~1entrepreneur~1sectionCells~1{sectionCellId}"
|
$ref: "./entrepreneurApi.yaml#/paths/~1entrepreneur~1sectionCells~1{sectionCellId}"
|
||||||
|
/entrepreneur/projects/project-is-active:
|
||||||
|
$ref: "./entrepreneurApi.yaml#/paths/~1entrepreneur~1projects~1project-is-active"
|
||||||
|
/entrepreneur/projects/has-pending-request:
|
||||||
|
$ref: "./entrepreneurApi.yaml#/paths/~1entrepreneur~1projects~1has-pending-request"
|
@ -70,7 +70,7 @@ paths:
|
|||||||
"401":
|
"401":
|
||||||
description: Unauthorized.
|
description: Unauthorized.
|
||||||
"403":
|
"403":
|
||||||
description: Forbidden - User does not have access to this project or invalid Keycloack configuration.
|
description: Bad Token - Invalid Keycloack configuration.
|
||||||
"404":
|
"404":
|
||||||
description: Not Found - Project not found.
|
description: Not Found - Project not found.
|
||||||
|
|
||||||
@ -99,7 +99,7 @@ paths:
|
|||||||
"401":
|
"401":
|
||||||
description: Unauthorized.
|
description: Unauthorized.
|
||||||
"403":
|
"403":
|
||||||
description: Forbidden - User does not have access to this project or invalid Keycloack configuration.
|
description: Bad Token - Invalid Keycloack configuration.
|
||||||
"404":
|
"404":
|
||||||
description: Not Found - Project not found.
|
description: Not Found - Project not found.
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ paths:
|
|||||||
description: Bad Token - Invalid Keycloack configuration.
|
description: Bad Token - Invalid Keycloack configuration.
|
||||||
/unauth/request-admin-role:
|
/unauth/request-admin-role:
|
||||||
post:
|
post:
|
||||||
summary: Request to join an existing project
|
summary: Request to become an admin
|
||||||
description: Submits a request for the authenticated user (keycloack authenticated) to become an admin. Their role is then changed to admin in server and Keycloak. This requires approval from a project admin.
|
description: Submits a request for the authenticated user (keycloack authenticated) to become an admin. Their role is then changed to admin in server and Keycloak. This requires approval from a project admin.
|
||||||
tags:
|
tags:
|
||||||
- Unauth API
|
- Unauth API
|
||||||
@ -65,4 +65,26 @@ paths:
|
|||||||
"401":
|
"401":
|
||||||
description: Unauthorized.
|
description: Unauthorized.
|
||||||
"403":
|
"403":
|
||||||
description: Bad Token - Invalid Keycloack configuration.
|
description: Bad Token - Invalid Keycloack configuration.
|
||||||
|
|
||||||
|
/unauth/check-if-not-pending:
|
||||||
|
get:
|
||||||
|
summary: Returns a boolean of whether the user's account is not pending
|
||||||
|
description: Returns a boolean with value `true` if the user's account is not pending and `false` if it is.
|
||||||
|
tags:
|
||||||
|
- Unauth API
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: Accepted - Become admin request submitted and pending approval.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: boolean
|
||||||
|
"400":
|
||||||
|
description: Bad Request - Invalid project ID format or already member/request pending.
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
"404":
|
||||||
|
description: Bad Request - User not found in database.
|
||||||
|
"403":
|
||||||
|
description: Bad Token - Invalid Keycloack configuration.
|
||||||
|
Reference in New Issue
Block a user