From 9e1f568ea47eb4136fb6e3811ade08683453bef3 Mon Sep 17 00:00:00 2001 From: Pierre Tellier Date: Sun, 6 Apr 2025 20:14:43 +0200 Subject: [PATCH] fix: comparaison between two projects instead of their IDs --- .../main/java/enseirb/myinpulse/service/UtilsService.java | 7 ++++++- .../java/enseirb/myinpulse/EntrepreneurApiServiceTest.java | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/UtilsService.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/UtilsService.java index df20142..6bdec9c 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/UtilsService.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/UtilsService.java @@ -15,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.server.ResponseStatusException; +import java.util.Objects; + @Service public class UtilsService { @@ -45,7 +47,9 @@ public class UtilsService { User user = this.userService.getUserByEmail(mail); Entrepreneur entrepreneur = this.entrepreneurService.getEntrepreneurById(user.getIdUser()); Project project = this.projectService.getProjectById(projectId); - return entrepreneur.getProjectParticipation().equals(project); + // We compare the ID instead of the project themselves + return Objects.equals( + entrepreneur.getProjectParticipation().getIdProject(), project.getIdProject()); } // TODO: test @@ -56,6 +60,7 @@ public class UtilsService { return true; } catch (ResponseStatusException e) { logger.info(e); + return false; } } diff --git a/MyINPulse-back/src/test/java/enseirb/myinpulse/EntrepreneurApiServiceTest.java b/MyINPulse-back/src/test/java/enseirb/myinpulse/EntrepreneurApiServiceTest.java index 5e32371..7209d46 100644 --- a/MyINPulse-back/src/test/java/enseirb/myinpulse/EntrepreneurApiServiceTest.java +++ b/MyINPulse-back/src/test/java/enseirb/myinpulse/EntrepreneurApiServiceTest.java @@ -87,13 +87,17 @@ public class EntrepreneurApiServiceTest { @Test void editValidSectionCell() { + System.out.println("START\n\n\n"); entrepreneurApiService.editSectionCell( IterableToList(sectionCells).getFirst().getIdSectionCell(), "modified content", "entrepreneur@mail.fr"); + // We get the data from the database again. + sectionCells = sectionCellService.getSectionCellsByProject(project, 2L); assertEquals( "modified content", IterableToList(sectionCells).getFirst().getContentSectionCell()); + System.out.println("END\n\n\n"); } @Test