Merge branch 'backend-api' of ssh://gitea.piair.dev:2222/piair/MyINPulse into backend-api

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

@@ -1,16 +1,37 @@
 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
-    public Iterable<Administrator> getProjects() {
-        throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
+
+    private final ProjectService projectService;
+    private final UserService userService;
+    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
@@ -18,19 +39,25 @@ public class AdminApiService {
         throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
     }
 
-    // TODO
+    // TODO: test
     public Iterable<Project> getPendingProjects() {
-        throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
+        return this.projectService.getPendingProjects();
     }
 
-    // TODO
+    // TODO: test
     public void validateProject(ProjectDecision decision) {
-        throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
+        projectService.updateProject(
+                decision.projectId,
+                null,
+                null,
+                null,
+                "ACTIVE",
+                this.administratorService.getAdministratorById(decision.projectId));
     }
 
-    // TODO
+    // TODO: solve todo + test
     public void addNewProject(Project project) {
-        throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
+        projectService.addNewProject(project); // TODO: how can the user know the ID ?
     }
 
     // TODO
@@ -38,8 +65,8 @@ public class AdminApiService {
         throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
     }
 
-    // TODO
-    public void deleteProject(String projectId) {
-        throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
+    // TODO: test
+    public void deleteProject(long projectId) {
+        this.projectService.deleteProjectById(projectId);
     }
 }

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

@@ -1,38 +1,43 @@
-package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services;
+package enseirb.myinpulse.service.database;
 
 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.web.bind.annotation.*;
+import org.springframework.stereotype.Service;
 import org.springframework.web.server.ResponseStatusException;
 
 import java.util.Optional;
 
-@RestController
-public class AdministratorController {
+@Service
+public class AdministratorService {
+    protected static final Logger logger = LogManager.getLogger();
 
-    @Autowired AdministratorRepository administratorRepository;
+    private final AdministratorRepository administratorRepository;
+
+    @Autowired
+    AdministratorService(AdministratorRepository administratorRepository) {
+        this.administratorRepository = administratorRepository;
+    }
 
-    @GetMapping("/Administrator")
-    @ResponseBody
     public Iterable<Administrator> allAdministrators() {
         return this.administratorRepository.findAll();
     }
 
-    @GetMapping("/Administrator/{id}")
-    public Administrator getAdministratorById(@PathVariable Long id) {
+    public Administrator getAdministratorById(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();
     }
 
-    @PostMapping("/Administrateurs")
-    public Administrator addAdministrator(@RequestBody Administrator administrator) {
+    public Administrator addAdministrator(Administrator administrator) {
         return this.administratorRepository.save(administrator);
     }
 }

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

@@ -1,19 +1,25 @@
 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
@@ -25,15 +31,19 @@ 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);
@@ -44,23 +54,52 @@ 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/UserService.java

@@ -1,41 +1,50 @@
-package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services;
+package enseirb.myinpulse.service.database;
 
 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.web.bind.annotation.*;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.server.ResponseStatusException;
 
 import java.util.Optional;
 
-@RestController
-public class UserController {
+@Service
+public class UserService {
+    private final UserRepository userRepository;
 
-    @Autowired UserRepository userRepository;
+    @Autowired
+    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,
@@ -54,7 +63,7 @@ public class UserController {
             user.get().setUserSurname(userSurname);
         }
         if (mainMail != null) {
-            user.get().setMainMail(mainMail);
+            user.get().setPrimaryMail(mainMail);
         }
         if (secondaryMail != null) {
             user.get().setSecondaryMail(secondaryMail);