MyINPulse-back/build.gradle

@@ -2,7 +2,6 @@ plugins {
     id 'java'
     id 'org.springframework.boot' version '3.4.2'
     id 'io.spring.dependency-management' version '1.1.7'
-    id 'jacoco'
 }
 
 group = 'enseirb'
@@ -37,22 +36,3 @@ dependencies {
 tasks.named('test') {
     useJUnitPlatform()
 }
-
-
-test {
-    finalizedBy jacocoTestReport // report is always generated after tests run
-}
-jacocoTestReport {
-    dependsOn test // tests are required to run before generating the report
-    reports {
-        xml.required = false
-        csv.required = false
-        html.outputLocation = layout.buildDirectory.dir('jacocoHtml')
-    }
-}
-
-
-jacoco {
-    toolVersion = "0.8.12"
-    reportsDirectory = layout.buildDirectory.dir('customJacocoReportDir')
-}

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

@@ -34,9 +34,9 @@ public class Administrator extends User {
     public Administrator(
             String userSurname,
             String username,
-            String primaryMail,
+            String mainMail,
             String secondaryMail,
             String phoneNumber) {
-        super(null, userSurname, username, primaryMail, secondaryMail, phoneNumber);
+        super(null, userSurname, username, mainMail, secondaryMail, phoneNumber);
     }
 }

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

@@ -40,13 +40,13 @@ public class Entrepreneur extends User {
             Long idUser,
             String userSurname,
             String username,
-            String primaryMail,
+            String mainMail,
             String secondaryMail,
             String phoneNumber,
             String school,
             String course,
             boolean sneeStatus) {
-        super(idUser, userSurname, username, primaryMail, secondaryMail, phoneNumber);
+        super(idUser, userSurname, username, mainMail, secondaryMail, phoneNumber);
         this.school = school;
         this.course = course;
         this.sneeStatus = sneeStatus;

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

@@ -39,16 +39,16 @@ public class Project {
     public Project() {}
 
     public Project(
+            Long idProject,
             String projectName,
             byte[] logo,
             LocalDate creationDate,
-            String projectStatus,
+            String projectStatus) {
-            Administrator projectAdministrator) {
+        this.idProject = idProject;
         this.projectName = projectName;
         this.logo = logo;
         this.creationDate = creationDate;
         this.projectStatus = projectStatus;
-        this.projectAdministrator = projectAdministrator;
     }
 
     public Long getIdProject() {

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

@@ -71,8 +71,8 @@ public class User {
         return primaryMail;
     }
 
-    public void setPrimaryMail(String primaryMail) {
+    public void setPrimaryMail(String mainMail) {
-        this.primaryMail = primaryMail;
+        this.primaryMail = mainMail;
     }
 
     public String getSecondaryMail() {

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

@@ -5,13 +5,10 @@ import enseirb.myinpulse.model.Administrator;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 
-import java.util.Optional;
-
 @RepositoryRestResource
 public interface AdministratorRepository extends JpaRepository<Administrator, Long> {
 
     /* @Query("SELECT a from Administrators a")
     Administrator findAllAdministrator(); */
 
-    Optional<Administrator> findByPrimaryMail(String PrimaryMail);
 }

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

@@ -37,17 +37,6 @@ public class AdministratorService {
         return administrator.get();
     }
 
-    public Administrator getAdministratorByPrimaryMain(String primaryMail) {
-        Optional<Administrator> administrator =
-                this.administratorRepository.findByPrimaryMail(primaryMail);
-        if (administrator.isEmpty()) {
-            logger.error("No administrator found with the mail {}", primaryMail);
-            throw new ResponseStatusException(
-                    HttpStatus.NOT_FOUND, "Cet administrateur n'existe pas");
-        }
-        return administrator.get();
-    }
-
     public Administrator addAdministrator(Administrator administrator) {
         return this.administratorRepository.save(administrator);
     }

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

@@ -53,7 +53,7 @@ public class UserService {
             @PathVariable Long id,
             String userSurname,
             String userName,
-            String primaryMail,
+            String mainMail,
             String secondaryMail,
             String phoneNumber) {
         Optional<User> user = userRepository.findById(id);
@@ -67,8 +67,8 @@ public class UserService {
         if (userSurname != null) {
             user.get().setUserSurname(userSurname);
         }
-        if (primaryMail != null) {
+        if (mainMail != null) {
-            user.get().setPrimaryMail(primaryMail);
+            user.get().setPrimaryMail(mainMail);
         }
         if (secondaryMail != null) {
             user.get().setSecondaryMail(secondaryMail);

MyINPulse-back/src/test/java/enseirb/myinpulse/AdminApiServiceTest.java

@@ -7,7 +7,6 @@ import enseirb.myinpulse.model.Administrator;
 import enseirb.myinpulse.model.Project;
 import enseirb.myinpulse.service.AdminApiService;
 import enseirb.myinpulse.service.database.AdministratorService;
-import enseirb.myinpulse.service.database.ProjectService;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -16,7 +15,6 @@ 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.util.ArrayList;
 import java.util.List;
 
@@ -26,44 +24,22 @@ public class AdminApiServiceTest {
     @Autowired private AdminApiService adminApiService;
 
     @BeforeAll
-    static void setup(
+    static void setup(@Autowired AdministratorService administratorService) {
-            @Autowired AdministratorService administratorService,
-            @Autowired ProjectService projectService) {
         administratorService.addAdministrator(
                 new Administrator(
-                        "admin",
+                        "admin", "admin", "testAdmin@example.com", "testAdmin@example.com", ""));
-                        "admin",
-                        "testAdminEmpty@example.com",
-                        "testAdmin@example.com",
-                        ""));
-        administratorService.addAdministrator(
-                new Administrator(
-                        "admin2",
-                        "admin2",
-                        "testAdminFull@example.com",
-                        "testAdmin@example.com",
-                        ""));
-        projectService.addNewProject(
-                new Project(
-                        "sampleProjectAdminApiService",
-                        null,
-                        LocalDate.now(),
-                        "ONGOING",
-                        administratorService.getAdministratorByPrimaryMain(
-                                "testAdminFull@example.com")));
     }
 
     @Test
-    void getProjectOfAdminIsEmpty() {
+    void getProjectOfAdminIsEmpty() throws Exception {
-        Iterable<Project> projects =
+        Iterable<Project> projects = adminApiService.getProjectsOfAdmin("testAdmin@example.com");
-                adminApiService.getProjectsOfAdmin("testAdminEmpty@example.com");
         List<Project> l = new ArrayList<>();
         projects.forEach(l::add);
         assertEquals(0, l.size());
     }
 
     @Test
-    void getProjectOfInexistantAdminFails() {
+    void getProjectOfInexistantAdminFails() throws Exception {
         String nonExistentAdminEmail = "testInexistantAdmin@example.com";
 
         assertThrows(
@@ -72,15 +48,4 @@ public class AdminApiServiceTest {
                     adminApiService.getProjectsOfAdmin(nonExistentAdminEmail);
                 });
     }
-
-    @Test
-    void getProjectOfAdminNotEmpty() {
-        Iterable<Project> projects =
-                adminApiService.getProjectsOfAdmin("testAdminFull@example.com");
-        List<Project> l = new ArrayList<>();
-        projects.forEach(l::add);
-        assertEquals(1, l.size());
-        Project p = l.getFirst();
-        assertEquals(p.getProjectName(), "sampleProjectAdminApiService");
-    }
 }