X-Git-Url: https://gerrit.onap.org/r/gitweb?p=portal.git;a=blobdiff_plain;f=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fcontroller%2FLanguageController.java;h=c545d7f174d99d3a53255747d69e87ba19d29136;hp=8f2e50e6d2b28498529a2bb5003ec35bca97a651;hb=485c51d686e57d53571c9e3c64e109e67c1b6f62;hpb=682a90dad9795a3fa9aaffbf43c488057b8529e7

diff --git a/portal-BE/src/main/java/org/onap/portal/controller/LanguageController.java b/portal-BE/src/main/java/org/onap/portal/controller/LanguageController.java
index 8f2e50e6..c545d7f1 100644
--- a/portal-BE/src/main/java/org/onap/portal/controller/LanguageController.java
+++ b/portal-BE/src/main/java/org/onap/portal/controller/LanguageController.java
@@ -107,10 +107,11 @@ public class LanguageController {
                             response.setStatus(PortalRestStatusEnum.OK);
                      } else {
                             response.setMessage("FAILURE");
-                            response.setResponse("User for id:" + userId + " do not exist");
+                            response.setResponse("User for id: " + userId + " do not exist");
                             response.setStatus(PortalRestStatusEnum.ERROR);
                      }
               } catch (Exception e) {
+                     LOGGER.error("Exception in setUpUserLanguage", e);
                      response.setMessage("FAILURE");
                      response.setResponse(e.toString());
                      response.setStatus(PortalRestStatusEnum.ERROR);
@@ -120,11 +121,11 @@ public class LanguageController {
        }
 
        @GetMapping(value = "/languageSetting/user/{loginId}", produces = MediaType.APPLICATION_JSON_VALUE)
-       public FnLanguage getUserLanguage(@PathVariable("loginId") final Long loginId) {
-              if (fnUserService.getUser(loginId).isPresent()) {
-                     return Optional.of(fnUserService.getUser(loginId).get().getLanguageId()).orElse(new FnLanguage());
+       public FnLanguageDto getUserLanguage(final Principal principal, @PathVariable("loginId") final Long loginId) {
+              if (fnUserService.existById(loginId)) {
+                     return fnLanguageMapper.fnLanguageToDto(Optional.of(fnUserService.getUser(loginId).get().getLanguageId()).orElse(new FnLanguage()));
               }
-              return new FnLanguage();
+              return new FnLanguageDto();
        }
 
        @PostMapping(value = "/language", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -136,6 +137,7 @@ public class LanguageController {
                      response.setResponse(languageService.save(principal, fnLanguage).toString());
                      response.setStatus(PortalRestStatusEnum.OK);
               } catch (Exception e) {
+                     LOGGER.error("Exception in saveLanguage", e);
                      response.setMessage("FAILURE");
                      response.setResponse(e.getMessage());
                      response.setStatus(PortalRestStatusEnum.ERROR);