MyINPulse-back/build.gradle

@@ -1,35 +1,33 @@
 plugins {
-    id 'java'
+	id 'java'
-    id 'org.springframework.boot' version '3.4.2'
+	id 'org.springframework.boot' version '3.4.2'
-    id 'io.spring.dependency-management' version '1.1.7'
+	id 'io.spring.dependency-management' version '1.1.7'
 }
 
 group = 'enseirb'
 version = '0.0.1-SNAPSHOT'
 
 java {
-    toolchain {
+	toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+		languageVersion = JavaLanguageVersion.of(21)
-    }
+	}
 }
 
 repositories {
-    mavenCentral()
+	mavenCentral()
 }
 
 dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
+	implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
-    implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-    implementation 'org.springframework.boot:spring-boot-starter-validation'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
-    implementation 'org.springframework.boot:spring-boot-starter-data-rest'
+	implementation 'org.springframework.boot:spring-boot-starter-data-rest'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.16.0'
+	implementation 'org.postgresql:postgresql'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.16.0'
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    implementation 'org.postgresql:postgresql'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.named('test') {
-    useJUnitPlatform()
+	useJUnitPlatform()
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/controller/AdminApi.java

@@ -26,8 +26,8 @@ public class AdminApi {
      * @return a list of all project managed by the current admin user
      */
     @GetMapping("/admin/projects")
-    public Iterable<Project> getProjects(@AuthenticationPrincipal Jwt principal) {
+    public Iterable<Administrator> getProjects() {
-        return adminApiService.getProjectsOfAdmin(principal.getClaimAsString("email"));
+        return adminApiService.getProjects();
     }
 
     /**
@@ -53,7 +53,7 @@ public class AdminApi {
     /**
      * Endpoint used to make a decision about a project.
      *
-     * <p>The decision must contain the administrator
+     * <p>The decision must contains the administrator
      *
      * @return the status code of the request
      */
@@ -96,7 +96,7 @@ public class AdminApi {
      * @return the status code of the request
      */
     @DeleteMapping("/admin/projects/remove/{projectId}")
-    public void deleteProject(@PathVariable long projectId) {
+    public void deleteProject(@PathVariable String projectId) {
         adminApiService.deleteProject(projectId);
     }
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/model/Project.java

@@ -11,26 +11,34 @@ import java.util.List;
 @Table(name = "project")
 public class Project {
 
-    @OneToMany(mappedBy = "projectParticipation", fetch = FetchType.LAZY, orphanRemoval = true)
-    private final List<Entrepreneur> listEntrepreneurParticipation = new ArrayList<>();
-    @OneToMany(mappedBy = "projectSectionCell", fetch = FetchType.LAZY, orphanRemoval = true)
-    private final List<SectionCell> listSectionCell = new ArrayList<>();
     @Id
     @NotNull
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long idProject;
+
     @Column(length = 255)
     private String projectName;
+
     private byte[] logo;
+
     private LocalDate creationDate;
+
     @Column(length = 255)
     private String projectStatus;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "idAdministrator")
     private Administrator projectAdministrator;
+
+    @OneToMany(mappedBy = "projectParticipation", fetch = FetchType.LAZY, orphanRemoval = true)
+    private List<Entrepreneur> listEntrepreneurParticipation = new ArrayList<>();
+
     @OneToOne(mappedBy = "projectProposed", fetch = FetchType.LAZY, orphanRemoval = true)
     private Entrepreneur entrepreneurProposed;
 
+    @OneToMany(mappedBy = "projectSectionCell", fetch = FetchType.LAZY, orphanRemoval = true)
+    private List<SectionCell> listSectionCell = new ArrayList<>();
+
     public Project() {}
 
     public Project(
@@ -85,8 +93,4 @@ public class Project {
     public void setProjectStatus(String projectStatus) {
         this.projectStatus = projectStatus;
     }
-
-    public void setAdministrator(Administrator administrator) {
-        this.projectAdministrator = administrator;
-    }
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/model/ProjectDecision.java

@@ -1,7 +1,7 @@
 package enseirb.myinpulse.model;
 
 public class ProjectDecision {
-    public long projectId;
+    int projectId;
-    public long adminId;
+    int adminId;
-    public long isAccepted;
+    int isAccepted;
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/model/User.java

@@ -20,7 +20,7 @@ public class User {
     private String userName;
 
     @Column(length = 255)
-    private String primaryMail;
+    private String mainMail;
 
     @Column(length = 255)
     private String secondaryMail;
@@ -34,13 +34,13 @@ public class User {
             Long idUser,
             String userSurname,
             String userName,
-            String primaryMail,
+            String mainMail,
             String secondaryMail,
             String phoneNumber) {
         this.idUser = idUser;
         this.userSurname = userSurname;
         this.userName = userName;
-        this.primaryMail = primaryMail;
+        this.mainMail = mainMail;
         this.secondaryMail = secondaryMail;
         this.phoneNumber = phoneNumber;
     }
@@ -69,12 +69,12 @@ public class User {
         userName = userName;
     }
 
-    public String getPrimaryMail() {
+    public String getMainMail() {
-        return primaryMail;
+        return mainMail;
     }
 
-    public void setPrimaryMail(String mainMail) {
+    public void setMainMail(String mainMail) {
-        this.primaryMail = mainMail;
+        this.mainMail = mainMail;
     }
 
     public String getSecondaryMail() {

MyINPulse-back/src/main/java/enseirb/myinpulse/repository/ProjectRepository.java

@@ -1,14 +1,9 @@
 package enseirb.myinpulse.repository;
 
-import enseirb.myinpulse.model.Administrator;
 import enseirb.myinpulse.model.Project;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 
 @RepositoryRestResource
-public interface ProjectRepository extends JpaRepository<Project, Long> {
+public interface ProjectRepository extends JpaRepository<Project, Long> {}
-    Iterable<Project> findByProjectAdministrator(Administrator administrator);
-
-    Iterable<Project> findByProjectStatus(String status);
-}

MyINPulse-back/src/main/java/enseirb/myinpulse/repository/UserRepository.java

@@ -5,11 +5,8 @@ import enseirb.myinpulse.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 
-import java.util.Optional;
-
 @RepositoryRestResource
 public interface UserRepository extends JpaRepository<User, Long> {
-    Optional<User> findByPrimaryMail(String email);
 
     /* @Query("SELECT u from User u")
     User findAllUser(); */

MyINPulse-back/src/main/java/enseirb/myinpulse/service/AdminApiService.java

@@ -1,37 +1,16 @@
 package enseirb.myinpulse.service;
 
 import enseirb.myinpulse.model.*;
-import enseirb.myinpulse.service.database.AdministratorService;
-import enseirb.myinpulse.service.database.ProjectService;
-import enseirb.myinpulse.service.database.UserService;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.server.ResponseStatusException;
 
 @Service
 public class AdminApiService {
-
+    // TODO
-    private final ProjectService projectService;
+    public Iterable<Administrator> getProjects() {
-    private final UserService userService;
+        throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
-    private final AdministratorService administratorService;
-
-    @Autowired
-    AdminApiService(
-            ProjectService projectService,
-            UserService userService,
-            AdministratorService administratorService) {
-        this.projectService = projectService;
-        this.userService = userService;
-        this.administratorService = administratorService;
-    }
-
-    // TODO: test
-    public Iterable<Project> getProjectsOfAdmin(String email) {
-        return projectService.getProjectsByAdminId(
-                administratorService.getAdministratorById(
-                        this.userService.getIdUserByEmail(email)));
     }
 
     // TODO
@@ -39,25 +18,19 @@ public class AdminApiService {
         throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
     }
 
-    // TODO: test
+    // TODO
     public Iterable<Project> getPendingProjects() {
-        return this.projectService.getPendingProjects();
+        throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
     }
 
-    // TODO: test
+    // TODO
     public void validateProject(ProjectDecision decision) {
-        projectService.updateProject(
+        throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
-                decision.projectId,
-                null,
-                null,
-                null,
-                "ACTIVE",
-                this.administratorService.getAdministratorById(decision.projectId));
     }
 
-    // TODO: solve todo + test
+    // TODO
     public void addNewProject(Project project) {
-        projectService.addNewProject(project); // TODO: how can the user know the ID ?
+        throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
     }
 
     // TODO
@@ -65,8 +38,8 @@ public class AdminApiService {
         throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
     }
 
-    // TODO: test
+    // TODO
-    public void deleteProject(long projectId) {
+    public void deleteProject(String projectId) {
-        this.projectService.deleteProjectById(projectId);
+        throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
     }
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/ProjectService.java

@@ -1,25 +1,19 @@
 package enseirb.myinpulse.service.database;
 
-import enseirb.myinpulse.model.Administrator;
 import enseirb.myinpulse.model.Project;
 import enseirb.myinpulse.repository.ProjectRepository;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.server.ResponseStatusException;
 
 import java.time.LocalDate;
-import java.util.List;
 import java.util.Optional;
 
 @Service
 public class ProjectService {
 
-    protected static final Logger logger = LogManager.getLogger();
-
     private final ProjectRepository projectRepository;
 
     @Autowired
@@ -31,19 +25,15 @@ public class ProjectService {
         return this.projectRepository.findAll();
     }
 
+    // TODO: change error
     public Project getProjectById(Long id) {
         Optional<Project> project = this.projectRepository.findById(id);
         if (project.isEmpty()) {
-            System.err.println("Project with id " + id + " not found");
             throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce projet n'existe pas");
         }
         return project.get();
     }
 
-    public Iterable<Project> getProjectsByAdminId(Administrator administrator) {
-        return this.projectRepository.findByProjectAdministrator(administrator);
-    }
-
     // TODO: validation
     public Project addNewProject(Project project) {
         return this.projectRepository.save(project);
@@ -54,52 +44,23 @@ public class ProjectService {
             String projectName,
             byte[] logo,
             LocalDate creationDate,
-            String projectStatus,
+            String projectStatus) {
-            Administrator administrator) {
         Optional<Project> project = this.projectRepository.findById(id);
-
         if (project.isEmpty()) {
-            logger.error("Project with id {} not found.", id);
             throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Ce projet n'existe pas");
         }
-
         if (projectName != null) {
             project.get().setProjectName(projectName);
         }
-
         if (logo != null) {
             project.get().setLogo(logo);
         }
-
         if (creationDate != null) {
             project.get().setCreationDate(creationDate);
         }
-
         if (projectStatus != null) {
-            if (!validateStatus(projectStatus)) {
-                System.err.println("updateProjectStatus: Invalid status " + projectStatus);
-                throw new ResponseStatusException(
-                        HttpStatus.NOT_ACCEPTABLE, "Ce status n'est pas accepté");
-            }
             project.get().setProjectStatus(projectStatus);
         }
-
-        if (administrator != null) {
-            project.get().setAdministrator(administrator);
-        }
-
         return this.projectRepository.save(project.get());
     }
-
-    public Boolean validateStatus(String status) {
-        return List.of("PENDING", "ACTIVE", "ENDED").contains(status);
-    }
-
-    public Iterable<Project> getPendingProjects() {
-        return this.projectRepository.findByProjectStatus("PENDING");
-    }
-
-    public void deleteProjectById(Long id) {
-        this.projectRepository.deleteById(id);
-    }
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/AdministratorController.java

@@ -1,43 +1,38 @@
-package enseirb.myinpulse.service.database;
+package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services;
 
 import enseirb.myinpulse.model.Administrator;
 import enseirb.myinpulse.repository.AdministratorRepository;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
 import java.util.Optional;
 
-@Service
+@RestController
-public class AdministratorService {
+public class AdministratorController {
-    protected static final Logger logger = LogManager.getLogger();
 
-    private final AdministratorRepository administratorRepository;
+    @Autowired AdministratorRepository administratorRepository;
-
-    @Autowired
-    AdministratorService(AdministratorRepository administratorRepository) {
-        this.administratorRepository = administratorRepository;
-    }
 
+    @GetMapping("/Administrator")
+    @ResponseBody
     public Iterable<Administrator> allAdministrators() {
         return this.administratorRepository.findAll();
     }
 
-    public Administrator getAdministratorById(long id) {
+    @GetMapping("/Administrator/{id}")
+    public Administrator getAdministratorById(@PathVariable Long id) {
         Optional<Administrator> administrator = this.administratorRepository.findById(id);
         if (administrator.isEmpty()) {
-            logger.error("No administrator found with id {}", id);
             throw new ResponseStatusException(
                     HttpStatus.NOT_FOUND, "Cet administrateur n'existe pas");
         }
         return administrator.get();
     }
 
-    public Administrator addAdministrator(Administrator administrator) {
+    @PostMapping("/Administrateurs")
+    public Administrator addAdministrator(@RequestBody Administrator administrator) {
         return this.administratorRepository.save(administrator);
     }
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/UserController.java

@@ -1,50 +1,41 @@
-package enseirb.myinpulse.service.database;
+package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services;
 
 import enseirb.myinpulse.model.User;
 import enseirb.myinpulse.repository.UserRepository;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.server.ResponseStatusException;
 
 import java.util.Optional;
 
-@Service
+@RestController
-public class UserService {
+public class UserController {
-    private final UserRepository userRepository;
 
-    @Autowired
+    @Autowired UserRepository userRepository;
-    UserService(UserRepository userRepository) {
-        this.userRepository = userRepository;
-    }
-
-    public Iterable<User> getAllUsers() {
-        return this.userRepository.findAll();
-    }
-
-    // TODO
-    public long getIdUserByEmail(String email) {
-        Optional<User> opt_user = this.userRepository.findByPrimaryMail(email);
-
-        if (opt_user.isEmpty()) {
-            System.err.println("Couldn't find user with email " + email);
-            throw new ResponseStatusException(HttpStatus.NOT_FOUND);
-        }
-        User user = opt_user.get();
-        return user.getIdUser();
-    }
 
+    @GetMapping("/User")
+    @ResponseBody
     public Iterable<User> allUsers() {
         return this.userRepository.findAll();
     }
 
+    @GetMapping("/User/{id}")
+    public User getUserById(@PathVariable Long id) {
+        Optional<User> user = userRepository.findById(id);
+        if (user.isEmpty()) {
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Cet utilisateur n'existe pas");
+        }
+        return user.get();
+    }
+
+    @PostMapping("/User")
     public User addUser(@RequestBody User user) {
         return this.userRepository.save(user);
     }
 
+    @PostMapping("/User/{id}")
     public User updateUser(
             @PathVariable Long id,
             String userSurname,
@@ -63,7 +54,7 @@ public class UserService {
             user.get().setUserSurname(userSurname);
         }
         if (mainMail != null) {
-            user.get().setPrimaryMail(mainMail);
+            user.get().setMainMail(mainMail);
         }
         if (secondaryMail != null) {
             user.get().setSecondaryMail(secondaryMail);

MyINPulse-back/src/main/resources/data.sql

@@ -8,7 +8,7 @@ SELECT setval('report_id_report_seq', 1, false);
 SELECT setval('section_cell_id_section_cell_seq', 1, false);
 SELECT setval('user_inpulse_id_user_seq', 1, false);
 
-INSERT INTO user_inpulse (user_surname, user_name, primary_mail, secondary_mail, phone_number)
+INSERT INTO user_inpulse (user_surname, user_name, main_mail, secondary_mail, phone_number)
 VALUES ('Dupont', 'Dupond', 'super@mail.fr', 'super2@mail.fr', '06 45 72 45 98'),
        ('Martin', 'Matin', 'genial@mail.fr', 'genial2@mail.fr', '06 52 14 58 73'),
        ('Charvet', 'Lautre', 'mieux@tmail.fr', 'mieux2@tmail.fr', '07 49 82 16 35'),

MyINPulse-back/src/main/resources/log4j2.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="INFO">
-    <Appenders>
-        <Console name="console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
-        </Console>
-    </Appenders>
-
-    <Loggers>
-        <Root level="trace">
-            <AppenderRef ref="console"/>
-        </Root>
-    </Loggers>
-</Configuration>