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=cd966fb42bbf556a6a788ea06d83f819ed4615e9;hb=0dd6f1189815079526c3f5211f01650bbe5e665b;hp=918731393c0cff9a3f140a2f95e507ed5c1bb5e3;hpb=ace89e59c9838b666ddd02c08fd5e39a94eee39a;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 91873139..cd966fb4 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,6 +40,7 @@
 
 package org.onap.portal.service.fn;
 
+import java.security.Principal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -47,11 +48,15 @@ import java.util.stream.Collectors;
 import org.onap.portal.dao.fn.FnUserDao;
 import org.onap.portal.domain.db.fn.FnUser;
 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 FnUserDao fnUserDao;
@@ -61,12 +66,12 @@ public class FnUserService implements UserDetailsService {
               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 +80,28 @@ 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<>());
+              return fnUserDao.getUserWithOrgUserId(orgUserIdValue).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<>());
+       List<FnUser> getUsersByOrgIds(final List<String> orgIds){
+              return fnUserDao.getUsersByOrgIds(orgIds).orElse(new ArrayList<>());
        }
 
-       List<FnUser> getUsersByOrgIdsNotificationsResult(String orgIds){
-              return fnUserDao.getUsersByOrgUserId(orgIds).orElse(new ArrayList<>());
+
+       List<FnUser> getActiveUsers(){
+              return fnUserDao.getActiveUsers().orElse(new ArrayList<>());
+       }
+
+       public void deleteUser(final FnUser fnUser){
+              fnUserDao.delete(fnUser);
        }
 
-       List<FnUser> etActiveUsers(){
-              return fnUserDao.findAll().stream().filter(fnUser -> "Y".equals(fnUser.getActiveYn())).collect(Collectors.toList());
+       public boolean existById(final Long userId) {
+              return fnUserDao.existsById(userId);
        }
 }