DMC/scipro
7
0
Fork 0
Code Issues31 Pull Requests5 Actions Projects1 Releases Wiki Activity

Make project type exemption apply to partner as well when selecting supervisor ideas

Browse Source
This commit is contained in:
Andreas Svanberg 2025-03-05 14:21:45 +01:00
parent 2842b64302
commit 50c16b4911
2 changed files with 15 additions and 4 deletions
core/src
main/java/se/su/dsv/scipro/match
IdeaServiceImpl.java
test/java/se/su/dsv/scipro/match
IdeaServiceImplTest.java

6
core/src/main/java/se/su/dsv/scipro/match/IdeaServiceImpl.java

@ -235,10 +235,8 @@ public class IdeaServiceImpl extends AbstractServiceImpl<Idea, Long> implements
if (authorParticipatingOnActiveIdea(coAuthor, ap)) { if (authorParticipatingOnActiveIdea(coAuthor, ap)) {
return new Pair<>(Boolean.FALSE, PARTNER_ALREADY_PARTICIPATING_ERROR); return new Pair<>(Boolean.FALSE, PARTNER_ALREADY_PARTICIPATING_ERROR);
} }
if ( List<ProjectType> typesForCoAuthor = applicationPeriodService.getTypesForStudent(ap, coAuthor);
coAuthor.getDegreeType() != ProjectType.UNKNOWN && if (!typesForCoAuthor.contains(idea.getProjectType())) {
coAuthor.getDegreeType() != idea.getProjectType().getDegreeType()
) {
return new Pair<>(Boolean.FALSE, WRONG_LEVEL_FOR_YOUR_PARTNER); return new Pair<>(Boolean.FALSE, WRONG_LEVEL_FOR_YOUR_PARTNER);
} }
if (!projectService.getActiveProjectsByUserAndProjectType(coAuthor, idea.getProjectType()).isEmpty()) { if (!projectService.getActiveProjectsByUserAndProjectType(coAuthor, idea.getProjectType()).isEmpty()) {

13
core/src/test/java/se/su/dsv/scipro/match/IdeaServiceImplTest.java

@ -241,6 +241,7 @@ public class IdeaServiceImplTest {
when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn(new GeneralSystemSettings()); when(generalSystemSettingsService.getGeneralSystemSettingsInstance()).thenReturn(new GeneralSystemSettings());
Idea idea = createBachelorIdea(Idea.Status.UNMATCHED); Idea idea = createBachelorIdea(Idea.Status.UNMATCHED);
when(applicationPeriodService.getTypesForStudent(applicationPeriod, student)).thenReturn(List.of(bachelor)); when(applicationPeriodService.getTypesForStudent(applicationPeriod, student)).thenReturn(List.of(bachelor));
when(applicationPeriodService.getTypesForStudent(applicationPeriod, coAuthor)).thenReturn(List.of(bachelor));
Pair<Boolean, String> acceptance = ideaService.validateStudentAcceptance( Pair<Boolean, String> acceptance = ideaService.validateStudentAcceptance(
idea, idea,
@ -404,6 +405,7 @@ public class IdeaServiceImplTest {
@Test @Test
public void wrong_type_for_author() { public void wrong_type_for_author() {
when(applicationPeriodService.getTypesForStudent(applicationPeriod, student)).thenReturn(List.of(master)); when(applicationPeriodService.getTypesForStudent(applicationPeriod, student)).thenReturn(List.of(master));
when(applicationPeriodService.getTypesForStudent(applicationPeriod, coAuthor)).thenReturn(List.of(bachelor));
assertPair( assertPair(
false, false,
@ -412,6 +414,17 @@ public class IdeaServiceImplTest {
); );
} }
@Test
public void wrong_type_for_partner() {
when(applicationPeriodService.getTypesForStudent(applicationPeriod, coAuthor)).thenReturn(List.of(master));
assertPair(
false,
"The idea is the wrong level for your partner, please pick another one.",
ideaService.validateStudentAcceptance(createBachelorIdea(Idea.Status.UNMATCHED), student, coAuthor, applicationPeriod)
);
}
private Idea mockInactiveIdea() { private Idea mockInactiveIdea() {
Idea idea = new Idea(); Idea idea = new Idea();
Match match = new Match(); Match match = new Match();