DMC/scipro
7
0
Fork 0
Code Issues43 Pull Requests9 Actions Projects1 Releases Wiki Activity

2082 Set default degree level to bachelor unless otherwise determined

Browse Source
This commit is contained in:
Andreas Svanberg 2021-09-09 11:31:37 +02:00
parent a957972b19
commit 6da2dfb8d6
2 changed files with 4 additions and 4 deletions
core/src/main/java/se/su/dsv/scipro/daisyExternal/impl
ImporterTransactionsImpl.java
daisy-integration/src/test/java/se/su/dsv/scipro/io/impl
ImporterTransactionsImplTest.java

2
core/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImpl.java

@ -81,7 +81,7 @@ public class ImporterTransactionsImpl implements ImporterTransactions {
.map(se.su.dsv.scipro.io.dto.Program::getType)
.map(this::toDegreeLevel)
.or(() -> getOverrideBasedOnCourse(courseRegistrations))
.orElse(DegreeLevel.NONE);
.orElse(DegreeLevel.BACHELOR);
final var oldLevel = user.getThesisLevel();
user.setThesisLevel(latestLevel);

6
daisy-integration/src/test/java/se/su/dsv/scipro/io/impl/ImporterTransactionsImplTest.java

@ -6,6 +6,7 @@ import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.verification.VerificationMode;
import se.su.dsv.scipro.daisyExternal.http.DaisyAPI;
import se.su.dsv.scipro.daisyExternal.impl.ImporterTransactionsImpl;
import se.su.dsv.scipro.io.dto.Person;
@ -21,8 +22,7 @@ import static org.junit.Assert.assertEquals;
import static org.mockito.AdditionalAnswers.returnsFirstArg;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.*;
@RunWith(MockitoJUnitRunner.class)
public class ImporterTransactionsImplTest {
@ -65,7 +65,7 @@ public class ImporterTransactionsImplTest {
importerTransactions.importPerson(person, new HashMap<>());
ArgumentCaptor<User> captor = ArgumentCaptor.forClass(User.class);
verify(userService).save(captor.capture());
verify(userService, atLeastOnce()).save(captor.capture());
assertUserPersonData(captor.getValue());
}