treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backend-api http://jira.mfd.msk:8088/browse/CLS-64 UserSettingsController fix unit test (see ea561b9a85)

Browse source
This commit is contained in:
AKurakin 2023-06-16 19:01:44 +03:00
parent 26e8dd200a
commit e5e7f774e5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsController.java
View file

@ -52,7 +52,7 @@ public class UserSettingsController extends AbstractQueueController {
public CommonGetAllResponse getAllForCurrentUser() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
String username = KeycloakUtils.getUserNameFromAuthentication(authentication);
User user = userImdg.getSingleObjectByFieldValues(Map.of("identifier", username));
User user = username == null ? null : userImdg.getSingleObjectByFieldValues(Map.of("identifier", username));
if (user == null) {
throw new IllegalStateException("cannot obtain userId from logged in user " + username);
}

2
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsControllerTest.java
View file

@ -21,7 +21,7 @@ class UserSettingsControllerTest extends AbstractControllerTest {
//ARRANGE
UserSettings userSettings = new UserSettings();
userSettings.setId(currentId.get());
userSettings.setUserId(currentId.get());
userSettings.setUserId(currentId.get()); // отдаются по userId CLS-64, todo в тесте null
userSettings.setJson("json");
userSettings.setVersion("version");