From b127daea0b73c4f2b08441b535d99001df02e56b Mon Sep 17 00:00:00 2001 From: Dominik Mizyn Date: Tue, 20 Aug 2019 09:19:24 +0200 Subject: [PATCH 1/1] Portal Spring Boot Development FnUser data access object and service up Issue-ID: PORTAL-710 Change-Id: I417c56117adfe7670b4cf90ccca15574dfe6e654 Signed-off-by: Dominik Mizyn --- .../java/org/onap/portal/dao/fn/FnUserDao.java | 62 +++++++++++++ .../org/onap/portal/service/fn/FnUserService.java | 102 +++++++++++++++++++++ 2 files changed, 164 insertions(+) create mode 100644 portal-BE/src/main/java/org/onap/portal/dao/fn/FnUserDao.java create mode 100644 portal-BE/src/main/java/org/onap/portal/service/fn/FnUserService.java diff --git a/portal-BE/src/main/java/org/onap/portal/dao/fn/FnUserDao.java b/portal-BE/src/main/java/org/onap/portal/dao/fn/FnUserDao.java new file mode 100644 index 00000000..458cc669 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/dao/fn/FnUserDao.java @@ -0,0 +1,62 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.dao.fn; + +import java.util.List; +import java.util.Optional; +import org.onap.portal.domain.db.fn.FnUser; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +@Repository +@Transactional +public interface FnUserDao extends JpaRepository { + Optional findByLoginId(String username); + + @Override + FnUser getOne(Long integer); + + @Query + Optional> getUsersByOrgUserId(@Param("orgIds") String orgIds); +} 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 new file mode 100644 index 00000000..abc25041 --- /dev/null +++ b/portal-BE/src/main/java/org/onap/portal/service/fn/FnUserService.java @@ -0,0 +1,102 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ + +package org.onap.portal.service.fn; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +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.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +@Service +public class FnUserService implements UserDetailsService { + + private final FnUserDao fnUserDao; + + @Autowired + public FnUserService(final FnUserDao fnUserDao) { + this.fnUserDao = fnUserDao; + } + + public FnUser saveFnUser(FnUser fnUser) { + return fnUserDao.save(fnUser); + } + + @Override + public FnUser loadUserByUsername(String username) throws UsernameNotFoundException { + Optional fnUser = fnUserDao.findByLoginId(username); + if (fnUser.isPresent()) { + return fnUser.get(); + } else { + throw new UsernameNotFoundException("User not found for username: " + username); + } + } + + public Optional getUser(Long id) { + return Optional.of(fnUserDao.getOne(id)); + } + + List getUserWithOrgUserId(final String orgUserIdValue){ + Optional> fnUsers = Optional.of(fnUserDao.findAll() + .stream() + .filter(fnUser -> orgUserIdValue.equals(fnUser.getOrgUserId())) + .collect(Collectors.toList())); + return fnUsers.orElse(new ArrayList<>()); + } + + List getUsersByOrgIdsNotificationsResult(List orgIds){ + String ids = "(" + orgIds.stream().map(s -> "'" + s + "'").collect(Collectors.joining()) + ")"; + return fnUserDao.getUsersByOrgUserId(ids).orElse(new ArrayList<>()); + } + + List getUsersByOrgIdsNotificationsResult(String orgIds){ + return fnUserDao.getUsersByOrgUserId(orgIds).orElse(new ArrayList<>()); + } + + List etActiveUsers(){ + return fnUserDao.findAll().stream().filter(fnUser -> "Y".equals(fnUser.getActiveYn())).collect(Collectors.toList()); + } +} -- 2.16.6