X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fservice%2Ffn%2FFnRoleService.java;h=aa859dbda6de0e03dc9091c914b0626384c9f02a;hb=refs%2Fchanges%2F01%2F98501%2F2;hp=45867b42f85917ff5b8703edba12480eaa4f113f;hpb=b444e627ff96fa720ba3cc487bef2761b2888e1b;p=portal.git

diff --git a/portal-BE/src/main/java/org/onap/portal/service/fn/FnRoleService.java b/portal-BE/src/main/java/org/onap/portal/service/fn/FnRoleService.java
index 45867b42..aa859dbd 100644
--- a/portal-BE/src/main/java/org/onap/portal/service/fn/FnRoleService.java
+++ b/portal-BE/src/main/java/org/onap/portal/service/fn/FnRoleService.java
@@ -54,34 +54,60 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 @Transactional
 public class FnRoleService {
-       private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FnRoleService.class);
 
+  private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FnRoleService.class);
 
-       private final FnRoleDao fnRoleDao;
 
-       @Autowired
-       public FnRoleService(FnRoleDao fnRoleDao) {
-              this.fnRoleDao = fnRoleDao;
-       }
+  private final FnRoleDao fnRoleDao;
 
-       public FnRole getById(final Long id) {
-              return fnRoleDao.findById(id).orElseThrow(EntityExistsException::new);
-       }
+  @Autowired
+  public FnRoleService(FnRoleDao fnRoleDao) {
+    this.fnRoleDao = fnRoleDao;
+  }
 
-       public FnRole getRole(final Long appId, final Long appRoleId) {
+  public FnRole getById(final Long id) {
+    return fnRoleDao.findById(id).orElseThrow(EntityExistsException::new);
+  }
 
-              String sql = "SELECT * FROM fn_role where APP_ID = :appId AND APP_ROLE_ID = :appRoleId";
+  public FnRole getRole(final Long appId, final Long appRoleId) {
 
-              List<FnRole> roles = Optional.of(fnRoleDao.retrieveAppRoleByAppRoleIdAndByAppId(appId, appRoleId)).orElse(new ArrayList<>());
-              if (!roles.isEmpty()) {
-                     logger.error(EELFLoggerDelegate.errorLogger,
-                             String.format(
-                                     "search by appId=%s, appRoleid=%s should have returned 0 or 1 results. Got %d. This is an internal server error.",
-                                     appId, appRoleId, roles.size()));
-                     logger.error(EELFLoggerDelegate.errorLogger,
-                             "Trying to recover from duplicates by returning the first search result. This issue should be treated, it is probably not critical because duplicate roles should be similar.");
-                     return roles.get(0);
-              }
-              return null;
-       }
+    String sql = "SELECT * FROM fn_role where APP_ID = :appId AND APP_ROLE_ID = :appRoleId";
+
+    List<FnRole> roles = Optional.of(fnRoleDao.retrieveAppRoleByAppRoleIdAndByAppId(appId, appRoleId))
+        .orElse(new ArrayList<>());
+    if (!roles.isEmpty()) {
+      logger.error(EELFLoggerDelegate.errorLogger,
+          String.format(
+              "search by appId=%s, appRoleid=%s should have returned 0 or 1 results. Got %d. This is an internal server error.",
+              appId, appRoleId, roles.size()));
+      logger.error(EELFLoggerDelegate.errorLogger,
+          "Trying to recover from duplicates by returning the first search result. This issue should be treated, it is probably not critical because duplicate roles should be similar.");
+      return roles.get(0);
+    }
+    return null;
+  }
+
+  public List<FnRole> retrieveAppRoleByAppRoleIdAndByAppId(final Long appId, final Long appRoleId) {
+    return Optional.of(fnRoleDao.retrieveAppRoleByAppRoleIdAndByAppId(appId, appRoleId)).orElse(new ArrayList<>());
+  }
+
+  public List<FnRole> getUserRoleOnUserIdAndAppId(final Long userId, final Long appId) {
+    return Optional.of(fnRoleDao.getUserRoleOnUserIdAndAppId(userId, appId)).orElse(new ArrayList<>());
+  }
+
+  public List<FnRole> retrieveAppRoleByRoleIdWhereAppIdIsNull(final Long roleId) {
+    return Optional.of(fnRoleDao.retrieveAppRoleByRoleIdWhereAppIdIsNull(roleId)).orElse(new ArrayList<>());
+  }
+
+  public List<FnRole> retrieveAppRolesWhereAppIdIsNull() {
+    return Optional.of(fnRoleDao.retrieveAppRolesWhereAppIdIsNull()).orElse(new ArrayList<>());
+  }
+
+  public List<FnRole> retrieveAppRolesByAppId(final Long id) {
+    return Optional.of(fnRoleDao.retrieveAppRolesByAppId(id)).orElse(new ArrayList<>());
+  }
+
+  public List<FnRole> retrieveAppRolesByRoleNameAndByAppId(final String roleName, final Long appId) {
+    return Optional.of(fnRoleDao.retrieveAppRolesByRoleNameAndByAppId(roleName, appId)).orElse(new ArrayList<>());
+  }
 }