From e5e7f774e5a757b7e93b242ebf0734f698a70c25 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 16 Jun 2023 19:01:44 +0300 Subject: [PATCH] backend-api http://jira.mfd.msk:8088/browse/CLS-64 UserSettingsController fix unit test (see ea561b9a854) --- .../controller/queue/utilities/UserSettingsController.java | 2 +- .../controller/queue/utilities/UserSettingsControllerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsController.java index 960e9f21d..f303632f3 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsController.java @@ -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); } diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsControllerTest.java index c8ad5827f..a57ace3b2 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsControllerTest.java @@ -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");