Code Review
/
portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
getAppRolesForUser() method up in UserRolesController
[portal.git]
/
portal-BE
/
src
/
main
/
java
/
org
/
onap
/
portal
/
domain
/
db
/
fn
/
FnRole.java
diff --git
a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRole.java
b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRole.java
index
80617ba
..
3de581b
100644
(file)
--- a/
portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRole.java
+++ b/
portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnRole.java
@@
-63,6
+63,7
@@
import javax.validation.constraints.Digits;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import lombok.AllArgsConstructor;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@@
-110,7
+111,7
@@
CREATE TABLE `fn_role` (
query = "FROM FnRole where roleName =:roleName and appId is null"),
@NamedQuery(
name = "FnRole.retrieveActiveRolesOfApplication",
query = "FROM FnRole where roleName =:roleName and appId is null"),
@NamedQuery(
name = "FnRole.retrieveActiveRolesOfApplication",
- query = "from FnRole where active
_y
n = 'Y' and appId=:appId"),
+ query = "from FnRole where active
Y
n = 'Y' and appId=:appId"),
@NamedQuery(
name = "FnRole.getUserRoleOnUserIdAndAppId",
query = " FROM"
@NamedQuery(
name = "FnRole.getUserRoleOnUserIdAndAppId",
query = " FROM"
@@
-120,7
+121,16
@@
CREATE TABLE `fn_role` (
+ " fr.roleId = fur.roleId\n"
+ " AND fur.userId = :userId"
+ " AND fur.appId = :appId\n"
+ " fr.roleId = fur.roleId\n"
+ " AND fur.userId = :userId"
+ " AND fur.appId = :appId\n"
- + " AND fr.activeYn = 'y'")
+ + " AND fr.activeYn = 'y'"),
+ @NamedQuery(
+ name = "FnRole.getGlobalRolesOfPortal",
+ query = "from"
+ + " FnRole"
+ + " where"
+ + " roleName like 'global_%'"
+ + " and appId is null"
+ + " and activeYn = 'Y'"
+ )
})
@Table(name = "fn_role", indexes = {
})
@Table(name = "fn_role", indexes = {
@@
-128,6
+138,7
@@
CREATE TABLE `fn_role` (
})
@NoArgsConstructor
@AllArgsConstructor
})
@NoArgsConstructor
@AllArgsConstructor
+@Builder
@Getter
@Setter
@Entity
@Getter
@Setter
@Entity