backend-test #10
@ -27,7 +27,6 @@ jobs:
|
|||||||
uses: gradle/actions/setup-gradle@v4
|
uses: gradle/actions/setup-gradle@v4
|
||||||
with:
|
with:
|
||||||
cache-disabled: true # Once the code has been pushed once in main, this should be reenabled.
|
cache-disabled: true # Once the code has been pushed once in main, this should be reenabled.
|
||||||
|
|
||||||
- name: init gradle
|
- name: init gradle
|
||||||
working-directory: ./MyINPulse-back/
|
working-directory: ./MyINPulse-back/
|
||||||
run: ./gradlew build # todo: run test, currently fail because no database is present
|
run: ./gradlew build # todo: run test, currently fail because no database is present
|
||||||
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,5 +1,8 @@
|
|||||||
.env
|
.env
|
||||||
.idea
|
.idea
|
||||||
keycloak/CAS/target
|
keycloak/CAS/target
|
||||||
|
keycloak/.installed
|
||||||
docker-compose.yaml
|
docker-compose.yaml
|
||||||
|
node_modules
|
||||||
|
.vscode
|
||||||
postgres/data
|
postgres/data
|
@ -31,7 +31,7 @@ public class WebSecurityCustomConfiguration {
|
|||||||
public CorsConfigurationSource corsConfigurationSource() {
|
public CorsConfigurationSource corsConfigurationSource() {
|
||||||
CorsConfiguration configuration = new CorsConfiguration();
|
CorsConfiguration configuration = new CorsConfiguration();
|
||||||
configuration.setAllowedOrigins(List.of(frontendUrl));
|
configuration.setAllowedOrigins(List.of(frontendUrl));
|
||||||
configuration.setAllowedMethods(Arrays.asList("GET", "OPTIONS"));
|
configuration.setAllowedMethods(Arrays.asList("GET", "OPTIONS", "POST", "PUT", "DELETE"));
|
||||||
configuration.setAllowedHeaders(
|
configuration.setAllowedHeaders(
|
||||||
Arrays.asList("authorization", "content-type", "x-auth-token"));
|
Arrays.asList("authorization", "content-type", "x-auth-token"));
|
||||||
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
|
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
|
||||||
@ -61,8 +61,6 @@ public class WebSecurityCustomConfiguration {
|
|||||||
.requestMatchers("/admin/**", "/shared/**")
|
.requestMatchers("/admin/**", "/shared/**")
|
||||||
.access(hasRole("REALM_MyINPulse-admin"))
|
.access(hasRole("REALM_MyINPulse-admin"))
|
||||||
.requestMatchers("/unauth/**")
|
.requestMatchers("/unauth/**")
|
||||||
.permitAll()
|
|
||||||
.anyRequest()
|
|
||||||
.authenticated())
|
.authenticated())
|
||||||
.oauth2ResourceServer(
|
.oauth2ResourceServer(
|
||||||
oauth2 ->
|
oauth2 ->
|
||||||
|
@ -57,7 +57,7 @@ public class AdminApi {
|
|||||||
*
|
*
|
||||||
* @return the status code of the request
|
* @return the status code of the request
|
||||||
*/
|
*/
|
||||||
@PostMapping("/admin/projects/decision")
|
@PostMapping("/admin/projects/pending/decision")
|
||||||
public void validateProject(@RequestBody ProjectDecision decision) {
|
public void validateProject(@RequestBody ProjectDecision decision) {
|
||||||
adminApiService.validateProject(decision);
|
adminApiService.validateProject(decision);
|
||||||
}
|
}
|
||||||
@ -67,7 +67,7 @@ public class AdminApi {
|
|||||||
*
|
*
|
||||||
* @return the status code of the request
|
* @return the status code of the request
|
||||||
*/
|
*/
|
||||||
@PostMapping("/admin/project/add")
|
@PostMapping("/admin/project")
|
||||||
public void addNewProject(@RequestBody Project project) {
|
public void addNewProject(@RequestBody Project project) {
|
||||||
adminApiService.addNewProject(project);
|
adminApiService.addNewProject(project);
|
||||||
}
|
}
|
||||||
@ -79,7 +79,7 @@ public class AdminApi {
|
|||||||
*
|
*
|
||||||
* @return the status code of the request
|
* @return the status code of the request
|
||||||
*/
|
*/
|
||||||
@PostMapping("/admin/appoitements/report/{appointmentId}")
|
@PostMapping("/admin/appointments/report/{appointmentId}")
|
||||||
public void createAppointmentReport(
|
public void createAppointmentReport(
|
||||||
@PathVariable long appointmentId,
|
@PathVariable long appointmentId,
|
||||||
@RequestBody Report report,
|
@RequestBody Report report,
|
||||||
@ -95,8 +95,36 @@ public class AdminApi {
|
|||||||
*
|
*
|
||||||
* @return the status code of the request
|
* @return the status code of the request
|
||||||
*/
|
*/
|
||||||
@DeleteMapping("/admin/projects/remove/{projectId}")
|
@DeleteMapping("/admin/projects/{projectId}")
|
||||||
public void deleteProject(@PathVariable long projectId) {
|
public void deleteProject(@PathVariable long projectId) {
|
||||||
adminApiService.deleteProject(projectId);
|
adminApiService.deleteProject(projectId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("/admin/make-admin/{userId}")
|
||||||
|
public void setAdmin(@PathVariable long userId, @AuthenticationPrincipal Jwt principal) {
|
||||||
|
this.adminApiService.setAdmin(userId, principal.getTokenValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/admin/accounts/validate/{userId}")
|
||||||
|
public void validateEntrepreneurAcc(
|
||||||
|
@PathVariable long userId, @AuthenticationPrincipal Jwt principal) {
|
||||||
|
this.adminApiService.validateEntrepreneurAccount(userId, principal.getTokenValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/admin/pending-accounts")
|
||||||
|
public Iterable<User> validateEntrepreneurAcc() {
|
||||||
|
return this.adminApiService.getPendingUsers();
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/admin/create-account")
|
||||||
|
public void createAccount(@AuthenticationPrincipal Jwt principal) {
|
||||||
|
String userSurname = principal.getClaimAsString("userSurname");
|
||||||
|
String username = principal.getClaimAsString("preferred_username");
|
||||||
|
String primaryMail = principal.getClaimAsString("email");
|
||||||
|
String secondaryMail = principal.getClaimAsString("secondaryMail");
|
||||||
|
String phoneNumber = principal.getClaimAsString("phoneNumber");
|
||||||
|
String school = principal.getClaimAsString("school");
|
||||||
|
this.adminApiService.createAccount(
|
||||||
|
userSurname, username, primaryMail, secondaryMail, phoneNumber, school);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,14 +1,20 @@
|
|||||||
package enseirb.myinpulse.controller;
|
package enseirb.myinpulse.controller;
|
||||||
|
|
||||||
import enseirb.myinpulse.model.SectionCell;
|
|
||||||
import enseirb.myinpulse.model.Project;
|
|
||||||
import enseirb.myinpulse.service.EntrepreneurApiService;
|
|
||||||
|
|
||||||
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;
|
||||||
import org.springframework.security.core.annotation.AuthenticationPrincipal;
|
import org.springframework.security.core.annotation.AuthenticationPrincipal;
|
||||||
import org.springframework.security.oauth2.jwt.Jwt;
|
import org.springframework.security.oauth2.jwt.Jwt;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PutMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import enseirb.myinpulse.model.Project;
|
||||||
|
import enseirb.myinpulse.model.SectionCell;
|
||||||
|
import enseirb.myinpulse.service.EntrepreneurApiService;
|
||||||
|
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
@RestController
|
@RestController
|
||||||
@ -28,13 +34,26 @@ public class EntrepreneurApi {
|
|||||||
*
|
*
|
||||||
* @return status code
|
* @return status code
|
||||||
*/
|
*/
|
||||||
@PutMapping("/entrepreneur/lcsection/modify/{sectionId}")
|
@PutMapping("/entrepreneur/sectionCells/{sectionCellId}")
|
||||||
public void editSectionCell(
|
public void editSectionCell(
|
||||||
@PathVariable Long sectionId,
|
@PathVariable Long sectionCellId,
|
||||||
@RequestBody SectionCell sectionCell,
|
@RequestBody String content,
|
||||||
@AuthenticationPrincipal Jwt principal) {
|
@AuthenticationPrincipal Jwt principal) {
|
||||||
entrepreneurApiService.editSectionCell(
|
entrepreneurApiService.editSectionCell(
|
||||||
sectionId, sectionCell, principal.getClaimAsString("email"));
|
sectionCellId, content, principal.getClaimAsString("email"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Endpoint used to update a LC section.
|
||||||
|
*
|
||||||
|
* @return status code
|
||||||
|
*/
|
||||||
|
@GetMapping("/entrepreneur/projects")
|
||||||
|
public Iterable<Project> getEntrepreneurProjectId(
|
||||||
|
@PathVariable Long sectionCellId,
|
||||||
|
@RequestBody String content,
|
||||||
|
@AuthenticationPrincipal Jwt principal) {
|
||||||
|
return entrepreneurApiService.getProjectIdViaClaim(principal.getClaimAsString("email"));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -44,10 +63,11 @@ public class EntrepreneurApi {
|
|||||||
*
|
*
|
||||||
* @return status code
|
* @return status code
|
||||||
*/
|
*/
|
||||||
@DeleteMapping("/entrepreneur/lcsection/remove/{sectionId}")
|
@DeleteMapping("/entrepreneur/sectionCells/{sectionCellId}")
|
||||||
public void removeSectionCell(
|
public void removeSectionCell(
|
||||||
@PathVariable Long sectionId, @AuthenticationPrincipal Jwt principal) {
|
@PathVariable Long sectionCellId, @AuthenticationPrincipal Jwt principal) {
|
||||||
entrepreneurApiService.removeSectionCell(sectionId, principal.getClaimAsString("email"));
|
entrepreneurApiService.removeSectionCell(
|
||||||
|
sectionCellId, principal.getClaimAsString("email"));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -57,7 +77,7 @@ public class EntrepreneurApi {
|
|||||||
*
|
*
|
||||||
* @return status code
|
* @return status code
|
||||||
*/
|
*/
|
||||||
@PostMapping("/entrepreneur/lcsection/add") // remove id from doc aswell
|
@PostMapping("/entrepreneur/sectionCells")
|
||||||
public void addLCSection(
|
public void addLCSection(
|
||||||
@RequestBody SectionCell sectionCell, @AuthenticationPrincipal Jwt principal) {
|
@RequestBody SectionCell sectionCell, @AuthenticationPrincipal Jwt principal) {
|
||||||
entrepreneurApiService.addSectionCell(sectionCell, principal.getClaimAsString("email"));
|
entrepreneurApiService.addSectionCell(sectionCell, principal.getClaimAsString("email"));
|
||||||
@ -70,7 +90,7 @@ public class EntrepreneurApi {
|
|||||||
*
|
*
|
||||||
* @return status code
|
* @return status code
|
||||||
*/
|
*/
|
||||||
@PostMapping("/entrepreneur/project/request")
|
@PostMapping("/entrepreneur/projects/request")
|
||||||
public void requestNewProject(
|
public void requestNewProject(
|
||||||
@RequestBody Project project, @AuthenticationPrincipal Jwt principal) {
|
@RequestBody Project project, @AuthenticationPrincipal Jwt principal) {
|
||||||
entrepreneurApiService.requestNewProject(project, principal.getClaimAsString("email"));
|
entrepreneurApiService.requestNewProject(project, principal.getClaimAsString("email"));
|
||||||
|
@ -30,7 +30,7 @@ public class SharedApi {
|
|||||||
*
|
*
|
||||||
* @return a list of lean canvas sections
|
* @return a list of lean canvas sections
|
||||||
*/
|
*/
|
||||||
@GetMapping("/shared/project/lcsection/{projectId}/{sectionId}/{date}")
|
@GetMapping("/shared/projects/sectionCells/{projectId}/{sectionId}/{date}")
|
||||||
public Iterable<SectionCell> getLCSection(
|
public Iterable<SectionCell> getLCSection(
|
||||||
@PathVariable("projectId") Long projectId,
|
@PathVariable("projectId") Long projectId,
|
||||||
@PathVariable("sectionId") Long sectionId,
|
@PathVariable("sectionId") Long sectionId,
|
||||||
@ -45,7 +45,7 @@ public class SharedApi {
|
|||||||
*
|
*
|
||||||
* @return a list of all entrepreneurs in a project
|
* @return a list of all entrepreneurs in a project
|
||||||
*/
|
*/
|
||||||
@GetMapping("/shared/entrepreneurs/{projectId}")
|
@GetMapping("/shared/projects/entrepreneurs/{projectId}")
|
||||||
public Iterable<Entrepreneur> getEntrepreneursByProjectId(
|
public Iterable<Entrepreneur> getEntrepreneursByProjectId(
|
||||||
@PathVariable int projectId, @AuthenticationPrincipal Jwt principal) {
|
@PathVariable int projectId, @AuthenticationPrincipal Jwt principal) {
|
||||||
return sharedApiService.getEntrepreneursByProjectId(
|
return sharedApiService.getEntrepreneursByProjectId(
|
||||||
@ -80,7 +80,7 @@ public class SharedApi {
|
|||||||
*
|
*
|
||||||
* @return a PDF file? TODO: how does that works ?
|
* @return a PDF file? TODO: how does that works ?
|
||||||
*/
|
*/
|
||||||
@GetMapping("/shared/projects/appointments/report/{appointmentId}")
|
@GetMapping("/shared/appointments/report/{appointmentId}")
|
||||||
public void getPDFReport(
|
public void getPDFReport(
|
||||||
@PathVariable int appointmentId, @AuthenticationPrincipal Jwt principal) {
|
@PathVariable int appointmentId, @AuthenticationPrincipal Jwt principal) {
|
||||||
try {
|
try {
|
||||||
@ -97,7 +97,7 @@ public class SharedApi {
|
|||||||
/**
|
/**
|
||||||
* @return TODO
|
* @return TODO
|
||||||
*/
|
*/
|
||||||
@PostMapping("/shared/appointment/request")
|
@PostMapping("/shared/appointments/request")
|
||||||
public void createAppointmentRequest(
|
public void createAppointmentRequest(
|
||||||
@RequestBody Appointment appointment, @AuthenticationPrincipal Jwt principal) {
|
@RequestBody Appointment appointment, @AuthenticationPrincipal Jwt principal) {
|
||||||
sharedApiService.createAppointmentRequest(appointment, principal.getClaimAsString("email"));
|
sharedApiService.createAppointmentRequest(appointment, principal.getClaimAsString("email"));
|
||||||
|
@ -0,0 +1,51 @@
|
|||||||
|
package enseirb.myinpulse.controller;
|
||||||
|
|
||||||
|
import enseirb.myinpulse.model.Entrepreneur;
|
||||||
|
import enseirb.myinpulse.service.EntrepreneurApiService;
|
||||||
|
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
import org.springframework.security.core.annotation.AuthenticationPrincipal;
|
||||||
|
import org.springframework.security.oauth2.jwt.Jwt;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
@SpringBootApplication
|
||||||
|
@RestController
|
||||||
|
public class UnauthApi {
|
||||||
|
|
||||||
|
private final EntrepreneurApiService entrepreneurApiService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
UnauthApi(EntrepreneurApiService entrepreneurApiService) {
|
||||||
|
this.entrepreneurApiService = entrepreneurApiService;
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/unauth/finalize")
|
||||||
|
public void createAccount(@AuthenticationPrincipal Jwt principal) {
|
||||||
|
boolean sneeStatus;
|
||||||
|
if (principal.getClaimAsString("sneeStatus") != null) {
|
||||||
|
sneeStatus = principal.getClaimAsString("sneeStatus").equals("true");
|
||||||
|
} else {
|
||||||
|
sneeStatus = false;
|
||||||
|
}
|
||||||
|
String userSurname = principal.getClaimAsString("userSurname");
|
||||||
|
String username = principal.getClaimAsString("preferred_username");
|
||||||
|
String primaryMail = principal.getClaimAsString("email");
|
||||||
|
String secondaryMail = principal.getClaimAsString("secondaryMail");
|
||||||
|
String phoneNumber = principal.getClaimAsString("phoneNumber");
|
||||||
|
String school = principal.getClaimAsString("school");
|
||||||
|
String course = principal.getClaimAsString("course");
|
||||||
|
Entrepreneur e =
|
||||||
|
new Entrepreneur(
|
||||||
|
userSurname,
|
||||||
|
username,
|
||||||
|
primaryMail,
|
||||||
|
secondaryMail,
|
||||||
|
phoneNumber,
|
||||||
|
school,
|
||||||
|
course,
|
||||||
|
sneeStatus,
|
||||||
|
true);
|
||||||
|
entrepreneurApiService.createAccount(e);
|
||||||
|
}
|
||||||
|
}
|
@ -37,7 +37,7 @@ public class Administrator extends User {
|
|||||||
String primaryMail,
|
String primaryMail,
|
||||||
String secondaryMail,
|
String secondaryMail,
|
||||||
String phoneNumber) {
|
String phoneNumber) {
|
||||||
super(null, userSurname, username, primaryMail, secondaryMail, phoneNumber);
|
super(userSurname, username, primaryMail, secondaryMail, phoneNumber, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Project> getListProject() {
|
public List<Project> getListProject() {
|
||||||
|
@ -44,15 +44,30 @@ public class Entrepreneur extends User {
|
|||||||
String phoneNumber,
|
String phoneNumber,
|
||||||
String school,
|
String school,
|
||||||
String course,
|
String course,
|
||||||
boolean sneeStatus) {
|
boolean sneeStatus,
|
||||||
super(userSurname, username, primaryMail, secondaryMail, phoneNumber);
|
boolean pending) {
|
||||||
|
super(userSurname, username, primaryMail, secondaryMail, phoneNumber, pending);
|
||||||
|
this.school = school;
|
||||||
|
this.course = course;
|
||||||
|
this.sneeStatus = sneeStatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Entrepreneur(
|
||||||
|
String userSurname,
|
||||||
|
String username,
|
||||||
|
String primaryMail,
|
||||||
|
String secondaryMail,
|
||||||
|
String phoneNumber,
|
||||||
|
String school,
|
||||||
|
String course,
|
||||||
|
boolean sneeStatus) {
|
||||||
|
super(userSurname, username, primaryMail, secondaryMail, phoneNumber, true);
|
||||||
this.school = school;
|
this.school = school;
|
||||||
this.course = course;
|
this.course = course;
|
||||||
this.sneeStatus = sneeStatus;
|
this.sneeStatus = sneeStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Entrepreneur(
|
public Entrepreneur(
|
||||||
Long idUser,
|
|
||||||
String userSurname,
|
String userSurname,
|
||||||
String userName,
|
String userName,
|
||||||
String primaryMail,
|
String primaryMail,
|
||||||
@ -63,8 +78,9 @@ public class Entrepreneur extends User {
|
|||||||
boolean sneeStatus,
|
boolean sneeStatus,
|
||||||
Project projectParticipation,
|
Project projectParticipation,
|
||||||
Project projectProposed,
|
Project projectProposed,
|
||||||
MakeAppointment makeAppointment) {
|
MakeAppointment makeAppointment,
|
||||||
super(idUser, userSurname, userName, primaryMail, secondaryMail, phoneNumber);
|
boolean pending) {
|
||||||
|
super(userSurname, userName, primaryMail, secondaryMail, phoneNumber, pending);
|
||||||
this.school = school;
|
this.school = school;
|
||||||
this.course = course;
|
this.course = course;
|
||||||
this.sneeStatus = sneeStatus;
|
this.sneeStatus = sneeStatus;
|
||||||
|
@ -66,6 +66,15 @@ public class Project {
|
|||||||
this.entrepreneurProposed = entrepreneurProposed;
|
this.entrepreneurProposed = entrepreneurProposed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (o == this) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
Project project = (Project) o;
|
||||||
|
return this.idProject == project.idProject;
|
||||||
|
}
|
||||||
|
|
||||||
public Long getIdProject() {
|
public Long getIdProject() {
|
||||||
return idProject;
|
return idProject;
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,9 @@ package enseirb.myinpulse.model;
|
|||||||
|
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
|
|
||||||
|
import org.hibernate.annotations.Generated;
|
||||||
|
import org.hibernate.generator.EventType;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -20,6 +23,10 @@ public class SectionCell {
|
|||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
private Long idSectionCell;
|
private Long idSectionCell;
|
||||||
|
|
||||||
|
@Column(columnDefinition = "serial")
|
||||||
|
@Generated(event = EventType.INSERT)
|
||||||
|
private Long idReference;
|
||||||
|
|
||||||
@Column() private long sectionId;
|
@Column() private long sectionId;
|
||||||
private String contentSectionCell;
|
private String contentSectionCell;
|
||||||
|
|
||||||
@ -56,6 +63,14 @@ public class SectionCell {
|
|||||||
this.idSectionCell = idSectionCell;
|
this.idSectionCell = idSectionCell;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Long getIdReference() {
|
||||||
|
return idReference;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setIdReference(Long idReference) {
|
||||||
|
this.idReference = idReference;
|
||||||
|
}
|
||||||
|
|
||||||
public Long getSectionId() {
|
public Long getSectionId() {
|
||||||
return sectionId;
|
return sectionId;
|
||||||
}
|
}
|
||||||
|
@ -26,36 +26,23 @@ public class User {
|
|||||||
@Column(length = 20)
|
@Column(length = 20)
|
||||||
private String phoneNumber;
|
private String phoneNumber;
|
||||||
|
|
||||||
|
@Column private boolean pending;
|
||||||
|
|
||||||
public User() {}
|
public User() {}
|
||||||
|
|
||||||
// TODO: this should be removed as we shouldn't be able to chose the ID. Leaving it for
|
|
||||||
// compatibility purposes, as soon as it's not used anymore, delete it
|
|
||||||
public User(
|
|
||||||
Long idUser,
|
|
||||||
String userSurname,
|
|
||||||
String userName,
|
|
||||||
String primaryMail,
|
|
||||||
String secondaryMail,
|
|
||||||
String phoneNumber) {
|
|
||||||
this.idUser = idUser;
|
|
||||||
this.userSurname = userSurname;
|
|
||||||
this.userName = userName;
|
|
||||||
this.primaryMail = primaryMail;
|
|
||||||
this.secondaryMail = secondaryMail;
|
|
||||||
this.phoneNumber = phoneNumber;
|
|
||||||
}
|
|
||||||
|
|
||||||
public User(
|
public User(
|
||||||
String userSurname,
|
String userSurname,
|
||||||
String userName,
|
String userName,
|
||||||
String primaryMail,
|
String primaryMail,
|
||||||
String secondaryMail,
|
String secondaryMail,
|
||||||
String phoneNumber) {
|
String phoneNumber,
|
||||||
|
boolean pending) {
|
||||||
this.userSurname = userSurname;
|
this.userSurname = userSurname;
|
||||||
this.userName = userName;
|
this.userName = userName;
|
||||||
this.primaryMail = primaryMail;
|
this.primaryMail = primaryMail;
|
||||||
this.secondaryMail = secondaryMail;
|
this.secondaryMail = secondaryMail;
|
||||||
this.phoneNumber = phoneNumber;
|
this.phoneNumber = phoneNumber;
|
||||||
|
this.pending = pending;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getIdUser() {
|
public Long getIdUser() {
|
||||||
@ -105,4 +92,12 @@ public class User {
|
|||||||
public void setPhoneNumber(String phoneNumber) {
|
public void setPhoneNumber(String phoneNumber) {
|
||||||
phoneNumber = phoneNumber;
|
phoneNumber = phoneNumber;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isPending() {
|
||||||
|
return pending;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPending(boolean pending) {
|
||||||
|
this.pending = pending;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,8 +9,9 @@ import java.util.Optional;
|
|||||||
|
|
||||||
@RepositoryRestResource
|
@RepositoryRestResource
|
||||||
public interface UserRepository extends JpaRepository<User, Long> {
|
public interface UserRepository extends JpaRepository<User, Long> {
|
||||||
Optional<User> findByPrimaryMail(String email);
|
Optional<User> findByPrimaryMail(String primaryMail);
|
||||||
|
|
||||||
|
Iterable<User> findAllByPendingEquals(boolean pending);
|
||||||
/* @Query("SELECT u from User u")
|
/* @Query("SELECT u from User u")
|
||||||
User findAllUser(); */
|
User findAllUser(); */
|
||||||
|
|
||||||
|
@ -24,6 +24,7 @@ public class AdminApiService {
|
|||||||
private final ProjectService projectService;
|
private final ProjectService projectService;
|
||||||
private final UserService userService;
|
private final UserService userService;
|
||||||
private final AdministratorService administratorService;
|
private final AdministratorService administratorService;
|
||||||
|
private final EntrepreneurService entrepreneurService;
|
||||||
private final UtilsService utilsService;
|
private final UtilsService utilsService;
|
||||||
private final AppointmentService appointmentService;
|
private final AppointmentService appointmentService;
|
||||||
private final ReportService reportService;
|
private final ReportService reportService;
|
||||||
@ -35,6 +36,7 @@ public class AdminApiService {
|
|||||||
UserService userService,
|
UserService userService,
|
||||||
AdministratorService administratorService,
|
AdministratorService administratorService,
|
||||||
UtilsService utilsService,
|
UtilsService utilsService,
|
||||||
|
EntrepreneurService entrepreneurService,
|
||||||
AppointmentService appointmentService,
|
AppointmentService appointmentService,
|
||||||
ReportService reportService,
|
ReportService reportService,
|
||||||
SectionCellService sectionCellService) {
|
SectionCellService sectionCellService) {
|
||||||
@ -45,6 +47,7 @@ public class AdminApiService {
|
|||||||
this.appointmentService = appointmentService;
|
this.appointmentService = appointmentService;
|
||||||
this.reportService = reportService;
|
this.reportService = reportService;
|
||||||
this.sectionCellService = sectionCellService;
|
this.sectionCellService = sectionCellService;
|
||||||
|
this.entrepreneurService = entrepreneurService;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: check if tests are sufficient - peer verification required
|
// TODO: check if tests are sufficient - peer verification required
|
||||||
@ -75,6 +78,12 @@ public class AdminApiService {
|
|||||||
}
|
}
|
||||||
if (user instanceof Entrepreneur) {
|
if (user instanceof Entrepreneur) {
|
||||||
Project project = ((Entrepreneur) user).getProjectParticipation();
|
Project project = ((Entrepreneur) user).getProjectParticipation();
|
||||||
|
if (project == null) {
|
||||||
|
throw new ResponseStatusException(
|
||||||
|
HttpStatus.NOT_FOUND,
|
||||||
|
"The user has no project, thus no appointments. No users should have no project");
|
||||||
|
}
|
||||||
|
|
||||||
project.getListSectionCell()
|
project.getListSectionCell()
|
||||||
.forEach(
|
.forEach(
|
||||||
sectionCell -> {
|
sectionCell -> {
|
||||||
@ -97,13 +106,14 @@ public class AdminApiService {
|
|||||||
decision.projectId,
|
decision.projectId,
|
||||||
null,
|
null,
|
||||||
null,
|
null,
|
||||||
null,
|
|
||||||
(decision.isAccepted == 1) ? ACTIVE : REJECTED,
|
(decision.isAccepted == 1) ? ACTIVE : REJECTED,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
this.administratorService.getAdministratorById(decision.adminId));
|
this.administratorService.getAdministratorById(decision.adminId));
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: check if tests are sufficient - peer verification required
|
// TODO: check if tests are sufficient - peer verification required
|
||||||
public void addNewProject(Project project) {
|
public Project addNewProject(Project project) {
|
||||||
project.setIdProject(null);
|
project.setIdProject(null);
|
||||||
// We remove the ID from the request to be sure that it will be auto generated
|
// We remove the ID from the request to be sure that it will be auto generated
|
||||||
try {
|
try {
|
||||||
@ -135,6 +145,7 @@ public class AdminApiService {
|
|||||||
sectionCell -> {
|
sectionCell -> {
|
||||||
sectionCell.setProjectSectionCell(newProject);
|
sectionCell.setProjectSectionCell(newProject);
|
||||||
});
|
});
|
||||||
|
return newProject;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void createAppointmentReport(long appointmentId, Report report, String mail) {
|
public void createAppointmentReport(long appointmentId, Report report, String mail) {
|
||||||
@ -163,4 +174,48 @@ public class AdminApiService {
|
|||||||
public void deleteProject(long projectId) {
|
public void deleteProject(long projectId) {
|
||||||
this.projectService.deleteProjectById(projectId);
|
this.projectService.deleteProjectById(projectId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setAdmin(long userId, String token) {
|
||||||
|
Entrepreneur e = this.entrepreneurService.getEntrepreneurById(userId);
|
||||||
|
Administrator a =
|
||||||
|
new Administrator(
|
||||||
|
e.getUserSurname(),
|
||||||
|
e.getUserName(),
|
||||||
|
e.getPrimaryMail(),
|
||||||
|
e.getSecondaryMail(),
|
||||||
|
e.getPhoneNumber());
|
||||||
|
this.entrepreneurService.deleteEntrepreneur(e);
|
||||||
|
this.administratorService.addAdministrator(a);
|
||||||
|
try {
|
||||||
|
KeycloakApi.setRoleToUser(a.getUserName(), "MyINPulse-admin", token);
|
||||||
|
} catch (Exception err) {
|
||||||
|
logger.error(err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void validateEntrepreneurAccount(long userId, String token) {
|
||||||
|
Entrepreneur e = this.entrepreneurService.getEntrepreneurById(userId);
|
||||||
|
try {
|
||||||
|
KeycloakApi.setRoleToUser(e.getUserName(), "MyINPulse-entrepreneur", token);
|
||||||
|
} catch (Exception err) {
|
||||||
|
logger.error(err);
|
||||||
|
}
|
||||||
|
this.entrepreneurService.validateEntrepreneurById(userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Iterable<User> getPendingUsers() {
|
||||||
|
return this.userService.getPendingAccounts();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void createAccount(
|
||||||
|
String username,
|
||||||
|
String userSurname,
|
||||||
|
String primaryMail,
|
||||||
|
String secondaryMail,
|
||||||
|
String phoneNumber,
|
||||||
|
String school) {
|
||||||
|
Administrator a =
|
||||||
|
new Administrator(username, userSurname, primaryMail, secondaryMail, phoneNumber);
|
||||||
|
this.administratorService.addAdministrator(a);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,10 +2,10 @@ package enseirb.myinpulse.service;
|
|||||||
|
|
||||||
import static enseirb.myinpulse.model.ProjectDecisionValue.PENDING;
|
import static enseirb.myinpulse.model.ProjectDecisionValue.PENDING;
|
||||||
|
|
||||||
|
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.service.database.ProjectService;
|
import enseirb.myinpulse.service.database.*;
|
||||||
import enseirb.myinpulse.service.database.SectionCellService;
|
|
||||||
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
@ -14,6 +14,10 @@ import org.springframework.http.HttpStatus;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.web.server.ResponseStatusException;
|
import org.springframework.web.server.ResponseStatusException;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class EntrepreneurApiService {
|
public class EntrepreneurApiService {
|
||||||
|
|
||||||
@ -22,24 +26,39 @@ public class EntrepreneurApiService {
|
|||||||
private final SectionCellService sectionCellService;
|
private final SectionCellService sectionCellService;
|
||||||
private final ProjectService projectService;
|
private final ProjectService projectService;
|
||||||
private final UtilsService utilsService;
|
private final UtilsService utilsService;
|
||||||
|
private final UserService userService;
|
||||||
|
private final EntrepreneurService entrepreneurService;
|
||||||
|
private final AdministratorService administratorService;
|
||||||
|
private final AppointmentService appointmentService;
|
||||||
|
private final AnnotationService annotationService;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
EntrepreneurApiService(
|
EntrepreneurApiService(
|
||||||
SectionCellService sectionCellService,
|
SectionCellService sectionCellService,
|
||||||
ProjectService projectService,
|
ProjectService projectService,
|
||||||
UtilsService utilsService) {
|
UtilsService utilsService,
|
||||||
|
UserService userService,
|
||||||
|
EntrepreneurService entrepreneurService,
|
||||||
|
AdministratorService administratorService,
|
||||||
|
AppointmentService appointmentService,
|
||||||
|
AnnotationService annotationService) {
|
||||||
this.sectionCellService = sectionCellService;
|
this.sectionCellService = sectionCellService;
|
||||||
this.projectService = projectService;
|
this.projectService = projectService;
|
||||||
this.utilsService = utilsService;
|
this.utilsService = utilsService;
|
||||||
|
this.userService = userService;
|
||||||
|
this.entrepreneurService = entrepreneurService;
|
||||||
|
this.administratorService = administratorService;
|
||||||
|
this.appointmentService = appointmentService;
|
||||||
|
this.annotationService = annotationService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void editSectionCell(Long sectionCellId, SectionCell sectionCell, String mail) {
|
public void editSectionCell(Long sectionCellId, String content, String mail) {
|
||||||
SectionCell editSectionCell = sectionCellService.getSectionCellById(sectionCellId);
|
if (sectionCellId == null) {
|
||||||
if (editSectionCell == null) {
|
logger.warn("Trying to edit unknown section cell");
|
||||||
System.err.println("Trying to edit unknown section cell");
|
|
||||||
throw new ResponseStatusException(
|
throw new ResponseStatusException(
|
||||||
HttpStatus.NOT_FOUND, "Cette cellule de section n'existe pas");
|
HttpStatus.NOT_FOUND, "Cette cellule de section n'existe pas");
|
||||||
}
|
}
|
||||||
|
SectionCell sectionCell = sectionCellService.getSectionCellById(sectionCellId);
|
||||||
if (!utilsService.isAllowedToCheckProject(
|
if (!utilsService.isAllowedToCheckProject(
|
||||||
mail, this.sectionCellService.getProjectId(sectionCellId))) {
|
mail, this.sectionCellService.getProjectId(sectionCellId))) {
|
||||||
logger.warn(
|
logger.warn(
|
||||||
@ -55,27 +74,45 @@ public class EntrepreneurApiService {
|
|||||||
mail,
|
mail,
|
||||||
sectionCellId,
|
sectionCellId,
|
||||||
this.sectionCellService.getProjectId(sectionCellId));
|
this.sectionCellService.getProjectId(sectionCellId));
|
||||||
sectionCellService.updateSectionCell(
|
SectionCell newSectionCell =
|
||||||
sectionCellId,
|
new SectionCell(
|
||||||
sectionCell.getSectionId(),
|
null,
|
||||||
sectionCell.getContentSectionCell(),
|
sectionCell.getSectionId(),
|
||||||
sectionCell.getModificationDate());
|
content,
|
||||||
|
LocalDateTime.now(),
|
||||||
|
sectionCell.getProjectSectionCell());
|
||||||
|
newSectionCell.setIdReference(sectionCell.getIdReference());
|
||||||
|
this.addSectionCell(newSectionCell, mail);
|
||||||
|
sectionCell
|
||||||
|
.getAppointmentSectionCell()
|
||||||
|
.forEach(
|
||||||
|
appointment -> {
|
||||||
|
this.appointmentService.updateAppointmentListSectionCell(
|
||||||
|
appointment.getIdAppointment(), newSectionCell);
|
||||||
|
});
|
||||||
|
sectionCell
|
||||||
|
.getListAnnotation()
|
||||||
|
.forEach(
|
||||||
|
annotation -> {
|
||||||
|
this.annotationService.updateAnnotationSectionCell(
|
||||||
|
annotation.getIdAnnotation(), newSectionCell);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public void removeSectionCell(Long sectionCellId, String mail) {
|
public void removeSectionCell(Long sectionCellId, String mail) {
|
||||||
SectionCell editSectionCell = sectionCellService.getSectionCellById(sectionCellId);
|
if (sectionCellId == null) {
|
||||||
if (editSectionCell == null) {
|
logger.warn("Trying to remove unknown section cell");
|
||||||
System.err.println("Trying to remove unknown section cell");
|
|
||||||
throw new ResponseStatusException(
|
throw new ResponseStatusException(
|
||||||
HttpStatus.NOT_FOUND, "Cette cellule de section n'existe pas");
|
HttpStatus.NOT_FOUND, "Cette cellule de section n'existe pas");
|
||||||
}
|
}
|
||||||
|
SectionCell editSectionCell = sectionCellService.getSectionCellById(sectionCellId);
|
||||||
if (!utilsService.isAllowedToCheckProject(
|
if (!utilsService.isAllowedToCheckProject(
|
||||||
mail, this.sectionCellService.getProjectId(sectionCellId))) {
|
mail, this.sectionCellService.getProjectId(sectionCellId))) {
|
||||||
logger.warn(
|
logger.warn(
|
||||||
"User {} tried to remove section cells {} of the project {} but is not allowed to.",
|
"User {} tried to remove section cells {} of the project {} but is not allowed to.",
|
||||||
mail,
|
mail,
|
||||||
sectionCellId,
|
sectionCellId,
|
||||||
this.sectionCellService.getSectionCellById(sectionCellId));
|
this.sectionCellService.getProjectId(sectionCellId));
|
||||||
throw new ResponseStatusException(
|
throw new ResponseStatusException(
|
||||||
HttpStatus.UNAUTHORIZED, "You're not allowed to check this project");
|
HttpStatus.UNAUTHORIZED, "You're not allowed to check this project");
|
||||||
}
|
}
|
||||||
@ -84,52 +121,113 @@ public class EntrepreneurApiService {
|
|||||||
mail,
|
mail,
|
||||||
sectionCellId,
|
sectionCellId,
|
||||||
this.sectionCellService.getProjectId(sectionCellId));
|
this.sectionCellService.getProjectId(sectionCellId));
|
||||||
sectionCellService.removeSectionCellById(sectionCellId);
|
SectionCell removedSectionCell =
|
||||||
|
new SectionCell(
|
||||||
|
null,
|
||||||
|
-1L,
|
||||||
|
"",
|
||||||
|
LocalDateTime.now(),
|
||||||
|
this.projectService.getProjectById(
|
||||||
|
editSectionCell.getProjectSectionCell().getIdProject()));
|
||||||
|
sectionCellService.addNewSectionCell(removedSectionCell);
|
||||||
|
this.sectionCellService.updateSectionCellReferenceId(
|
||||||
|
removedSectionCell.getIdSectionCell(), editSectionCell.getIdReference());
|
||||||
|
projectService.updateProjectListSectionCell(
|
||||||
|
sectionCellService.getProjectId(sectionCellId), removedSectionCell);
|
||||||
|
// sectionCellService.removeSectionCellById(sectionCellId);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addSectionCell(SectionCell sectionCell, String mail) {
|
public void addSectionCell(SectionCell sectionCell, String mail) {
|
||||||
if (sectionCell == null) {
|
if (sectionCell == null) {
|
||||||
System.err.println("Trying to create an empty section cell");
|
logger.warn("Trying to create an empty section cell");
|
||||||
throw new ResponseStatusException(
|
throw new ResponseStatusException(
|
||||||
HttpStatus.BAD_REQUEST, "La cellule de section fournie est vide");
|
HttpStatus.BAD_REQUEST, "La cellule de section fournie est vide");
|
||||||
}
|
}
|
||||||
|
if (sectionCell.getSectionId() == -1) {
|
||||||
|
logger.warn("Trying to create an illegal section cell");
|
||||||
|
throw new ResponseStatusException(
|
||||||
|
HttpStatus.BAD_REQUEST, "La cellule de section fournie n'est pas valide");
|
||||||
|
}
|
||||||
if (!utilsService.isAllowedToCheckProject(
|
if (!utilsService.isAllowedToCheckProject(
|
||||||
mail, this.sectionCellService.getProjectId(sectionCell.getIdSectionCell()))) {
|
mail, sectionCell.getProjectSectionCell().getIdProject())) {
|
||||||
logger.warn(
|
logger.warn(
|
||||||
"User {} tried to add a section cell to the project {} but is not allowed to.",
|
"User {} tried to add a section cell to the project {} but is not allowed to.",
|
||||||
mail,
|
mail,
|
||||||
this.sectionCellService.getProjectId(sectionCell.getIdSectionCell()));
|
sectionCell.getProjectSectionCell().getIdProject());
|
||||||
throw new ResponseStatusException(
|
throw new ResponseStatusException(
|
||||||
HttpStatus.UNAUTHORIZED, "You're not allowed to check this project");
|
HttpStatus.UNAUTHORIZED, "You're not allowed to check this project");
|
||||||
}
|
}
|
||||||
logger.info(
|
logger.info(
|
||||||
"User {} added a new section cell {} to the project with id {}",
|
"User {} added a new section cell {} to the project {}",
|
||||||
mail,
|
mail,
|
||||||
sectionCell.getIdSectionCell(),
|
sectionCell.getIdSectionCell(),
|
||||||
this.sectionCellService.getProjectId(sectionCell.getIdSectionCell()));
|
sectionCell.getProjectSectionCell().getIdProject());
|
||||||
SectionCell newSectionCell = sectionCellService.addNewSectionCell(sectionCell);
|
SectionCell newSectionCell =
|
||||||
|
sectionCellService.addNewSectionCell(
|
||||||
|
sectionCell); // if here, logger fails cause id is null (not added yet)
|
||||||
newSectionCell.getProjectSectionCell().updateListSectionCell(newSectionCell);
|
newSectionCell.getProjectSectionCell().updateListSectionCell(newSectionCell);
|
||||||
newSectionCell
|
newSectionCell
|
||||||
.getAppointmentSectionCell()
|
.getAppointmentSectionCell()
|
||||||
.forEach(
|
.forEach(
|
||||||
appointment -> {
|
appointment -> {
|
||||||
appointment.updateListSectionCell(newSectionCell);
|
this.appointmentService.updateAppointmentListSectionCell(
|
||||||
|
appointment.getIdAppointment(), newSectionCell);
|
||||||
});
|
});
|
||||||
newSectionCell
|
newSectionCell
|
||||||
.getListAnnotation()
|
.getListAnnotation()
|
||||||
.forEach(
|
.forEach(
|
||||||
annotation -> {
|
annotation -> {
|
||||||
annotation.setSectionCellAnnotation(newSectionCell);
|
this.annotationService.updateAnnotationSectionCell(
|
||||||
|
annotation.getIdAnnotation(), newSectionCell);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public void requestNewProject(Project project, String mail) {
|
public void requestNewProject(Project project, String mail) {
|
||||||
if (project == null) {
|
if (project == null) {
|
||||||
logger.error("Trying to request the creation of a null project");
|
logger.warn("Trying to request the creation of a null project");
|
||||||
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Le projet fourni est vide");
|
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Le projet fourni est vide");
|
||||||
}
|
}
|
||||||
logger.info("User {} created a new project with id {}", mail, project.getIdProject());
|
logger.info("User {} created a new project named {}", mail, project.getProjectName());
|
||||||
project.setProjectStatus(PENDING);
|
project.setEntrepreneurProposed((Entrepreneur) this.userService.getUserByEmail(mail));
|
||||||
projectService.addNewProject(project);
|
projectService.addNewProject(project);
|
||||||
|
this.projectService.updateProjectStatus(project.getIdProject(), PENDING);
|
||||||
|
if (project.getProjectAdministrator() != null) {
|
||||||
|
this.administratorService.updateAdministratorListProject(
|
||||||
|
project.getProjectAdministrator().getIdUser(), project);
|
||||||
|
}
|
||||||
|
this.entrepreneurService.updateEntrepreneurProjectProposed(
|
||||||
|
this.userService.getUserByEmail(mail).getIdUser(), project);
|
||||||
|
this.entrepreneurService.updateEntrepreneurProjectParticipation(
|
||||||
|
this.userService.getUserByEmail(mail).getIdUser(), project);
|
||||||
|
project.getListEntrepreneurParticipation()
|
||||||
|
.forEach(
|
||||||
|
entrepreneur ->
|
||||||
|
this.entrepreneurService.updateEntrepreneurProjectParticipation(
|
||||||
|
entrepreneur.getIdUser(), project));
|
||||||
|
project.getListSectionCell()
|
||||||
|
.forEach(
|
||||||
|
sectionCell ->
|
||||||
|
this.sectionCellService.updateSectionCellProject(
|
||||||
|
sectionCell.getIdSectionCell(), project));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void createAccount(Entrepreneur e) {
|
||||||
|
try {
|
||||||
|
userService.getUserByEmail(e.getPrimaryMail());
|
||||||
|
logger.error("The user {} already exists in the system", e.getPrimaryMail());
|
||||||
|
} catch (ResponseStatusException err) {
|
||||||
|
this.entrepreneurService.addEntrepreneur(e);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
throw new ResponseStatusException(HttpStatus.CONFLICT, "User already exists in the system");
|
||||||
|
}
|
||||||
|
|
||||||
|
public Iterable<Project> getProjectIdViaClaim(String email) {
|
||||||
|
Long UserId = this.userService.getUserByEmail(email).getIdUser();
|
||||||
|
Entrepreneur entrepreneur = this.entrepreneurService.getEntrepreneurById(UserId);
|
||||||
|
List<Project> Project_List = new ArrayList<>();
|
||||||
|
|
||||||
|
Project_List.add(entrepreneur.getProjectParticipation());
|
||||||
|
return Project_List;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,12 +6,17 @@ import enseirb.myinpulse.exception.UserNotFoundException;
|
|||||||
import enseirb.myinpulse.model.RoleRepresentation;
|
import enseirb.myinpulse.model.RoleRepresentation;
|
||||||
import enseirb.myinpulse.model.UserRepresentation;
|
import enseirb.myinpulse.model.UserRepresentation;
|
||||||
|
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.springframework.web.client.RestClient;
|
import org.springframework.web.client.RestClient;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
import javax.management.relation.RoleNotFoundException;
|
import javax.management.relation.RoleNotFoundException;
|
||||||
|
|
||||||
public class KeycloakApi {
|
public class KeycloakApi {
|
||||||
|
|
||||||
|
protected static final Logger logger = LogManager.getLogger();
|
||||||
static final String keycloakUrl;
|
static final String keycloakUrl;
|
||||||
static final String realmName;
|
static final String realmName;
|
||||||
|
|
||||||
@ -29,44 +34,48 @@ public class KeycloakApi {
|
|||||||
realmName = System.getenv("VITE_KEYCLOAK_REALM");
|
realmName = System.getenv("VITE_KEYCLOAK_REALM");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static String toBearer(String b) {
|
||||||
|
return "Bearer " + b;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Uses Keycloak API to retrieve a role representation of a role by its name
|
* Uses Keycloak API to retrieve a role representation of a role by its name
|
||||||
*
|
*
|
||||||
* @param roleName name of the role
|
* @param roleName name of the role
|
||||||
* @param bearer authorization header used by the client to authenticate to keycloak
|
* @param token authorization header used by the client to authenticate to keycloak
|
||||||
*/
|
*/
|
||||||
public static RoleRepresentation getRoleRepresentationByName(String roleName, String bearer)
|
public static RoleRepresentation getRoleRepresentationByName(String roleName, String token)
|
||||||
throws RoleNotFoundException {
|
throws RoleNotFoundException {
|
||||||
RoleRepresentation[] response =
|
RoleRepresentation response =
|
||||||
RestClient.builder()
|
RestClient.builder()
|
||||||
.baseUrl(keycloakUrl)
|
.baseUrl(keycloakUrl)
|
||||||
.defaultHeader("Authorization", bearer)
|
.defaultHeader("Authorization", toBearer(token))
|
||||||
.build()
|
.build()
|
||||||
.get()
|
.get()
|
||||||
.uri("/admin/realms/{realmName}/roles/{roleName}", realmName, roleName)
|
.uri("/admin/realms/{realmName}/roles/{roleName}", realmName, roleName)
|
||||||
.retrieve()
|
.retrieve()
|
||||||
.body(RoleRepresentation[].class);
|
.body(RoleRepresentation.class);
|
||||||
|
/*
|
||||||
if (response == null || response.length == 0) {
|
{"id":"7a845f2e-c832-4465-8cd8-894d72bc13f1","name":"MyINPulse-entrepreneur","description":"Role for entrepreneur","composite":false,"clientRole":false,"containerId":"0d6f691b-e328-471a-b89e-c30bd7e5b6b0","attributes":{}}
|
||||||
throw new RoleNotFoundException("Role not found");
|
*/
|
||||||
}
|
// TODO: check what happens when role does not exist
|
||||||
return response[0];
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use keycloak API to to retreive a userID via his name or email.
|
* Use keycloak API to to retreive a userID via his name or email.
|
||||||
*
|
*
|
||||||
* @param username username or mail of the user
|
* @param username username or mail of the user
|
||||||
* @param bearer bearer of the user, allowing access to database
|
* @param token bearer of the user, allowing access to database
|
||||||
* @return the userid, as a String
|
* @return the userid, as a String
|
||||||
* @throws UserNotFoundException
|
* @throws UserNotFoundException
|
||||||
*/
|
*/
|
||||||
public static String getUserIdByName(String username, String bearer)
|
public static String getUserIdByName(String username, String token)
|
||||||
throws UserNotFoundException {
|
throws UserNotFoundException {
|
||||||
UserRepresentation[] response =
|
UserRepresentation[] response =
|
||||||
RestClient.builder()
|
RestClient.builder()
|
||||||
.baseUrl(keycloakUrl)
|
.baseUrl(keycloakUrl)
|
||||||
.defaultHeader("Authorization", bearer)
|
.defaultHeader("Authorization", toBearer(token))
|
||||||
.build()
|
.build()
|
||||||
.get()
|
.get()
|
||||||
.uri(
|
.uri(
|
||||||
@ -91,27 +100,26 @@ public class KeycloakApi {
|
|||||||
*
|
*
|
||||||
* @param username
|
* @param username
|
||||||
* @param roleName
|
* @param roleName
|
||||||
* @param bearer
|
* @param token
|
||||||
* @throws RoleNotFoundException
|
* @throws RoleNotFoundException
|
||||||
* @throws UserNotFoundException
|
* @throws UserNotFoundException
|
||||||
*/
|
*/
|
||||||
public static void setRoleToUser(String username, String roleName, String bearer)
|
public static void setRoleToUser(String username, String roleName, String token)
|
||||||
throws RoleNotFoundException, UserNotFoundException {
|
throws RoleNotFoundException, UserNotFoundException {
|
||||||
RoleRepresentation roleRepresentation = getRoleRepresentationByName(roleName, bearer);
|
RoleRepresentation roleRepresentation = getRoleRepresentationByName(roleName, token);
|
||||||
String userId = getUserIdByName(username, bearer);
|
String userId = getUserIdByName(username, token);
|
||||||
|
List<RoleRepresentation> rolesToAdd = List.of(roleRepresentation);
|
||||||
|
logger.debug("Adding role {} to user {}", roleRepresentation.id, userId);
|
||||||
RestClient.builder()
|
RestClient.builder()
|
||||||
.baseUrl(keycloakUrl)
|
.baseUrl(keycloakUrl)
|
||||||
.defaultHeader("Authorization", bearer)
|
.defaultHeader("Authorization", toBearer(token))
|
||||||
.build()
|
.build()
|
||||||
.post()
|
.post()
|
||||||
.uri(
|
.uri("/admin/realms/" + realmName + "/users/" + userId + "/role-mappings/realm")
|
||||||
"/admin/realms/${realmName}/users/${userId}/role-mappings/realm",
|
.body(rolesToAdd)
|
||||||
realmName,
|
|
||||||
userId)
|
|
||||||
.body(roleRepresentation)
|
|
||||||
.contentType(APPLICATION_JSON)
|
.contentType(APPLICATION_JSON)
|
||||||
.retrieve();
|
.retrieve()
|
||||||
|
.toBodilessEntity();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -2,7 +2,8 @@ package enseirb.myinpulse.service;
|
|||||||
|
|
||||||
import com.itextpdf.text.*;
|
import com.itextpdf.text.*;
|
||||||
import com.itextpdf.text.pdf.PdfWriter;
|
import com.itextpdf.text.pdf.PdfWriter;
|
||||||
|
import enseirb.myinpulse.controller.AdminApi;
|
||||||
|
import enseirb.myinpulse.controller.EntrepreneurApi;
|
||||||
import enseirb.myinpulse.model.*;
|
import enseirb.myinpulse.model.*;
|
||||||
import enseirb.myinpulse.service.database.*;
|
import enseirb.myinpulse.service.database.*;
|
||||||
|
|
||||||
@ -24,11 +25,17 @@ import java.nio.file.StandardCopyOption;
|
|||||||
import java.time.LocalDateTime;
|
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.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class SharedApiService {
|
public class SharedApiService {
|
||||||
|
|
||||||
|
private final AdminApi adminApi;
|
||||||
|
|
||||||
|
private final EntrepreneurApi entrepreneurApi;
|
||||||
|
|
||||||
protected static final Logger logger = LogManager.getLogger();
|
protected static final Logger logger = LogManager.getLogger();
|
||||||
|
|
||||||
private final ProjectService projectService;
|
private final ProjectService projectService;
|
||||||
@ -44,12 +51,16 @@ public class SharedApiService {
|
|||||||
EntrepreneurService entrepreneurService,
|
EntrepreneurService entrepreneurService,
|
||||||
SectionCellService sectionCellService,
|
SectionCellService sectionCellService,
|
||||||
AppointmentService appointmentService,
|
AppointmentService appointmentService,
|
||||||
UtilsService utilsService) {
|
UtilsService utilsService,
|
||||||
|
EntrepreneurApi entrepreneurApi,
|
||||||
|
AdminApi adminApi) {
|
||||||
this.projectService = projectService;
|
this.projectService = projectService;
|
||||||
this.entrepreneurService = entrepreneurService;
|
this.entrepreneurService = entrepreneurService;
|
||||||
this.sectionCellService = sectionCellService;
|
this.sectionCellService = sectionCellService;
|
||||||
this.appointmentService = appointmentService;
|
this.appointmentService = appointmentService;
|
||||||
this.utilsService = utilsService;
|
this.utilsService = utilsService;
|
||||||
|
this.entrepreneurApi = entrepreneurApi;
|
||||||
|
this.adminApi = adminApi;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO filter this with date
|
// TODO filter this with date
|
||||||
@ -69,10 +80,54 @@ public class SharedApiService {
|
|||||||
LocalDateTime dateTime = LocalDateTime.parse(date, formatter);
|
LocalDateTime dateTime = LocalDateTime.parse(date, formatter);
|
||||||
|
|
||||||
Project project = this.projectService.getProjectById(projectId);
|
Project project = this.projectService.getProjectById(projectId);
|
||||||
return this.sectionCellService.getSectionCellsByProjectAndSectionIdBeforeDate(
|
return this.sectionCellService.getLatestSectionCellsByIdReferenceBeforeDate(
|
||||||
project, sectionId, dateTime);
|
project, sectionId, dateTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Retrieve all up to date (for every sectionId) sectionCells of a project
|
||||||
|
public Iterable<SectionCell> getAllSectionCells(long projectId, String mail) {
|
||||||
|
if (!utilsService.isAllowedToCheckProject(mail, projectId)) {
|
||||||
|
logger.warn(
|
||||||
|
"User {} tried to check section cells of the project {} but is not allowed to.",
|
||||||
|
mail,
|
||||||
|
projectId);
|
||||||
|
throw new ResponseStatusException(
|
||||||
|
HttpStatus.UNAUTHORIZED, "You're not allowed to check this project");
|
||||||
|
}
|
||||||
|
|
||||||
|
Project project = this.projectService.getProjectById(projectId);
|
||||||
|
|
||||||
|
Map<Long, SectionCell> latestSectionCellsMap =
|
||||||
|
new HashMap<>(); // List for the intermediate result
|
||||||
|
|
||||||
|
// Iterate through all SectionCells associated with the project
|
||||||
|
// This loop iterates over project.getListSectionCell() but does NOT modify it which causes
|
||||||
|
// ConcurrentModificationException.
|
||||||
|
// Modifications are done only on the latestSectionCellsMap (which is safe).
|
||||||
|
project.getListSectionCell() // <-- Iterating over the original list (read-only)
|
||||||
|
.forEach(
|
||||||
|
projectCell -> {
|
||||||
|
Long idReference = projectCell.getIdReference();
|
||||||
|
// Check if we have already seen a SectionCell with this idReference in
|
||||||
|
// our map
|
||||||
|
if (latestSectionCellsMap.containsKey(idReference)) {
|
||||||
|
SectionCell existingCell = latestSectionCellsMap.get(idReference);
|
||||||
|
// Compare modification dates. If the current cell is newer, replace
|
||||||
|
// the one in the map.
|
||||||
|
if (projectCell
|
||||||
|
.getModificationDate()
|
||||||
|
.isAfter(existingCell.getModificationDate())) {
|
||||||
|
latestSectionCellsMap.put(idReference, projectCell);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// If this is the first time we encounter this idReference, add the
|
||||||
|
// cell to the map.
|
||||||
|
latestSectionCellsMap.put(idReference, projectCell);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return new ArrayList<>(latestSectionCellsMap.values());
|
||||||
|
}
|
||||||
|
|
||||||
// TODO: test
|
// TODO: test
|
||||||
public Iterable<Entrepreneur> getEntrepreneursByProjectId(long projectId, String mail) {
|
public Iterable<Entrepreneur> getEntrepreneursByProjectId(long projectId, String mail) {
|
||||||
if (!utilsService.isAllowedToCheckProject(mail, projectId)) {
|
if (!utilsService.isAllowedToCheckProject(mail, projectId)) {
|
||||||
@ -247,6 +302,13 @@ public class SharedApiService {
|
|||||||
sectionCell -> {
|
sectionCell -> {
|
||||||
sectionCell.updateAppointmentSectionCell(newAppointment);
|
sectionCell.updateAppointmentSectionCell(newAppointment);
|
||||||
});
|
});
|
||||||
newAppointment.getAppointmentReport().setAppointmentReport(newAppointment);
|
|
||||||
|
/*
|
||||||
|
* On initial insertion, the resport value is null unless that report does already exist in the db somewhere
|
||||||
|
* If a non null value is passed and it does not exist in db it will throw an exception
|
||||||
|
*/
|
||||||
|
if (newAppointment.getAppointmentReport() != null) {
|
||||||
|
newAppointment.getAppointmentReport().setAppointmentReport(newAppointment);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -15,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.web.server.ResponseStatusException;
|
import org.springframework.web.server.ResponseStatusException;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class UtilsService {
|
public class UtilsService {
|
||||||
|
|
||||||
@ -44,18 +46,29 @@ public class UtilsService {
|
|||||||
}
|
}
|
||||||
User user = this.userService.getUserByEmail(mail);
|
User user = this.userService.getUserByEmail(mail);
|
||||||
Entrepreneur entrepreneur = this.entrepreneurService.getEntrepreneurById(user.getIdUser());
|
Entrepreneur entrepreneur = this.entrepreneurService.getEntrepreneurById(user.getIdUser());
|
||||||
|
if (entrepreneur == null) {
|
||||||
|
logger.debug("testing access with an unknown Entrepreneur");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (entrepreneur.getProjectParticipation() == null) {
|
||||||
|
logger.debug("testing access with an user with no project participation");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
Project project = this.projectService.getProjectById(projectId);
|
Project project = this.projectService.getProjectById(projectId);
|
||||||
return entrepreneur.getProjectParticipation() == project;
|
// We compare the ID instead of the project themselves
|
||||||
|
return Objects.equals(
|
||||||
|
entrepreneur.getProjectParticipation().getIdProject(), project.getIdProject());
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: test
|
// TODO: test
|
||||||
Boolean isAnAdmin(String mail) {
|
public Boolean isAnAdmin(String mail) {
|
||||||
try {
|
try {
|
||||||
long userId = this.userService.getUserByEmail(mail).getIdUser();
|
long userId = this.userService.getUserByEmail(mail).getIdUser();
|
||||||
Administrator a = this.administratorService.getAdministratorById(userId);
|
Administrator a = this.administratorService.getAdministratorById(userId);
|
||||||
return true;
|
return true;
|
||||||
} catch (ResponseStatusException e) {
|
} catch (ResponseStatusException e) {
|
||||||
logger.info(e);
|
logger.info(e);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,9 @@
|
|||||||
package enseirb.myinpulse.service.database;
|
package enseirb.myinpulse.service.database;
|
||||||
|
|
||||||
import enseirb.myinpulse.model.Administrator;
|
import enseirb.myinpulse.model.Administrator;
|
||||||
|
import enseirb.myinpulse.model.Annotation;
|
||||||
|
import enseirb.myinpulse.model.MakeAppointment;
|
||||||
|
import enseirb.myinpulse.model.Project;
|
||||||
import enseirb.myinpulse.repository.AdministratorRepository;
|
import enseirb.myinpulse.repository.AdministratorRepository;
|
||||||
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
@ -52,6 +55,49 @@ public class AdministratorService {
|
|||||||
return this.administratorRepository.save(administrator);
|
return this.administratorRepository.save(administrator);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void updateAdministratorListProject(long idAdministrator, Project project) {
|
||||||
|
Administrator administrator = getAdministratorById(idAdministrator);
|
||||||
|
administrator.updateListProject(project);
|
||||||
|
this.administratorRepository.save(administrator);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateAdministratorListAnnotation(long idAdministrator, Annotation annotation) {
|
||||||
|
Administrator administrator = getAdministratorById(idAdministrator);
|
||||||
|
administrator.updateListAnnotation(annotation);
|
||||||
|
this.administratorRepository.save(administrator);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateAdministratorMakeAppointment(
|
||||||
|
long idAdministrator, MakeAppointment makeAppointment) {
|
||||||
|
Administrator administrator = getAdministratorById(idAdministrator);
|
||||||
|
administrator.setMakeAppointment(makeAppointment);
|
||||||
|
this.administratorRepository.save(administrator);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Administrator updateAdministrator(
|
||||||
|
Long idAdministrator,
|
||||||
|
Project project,
|
||||||
|
Annotation annotation,
|
||||||
|
MakeAppointment makeAppointment) {
|
||||||
|
Optional<Administrator> administrator = administratorRepository.findById(idAdministrator);
|
||||||
|
if (administrator.isEmpty()) {
|
||||||
|
logger.error(
|
||||||
|
"updateAdministrator : No administrator found with id {}", idAdministrator);
|
||||||
|
throw new ResponseStatusException(
|
||||||
|
HttpStatus.NOT_FOUND, "Cet administrateur n'existe pas");
|
||||||
|
}
|
||||||
|
if (project != null) {
|
||||||
|
administrator.get().updateListProject(project);
|
||||||
|
}
|
||||||
|
if (annotation != null) {
|
||||||
|
administrator.get().updateListAnnotation(annotation);
|
||||||
|
}
|
||||||
|
if (makeAppointment != null) {
|
||||||
|
administrator.get().setMakeAppointment(makeAppointment);
|
||||||
|
}
|
||||||
|
return this.administratorRepository.save(administrator.get());
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
public Administrator getAdministratorByProject(Project project) {
|
public Administrator getAdministratorByProject(Project project) {
|
||||||
r
|
r
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
package enseirb.myinpulse.service.database;
|
package enseirb.myinpulse.service.database;
|
||||||
|
|
||||||
|
import enseirb.myinpulse.model.Administrator;
|
||||||
import enseirb.myinpulse.model.Annotation;
|
import enseirb.myinpulse.model.Annotation;
|
||||||
|
import enseirb.myinpulse.model.SectionCell;
|
||||||
import enseirb.myinpulse.repository.AnnotationRepository;
|
import enseirb.myinpulse.repository.AnnotationRepository;
|
||||||
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
@ -46,6 +48,12 @@ public class AnnotationService {
|
|||||||
this.annotationRepository.deleteById(id);
|
this.annotationRepository.deleteById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void updateAnnotationComment(long idAnnotation, String comment) {
|
||||||
|
Annotation annotation = getAnnotationById(idAnnotation);
|
||||||
|
annotation.setComment(comment);
|
||||||
|
this.annotationRepository.save(annotation);
|
||||||
|
}
|
||||||
|
|
||||||
public Annotation updateAnnotation(Long id, String comment) {
|
public Annotation updateAnnotation(Long id, String comment) {
|
||||||
Optional<Annotation> annotation = annotationRepository.findById(id);
|
Optional<Annotation> annotation = annotationRepository.findById(id);
|
||||||
if (annotation.isEmpty()) {
|
if (annotation.isEmpty()) {
|
||||||
@ -58,4 +66,16 @@ public class AnnotationService {
|
|||||||
}
|
}
|
||||||
return this.annotationRepository.save(annotation.get());
|
return this.annotationRepository.save(annotation.get());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void updateAnnotationSectionCell(long idAnnotation, SectionCell sectionCell) {
|
||||||
|
Annotation annotation = getAnnotationById(idAnnotation);
|
||||||
|
annotation.setSectionCellAnnotation(sectionCell);
|
||||||
|
this.annotationRepository.save(annotation);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateAnnotationAdministrator(long idAnnotation, Administrator administrator) {
|
||||||
|
Annotation annotation = getAnnotationById(idAnnotation);
|
||||||
|
annotation.setAdministratorAnnotation(administrator);
|
||||||
|
this.annotationRepository.save(annotation);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package enseirb.myinpulse.service.database;
|
package enseirb.myinpulse.service.database;
|
||||||
|
|
||||||
import enseirb.myinpulse.model.Appointment;
|
import enseirb.myinpulse.model.Appointment;
|
||||||
|
import enseirb.myinpulse.model.SectionCell;
|
||||||
import enseirb.myinpulse.repository.AppointmentRepository;
|
import enseirb.myinpulse.repository.AppointmentRepository;
|
||||||
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
@ -47,13 +48,50 @@ public class AppointmentService {
|
|||||||
this.appointmentRepository.deleteById(id);
|
this.appointmentRepository.deleteById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void updateAppointmentDate(long idAppointment, LocalDate date) {
|
||||||
|
Appointment appointment = getAppointmentById(idAppointment);
|
||||||
|
appointment.setAppointmentDate(date);
|
||||||
|
this.appointmentRepository.save(appointment);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateAppointmentTime(long idAppointment, LocalTime time) {
|
||||||
|
Appointment appointment = getAppointmentById(idAppointment);
|
||||||
|
appointment.setAppointmentTime(time);
|
||||||
|
this.appointmentRepository.save(appointment);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateAppointmentDuration(long idAppointment, LocalTime duration) {
|
||||||
|
Appointment appointment = getAppointmentById(idAppointment);
|
||||||
|
appointment.setAppointmentDuration(duration);
|
||||||
|
this.appointmentRepository.save(appointment);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateAppointmentPlace(long idAppointment, String place) {
|
||||||
|
Appointment appointment = getAppointmentById(idAppointment);
|
||||||
|
appointment.setAppointmentPlace(place);
|
||||||
|
this.appointmentRepository.save(appointment);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateAppointmentSubject(long idAppointment, String subject) {
|
||||||
|
Appointment appointment = getAppointmentById(idAppointment);
|
||||||
|
appointment.setAppointmentSubject(subject);
|
||||||
|
this.appointmentRepository.save(appointment);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateAppointmentListSectionCell(long idAppointment, SectionCell sectionCell) {
|
||||||
|
Appointment appointment = getAppointmentById(idAppointment);
|
||||||
|
appointment.updateListSectionCell(sectionCell);
|
||||||
|
this.appointmentRepository.save(appointment);
|
||||||
|
}
|
||||||
|
|
||||||
public Appointment updateAppointment(
|
public Appointment updateAppointment(
|
||||||
Long id,
|
Long id,
|
||||||
LocalDate appointmentDate,
|
LocalDate appointmentDate,
|
||||||
LocalTime appointmentTime,
|
LocalTime appointmentTime,
|
||||||
LocalTime appointmentDuration,
|
LocalTime appointmentDuration,
|
||||||
String appointmentPlace,
|
String appointmentPlace,
|
||||||
String appointmentSubject) {
|
String appointmentSubject,
|
||||||
|
SectionCell sectionCell) {
|
||||||
Optional<Appointment> appointment = this.appointmentRepository.findById(id);
|
Optional<Appointment> appointment = this.appointmentRepository.findById(id);
|
||||||
if (appointment.isEmpty()) {
|
if (appointment.isEmpty()) {
|
||||||
logger.error("updateAppointment : No appointment found with id {}", id);
|
logger.error("updateAppointment : No appointment found with id {}", id);
|
||||||
@ -74,6 +112,9 @@ public class AppointmentService {
|
|||||||
if (appointmentSubject != null) {
|
if (appointmentSubject != null) {
|
||||||
appointment.get().setAppointmentSubject(appointmentSubject);
|
appointment.get().setAppointmentSubject(appointmentSubject);
|
||||||
}
|
}
|
||||||
|
if (sectionCell != null) {
|
||||||
|
appointment.get().updateListSectionCell(sectionCell);
|
||||||
|
}
|
||||||
return this.appointmentRepository.save(appointment.get());
|
return this.appointmentRepository.save(appointment.get());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package enseirb.myinpulse.service.database;
|
package enseirb.myinpulse.service.database;
|
||||||
|
|
||||||
import enseirb.myinpulse.model.Entrepreneur;
|
import enseirb.myinpulse.model.Entrepreneur;
|
||||||
|
import enseirb.myinpulse.model.MakeAppointment;
|
||||||
import enseirb.myinpulse.model.Project;
|
import enseirb.myinpulse.model.Project;
|
||||||
import enseirb.myinpulse.repository.EntrepreneurRepository;
|
import enseirb.myinpulse.repository.EntrepreneurRepository;
|
||||||
|
|
||||||
@ -41,8 +42,52 @@ public class EntrepreneurService {
|
|||||||
return this.entrepreneurRepository.save(entrepreneur);
|
return this.entrepreneurRepository.save(entrepreneur);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void updateEntrepreneurSchool(long idEntrepreneur, String school) {
|
||||||
|
Entrepreneur entrepreneur = getEntrepreneurById(idEntrepreneur);
|
||||||
|
entrepreneur.setSchool(school);
|
||||||
|
this.entrepreneurRepository.save(entrepreneur);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateEntrepreneurCourse(long idEntrepreneur, String course) {
|
||||||
|
Entrepreneur entrepreneur = getEntrepreneurById(idEntrepreneur);
|
||||||
|
entrepreneur.setCourse(course);
|
||||||
|
this.entrepreneurRepository.save(entrepreneur);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateEntrepreneurSneeStatus(long idEntrepreneur, boolean status) {
|
||||||
|
Entrepreneur entrepreneur = getEntrepreneurById(idEntrepreneur);
|
||||||
|
entrepreneur.setSneeStatus(status);
|
||||||
|
this.entrepreneurRepository.save(entrepreneur);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateEntrepreneurProjectParticipation(
|
||||||
|
long idEntrepreneur, Project projectParticipation) {
|
||||||
|
Entrepreneur entrepreneur = getEntrepreneurById(idEntrepreneur);
|
||||||
|
entrepreneur.setProjectParticipation(projectParticipation);
|
||||||
|
this.entrepreneurRepository.save(entrepreneur);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateEntrepreneurProjectProposed(long idEntrepreneur, Project projectProposed) {
|
||||||
|
Entrepreneur entrepreneur = getEntrepreneurById(idEntrepreneur);
|
||||||
|
entrepreneur.setProjectParticipation(projectProposed);
|
||||||
|
this.entrepreneurRepository.save(entrepreneur);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateEntrepreneurMakeAppointment(
|
||||||
|
long idEntrepreneur, MakeAppointment makeAppointment) {
|
||||||
|
Entrepreneur entrepreneur = getEntrepreneurById(idEntrepreneur);
|
||||||
|
entrepreneur.setMakeAppointment(makeAppointment);
|
||||||
|
this.entrepreneurRepository.save(entrepreneur);
|
||||||
|
}
|
||||||
|
|
||||||
public Entrepreneur updateEntrepreneur(
|
public Entrepreneur updateEntrepreneur(
|
||||||
Long id, String school, String course, Boolean sneeStatus) {
|
Long id,
|
||||||
|
String school,
|
||||||
|
String course,
|
||||||
|
Boolean sneeStatus,
|
||||||
|
Project projectParticipation,
|
||||||
|
Project projectProposed,
|
||||||
|
MakeAppointment makeAppointment) {
|
||||||
Optional<Entrepreneur> entrepreneur = entrepreneurRepository.findById(id);
|
Optional<Entrepreneur> entrepreneur = entrepreneurRepository.findById(id);
|
||||||
if (entrepreneur.isEmpty()) {
|
if (entrepreneur.isEmpty()) {
|
||||||
logger.error("updateEntrepreneur : No entrepreneur found with id {}", id);
|
logger.error("updateEntrepreneur : No entrepreneur found with id {}", id);
|
||||||
@ -58,10 +103,33 @@ public class EntrepreneurService {
|
|||||||
if (sneeStatus != null) {
|
if (sneeStatus != null) {
|
||||||
entrepreneur.get().setSneeStatus(sneeStatus);
|
entrepreneur.get().setSneeStatus(sneeStatus);
|
||||||
}
|
}
|
||||||
|
if (projectParticipation != null) {
|
||||||
|
entrepreneur.get().setProjectParticipation(projectParticipation);
|
||||||
|
}
|
||||||
|
if (projectProposed != null) {
|
||||||
|
entrepreneur.get().setProjectParticipation(projectProposed);
|
||||||
|
}
|
||||||
|
if (makeAppointment != null) {
|
||||||
|
entrepreneur.get().setMakeAppointment(makeAppointment);
|
||||||
|
}
|
||||||
return this.entrepreneurRepository.save(entrepreneur.get());
|
return this.entrepreneurRepository.save(entrepreneur.get());
|
||||||
}
|
}
|
||||||
|
|
||||||
public Iterable<Entrepreneur> GetEntrepreneurByProject(Project project) {
|
public Iterable<Entrepreneur> GetEntrepreneurByProject(Project project) {
|
||||||
return this.entrepreneurRepository.getEntrepreneurByProjectParticipation(project);
|
return this.entrepreneurRepository.getEntrepreneurByProjectParticipation(project);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void deleteEntrepreneur(Entrepreneur e) {
|
||||||
|
this.entrepreneurRepository.delete(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void validateEntrepreneurById(Long id) {
|
||||||
|
System.out.println("\nVALIDATING\n");
|
||||||
|
Optional<Entrepreneur> e = this.entrepreneurRepository.findById(id);
|
||||||
|
if (e.isEmpty()) {
|
||||||
|
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Entrepreneur n'existe pas");
|
||||||
|
}
|
||||||
|
e.get().setPending(false);
|
||||||
|
this.entrepreneurRepository.save(e.get());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,9 +2,7 @@ package enseirb.myinpulse.service.database;
|
|||||||
|
|
||||||
import static enseirb.myinpulse.model.ProjectDecisionValue.PENDING;
|
import static enseirb.myinpulse.model.ProjectDecisionValue.PENDING;
|
||||||
|
|
||||||
import enseirb.myinpulse.model.Administrator;
|
import enseirb.myinpulse.model.*;
|
||||||
import enseirb.myinpulse.model.Project;
|
|
||||||
import enseirb.myinpulse.model.ProjectDecisionValue;
|
|
||||||
import enseirb.myinpulse.repository.ProjectRepository;
|
import enseirb.myinpulse.repository.ProjectRepository;
|
||||||
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
@ -14,7 +12,6 @@ import org.springframework.http.HttpStatus;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.web.server.ResponseStatusException;
|
import org.springframework.web.server.ResponseStatusException;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@ -52,12 +49,50 @@ public class ProjectService {
|
|||||||
return this.projectRepository.save(project);
|
return this.projectRepository.save(project);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void updateProjectName(long idProject, String name) {
|
||||||
|
Project project = getProjectById(idProject);
|
||||||
|
project.setProjectName(name);
|
||||||
|
this.projectRepository.save(project);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateProjectLogo(long idProject, byte[] logo) {
|
||||||
|
Project project = getProjectById(idProject);
|
||||||
|
project.setLogo(logo);
|
||||||
|
this.projectRepository.save(project);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateProjectStatus(long idProject, ProjectDecisionValue status) {
|
||||||
|
Project project = getProjectById(idProject);
|
||||||
|
project.setProjectStatus(status);
|
||||||
|
this.projectRepository.save(project);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateProjectEntrepreneurParticipation(
|
||||||
|
long idProject, Entrepreneur entrepreneurParticipation) {
|
||||||
|
Project project = getProjectById(idProject);
|
||||||
|
project.updateListEntrepreneurParticipation(entrepreneurParticipation);
|
||||||
|
this.projectRepository.save(project);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateProjectListSectionCell(long idProject, SectionCell sectionCell) {
|
||||||
|
Project project = getProjectById(idProject);
|
||||||
|
project.updateListSectionCell(sectionCell);
|
||||||
|
this.projectRepository.save(project);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateProjectAdministrator(long idProject, Administrator administrator) {
|
||||||
|
Project project = getProjectById(idProject);
|
||||||
|
project.setProjectAdministrator(administrator);
|
||||||
|
this.projectRepository.save(project);
|
||||||
|
}
|
||||||
|
|
||||||
public Project updateProject(
|
public Project updateProject(
|
||||||
Long id,
|
Long id,
|
||||||
String projectName,
|
String projectName,
|
||||||
byte[] logo,
|
byte[] logo,
|
||||||
LocalDate creationDate,
|
|
||||||
ProjectDecisionValue projectStatus,
|
ProjectDecisionValue projectStatus,
|
||||||
|
Entrepreneur entrepreneurParticipation,
|
||||||
|
SectionCell sectionCell,
|
||||||
Administrator administrator) {
|
Administrator administrator) {
|
||||||
Optional<Project> project = this.projectRepository.findById(id);
|
Optional<Project> project = this.projectRepository.findById(id);
|
||||||
|
|
||||||
@ -73,11 +108,6 @@ public class ProjectService {
|
|||||||
if (logo != null) {
|
if (logo != null) {
|
||||||
project.get().setLogo(logo);
|
project.get().setLogo(logo);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (creationDate != null) {
|
|
||||||
project.get().setCreationDate(creationDate);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (projectStatus != null) {
|
if (projectStatus != null) {
|
||||||
// TODO: check if this is really useful
|
// TODO: check if this is really useful
|
||||||
/*
|
/*
|
||||||
@ -89,7 +119,12 @@ public class ProjectService {
|
|||||||
*/
|
*/
|
||||||
project.get().setProjectStatus(projectStatus);
|
project.get().setProjectStatus(projectStatus);
|
||||||
}
|
}
|
||||||
|
if (entrepreneurParticipation != null) {
|
||||||
|
project.get().updateListEntrepreneurParticipation(entrepreneurParticipation);
|
||||||
|
}
|
||||||
|
if (sectionCell != null) {
|
||||||
|
project.get().updateListSectionCell(sectionCell);
|
||||||
|
}
|
||||||
if (administrator != null) {
|
if (administrator != null) {
|
||||||
project.get().setProjectAdministrator(administrator);
|
project.get().setProjectAdministrator(administrator);
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package enseirb.myinpulse.service.database;
|
package enseirb.myinpulse.service.database;
|
||||||
|
|
||||||
|
import enseirb.myinpulse.model.Appointment;
|
||||||
import enseirb.myinpulse.model.Report;
|
import enseirb.myinpulse.model.Report;
|
||||||
import enseirb.myinpulse.repository.ReportRepository;
|
import enseirb.myinpulse.repository.ReportRepository;
|
||||||
|
|
||||||
@ -46,7 +47,19 @@ public class ReportService {
|
|||||||
this.reportRepository.deleteById(id);
|
this.reportRepository.deleteById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Report updateReport(Long id, String reportContent) {
|
public void updateReportContent(long idReport, String content) {
|
||||||
|
Report report = getReportById(idReport);
|
||||||
|
report.setReportContent(content);
|
||||||
|
this.reportRepository.save(report);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateReportAppointment(long idReport, Appointment appointment) {
|
||||||
|
Report report = getReportById(idReport);
|
||||||
|
report.setAppointmentReport(appointment);
|
||||||
|
this.reportRepository.save(report);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Report updateReport(Long id, String reportContent, Appointment appointment) {
|
||||||
Optional<Report> report = this.reportRepository.findById(id);
|
Optional<Report> report = this.reportRepository.findById(id);
|
||||||
if (report.isEmpty()) {
|
if (report.isEmpty()) {
|
||||||
logger.error("updateReport : No report found with id {}", id);
|
logger.error("updateReport : No report found with id {}", id);
|
||||||
@ -55,6 +68,9 @@ public class ReportService {
|
|||||||
if (reportContent != null) {
|
if (reportContent != null) {
|
||||||
report.get().setReportContent(reportContent);
|
report.get().setReportContent(reportContent);
|
||||||
}
|
}
|
||||||
|
if (appointment != null) {
|
||||||
|
report.get().setAppointmentReport(appointment);
|
||||||
|
}
|
||||||
return this.reportRepository.save(report.get());
|
return this.reportRepository.save(report.get());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package enseirb.myinpulse.service.database;
|
package enseirb.myinpulse.service.database;
|
||||||
|
|
||||||
|
import enseirb.myinpulse.model.Annotation;
|
||||||
import enseirb.myinpulse.model.Appointment;
|
import enseirb.myinpulse.model.Appointment;
|
||||||
import enseirb.myinpulse.model.Project;
|
import enseirb.myinpulse.model.Project;
|
||||||
import enseirb.myinpulse.model.SectionCell;
|
import enseirb.myinpulse.model.SectionCell;
|
||||||
@ -13,7 +14,9 @@ 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.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@ -50,22 +53,63 @@ public class SectionCellService {
|
|||||||
this.sectionCellRepository.deleteById(id);
|
this.sectionCellRepository.deleteById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void updateSectionCellReferenceId(Long idSectionCell, Long referenceId) {
|
||||||
|
SectionCell sectionCell = this.getSectionCellById(idSectionCell);
|
||||||
|
sectionCell.setIdReference(referenceId);
|
||||||
|
this.sectionCellRepository.save(sectionCell);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateSectionCellContent(long idSectionCell, String content) {
|
||||||
|
SectionCell sectionCell = getSectionCellById(idSectionCell);
|
||||||
|
sectionCell.setContentSectionCell(content);
|
||||||
|
this.sectionCellRepository.save(sectionCell);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateSectionCellListAppointment(long idSectionCell, Appointment appointment) {
|
||||||
|
SectionCell sectionCell = getSectionCellById(idSectionCell);
|
||||||
|
sectionCell.updateAppointmentSectionCell(appointment);
|
||||||
|
this.sectionCellRepository.save(sectionCell);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateSectionCellListAnnotation(long idSectionCell, Annotation annotation) {
|
||||||
|
SectionCell sectionCell = getSectionCellById(idSectionCell);
|
||||||
|
sectionCell.updateListAnnotation(annotation);
|
||||||
|
this.sectionCellRepository.save(sectionCell);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateSectionCellProject(long idSectionCell, Project project) {
|
||||||
|
SectionCell sectionCell = getSectionCellById(idSectionCell);
|
||||||
|
sectionCell.setProjectSectionCell(project);
|
||||||
|
this.sectionCellRepository.save(sectionCell);
|
||||||
|
}
|
||||||
|
|
||||||
public SectionCell updateSectionCell(
|
public SectionCell updateSectionCell(
|
||||||
Long id, Long sectionId, String contentSectionCell, LocalDateTime modificationDate) {
|
Long id,
|
||||||
|
String contentSectionCell,
|
||||||
|
Appointment appointment,
|
||||||
|
Annotation annotation,
|
||||||
|
Project project) {
|
||||||
Optional<SectionCell> sectionCell = this.sectionCellRepository.findById(id);
|
Optional<SectionCell> sectionCell = this.sectionCellRepository.findById(id);
|
||||||
if (sectionCell.isEmpty()) {
|
if (sectionCell.isEmpty()) {
|
||||||
logger.error("updateSectionCell : No sectionCell found with id {}", id);
|
logger.error("updateSectionCell : No sectionCell found with id {}", id);
|
||||||
throw new ResponseStatusException(
|
throw new ResponseStatusException(
|
||||||
HttpStatus.NOT_FOUND, "Cette cellule de section n'existe pas");
|
HttpStatus.NOT_FOUND, "Cette cellule de section n'existe pas");
|
||||||
}
|
}
|
||||||
if (sectionId != null) {
|
|
||||||
sectionCell.get().setSectionId(sectionId);
|
|
||||||
}
|
|
||||||
if (contentSectionCell != null) {
|
if (contentSectionCell != null) {
|
||||||
sectionCell.get().setContentSectionCell(contentSectionCell);
|
sectionCell.get().setContentSectionCell(contentSectionCell);
|
||||||
|
sectionCell.get().setModificationDate(LocalDateTime.now());
|
||||||
}
|
}
|
||||||
if (modificationDate != null) {
|
if (appointment != null) {
|
||||||
sectionCell.get().setModificationDate(modificationDate);
|
sectionCell.get().updateAppointmentSectionCell(appointment);
|
||||||
|
sectionCell.get().setModificationDate(LocalDateTime.now());
|
||||||
|
}
|
||||||
|
if (annotation != null) {
|
||||||
|
sectionCell.get().updateListAnnotation(annotation);
|
||||||
|
sectionCell.get().setModificationDate(LocalDateTime.now());
|
||||||
|
}
|
||||||
|
if (project != null) {
|
||||||
|
sectionCell.get().setProjectSectionCell(project);
|
||||||
|
sectionCell.get().setModificationDate(LocalDateTime.now());
|
||||||
}
|
}
|
||||||
return this.sectionCellRepository.save(sectionCell.get());
|
return this.sectionCellRepository.save(sectionCell.get());
|
||||||
}
|
}
|
||||||
@ -90,4 +134,37 @@ public class SectionCellService {
|
|||||||
return sectionCellRepository.findByProjectSectionCellAndSectionIdAndModificationDateBefore(
|
return sectionCellRepository.findByProjectSectionCellAndSectionIdAndModificationDateBefore(
|
||||||
project, sectionId, date);
|
project, sectionId, date);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Iterable<SectionCell> getLatestSectionCellsByIdReferenceBeforeDate(
|
||||||
|
Project project, long sectionId, LocalDateTime date) {
|
||||||
|
|
||||||
|
// 1. Fetch ALL relevant SectionCells modified before the date
|
||||||
|
Iterable<SectionCell> allMatchingCells =
|
||||||
|
sectionCellRepository.findByProjectSectionCellAndSectionIdAndModificationDateBefore(
|
||||||
|
project, sectionId, date);
|
||||||
|
|
||||||
|
// 2. Find the latest for each idReference
|
||||||
|
Map<Long, SectionCell> latestCellsByIdReference = new HashMap<>();
|
||||||
|
|
||||||
|
for (SectionCell cell : allMatchingCells) {
|
||||||
|
Long idReference = cell.getIdReference();
|
||||||
|
|
||||||
|
// Check if we've seen this idReference before
|
||||||
|
if (latestCellsByIdReference.containsKey(idReference)) {
|
||||||
|
// If yes, compare modification dates
|
||||||
|
SectionCell existingLatest = latestCellsByIdReference.get(idReference);
|
||||||
|
|
||||||
|
// If the current cell is more recent, update the map
|
||||||
|
if (cell.getModificationDate().isAfter(existingLatest.getModificationDate())) {
|
||||||
|
latestCellsByIdReference.put(idReference, cell);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// If this is the first time we see this idReference, add it to the map
|
||||||
|
latestCellsByIdReference.put(idReference, cell);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Return the collection of the latest cells (the values from the map)
|
||||||
|
return latestCellsByIdReference.values();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -30,6 +30,15 @@ public class UserService {
|
|||||||
return this.userRepository.findAll();
|
return this.userRepository.findAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public User getUserById(long id) {
|
||||||
|
Optional<User> user = this.userRepository.findById(id);
|
||||||
|
if (user.isEmpty()) {
|
||||||
|
logger.error("getUserById : No user found with id {}", id);
|
||||||
|
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Cet utilisateur n'existe pas");
|
||||||
|
}
|
||||||
|
return user.get();
|
||||||
|
}
|
||||||
|
|
||||||
// TODO
|
// TODO
|
||||||
public User getUserByEmail(String email) {
|
public User getUserByEmail(String email) {
|
||||||
Optional<User> opt_user = this.userRepository.findByPrimaryMail(email);
|
Optional<User> opt_user = this.userRepository.findByPrimaryMail(email);
|
||||||
@ -49,6 +58,36 @@ public class UserService {
|
|||||||
return this.userRepository.save(user);
|
return this.userRepository.save(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void updateUserSurname(long idUser, String surname) {
|
||||||
|
User user = getUserById(idUser);
|
||||||
|
user.setUserSurname(surname);
|
||||||
|
this.userRepository.save(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateUserName(long idUser, String name) {
|
||||||
|
User user = getUserById(idUser);
|
||||||
|
user.setUserName(name);
|
||||||
|
this.userRepository.save(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateUserPrimaryMail(long idUser, String primaryMail) {
|
||||||
|
User user = getUserById(idUser);
|
||||||
|
user.setPrimaryMail(primaryMail);
|
||||||
|
this.userRepository.save(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateUserSecondaryMail(long idUser, String secondaryMail) {
|
||||||
|
User user = getUserById(idUser);
|
||||||
|
user.setSecondaryMail(secondaryMail);
|
||||||
|
this.userRepository.save(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateUserPhoneNumber(long idUser, String phoneNumber) {
|
||||||
|
User user = getUserById(idUser);
|
||||||
|
user.setPhoneNumber(phoneNumber);
|
||||||
|
this.userRepository.save(user);
|
||||||
|
}
|
||||||
|
|
||||||
public User updateUser(
|
public User updateUser(
|
||||||
@PathVariable Long id,
|
@PathVariable Long id,
|
||||||
String userSurname,
|
String userSurname,
|
||||||
@ -78,4 +117,8 @@ public class UserService {
|
|||||||
}
|
}
|
||||||
return this.userRepository.save(user.get());
|
return this.userRepository.save(user.get());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Iterable<User> getPendingAccounts() {
|
||||||
|
return this.userRepository.findAllByPendingEquals(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,14 +4,10 @@ import static enseirb.myinpulse.model.ProjectDecisionValue.*;
|
|||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
import enseirb.myinpulse.model.Administrator;
|
import enseirb.myinpulse.model.*;
|
||||||
import enseirb.myinpulse.model.Entrepreneur;
|
|
||||||
import enseirb.myinpulse.model.Project;
|
|
||||||
import enseirb.myinpulse.model.ProjectDecision;
|
|
||||||
import enseirb.myinpulse.service.AdminApiService;
|
import enseirb.myinpulse.service.AdminApiService;
|
||||||
import enseirb.myinpulse.service.database.AdministratorService;
|
import enseirb.myinpulse.service.UtilsService;
|
||||||
import enseirb.myinpulse.service.database.EntrepreneurService;
|
import enseirb.myinpulse.service.database.*;
|
||||||
import enseirb.myinpulse.service.database.ProjectService;
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.BeforeAll;
|
import org.junit.jupiter.api.BeforeAll;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
@ -21,6 +17,8 @@ import org.springframework.transaction.annotation.Transactional;
|
|||||||
import org.springframework.web.server.ResponseStatusException;
|
import org.springframework.web.server.ResponseStatusException;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.time.LocalTime;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -30,14 +28,22 @@ public class AdminApiServiceTest {
|
|||||||
private static long administratorid;
|
private static long administratorid;
|
||||||
private static Administrator administrator;
|
private static Administrator administrator;
|
||||||
private static Entrepreneur entrepreneur;
|
private static Entrepreneur entrepreneur;
|
||||||
|
private static Appointment appt;
|
||||||
|
private static Project p;
|
||||||
@Autowired private AdminApiService adminApiService;
|
@Autowired private AdminApiService adminApiService;
|
||||||
@Autowired private ProjectService projectService;
|
@Autowired private ProjectService projectService;
|
||||||
|
@Autowired private EntrepreneurService entrepreneurService;
|
||||||
|
@Autowired private SectionCellService sectionCellService;
|
||||||
|
@Autowired private AppointmentService appointmentService;
|
||||||
|
@Autowired private UtilsService utilsService;
|
||||||
|
|
||||||
@BeforeAll
|
@BeforeAll
|
||||||
static void setup(
|
static void setup(
|
||||||
@Autowired AdministratorService administratorService,
|
@Autowired AdministratorService administratorService,
|
||||||
@Autowired ProjectService projectService,
|
@Autowired ProjectService projectService,
|
||||||
@Autowired EntrepreneurService entrepreneurService) {
|
@Autowired EntrepreneurService entrepreneurService,
|
||||||
|
@Autowired AppointmentService appoitmentService,
|
||||||
|
@Autowired SectionCellService sectionCellService) {
|
||||||
administratorService.addAdministrator(
|
administratorService.addAdministrator(
|
||||||
new Administrator(
|
new Administrator(
|
||||||
"admin",
|
"admin",
|
||||||
@ -54,6 +60,7 @@ public class AdminApiServiceTest {
|
|||||||
"testAdmin@example.com",
|
"testAdmin@example.com",
|
||||||
""));
|
""));
|
||||||
administratorid = administrator.getIdUser();
|
administratorid = administrator.getIdUser();
|
||||||
|
|
||||||
entrepreneur =
|
entrepreneur =
|
||||||
new Entrepreneur(
|
new Entrepreneur(
|
||||||
"JeSuisUnEntrepreneurDeCompet",
|
"JeSuisUnEntrepreneurDeCompet",
|
||||||
@ -65,14 +72,32 @@ public class AdminApiServiceTest {
|
|||||||
"info ofc",
|
"info ofc",
|
||||||
false);
|
false);
|
||||||
entrepreneurService.addEntrepreneur(entrepreneur);
|
entrepreneurService.addEntrepreneur(entrepreneur);
|
||||||
projectService.addNewProject(
|
|
||||||
new Project(
|
Entrepreneur entrepreneur2 =
|
||||||
"sampleProjectAdminApiService",
|
new Entrepreneur(
|
||||||
|
"GDProjets", "", "Entrepreneur2@inpulse.com", "", "", "", "info ofc", true);
|
||||||
|
entrepreneurService.addEntrepreneur(entrepreneur2);
|
||||||
|
|
||||||
|
p =
|
||||||
|
projectService.addNewProject(
|
||||||
|
new Project(
|
||||||
|
"sampleProjectAdminApiService",
|
||||||
|
null,
|
||||||
|
LocalDate.now(),
|
||||||
|
ACTIVE,
|
||||||
|
administratorService.getAdministratorByPrimaryMain(
|
||||||
|
"testAdminFull@example.com")));
|
||||||
|
|
||||||
|
entrepreneurService.updateEntrepreneurProjectParticipation(entrepreneur2.getIdUser(), p);
|
||||||
|
|
||||||
|
appt =
|
||||||
|
new Appointment(
|
||||||
null,
|
null,
|
||||||
LocalDate.now(),
|
LocalDate.now(),
|
||||||
ACTIVE,
|
LocalTime.now(),
|
||||||
administratorService.getAdministratorByPrimaryMain(
|
LocalTime.now(),
|
||||||
"testAdminFull@example.com")));
|
"Salle TD 03",
|
||||||
|
"Discussion importante");
|
||||||
}
|
}
|
||||||
|
|
||||||
private <T> List<T> IterableToList(Iterable<T> iterable) {
|
private <T> List<T> IterableToList(Iterable<T> iterable) {
|
||||||
@ -106,7 +131,7 @@ public class AdminApiServiceTest {
|
|||||||
List<Project> l = IterableToList(projects);
|
List<Project> l = IterableToList(projects);
|
||||||
assertEquals(1, l.size());
|
assertEquals(1, l.size());
|
||||||
Project p = l.getFirst();
|
Project p = l.getFirst();
|
||||||
assertEquals(p.getProjectName(), "sampleProjectAdminApiService");
|
assertEquals("sampleProjectAdminApiService", p.getProjectName());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@ -180,7 +205,7 @@ public class AdminApiServiceTest {
|
|||||||
@Test
|
@Test
|
||||||
void addProjectToAdmin() {
|
void addProjectToAdmin() {
|
||||||
assertEquals(0, administrator.getListProject().size());
|
assertEquals(0, administrator.getListProject().size());
|
||||||
Project p1 = new Project("assProjectToAdmin", null, LocalDate.now(), ACTIVE, administrator);
|
Project p1 = new Project("addProjectToAdmin", null, LocalDate.now(), ACTIVE, administrator);
|
||||||
this.adminApiService.addNewProject(p1);
|
this.adminApiService.addNewProject(p1);
|
||||||
assertEquals(1, administrator.getListProject().size());
|
assertEquals(1, administrator.getListProject().size());
|
||||||
}
|
}
|
||||||
@ -189,7 +214,7 @@ public class AdminApiServiceTest {
|
|||||||
void addProjectToUser() {
|
void addProjectToUser() {
|
||||||
assertNull(entrepreneur.getProjectParticipation());
|
assertNull(entrepreneur.getProjectParticipation());
|
||||||
Project p1 =
|
Project p1 =
|
||||||
new Project("assProjectToAdmin", null, LocalDate.now(), ACTIVE, null, entrepreneur);
|
new Project("addProjectToAdmin", null, LocalDate.now(), ACTIVE, null, entrepreneur);
|
||||||
this.adminApiService.addNewProject(p1);
|
this.adminApiService.addNewProject(p1);
|
||||||
assertEquals(p1, entrepreneur.getProjectParticipation());
|
assertEquals(p1, entrepreneur.getProjectParticipation());
|
||||||
}
|
}
|
||||||
@ -202,7 +227,7 @@ public class AdminApiServiceTest {
|
|||||||
assertNull(e1.getProjectParticipation());
|
assertNull(e1.getProjectParticipation());
|
||||||
assertNull(e2.getProjectParticipation());
|
assertNull(e2.getProjectParticipation());
|
||||||
assertNull(e3.getProjectParticipation());
|
assertNull(e3.getProjectParticipation());
|
||||||
Project p1 = new Project("assProjectToAdmin", null, LocalDate.now(), ACTIVE, null, null);
|
Project p1 = new Project("addProjectToAdmin", null, LocalDate.now(), ACTIVE, null, null);
|
||||||
p1.updateListEntrepreneurParticipation(e1);
|
p1.updateListEntrepreneurParticipation(e1);
|
||||||
p1.updateListEntrepreneurParticipation(e2);
|
p1.updateListEntrepreneurParticipation(e2);
|
||||||
p1.updateListEntrepreneurParticipation(e3);
|
p1.updateListEntrepreneurParticipation(e3);
|
||||||
@ -221,4 +246,86 @@ public class AdminApiServiceTest {
|
|||||||
this.adminApiService.addNewProject(p1);
|
this.adminApiService.addNewProject(p1);
|
||||||
assertThrows(ResponseStatusException.class, () -> this.adminApiService.addNewProject(p2));
|
assertThrows(ResponseStatusException.class, () -> this.adminApiService.addNewProject(p2));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// We could do a delete active project, but it's not really useful.
|
||||||
|
@Test
|
||||||
|
void deletePendingProject() {
|
||||||
|
int oldsize = IterableToList(this.adminApiService.getPendingProjects()).size();
|
||||||
|
Project p1 =
|
||||||
|
new Project("PendingProjectAdminApiService2", null, LocalDate.now(), PENDING, null);
|
||||||
|
Project p2 = this.adminApiService.addNewProject(p1);
|
||||||
|
|
||||||
|
assertEquals(oldsize + 1, IterableToList(this.adminApiService.getPendingProjects()).size());
|
||||||
|
this.adminApiService.deleteProject(p2.getIdProject());
|
||||||
|
|
||||||
|
assertEquals(oldsize, IterableToList(this.adminApiService.getPendingProjects()).size());
|
||||||
|
for (int i = 0; i < oldsize; i++) {
|
||||||
|
assertNotEquals(
|
||||||
|
p1.getIdProject(),
|
||||||
|
IterableToList(this.adminApiService.getPendingProjects())
|
||||||
|
.get(i)
|
||||||
|
.getIdProject());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getUpcommingAppointmentUnkwnownUser() {
|
||||||
|
assertThrows(
|
||||||
|
ResponseStatusException.class,
|
||||||
|
() -> {
|
||||||
|
Iterable<Appointment> a =
|
||||||
|
this.adminApiService.getUpcomingAppointments(
|
||||||
|
"entrepreneur-inexistent@mail.fr");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getUpcommingAppointmentNoProject() {
|
||||||
|
assertThrows(
|
||||||
|
ResponseStatusException.class,
|
||||||
|
() -> {
|
||||||
|
Iterable<Appointment> a =
|
||||||
|
this.adminApiService.getUpcomingAppointments(
|
||||||
|
"Entrepreneur@inpulse.com");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getUpcommingAppointmentEmpty() {
|
||||||
|
Iterable<Appointment> a =
|
||||||
|
this.adminApiService.getUpcomingAppointments("Entrepreneur2@inpulse.com");
|
||||||
|
assertEquals(0, IterableToList(a).size());
|
||||||
|
}
|
||||||
|
|
||||||
|
@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()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,324 @@
|
|||||||
|
package enseirb.myinpulse;
|
||||||
|
|
||||||
|
import static enseirb.myinpulse.model.ProjectDecisionValue.*;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
|
import enseirb.myinpulse.model.*;
|
||||||
|
import enseirb.myinpulse.service.EntrepreneurApiService;
|
||||||
|
import enseirb.myinpulse.service.database.*;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.BeforeAll;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
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;
|
||||||
|
|
||||||
|
@SpringBootTest
|
||||||
|
@Transactional
|
||||||
|
public class EntrepreneurApiServiceTest {
|
||||||
|
private static Entrepreneur entrepreneur;
|
||||||
|
private static Project project;
|
||||||
|
private static Iterable<SectionCell> sectionCells2;
|
||||||
|
private static Iterable<SectionCell> sectionCells3;
|
||||||
|
@Autowired private EntrepreneurApiService entrepreneurApiService;
|
||||||
|
@Autowired private EntrepreneurService entrepreneurService;
|
||||||
|
@Autowired private ProjectService projectService;
|
||||||
|
@Autowired private SectionCellService sectionCellService;
|
||||||
|
@Autowired private AnnotationService annotationService;
|
||||||
|
@Autowired private AppointmentService appointmentService;
|
||||||
|
|
||||||
|
@BeforeAll
|
||||||
|
static void setup(
|
||||||
|
@Autowired EntrepreneurService entrepreneurService,
|
||||||
|
@Autowired ProjectService projectService,
|
||||||
|
@Autowired SectionCellService sectionCellService) {
|
||||||
|
entrepreneur =
|
||||||
|
entrepreneurService.addEntrepreneur(
|
||||||
|
new Entrepreneur(
|
||||||
|
"entre",
|
||||||
|
"preneur",
|
||||||
|
"entrepreneur@mail.fr",
|
||||||
|
"entrepreneur2@mail.fr",
|
||||||
|
"01 45 71 25 48",
|
||||||
|
"ENSEIRB",
|
||||||
|
"Info",
|
||||||
|
false));
|
||||||
|
entrepreneurService.addEntrepreneur(
|
||||||
|
new Entrepreneur(
|
||||||
|
"entre2",
|
||||||
|
"preneur2",
|
||||||
|
"testentrepreneur@mail.fr",
|
||||||
|
"testentrepreneur2@mail.fr",
|
||||||
|
"",
|
||||||
|
"ENSEGID",
|
||||||
|
"",
|
||||||
|
true));
|
||||||
|
project =
|
||||||
|
projectService.addNewProject(
|
||||||
|
new Project("Project", null, LocalDate.now(), ACTIVE, null, entrepreneur));
|
||||||
|
entrepreneurService.updateEntrepreneurProjectProposed(entrepreneur.getIdUser(), project);
|
||||||
|
entrepreneurService.updateEntrepreneurProjectParticipation(
|
||||||
|
entrepreneur.getIdUser(), project);
|
||||||
|
SectionCell s1 =
|
||||||
|
sectionCellService.addNewSectionCell(
|
||||||
|
new SectionCell(
|
||||||
|
null,
|
||||||
|
2L,
|
||||||
|
"contenu très intéressant",
|
||||||
|
LocalDateTime.now(),
|
||||||
|
project));
|
||||||
|
|
||||||
|
SectionCell s2 =
|
||||||
|
sectionCellService.addNewSectionCell(
|
||||||
|
new SectionCell(
|
||||||
|
null,
|
||||||
|
3L,
|
||||||
|
"contenu très intéressant2",
|
||||||
|
LocalDateTime.now(),
|
||||||
|
project));
|
||||||
|
sectionCells2 = sectionCellService.getSectionCellsByProject(project, 2L);
|
||||||
|
sectionCells3 = sectionCellService.getSectionCellsByProject(project, 3L);
|
||||||
|
}
|
||||||
|
|
||||||
|
private <T> List<T> IterableToList(Iterable<T> iterable) {
|
||||||
|
List<T> l = new ArrayList<>();
|
||||||
|
iterable.forEach(l::add);
|
||||||
|
return l;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void editValidSectionCell() {
|
||||||
|
System.out.println("editValidSectionCell : ");
|
||||||
|
SectionCell modified = IterableToList(sectionCells2).getLast();
|
||||||
|
this.sectionCellService.updateSectionCellListAnnotation(
|
||||||
|
modified.getIdSectionCell(),
|
||||||
|
annotationService.addNewAnnotation(new Annotation(null, "oui j'annote encore")));
|
||||||
|
this.sectionCellService.updateSectionCellListAppointment(
|
||||||
|
modified.getIdSectionCell(),
|
||||||
|
appointmentService.addNewAppointment(
|
||||||
|
new Appointment(
|
||||||
|
null,
|
||||||
|
LocalDate.now(),
|
||||||
|
LocalTime.now(),
|
||||||
|
LocalTime.of(2, 5),
|
||||||
|
"TD14",
|
||||||
|
"clément s'est plaint")));
|
||||||
|
entrepreneurApiService.editSectionCell(
|
||||||
|
modified.getIdSectionCell(), "modified content", "entrepreneur@mail.fr");
|
||||||
|
// We get the data from the database again.
|
||||||
|
SectionCell s =
|
||||||
|
IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).getLast();
|
||||||
|
assertEquals("modified content", s.getContentSectionCell());
|
||||||
|
assertEquals(
|
||||||
|
2, IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).size());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void editInvalidSectionCell() {
|
||||||
|
System.out.println("editInvalidSectionCell : ");
|
||||||
|
assertThrows(
|
||||||
|
ResponseStatusException.class,
|
||||||
|
() ->
|
||||||
|
entrepreneurApiService.editSectionCell(
|
||||||
|
-1L, "should not be modified", "entrepreneur@mail.fr"));
|
||||||
|
SectionCell s =
|
||||||
|
IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).getLast();
|
||||||
|
assertEquals("contenu très intéressant", s.getContentSectionCell());
|
||||||
|
assertEquals(
|
||||||
|
1, IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).size());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void editSectionCellInvalidAccess() {
|
||||||
|
System.out.println("editSectionCellInvalidAccess : ");
|
||||||
|
assertThrows(
|
||||||
|
ResponseStatusException.class,
|
||||||
|
() ->
|
||||||
|
entrepreneurApiService.editSectionCell(
|
||||||
|
IterableToList(sectionCells3).getFirst().getIdSectionCell(),
|
||||||
|
"should not be modified",
|
||||||
|
"testentrepreneur@mail.fr"));
|
||||||
|
SectionCell s =
|
||||||
|
IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).getFirst();
|
||||||
|
|
||||||
|
assertEquals("contenu très intéressant", s.getContentSectionCell());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void editNullSectionCell() {
|
||||||
|
System.out.println("editNullSectionCell : ");
|
||||||
|
assertThrows(
|
||||||
|
ResponseStatusException.class,
|
||||||
|
() ->
|
||||||
|
entrepreneurApiService.editSectionCell(
|
||||||
|
null, "modified content", "entrepreneur@mail.fr"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void removeValidSectionCell() {
|
||||||
|
System.out.println("removeValidSectionCell : ");
|
||||||
|
SectionCell tmpCell =
|
||||||
|
sectionCellService.addNewSectionCell(
|
||||||
|
new SectionCell(
|
||||||
|
null, 2L, "contenu temporaire", LocalDateTime.now(), project));
|
||||||
|
assertEquals(
|
||||||
|
2, IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).size());
|
||||||
|
assertDoesNotThrow(
|
||||||
|
() ->
|
||||||
|
entrepreneurApiService.removeSectionCell(
|
||||||
|
tmpCell.getIdSectionCell(), "entrepreneur@mail.fr"));
|
||||||
|
assertEquals(
|
||||||
|
tmpCell.getIdReference(),
|
||||||
|
IterableToList(sectionCellService.getSectionCellsByProject(project, -1L))
|
||||||
|
.getLast()
|
||||||
|
.getIdReference());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void removeInvalidSectionCell() {
|
||||||
|
System.out.println("removeInvalidSectionCell : ");
|
||||||
|
assertThrows(
|
||||||
|
ResponseStatusException.class,
|
||||||
|
() -> entrepreneurApiService.removeSectionCell(-1L, "entrepreneur@mail.fr"));
|
||||||
|
SectionCell s =
|
||||||
|
IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).getFirst();
|
||||||
|
|
||||||
|
assertEquals("contenu très intéressant", s.getContentSectionCell());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void removeNullSectionCell() {
|
||||||
|
System.out.println("removeNullSectionCell : ");
|
||||||
|
assertThrows(
|
||||||
|
ResponseStatusException.class,
|
||||||
|
() -> entrepreneurApiService.removeSectionCell(null, "entrepreneur@mail.fr"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void addValidSectionCell() {
|
||||||
|
System.out.println("addValidSectionCell : ");
|
||||||
|
SectionCell added =
|
||||||
|
sectionCellService.addNewSectionCell(
|
||||||
|
new SectionCell(null, 2L, "contenu ajouté", LocalDateTime.now(), project));
|
||||||
|
added.updateListAnnotation(
|
||||||
|
annotationService.addNewAnnotation(new Annotation(null, "oui j'annote")));
|
||||||
|
added.updateAppointmentSectionCell(
|
||||||
|
appointmentService.addNewAppointment(
|
||||||
|
new Appointment(
|
||||||
|
null,
|
||||||
|
LocalDate.now(),
|
||||||
|
LocalTime.now(),
|
||||||
|
LocalTime.of(2, 5),
|
||||||
|
"TD15",
|
||||||
|
"clément qui se plaint")));
|
||||||
|
entrepreneurApiService.addSectionCell(added, "entrepreneur@mail.fr");
|
||||||
|
SectionCell s =
|
||||||
|
IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).getLast();
|
||||||
|
assertEquals("contenu ajouté", s.getContentSectionCell());
|
||||||
|
assertEquals(
|
||||||
|
2, IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).size());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void addSectionCellInvalidAccess() {
|
||||||
|
System.out.println("addSectionCellInvalidAccess : ");
|
||||||
|
SectionCell added =
|
||||||
|
new SectionCell(null, 2L, "contenu ajouté", LocalDateTime.now(), project);
|
||||||
|
assertThrows(
|
||||||
|
ResponseStatusException.class,
|
||||||
|
() -> entrepreneurApiService.addSectionCell(added, "fauxentrepreneur@mail.fr"));
|
||||||
|
SectionCell s =
|
||||||
|
IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).getLast();
|
||||||
|
assertEquals(
|
||||||
|
1, IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).size());
|
||||||
|
assertEquals("contenu très intéressant", s.getContentSectionCell());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void addInvalidSectionCell() {
|
||||||
|
System.out.println("addInvalidSectionCell : ");
|
||||||
|
SectionCell added =
|
||||||
|
sectionCellService.addNewSectionCell(
|
||||||
|
new SectionCell(null, -1L, "contenu ajouté", LocalDateTime.now(), project));
|
||||||
|
assertThrows(
|
||||||
|
ResponseStatusException.class,
|
||||||
|
() -> entrepreneurApiService.addSectionCell(added, "entrepreneur@mail.fr"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void addNullSectionCell() {
|
||||||
|
System.out.println("addNullSectionCell : ");
|
||||||
|
assertThrows(
|
||||||
|
ResponseStatusException.class,
|
||||||
|
() -> entrepreneurApiService.addSectionCell(null, "entrepreneur@mail.fr"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void requestValidProject() {
|
||||||
|
System.out.println("requestValidProject : ");
|
||||||
|
int nb_project = IterableToList(this.projectService.getAllProjects()).size();
|
||||||
|
Project validProject =
|
||||||
|
new Project("validProject", null, LocalDate.now(), ACTIVE, null, entrepreneur);
|
||||||
|
validProject.updateListEntrepreneurParticipation(
|
||||||
|
IterableToList(entrepreneurService.getAllEntrepreneurs()).getLast());
|
||||||
|
validProject.updateListSectionCell((IterableToList(sectionCells2).getFirst()));
|
||||||
|
entrepreneurApiService.requestNewProject(validProject, "entrepreneur@mail.fr");
|
||||||
|
assertEquals(PENDING, validProject.getProjectStatus());
|
||||||
|
assertEquals((nb_project + 1), IterableToList(this.projectService.getAllProjects()).size());
|
||||||
|
assertEquals(
|
||||||
|
IterableToList(entrepreneurService.getAllEntrepreneurs()).getLast(),
|
||||||
|
validProject.getListEntrepreneurParticipation().getLast());
|
||||||
|
assertEquals(
|
||||||
|
IterableToList(sectionCells2).getFirst().getIdSectionCell(),
|
||||||
|
validProject.getListSectionCell().getFirst().getIdSectionCell());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void requestNullProject() {
|
||||||
|
System.out.println("requestNullProject : ");
|
||||||
|
assertThrows(
|
||||||
|
ResponseStatusException.class,
|
||||||
|
() -> entrepreneurApiService.requestNewProject(null, "entrepreneur@mail.fr"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void createNewValidAccount() {
|
||||||
|
System.out.println("createNewValidAccount : ");
|
||||||
|
int nb_entrepreneur = IterableToList(this.entrepreneurService.getAllEntrepreneurs()).size();
|
||||||
|
Entrepreneur newEntrepreneur =
|
||||||
|
new Entrepreneur(
|
||||||
|
"New",
|
||||||
|
"Test",
|
||||||
|
"mailtest@test.fr",
|
||||||
|
"mailtest2@test.fr",
|
||||||
|
"0888888888",
|
||||||
|
"ENSEIRB",
|
||||||
|
"ELEC",
|
||||||
|
false,
|
||||||
|
true);
|
||||||
|
assertDoesNotThrow(() -> entrepreneurApiService.createAccount(newEntrepreneur));
|
||||||
|
assertEquals(
|
||||||
|
(nb_entrepreneur + 1),
|
||||||
|
IterableToList(this.entrepreneurService.getAllEntrepreneurs()).size());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void createExistingAccount() {
|
||||||
|
System.out.println("createExistingAccount : ");
|
||||||
|
int nb_entrepreneur = IterableToList(this.entrepreneurService.getAllEntrepreneurs()).size();
|
||||||
|
assertThrows(
|
||||||
|
ResponseStatusException.class,
|
||||||
|
() -> entrepreneurApiService.createAccount(entrepreneur));
|
||||||
|
assertEquals(
|
||||||
|
nb_entrepreneur,
|
||||||
|
IterableToList(this.entrepreneurService.getAllEntrepreneurs()).size());
|
||||||
|
}
|
||||||
|
}
|
File diff suppressed because it is too large
Load Diff
13
documentation/openapi/notes.md
Normal file
13
documentation/openapi/notes.md
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
## API Endpoints notes
|
||||||
|
|
||||||
|
### EntrepreneurApi and SharedApi
|
||||||
|
#### Endpoint Name Changes
|
||||||
|
- `/entrepreneur/lcsection/modify/{sectionId}` → `/entrepreneur/sectionCell/modify/{sectionId}`
|
||||||
|
|
||||||
|
### Admin api
|
||||||
|
- `/admin/appointments/report/{appointmentId}` has no PUT and DELETE
|
||||||
|
- `/admin/request-join` and `/admin/request-join/decision/{joinRequestId}` have not yet been implemented
|
||||||
|
|
||||||
|
### Unauth api
|
||||||
|
- `/unauth/request-join/{projectId}` has not yet been implemented
|
||||||
|
|
11
documentation/openapi/run_doc.sh
Executable file
11
documentation/openapi/run_doc.sh
Executable file
@ -0,0 +1,11 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
cd ./swagger-ui
|
||||||
|
|
||||||
|
if [ ! -d "./node_modules/" ]
|
||||||
|
then
|
||||||
|
npm install
|
||||||
|
npm install swagger-cli
|
||||||
|
fi
|
||||||
|
|
||||||
|
npm start
|
345
documentation/openapi/src/adminApi.yaml
Normal file
345
documentation/openapi/src/adminApi.yaml
Normal file
@ -0,0 +1,345 @@
|
|||||||
|
# Admin API Endpoints
|
||||||
|
paths:
|
||||||
|
/admin/projects:
|
||||||
|
get:
|
||||||
|
operationId: getAdminProjects
|
||||||
|
summary: Get projects associated with the admin
|
||||||
|
tags:
|
||||||
|
- Admin API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-admin]
|
||||||
|
description: Retrieves a list of projects managed by the requesting admin, including details for overview.
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK - List of projects returned successfully.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "./main.yaml#/components/schemas/project"
|
||||||
|
"400":
|
||||||
|
description: Bad Request - Invalid project data provided (e.g., missing required fields).
|
||||||
|
"401":
|
||||||
|
description: Unauthorized - Authentication required or invalid token.
|
||||||
|
|
||||||
|
post:
|
||||||
|
operationId: addProjectManually
|
||||||
|
summary: Manually add a new project
|
||||||
|
description: Creates a new project with the provided details. (NOTE that this meant for manually inserting projects, for example importing already existing projects).
|
||||||
|
tags:
|
||||||
|
- Admin API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-admin]
|
||||||
|
requestBody:
|
||||||
|
required: true
|
||||||
|
description: Project details to create. `idProject` and `creationDate` will be ignored if sent and set by the server.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "./main.yaml#/components/schemas/project"
|
||||||
|
responses:
|
||||||
|
"201": # Use 201 Created for successful creation
|
||||||
|
description: Created - Project added successfully. Returns the created project.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "./main.yaml#/components/schemas/project"
|
||||||
|
"409":
|
||||||
|
description: Bad Request - Project already exists.
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
|
||||||
|
/admin/projects/pending:
|
||||||
|
get:
|
||||||
|
operationId: getPendingProjects
|
||||||
|
summary: Get projects awaiting validation
|
||||||
|
tags:
|
||||||
|
- Admin API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-admin]
|
||||||
|
description: Retrieves a list of projects submitted by entrepreneurs that are pending admin approval.
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK - List of pending projects returned.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "./main.yaml#/components/schemas/project" # Assuming pending projects use the same schema
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
/admin/request-join:
|
||||||
|
get:
|
||||||
|
operationId: getPendingProjects
|
||||||
|
summary: Get entrepreneurs project join requests
|
||||||
|
tags:
|
||||||
|
- Admin API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-admin]
|
||||||
|
description: Retrieves a list of pending requests from entrepreneurs to join an existing project.
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK - List of pending project join requests.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "./main.yaml#/components/schemas/joinRequest"
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
/admin/request-join/decision/{joinRequestId}:
|
||||||
|
post:
|
||||||
|
summary: Approve or reject a pending project join request
|
||||||
|
tags:
|
||||||
|
- Admin API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-admin]
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: joinRequestId
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
description: The ID of the pending join request to decide upon.
|
||||||
|
|
||||||
|
description: |-
|
||||||
|
Allows an admin to make a decision on an ebtrepreneur's request to join an existing project awaiting validation.
|
||||||
|
If approved (isAccepted=true), the entrepreneur is linked to the project with ID joinRequestId.
|
||||||
|
If rejected (isAccepted=false), the pending request data might be archived or deleted based on business logic.
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK - No Content, decision processed successfully..
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
$ref: "./main.yaml#/components/schemas/joinRequestDecision"
|
||||||
|
"400":
|
||||||
|
description: Bad Request - Invalid input (e.g., missing decision).
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
|
||||||
|
/admin/projects/pending/decision:
|
||||||
|
post:
|
||||||
|
operationId: decidePendingProject
|
||||||
|
summary: Approve or reject a pending project
|
||||||
|
tags:
|
||||||
|
- Admin API
|
||||||
|
description: |-
|
||||||
|
Allows an admin to make a decision on a project awaiting validation.
|
||||||
|
If approved (isAccepted=true), the project status changes, and it's linked to the involved users.
|
||||||
|
If rejected (isAccepted=false), the pending project data might be archived or deleted based on business logic.
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-admin]
|
||||||
|
requestBody:
|
||||||
|
required: true
|
||||||
|
description: Decision payload.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: './main.yaml#/components/schemas/projectDecision'
|
||||||
|
responses:
|
||||||
|
"204": # Use 204 No Content for successful action with no body
|
||||||
|
description: No Content - Decision processed successfully.
|
||||||
|
"400":
|
||||||
|
description: Bad Request - Invalid input (e.g., missing decision).
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
|
||||||
|
/admin/pending-accounts: # Path updated
|
||||||
|
get:
|
||||||
|
operationId: getPendingAccounts
|
||||||
|
summary: Get accounts awaiting validation
|
||||||
|
description: Retrieves a list of entrepreneur user accounts that are pending admin validation.
|
||||||
|
tags:
|
||||||
|
- Admin API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-admin]
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK - List of pending accounts returned.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "./main.yaml#/components/schemas/user-entrepreneur"
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
/admin/accounts/validate/{userId}:
|
||||||
|
post: # Changed to POST as it changes state
|
||||||
|
operationId: validateUserAccount
|
||||||
|
summary: Validate a pending user account
|
||||||
|
description: Marks the user account specified by userId as validated/active.
|
||||||
|
tags:
|
||||||
|
- Admin API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-admin]
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: userId
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
description: The ID of the user account to validate.
|
||||||
|
example: 102
|
||||||
|
responses:
|
||||||
|
"204":
|
||||||
|
description: No Content - Account validated successfully.
|
||||||
|
"400":
|
||||||
|
description: Bad Request - Invalid user ID format.
|
||||||
|
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
/admin/appointments/upcoming:
|
||||||
|
get:
|
||||||
|
operationId: getUpcomingAppointments
|
||||||
|
summary: Get upcoming appointments for an admin
|
||||||
|
tags:
|
||||||
|
- Admin API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-admin]
|
||||||
|
description: Retrieves a list of appointments scheduled for an admin in the future.
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK - List of upcoming appointments.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "./main.yaml#/components/schemas/appointment"
|
||||||
|
"404":
|
||||||
|
description: no appointments found.
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
/admin/appointments/report/{appointmentId}:
|
||||||
|
post:
|
||||||
|
operationId: createAppointmentReport
|
||||||
|
summary: Create a report for an appointment
|
||||||
|
description: Creates and links a new report (e.g., meeting minutes) to the specified appointment using the provided content.
|
||||||
|
tags:
|
||||||
|
- Admin API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-admin]
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: appointmentId
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
description: ID of the appointment to add a report to.
|
||||||
|
example: 303
|
||||||
|
requestBody:
|
||||||
|
required: true
|
||||||
|
description: Report content. `idReport` will be ignored if sent.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "./main.yaml#/components/schemas/report"
|
||||||
|
responses:
|
||||||
|
"201":
|
||||||
|
description: Created - Report created and linked successfully. Returns the created report.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema: { $ref: "./main.yaml#/components/schemas/report" }
|
||||||
|
"400":
|
||||||
|
description: Bad Request - Invalid input (e.g., missing content, invalid appointment ID format).
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
put: # Changed to PUT for update/replacement
|
||||||
|
operationId: updateAppointmentReport
|
||||||
|
summary: Update an existing appointment report
|
||||||
|
description: Updates the content of an existing report linked to the specified appointment. Replaces the entire report content.
|
||||||
|
tags:
|
||||||
|
- Admin API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-admin]
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: appointmentId
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
description: ID of the appointment whose report needs updating.
|
||||||
|
example: 303
|
||||||
|
requestBody:
|
||||||
|
required: true
|
||||||
|
description: New report content. `idReport` in the body should match the existing report's ID or will be ignored.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "./main.yaml#/components/schemas/report"
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK - Report updated successfully. Returns the updated report.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema: { $ref: "./main.yaml#/components/schemas/report" }
|
||||||
|
"400":
|
||||||
|
description: Bad Request - Invalid input (e.g., missing content).
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
|
||||||
|
/admin/projects/{projectId}:
|
||||||
|
delete:
|
||||||
|
operationId: removeProject
|
||||||
|
summary: Remove a project
|
||||||
|
description: Permanently removes the project specified by projectId and potentially related data (use with caution).
|
||||||
|
tags:
|
||||||
|
- Admin API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-admin]
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: projectId
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
description: The ID of the project to remove.
|
||||||
|
example: 12
|
||||||
|
responses:
|
||||||
|
"204":
|
||||||
|
description: No Content - Project removed successfully.
|
||||||
|
"400":
|
||||||
|
description: Bad Request - Invalid project ID format.
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/admin/make-admin/{userId}:
|
||||||
|
post:
|
||||||
|
operationId: grantAdminRights
|
||||||
|
summary: Grant admin rights to a user
|
||||||
|
tags:
|
||||||
|
- Admin API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-admin]
|
||||||
|
description: Elevates the specified user to also have administrator privileges. Assumes the user already exists.
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: userId
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
description: The ID of the user to grant admin rights.
|
||||||
|
example: 103
|
||||||
|
responses:
|
||||||
|
"204": # Use 204 No Content
|
||||||
|
description: No Content - Admin rights granted successfully.
|
||||||
|
"400":
|
||||||
|
description: Bad Request - Invalid user ID format or user is already an admin.
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
136
documentation/openapi/src/entrepreneurApi.yaml
Normal file
136
documentation/openapi/src/entrepreneurApi.yaml
Normal file
@ -0,0 +1,136 @@
|
|||||||
|
# Entrepreneur API Endpoints
|
||||||
|
paths:
|
||||||
|
/entrepreneur/projects/request:
|
||||||
|
post:
|
||||||
|
operationId: requestProjectCreation
|
||||||
|
summary: Request creation and validation of a new project
|
||||||
|
tags:
|
||||||
|
- Entrepreneurs API
|
||||||
|
description: |-
|
||||||
|
Submits a request for a new project. The project details are provided in the request body.
|
||||||
|
The requesting entrepreneur (identified by the token) will be associated to it.
|
||||||
|
The project is created with a 'pending' status, awaiting admin approval.
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-entrepreneur]
|
||||||
|
requestBody:
|
||||||
|
required: true
|
||||||
|
description: Project details for the request. `status`, `creationDate` are required by the model when being sent but is ignored by the server;
|
||||||
|
primarily expects a valid `projectId`, `name`, `logo`.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "./main.yaml#/components/schemas/project"
|
||||||
|
responses:
|
||||||
|
"202":
|
||||||
|
description: Accepted - Project creation request received and is pending validation.
|
||||||
|
"400":
|
||||||
|
description: Bad Request - Invalid input (e.g., missing name).
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
/entrepreneur/sectionCells: # Base path
|
||||||
|
post:
|
||||||
|
operationId: addSectionCell
|
||||||
|
summary: Add a cell to a Lean Canvas section
|
||||||
|
description: Adds a new cell (like a sticky note) with the provided content to a specific section of the entrepreneur's project's Lean Canvas. Assumes project context is known based on user's token.
|
||||||
|
`idSectionCell` and `modificationDate` are server-generated so they're values in the request are ignored by the server.
|
||||||
|
tags:
|
||||||
|
- Entrepreneurs API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-entrepreneur]
|
||||||
|
requestBody:
|
||||||
|
required: true
|
||||||
|
description: Section cell details. `idSectionCell` and `modificationDate` will be ignored if sent.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "./main.yaml#/components/schemas/sectionCell"
|
||||||
|
responses:
|
||||||
|
"201":
|
||||||
|
description: Created - Section cell added successfully. Returns the created cell.
|
||||||
|
"400":
|
||||||
|
description: Bad Request - Invalid input (e.g., missing content or sectionId).
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
/entrepreneur/sectionCells/{sectionCellId}:
|
||||||
|
put:
|
||||||
|
operationId: modifySectionCell
|
||||||
|
summary: Modify data in a Lean Canvas section cell
|
||||||
|
description: Updates the content of an existing Lean Canvas section cell specified by `sectionCellId`. The server "updates" (it keeps a record of the previous version to keep a history of all the sectionCells and creates a new ones with the specified modifications) the `modificationDate`.
|
||||||
|
tags:
|
||||||
|
- Entrepreneurs API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-entrepreneur]
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: sectionCellId
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
description: The ID of the section cell to modify.
|
||||||
|
example: 508
|
||||||
|
requestBody:
|
||||||
|
required: true
|
||||||
|
description: Updated section cell details. `sectionCellId` "the path parameter" is the only id that's consideredn the `sectionCellId` id in the request body is ignored. `modificationDate` should be updated by the server.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "./main.yaml#/components/schemas/sectionCell"
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK - Section cell updated successfully. Returns the updated cell.
|
||||||
|
"404":
|
||||||
|
description: Bad Request - Invalid input or ID mismatch.
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
delete:
|
||||||
|
operationId: removeSectionCell
|
||||||
|
summary: Remove a Lean Canvas section cell
|
||||||
|
description: Deletes the Lean Canvas section cell specified by `sectionCellId`.
|
||||||
|
tags:
|
||||||
|
- Entrepreneurs API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-entrepreneur]
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: sectionCellId
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
description: The ID of the section cell to remove.
|
||||||
|
example: 509
|
||||||
|
responses:
|
||||||
|
"204":
|
||||||
|
description: No Content - Section cell removed successfully.
|
||||||
|
"400":
|
||||||
|
description: Bad Request - Invalid ID format.
|
||||||
|
"404":
|
||||||
|
description: Bad Request - sectionCell not found.
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
|
||||||
|
/entrepreneur/projects:
|
||||||
|
get:
|
||||||
|
summary: gets the projectId of the project associated with the entrepreneur
|
||||||
|
description: returns a list of projectIds of the projects associated with the entrepreneur
|
||||||
|
tags:
|
||||||
|
- Entrepreneurs API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-entrepreneur]
|
||||||
|
parameters:
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK - Section cell updated successfully. Returns the updated cell.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "./main.yaml#/components/schemas/project"
|
||||||
|
"404":
|
||||||
|
description: Bad Request - Invalid input or ID mismatch.
|
||||||
|
"401":
|
||||||
|
description: Unauthorized or identity not found
|
149
documentation/openapi/src/main.yaml
Normal file
149
documentation/openapi/src/main.yaml
Normal file
@ -0,0 +1,149 @@
|
|||||||
|
openapi: 3.0.3
|
||||||
|
info:
|
||||||
|
title: MyInpulse Backend API
|
||||||
|
description: This serves as an OpenAPI documentation for the MyInpulse backend service, covering operations for Entrepreneurs, Admins, and shared functionalities.
|
||||||
|
version: 0.2.1
|
||||||
|
|
||||||
|
tags:
|
||||||
|
- name: Entrepreneurs API
|
||||||
|
description: API endpoints primarily for Entrepreneur users.
|
||||||
|
- name: Admin API
|
||||||
|
description: API endpoints restricted to Admin users for management tasks.
|
||||||
|
- name: Shared API
|
||||||
|
description: API endpoints accessible by both Entrepreneurs and Admins.
|
||||||
|
- name: Unauth API
|
||||||
|
description: API endpoints related to user account management.
|
||||||
|
|
||||||
|
components:
|
||||||
|
schemas:
|
||||||
|
user:
|
||||||
|
$ref: "models.yaml#/user"
|
||||||
|
user-entrepreneur:
|
||||||
|
$ref: "models.yaml#/user-entrepreneur"
|
||||||
|
user-admin:
|
||||||
|
$ref: "models.yaml#/user-admin"
|
||||||
|
sectionCell:
|
||||||
|
$ref: "models.yaml#/sectionCell"
|
||||||
|
project:
|
||||||
|
$ref: "models.yaml#/project"
|
||||||
|
report:
|
||||||
|
$ref: "models.yaml#/report"
|
||||||
|
appointment:
|
||||||
|
$ref: "models.yaml#/appointment"
|
||||||
|
joinRequest:
|
||||||
|
$ref: "models.yaml#/joinRequest"
|
||||||
|
projectDecision:
|
||||||
|
$ref: "models.yaml#/projectDecision"
|
||||||
|
joinRequestDecision:
|
||||||
|
$ref: "models.yaml#/joinRequestDecision"
|
||||||
|
|
||||||
|
securitySchemes:
|
||||||
|
MyINPulse:
|
||||||
|
type: oauth2
|
||||||
|
description: OAuth2 authentication using Keycloak.
|
||||||
|
flows:
|
||||||
|
implicit:
|
||||||
|
authorizationUrl: '{keycloakBaseUrl}/realms/{keycloakRealm}/protocol/openid-connect/auth'
|
||||||
|
scopes:
|
||||||
|
MyINPulse-admin: Grants administrator access.
|
||||||
|
MyINPulse-entrepreneur: Grants standard entrepreneur user access.
|
||||||
|
|
||||||
|
servers:
|
||||||
|
- url: '{serverProtocol}://{serverHost}:{serverPort}'
|
||||||
|
description: API Server
|
||||||
|
variables:
|
||||||
|
serverProtocol:
|
||||||
|
enum: [http, https]
|
||||||
|
default: http
|
||||||
|
serverHost:
|
||||||
|
default: localhost
|
||||||
|
serverPort:
|
||||||
|
enum: ['8081']
|
||||||
|
default: '8081'
|
||||||
|
keycloakBaseUrl:
|
||||||
|
default: http://localhost:7080
|
||||||
|
description: Base URL for the Keycloak server.
|
||||||
|
keycloakRealm:
|
||||||
|
default: MyInpulseRealm
|
||||||
|
description: Keycloak realm name.
|
||||||
|
|
||||||
|
paths:
|
||||||
|
# _ _ _ _ _ _
|
||||||
|
# | | | |_ __ __ _ _ _| |_| |__ / \ _ __ (_)
|
||||||
|
# | | | | '_ \ / _` | | | | __| '_ \ / _ \ | '_ \| |
|
||||||
|
# | |_| | | | | (_| | |_| | |_| | | |/ ___ \| |_) | |
|
||||||
|
# \___/|_| |_|\__,_|\__,_|\__|_| |_/_/ \_\ .__/|_|
|
||||||
|
# |_|
|
||||||
|
|
||||||
|
/unauth/finalize:
|
||||||
|
$ref: "./unauthApi.yaml#/paths/~1unauth~1finalize"
|
||||||
|
/unauth/request-join/{projectId}:
|
||||||
|
$ref: "./unauthApi.yaml#/paths/~1unauth~1request-join~1{projectId}"
|
||||||
|
|
||||||
|
# _ ____ __ __ ___ _ _ _ ____ ___
|
||||||
|
# / \ | _ \| \/ |_ _| \ | | / \ | _ \_ _|
|
||||||
|
# / _ \ | | | | |\/| || || \| | / _ \ | |_) | |
|
||||||
|
# / ___ \| |_| | | | || || |\ | / ___ \| __/| |
|
||||||
|
# /_/ \_\____/|_| |_|___|_| \_| /_/ \_\_| |___|
|
||||||
|
#
|
||||||
|
/admin/pending-accounts:
|
||||||
|
$ref: "./adminApi.yaml#/paths/~1admin~1pending-accounts"
|
||||||
|
/admin/accounts/validate/{userId}:
|
||||||
|
$ref: "./adminApi.yaml#/paths/~1admin~1accounts~1validate~1{userId}"
|
||||||
|
/admin/request-join:
|
||||||
|
$ref: "./adminApi.yaml#/paths/~1admin~1request-join"
|
||||||
|
/admin/request-join/decision/{joinRequestId}:
|
||||||
|
$ref: "./adminApi.yaml#/paths/~1admin~1request-join~1decision~1{joinRequestId}"
|
||||||
|
/admin/projects:
|
||||||
|
$ref: "./adminApi.yaml#/paths/~1admin~1projects"
|
||||||
|
/admin/projects/pending:
|
||||||
|
$ref: "./adminApi.yaml#/paths/~1admin~1projects~1pending"
|
||||||
|
/admin/projects/pending/decision:
|
||||||
|
$ref: "./adminApi.yaml#/paths/~1admin~1projects~1pending~1decision"
|
||||||
|
/admin/appointments/report/{appointmentId}:
|
||||||
|
$ref: "./adminApi.yaml#/paths/~1admin~1appointments~1report~1{appointmentId}"
|
||||||
|
/admin/appointments/upcoming:
|
||||||
|
$ref: "./adminApi.yaml#/paths/~1admin~1appointments~1upcoming"
|
||||||
|
/admin/projects/{projectId}:
|
||||||
|
$ref: "./adminApi.yaml#/paths/~1admin~1projects~1{projectId}"
|
||||||
|
/admin/make-admin/{userId}:
|
||||||
|
$ref: "./adminApi.yaml#/paths/~1admin~1make-admin~1{userId}"
|
||||||
|
|
||||||
|
# ____ _ _ _ ____ ___
|
||||||
|
# / ___|| |__ __ _ _ __ ___ __| | / \ | _ \_ _|
|
||||||
|
# \___ \| '_ \ / _` | '__/ _ \/ _` | / _ \ | |_) | |
|
||||||
|
# ___) | | | | (_| | | | __/ (_| | / ___ \| __/| |
|
||||||
|
# |____/|_| |_|\__,_|_| \___|\__,_| /_/ \_\_| |___|
|
||||||
|
#
|
||||||
|
/shared/projects/sectionCells/{projectId}/{sectionId}/{date}:
|
||||||
|
$ref: "./sharedApi.yaml#/paths/~1shared~1projects~1sectionCells~1{projectId}~1{sectionId}~1{date}"
|
||||||
|
/shared/projects/entrepreneurs/{projectId}:
|
||||||
|
$ref: "./sharedApi.yaml#/paths/~1shared~1projects~1entrepreneurs~1{projectId}"
|
||||||
|
/shared/projects/admin/{projectId}:
|
||||||
|
$ref: "./sharedApi.yaml#/paths/~1shared~1projects~1admin~1{projectId}"
|
||||||
|
/shared/projects/appointments/{projectId}:
|
||||||
|
$ref: "./sharedApi.yaml#/paths/~1shared~1projects~1appointments~1{projectId}"
|
||||||
|
/shared/appointments/report/{appointmentId}:
|
||||||
|
$ref: "./sharedApi.yaml#/paths/~1shared~1appointments~1report~1{appointmentId}"
|
||||||
|
/shared/appointments/request:
|
||||||
|
$ref: "./sharedApi.yaml#/paths/~1shared~1appointments~1request"
|
||||||
|
|
||||||
|
# _____ _ _ _____ ____ _____ ____ ____ _____ _ _ _____ _ _ ____
|
||||||
|
# | ____| \ | |_ _| _ \| ____| _ \| _ \| ____| \ | | ____| | | | _ \
|
||||||
|
# | _| | \| | | | | |_) | _| | |_) | |_) | _| | \| | _| | | | | |_) |
|
||||||
|
# | |___| |\ | | | | _ <| |___| __/| _ <| |___| |\ | |___| |_| | _ <
|
||||||
|
# |_____|_|_\_| |_| |_| \_\_____|_| |_| \_\_____|_| \_|_____|\___/|_| \_\
|
||||||
|
# / \ | _ \_ _|
|
||||||
|
# / _ \ | |_) | |
|
||||||
|
# / ___ \| __/| |
|
||||||
|
# /_/ \_\_| |___|
|
||||||
|
#
|
||||||
|
|
||||||
|
/entrepreneur/projects:
|
||||||
|
$ref: "./entrepreneurApi.yaml#/paths/~1entrepreneur~1projects"
|
||||||
|
/entrepreneur/projects/request:
|
||||||
|
$ref: "./entrepreneurApi.yaml#/paths/~1entrepreneur~1projects~1request"
|
||||||
|
/entrepreneur/sectionCells:
|
||||||
|
$ref: "./entrepreneurApi.yaml#/paths/~1entrepreneur~1sectionCells"
|
||||||
|
/entrepreneur/sectionCells/{sectionCellId}:
|
||||||
|
$ref: "./entrepreneurApi.yaml#/paths/~1entrepreneur~1sectionCells~1{sectionCellId}"
|
210
documentation/openapi/src/models.yaml
Normal file
210
documentation/openapi/src/models.yaml
Normal file
@ -0,0 +1,210 @@
|
|||||||
|
# models.yaml
|
||||||
|
user:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
idUser:
|
||||||
|
type: integer
|
||||||
|
description: Unique identifier for the user.
|
||||||
|
#readOnly: true # Typically generated by the server
|
||||||
|
example: 101
|
||||||
|
userSurname:
|
||||||
|
type: string
|
||||||
|
description: User's surname (last name).
|
||||||
|
example: "Doe"
|
||||||
|
userName:
|
||||||
|
type: string
|
||||||
|
description: User's given name (first name).
|
||||||
|
example: "John"
|
||||||
|
primaryMail:
|
||||||
|
type: string
|
||||||
|
format: email
|
||||||
|
description: User's primary email address.
|
||||||
|
example: "john.doe@example.com"
|
||||||
|
secondaryMail:
|
||||||
|
type: string
|
||||||
|
format: email
|
||||||
|
description: User's secondary email address (optional).
|
||||||
|
example: "j.doe@personal.com"
|
||||||
|
phoneNumber:
|
||||||
|
type: string
|
||||||
|
description: User's phone number.
|
||||||
|
example: "+33612345678" # Example using international format
|
||||||
|
|
||||||
|
user-entrepreneur:
|
||||||
|
allOf:
|
||||||
|
- $ref: "#/user"
|
||||||
|
- type: object
|
||||||
|
properties:
|
||||||
|
school:
|
||||||
|
type: string
|
||||||
|
description: The school the entrepreneur attends/attended.
|
||||||
|
example: "ENSEIRB-MATMECA"
|
||||||
|
course:
|
||||||
|
type: string
|
||||||
|
description: The specific course or program of study.
|
||||||
|
example: "Electronics"
|
||||||
|
sneeStatus:
|
||||||
|
type: boolean
|
||||||
|
description: Indicates if the user has SNEE status (Statut National d'Étudiant-Entrepreneur).
|
||||||
|
example: true
|
||||||
|
example: # Added full object example
|
||||||
|
idUser: 101
|
||||||
|
userSurname: "Doe"
|
||||||
|
userName: "John"
|
||||||
|
primaryMail: "john.doe@example.com"
|
||||||
|
secondaryMail: "j.doe@personal.com"
|
||||||
|
phoneNumber: "+33612345678"
|
||||||
|
school: "ENSEIRB-MATMECA"
|
||||||
|
course: "Electronics"
|
||||||
|
sneeStatus: true
|
||||||
|
|
||||||
|
user-admin:
|
||||||
|
allOf:
|
||||||
|
- $ref: "#/user"
|
||||||
|
# No additional properties needed for this example
|
||||||
|
example: # Added full object example
|
||||||
|
idUser: 55
|
||||||
|
userSurname: "Admin"
|
||||||
|
userName: "Super"
|
||||||
|
primaryMail: "admin@myinpulse.com"
|
||||||
|
phoneNumber: "+33512345678"
|
||||||
|
|
||||||
|
sectionCell:
|
||||||
|
type: object
|
||||||
|
description: Represents a cell (like a sticky note) within a specific section of a project's Lean Canvas.
|
||||||
|
properties:
|
||||||
|
idSectionCell:
|
||||||
|
type: integer
|
||||||
|
description: Unique identifier for the section cell.
|
||||||
|
#readOnly: true # Generated by server
|
||||||
|
example: 508
|
||||||
|
sectionId:
|
||||||
|
type: integer
|
||||||
|
description: Identifier of the Lean Canvas section this cell belongs to (e.g., 1 for Problem, 2 for Solution).
|
||||||
|
example: 1
|
||||||
|
contentSectionCell:
|
||||||
|
type: string
|
||||||
|
description: The text content of the section cell.
|
||||||
|
example: "Users find it hard to track project progress."
|
||||||
|
modificationDate:
|
||||||
|
type: string
|
||||||
|
format: date # Using Java LocalDate -> YYYY-MM-DD
|
||||||
|
description: The date when this cell was last modified.
|
||||||
|
#readOnly: true # Typically updated by the server on modification
|
||||||
|
example: "yyyy-MM-dd HH:mm"
|
||||||
|
|
||||||
|
project:
|
||||||
|
type: object
|
||||||
|
description: Represents a project being managed or developed.
|
||||||
|
properties:
|
||||||
|
idProject:
|
||||||
|
type: integer
|
||||||
|
description: Unique identifier for the project.
|
||||||
|
#readOnly: true # Generated by server
|
||||||
|
example: 12
|
||||||
|
projectName:
|
||||||
|
type: string
|
||||||
|
description: The name of the project.
|
||||||
|
example: "MyInpulse Mobile App"
|
||||||
|
creationDate:
|
||||||
|
type: string
|
||||||
|
format: date # Using Java LocalDate -> YYYY-MM-DD
|
||||||
|
description: The date when the project was created in the system.
|
||||||
|
#readOnly: true # Set by server
|
||||||
|
example: "yyyy-MM-dd HH:mm"
|
||||||
|
logo:
|
||||||
|
type: string
|
||||||
|
format: byte
|
||||||
|
description: Base64 encoded string representing the project logo image.
|
||||||
|
example: "/*Base64 encoded string representing the project logo image*/"
|
||||||
|
status:
|
||||||
|
type: string
|
||||||
|
enum: [PENDING, ACTIVE, ENDED, ABORTED, REJECTED]
|
||||||
|
description: Corresponds to a status enum internal to the backend, it's value in in requests
|
||||||
|
incoming to the server should be ignored as the client shouldn't be specifying them.
|
||||||
|
example: "NaN"
|
||||||
|
|
||||||
|
joinRequest:
|
||||||
|
type: object
|
||||||
|
description: Represents a request from an entrepreneur to join an already existing project.
|
||||||
|
properties:
|
||||||
|
idProject:
|
||||||
|
type: integer
|
||||||
|
description: the ID of the project the entrepreneur wants to join.
|
||||||
|
example: 42
|
||||||
|
entrepreneur:
|
||||||
|
$ref: "#/user-entrepreneur"
|
||||||
|
|
||||||
|
|
||||||
|
report:
|
||||||
|
type: object
|
||||||
|
description: Represents a report associated with an appointment.
|
||||||
|
properties:
|
||||||
|
idReport:
|
||||||
|
type: integer
|
||||||
|
description: Unique identifier for the report.
|
||||||
|
#readOnly: true # Generated by server
|
||||||
|
example: 987
|
||||||
|
reportContent:
|
||||||
|
type: string
|
||||||
|
description: The textual content of the report. Could be plain text or Markdown (specify if known).
|
||||||
|
example: "Discussed roadmap milestones for Q3. Agreed on preliminary UI mockups."
|
||||||
|
|
||||||
|
appointment: # Corrected typo
|
||||||
|
type: object
|
||||||
|
description: Represents a scheduled meeting or appointment.
|
||||||
|
properties:
|
||||||
|
idAppointment: # Assuming there's an ID
|
||||||
|
type: integer
|
||||||
|
description: Unique identifier for the appointment.
|
||||||
|
#readOnly: true
|
||||||
|
example: 303
|
||||||
|
appointmentDate:
|
||||||
|
type: string
|
||||||
|
format: date # Using Java LocalDate -> YYYY-MM-DD
|
||||||
|
description: The date of the appointment.
|
||||||
|
example: "2025-05-10"
|
||||||
|
appointmentTime:
|
||||||
|
type: string
|
||||||
|
format: time # Using Java LocalTime -> HH:mm:ss
|
||||||
|
description: The time of the appointment (local time).
|
||||||
|
example: "14:30:00"
|
||||||
|
appointmentDuration:
|
||||||
|
type: string
|
||||||
|
description: Duration of the appointment in ISO 8601 duration format (e.g., PT1H30M for 1 hour 30 minutes).
|
||||||
|
example: "PT1H" # Example for 1 hour
|
||||||
|
appointmentPlace:
|
||||||
|
type: string
|
||||||
|
description: Location or meeting link for the appointment.
|
||||||
|
example: "Meeting Room 3 / https://meet.example.com/abc-def-ghi"
|
||||||
|
appointmentSubject:
|
||||||
|
type: string
|
||||||
|
description: The main topic or subject of the appointment.
|
||||||
|
example: "Q3 Roadmap Planning"
|
||||||
|
# Consider adding project ID or user IDs if relevant association exists
|
||||||
|
|
||||||
|
projectDecision:
|
||||||
|
type: object
|
||||||
|
description: Represents a decision from an admin to accept a pending project.
|
||||||
|
properties:
|
||||||
|
projectId:
|
||||||
|
type: integer
|
||||||
|
description: The ID of the project the entrepreneur wants to join.
|
||||||
|
example: 12
|
||||||
|
adminId:
|
||||||
|
type: integer
|
||||||
|
description: The ID of the project the admin who will supervise the project in case of admission.
|
||||||
|
example: 2
|
||||||
|
isAccepted:
|
||||||
|
type: boolean
|
||||||
|
description: The boolean value of the decision.
|
||||||
|
example: "true"
|
||||||
|
|
||||||
|
joinRequestDecision:
|
||||||
|
type: object
|
||||||
|
description: Represents a decision from an admin to accept a pending project join request.
|
||||||
|
properties:
|
||||||
|
isAccepted:
|
||||||
|
type: boolean
|
||||||
|
description: The boolean value of the decision.
|
||||||
|
example: "true"
|
186
documentation/openapi/src/sharedApi.yaml
Normal file
186
documentation/openapi/src/sharedApi.yaml
Normal file
@ -0,0 +1,186 @@
|
|||||||
|
# Shared API Endpoints
|
||||||
|
paths:
|
||||||
|
|
||||||
|
/shared/projects/sectionCells/{projectId}/{sectionId}/{date}:
|
||||||
|
get:
|
||||||
|
operationId: getSectionCellsByDate
|
||||||
|
summary: Get project section cells modified on a specific date
|
||||||
|
tags:
|
||||||
|
- Shared API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-entrepreneur, MyINPulse-admin]
|
||||||
|
description: Retrieves section cells belonging to a specific section of a project, filtered by the last modification date. Requires user to have access to the project.
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: projectId
|
||||||
|
required: true
|
||||||
|
schema: { type: integer }
|
||||||
|
description: ID of the project.
|
||||||
|
- in: path
|
||||||
|
name: sectionId
|
||||||
|
required: true
|
||||||
|
schema: { type: integer }
|
||||||
|
description: ID of the Lean Canvas section.
|
||||||
|
- in: path
|
||||||
|
name: date
|
||||||
|
required: true
|
||||||
|
schema: { type: string, format: date } # Expect YYYY-MM-DD
|
||||||
|
description: The modification date to filter by (YYYY-MM-DD HH:mm).
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK - List of section cells matching the criteria.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "./main.yaml#/components/schemas/sectionCell"
|
||||||
|
"400":
|
||||||
|
description: Bad Request - Invalid parameter format.
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
|
||||||
|
/shared/projects/entrepreneurs/{projectId}:
|
||||||
|
get:
|
||||||
|
operationId: getProjectEntrepreneurs
|
||||||
|
summary: Get entrepreneurs associated with a project
|
||||||
|
tags:
|
||||||
|
- Shared API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-entrepreneur, MyINPulse-admin]
|
||||||
|
description: Retrieves a list of entrepreneur users associated with the specified project. Requires access to the project.
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: projectId
|
||||||
|
required: true
|
||||||
|
schema: { type: integer }
|
||||||
|
description: ID of the project.
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK - List of entrepreneurs.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "./main.yaml#/components/schemas/user-entrepreneur"
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
"403":
|
||||||
|
description: Forbidden - User does not have access to this project.
|
||||||
|
"404":
|
||||||
|
description: Not Found - Project not found.
|
||||||
|
|
||||||
|
/shared/projects/admin/{projectId}: # Path updated
|
||||||
|
get:
|
||||||
|
operationId: getProjectAdmin
|
||||||
|
summary: Get admin associated with a project
|
||||||
|
tags:
|
||||||
|
- Shared API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-entrepreneur, MyINPulse-admin]
|
||||||
|
description: Retrieves a list of admin users associated with the specified project. Requires access to the project.
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: projectId
|
||||||
|
required: true
|
||||||
|
schema: { type: integer }
|
||||||
|
description: ID of the project.
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK - admin.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "./main.yaml#/components/schemas/user-admin"
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
"403":
|
||||||
|
description: Forbidden - User does not have access to this project.
|
||||||
|
"404":
|
||||||
|
description: Not Found - Project not found.
|
||||||
|
|
||||||
|
|
||||||
|
/shared/projects/appointments/{projectId}:
|
||||||
|
get:
|
||||||
|
operationId: getProjectAppointments
|
||||||
|
summary: Get appointments related to a project
|
||||||
|
tags:
|
||||||
|
- Shared API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-entrepreneur, MyINPulse-admin]
|
||||||
|
description: Retrieves a list of appointments associated with the specified project. Requires access to the project.
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: projectId
|
||||||
|
required: true
|
||||||
|
schema: { type: integer }
|
||||||
|
description: ID of the project.
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK - List of appointments.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "./main.yaml#/components/schemas/appointment"
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
|
||||||
|
/shared/appointments/report/{appointmentId}: # Path updated
|
||||||
|
get:
|
||||||
|
operationId: getAppointmentReport # Shared endpoint implies read-only access might be possible
|
||||||
|
summary: Get the report for an appointment
|
||||||
|
tags:
|
||||||
|
- Shared API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-entrepreneur, MyINPulse-admin]
|
||||||
|
description: Retrieves the report associated with a specific appointment. Requires user to have access to the appointment/project.
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: appointmentId
|
||||||
|
required: true
|
||||||
|
schema: { type: integer }
|
||||||
|
description: ID of the appointment.
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: OK - Report PDF returned.
|
||||||
|
content:
|
||||||
|
application/pdf:
|
||||||
|
schema:
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
format: binary
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
||||||
|
|
||||||
|
/shared/appointments/request:
|
||||||
|
post:
|
||||||
|
operationId: requestAppointment
|
||||||
|
summary: Request a new appointment
|
||||||
|
tags:
|
||||||
|
- Shared API
|
||||||
|
security:
|
||||||
|
- MyINPulse: [MyINPulse-entrepreneur, MyINPulse-admin]
|
||||||
|
description: Allows a user (entrepreneur or admin) to request a new appointment, potentially with another user or regarding a project. Details in the body. The request might need confirmation or create a pending appointment.
|
||||||
|
requestBody:
|
||||||
|
required: true
|
||||||
|
description: Details of the appointment request.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "./main.yaml#/components/schemas/appointment" # Assuming request uses same model structure
|
||||||
|
# Potentially add projectId or targetUserId here
|
||||||
|
responses:
|
||||||
|
"202": # Accepted seems appropriate for a request
|
||||||
|
description: Accepted - Appointment request submitted.
|
||||||
|
"400":
|
||||||
|
description: Bad Request - Invalid appointment details.
|
||||||
|
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
|
62
documentation/openapi/src/unauthApi.yaml
Normal file
62
documentation/openapi/src/unauthApi.yaml
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
|
||||||
|
# _ _ _ _ _ _
|
||||||
|
# | | | |_ __ __ _ _ _| |_| |__ / \ _ __ (_)
|
||||||
|
# | | | | '_ \ / _` | | | | __| '_ \ / _ \ | '_ \| |
|
||||||
|
# | |_| | | | | (_| | |_| | |_| | | |/ ___ \| |_) | |
|
||||||
|
# \___/|_| |_|\__,_|\__,_|\__|_| |_/_/ \_\ .__/|_|
|
||||||
|
# |_|
|
||||||
|
|
||||||
|
paths:
|
||||||
|
/unauth/finalize:
|
||||||
|
post:
|
||||||
|
summary: Finalize account setup using authentication token
|
||||||
|
description: |-
|
||||||
|
Completes the user account creation/setup process in the MyInpulse system.
|
||||||
|
This endpoint requires the user to be authenticated via Keycloak (e.g., after initial login).
|
||||||
|
User details (name, email, etc.) are extracted from the authenticated user's token (e.g., Keycloak JWT).
|
||||||
|
No request body is needed. The account is marked as pending admin validation upon successful finalization.
|
||||||
|
tags:
|
||||||
|
- Unauth API
|
||||||
|
responses:
|
||||||
|
"201":
|
||||||
|
description: Created - Account finalized and pending admin validation. Returns the user profile.
|
||||||
|
"400":
|
||||||
|
description: Bad Request - Problem processing the token or user data derived from it.
|
||||||
|
"401":
|
||||||
|
description: Unauthorized - Valid authentication token required.
|
||||||
|
/unauth/request-join/{projectId}:
|
||||||
|
post:
|
||||||
|
summary: Request to join an existing project
|
||||||
|
description: Submits a request for the authenticated user (keycloack authenticated) to join the project specified by projectId. Their role is then changed to entrepreneur in server and Keycloak. This requires approval from a project admin.
|
||||||
|
tags:
|
||||||
|
- Unauth API
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: projectId
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
description: The ID of the project to request joining.
|
||||||
|
example: 15
|
||||||
|
responses: # Moved responses block to correct level
|
||||||
|
"202":
|
||||||
|
description: Accepted - Join request submitted and pending approval.
|
||||||
|
"400":
|
||||||
|
description: Bad Request - Invalid project ID format
|
||||||
|
"409":
|
||||||
|
description: Already member/request pending.
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
||||||
|
/unauth/request-admin-role:
|
||||||
|
post:
|
||||||
|
summary: Request to join an existing project
|
||||||
|
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:
|
||||||
|
- Unauth API
|
||||||
|
responses:
|
||||||
|
"202":
|
||||||
|
description: Accepted - Become admin request submitted and pending approval.
|
||||||
|
"400":
|
||||||
|
description: Bad Request - Invalid project ID format or already member/request pending.
|
||||||
|
"401":
|
||||||
|
description: Unauthorized.
|
14
documentation/openapi/swagger-ui/main.js
Normal file
14
documentation/openapi/swagger-ui/main.js
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
const express = require("express");
|
||||||
|
const swaggerUi = require("swagger-ui-express");
|
||||||
|
const yaml = require("js-yaml");
|
||||||
|
const fs = require("fs");
|
||||||
|
|
||||||
|
const app = express();
|
||||||
|
|
||||||
|
const swaggerDocument = yaml.load(fs.readFileSync("../src/bundled.yaml", "utf8"));
|
||||||
|
|
||||||
|
app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(swaggerDocument));
|
||||||
|
|
||||||
|
app.listen(3000, () => {
|
||||||
|
console.log("Swagger UI running at http://localhost:3000/api-docs");
|
||||||
|
});
|
2178
documentation/openapi/swagger-ui/package-lock.json
generated
Normal file
2178
documentation/openapi/swagger-ui/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
21
documentation/openapi/swagger-ui/package.json
Normal file
21
documentation/openapi/swagger-ui/package.json
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"name": "swagger-ui",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"main": "index.js",
|
||||||
|
"scripts": {
|
||||||
|
"test": "echo \"Error: no test specified\" && exit 1",
|
||||||
|
"bundle": "swagger-cli bundle -o ../src/bundled.yaml -t yaml ../src/main.yaml",
|
||||||
|
"start": "npm run bundle; node main.js"
|
||||||
|
},
|
||||||
|
"keywords": [],
|
||||||
|
"author": "",
|
||||||
|
"license": "ISC",
|
||||||
|
"description": "",
|
||||||
|
"dependencies": {
|
||||||
|
"express": "^4.21.2",
|
||||||
|
"js-yaml": "^4.1.0",
|
||||||
|
"package.json": "^2.0.1",
|
||||||
|
"swagger-cli": "^4.0.4",
|
||||||
|
"swagger-ui-express": "^5.0.1"
|
||||||
|
}
|
||||||
|
}
|
@ -4,6 +4,7 @@ import { callApi } from "@/services/api.ts";
|
|||||||
import { ref } from "vue";
|
import { ref } from "vue";
|
||||||
|
|
||||||
const CustomRequest = ref("");
|
const CustomRequest = ref("");
|
||||||
|
const USERID = ref("");
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
@ -34,30 +35,7 @@ const CustomRequest = ref("");
|
|||||||
<td>Current refresh token</td>
|
<td>Current refresh token</td>
|
||||||
<td>{{ store.user.refreshToken }}</td>
|
<td>{{ store.user.refreshToken }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td>Entrepreneur API call</td>
|
|
||||||
<td>
|
|
||||||
<button @click="callApi('random')">call</button>
|
|
||||||
</td>
|
|
||||||
<td>res</td>
|
|
||||||
<td></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Admin API call</td>
|
|
||||||
<td>
|
|
||||||
<button @click="callApi('random2')">call</button>
|
|
||||||
</td>
|
|
||||||
<td>res</td>
|
|
||||||
<td></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Unauth API call</td>
|
|
||||||
<td>
|
|
||||||
<button @click="callApi('unauth/dev')">call</button>
|
|
||||||
</td>
|
|
||||||
<td>res</td>
|
|
||||||
<td id="3"></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<input v-model="CustomRequest" placeholder="edit me" />
|
<input v-model="CustomRequest" placeholder="edit me" />
|
||||||
@ -66,6 +44,83 @@ const CustomRequest = ref("");
|
|||||||
<button @click="callApi(CustomRequest)">call</button>
|
<button @click="callApi(CustomRequest)">call</button>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td>Create an account</td>
|
||||||
|
<td>
|
||||||
|
<button @click="callApi('unauth/create_account')">
|
||||||
|
call
|
||||||
|
</button>
|
||||||
|
</td>
|
||||||
|
<td>res</td>
|
||||||
|
<td id="4"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Get Pending Accounts</td>
|
||||||
|
<td>
|
||||||
|
<button @click="callApi('admin/get_pending_accounts')">
|
||||||
|
call
|
||||||
|
</button>
|
||||||
|
</td>
|
||||||
|
<td>res</td>
|
||||||
|
<td id="6"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>admin/validate_user_account/{id}</td>
|
||||||
|
<td>
|
||||||
|
<button
|
||||||
|
@click="
|
||||||
|
callApi('admin/validate_user_account/' + USERID)
|
||||||
|
"
|
||||||
|
>
|
||||||
|
call
|
||||||
|
</button>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td>
|
||||||
|
<input v-model="USERID" placeholder="user ID" />
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td id="5"></td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td>admin/setadmin/{uid}</td>
|
||||||
|
<td>
|
||||||
|
<button @click="callApi('admin/setadmin/' + USERID)">
|
||||||
|
call
|
||||||
|
</button>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td>
|
||||||
|
<input v-model="USERID" placeholder="user ID" />
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Unauth API call</td>
|
||||||
|
<td>
|
||||||
|
<button @click="callApi('unauth/dev')">call</button>
|
||||||
|
</td>
|
||||||
|
<td>res</td>
|
||||||
|
<td id="8"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Unauth API call</td>
|
||||||
|
<td>
|
||||||
|
<button @click="callApi('unauth/dev')">call</button>
|
||||||
|
</td>
|
||||||
|
<td>res</td>
|
||||||
|
<td id="9"></td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td>Unauth API call</td>
|
||||||
|
<td>
|
||||||
|
<button @click="callApi('unauth/dev')">call</button>
|
||||||
|
</td>
|
||||||
|
<td>res</td>
|
||||||
|
<td id="10"></td>
|
||||||
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</template>
|
</template>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user