X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fservice%2Ffn%2FFnUserService.java;h=5c1c84b5d402cf8032af63856e47ed31a8a521ac;hb=701fad2486d1e8b3730dbb175ad81a4381dece41;hp=abc25041c0c26619392d72081c8b3a2407ab0fb6;hpb=53c92344af793a671019038c8ff21302c7bc2a73;p=portal.git

diff --git a/portal-BE/src/main/java/org/onap/portal/service/fn/FnUserService.java b/portal-BE/src/main/java/org/onap/portal/service/fn/FnUserService.java
index abc25041..5c1c84b5 100644
--- a/portal-BE/src/main/java/org/onap/portal/service/fn/FnUserService.java
+++ b/portal-BE/src/main/java/org/onap/portal/service/fn/FnUserService.java
@@ -40,33 +40,45 @@
 
 package org.onap.portal.service.fn;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.security.Principal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
+import org.onap.portal.controller.UserRolesController;
 import org.onap.portal.dao.fn.FnUserDao;
 import org.onap.portal.domain.db.fn.FnUser;
+import org.onap.portal.domain.dto.transport.UserWithNameSurnameTitle;
+import org.onap.portal.utils.EcompPortalUtils;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
+@EnableAspectJAutoProxy
+@Transactional
 public class FnUserService implements UserDetailsService {
 
-       private final FnUserDao fnUserDao;
+       private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FnUserService.class);
+
+       private FnUserDao fnUserDao;
 
        @Autowired
-       public FnUserService(final FnUserDao fnUserDao) {
+       public FnUserService(FnUserDao fnUserDao) {
               this.fnUserDao = fnUserDao;
        }
 
-       public FnUser saveFnUser(FnUser fnUser) {
+       public FnUser saveFnUser(final Principal principal, final FnUser fnUser) {
               return fnUserDao.save(fnUser);
        }
 
        @Override
-       public FnUser loadUserByUsername(String username) throws UsernameNotFoundException {
+       public FnUser loadUserByUsername(final String username) throws UsernameNotFoundException {
               Optional<FnUser> fnUser = fnUserDao.findByLoginId(username);
               if (fnUser.isPresent()) {
                      return fnUser.get();
@@ -75,28 +87,32 @@ public class FnUserService implements UserDetailsService {
               }
        }
 
-       public Optional<FnUser> getUser(Long id) {
+       public Optional<FnUser> getUser(final Long id) {
               return Optional.of(fnUserDao.getOne(id));
        }
 
-       List<FnUser> getUserWithOrgUserId(final String orgUserIdValue){
-              Optional<List<FnUser>> fnUsers =  Optional.of(fnUserDao.findAll()
-                      .stream()
-                      .filter(fnUser -> orgUserIdValue.equals(fnUser.getOrgUserId()))
-                      .collect(Collectors.toList()));
-              return fnUsers.orElse(new ArrayList<>());
+       List<FnUser> getUserWithOrgUserId(final String orgUserIdValue) {
+              return fnUserDao.getUserWithOrgUserId(orgUserIdValue).orElse(new ArrayList<>());
+       }
+
+       List<FnUser> getUsersByOrgIds(final List<String> orgIds) {
+              return fnUserDao.getUsersByOrgIds(orgIds).orElse(new ArrayList<>());
+       }
+
+
+       List<FnUser> getActiveUsers() {
+              return fnUserDao.getActiveUsers().orElse(new ArrayList<>());
        }
 
-       List<FnUser> getUsersByOrgIdsNotificationsResult(List<String> orgIds){
-              String ids = "(" + orgIds.stream().map(s -> "'" + s + "'").collect(Collectors.joining()) + ")";
-              return fnUserDao.getUsersByOrgUserId(ids).orElse(new ArrayList<>());
+       public void deleteUser(final FnUser fnUser) {
+              fnUserDao.delete(fnUser);
        }
 
-       List<FnUser> getUsersByOrgIdsNotificationsResult(String orgIds){
-              return fnUserDao.getUsersByOrgUserId(orgIds).orElse(new ArrayList<>());
+       public boolean existById(final Long userId) {
+              return fnUserDao.existsById(userId);
        }
 
-       List<FnUser> etActiveUsers(){
-              return fnUserDao.findAll().stream().filter(fnUser -> "Y".equals(fnUser.getActiveYn())).collect(Collectors.toList());
+       public List<FnUser> findAll() {
+              return fnUserDao.findAll();
        }
-}
+       }
\ No newline at end of file