import org.onap.portal.domain.dto.fn.FnLanguageDto;
import org.onap.portal.domain.mapper.FnLanguageMapper;
import org.onap.portal.domain.mapper.FnUserMapper;
-import org.onap.portal.service.fn.FnLanguageService;
-import org.onap.portal.service.fn.FnUserService;
+import org.onap.portal.service.language.FnLanguageService;
+import org.onap.portal.service.user.FnUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@SuppressWarnings("OptionalGetWithoutIsPresent")
FnUser user = fnUserService.getUser(userId).get();
user.setLanguageId(fnLanguage);
- fnUserService.saveFnUser(principal, user);
+ fnUserService.saveFnUser(user);
//response.setResponse(fnUserMapper.fnUserToFnUserDto(user).toString());
response.setMessage("SUCCESS");
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);
}
@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)
PortalRestResponse<String> response = new PortalRestResponse<>();
try {
response.setMessage("SUCCESS");
- response.setResponse(languageService.save(principal, fnLanguage).toString());
+ response.setResponse(languageService.save(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);