From b672dd200c5b25c20ee98163487d10b6216d084b Mon Sep 17 00:00:00 2001 From: Pierre Tellier Date: Sun, 6 Apr 2025 20:30:29 +0200 Subject: [PATCH] fix: name coherence + test logic --- .../myinpulse/service/UtilsService.java | 8 ++++ .../service/database/SectionCellService.java | 5 +- .../myinpulse/EntrepreneurApiServiceTest.java | 46 ++++++++++++------- 3 files changed, 40 insertions(+), 19 deletions(-) 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 6bdec9c..27a2841 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/UtilsService.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/UtilsService.java @@ -46,6 +46,14 @@ public class UtilsService { } User user = this.userService.getUserByEmail(mail); 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); // We compare the ID instead of the project themselves return Objects.equals( diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/SectionCellService.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/SectionCellService.java index 71f90c2..3d052d6 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/SectionCellService.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/SectionCellService.java @@ -106,9 +106,8 @@ public class SectionCellService { return this.sectionCellRepository.save(sectionCell.get()); } - public Iterable getSectionCellsByProject(Project project, Long idSectionCell) { - return this.sectionCellRepository.findByProjectSectionCellAndSectionId( - project, idSectionCell); + public Iterable getSectionCellsByProject(Project project, Long sectionId) { + return this.sectionCellRepository.findByProjectSectionCellAndSectionId(project, sectionId); } public Long getProjectId(Long sectionCellId) { diff --git a/MyINPulse-back/src/test/java/enseirb/myinpulse/EntrepreneurApiServiceTest.java b/MyINPulse-back/src/test/java/enseirb/myinpulse/EntrepreneurApiServiceTest.java index 7209d46..18bb429 100644 --- a/MyINPulse-back/src/test/java/enseirb/myinpulse/EntrepreneurApiServiceTest.java +++ b/MyINPulse-back/src/test/java/enseirb/myinpulse/EntrepreneurApiServiceTest.java @@ -29,7 +29,8 @@ import java.util.List; public class EntrepreneurApiServiceTest { private static Entrepreneur entrepreneur; private static Project project; - private static Iterable sectionCells; + private static Iterable sectionCells2; + private static Iterable sectionCells3; @Autowired private EntrepreneurApiService entrepreneurApiService; @Autowired private EntrepreneurService entrepreneurService; @Autowired private ProjectService projectService; @@ -73,10 +74,25 @@ public class EntrepreneurApiServiceTest { System.out.println(entrepreneur); // System.out.println(entrepreneur.getProjectProposed()); // System.out.println(entrepreneur.getProjectParticipation()); - sectionCellService.addNewSectionCell( - new SectionCell( - null, 2L, "contenu très intéressant", LocalDateTime.now(), project)); - sectionCells = sectionCellService.getSectionCellsByProject(project, 2L); + 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éressant", + LocalDateTime.now(), + project)); + sectionCells2 = sectionCellService.getSectionCellsByProject(project, 2L); + sectionCells3 = sectionCellService.getSectionCellsByProject(project, 3L); } private List IterableToList(Iterable iterable) { @@ -87,17 +103,14 @@ public class EntrepreneurApiServiceTest { @Test void editValidSectionCell() { - System.out.println("START\n\n\n"); entrepreneurApiService.editSectionCell( - IterableToList(sectionCells).getFirst().getIdSectionCell(), + IterableToList(sectionCells2).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"); + SectionCell s = + IterableToList(sectionCellService.getSectionCellsByProject(project, 2L)).getFirst(); + assertEquals("modified content", s.getContentSectionCell()); } @Test @@ -115,12 +128,13 @@ public class EntrepreneurApiServiceTest { ResponseStatusException.class, () -> entrepreneurApiService.editSectionCell( - IterableToList(sectionCells).getFirst().getIdSectionCell(), + IterableToList(sectionCells3).getFirst().getIdSectionCell(), "should not be modified", "testentrepreneur@mail.fr")); - assertEquals( - "contenu très intéressant", - IterableToList(sectionCells).getFirst().getContentSectionCell()); + SectionCell s = + IterableToList(sectionCellService.getSectionCellsByProject(project, 3L)).getFirst(); + + assertEquals("contenu très intéressant", s.getContentSectionCell()); } @Test