diff options
| author |   Christopher Lott (cl778h) <clott@research.att.com> | 2017-08-31 11:10:51 -0400 |
|---|---|---|
| committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-08-31 11:10:57 -0400 |
| commit | e65a5d4a4852cbd0056fb3b881613f0a4dba4ecf (patch) | |
| tree | edc1c00f9517f668f84271cafbb84b579bb82cf8 /ecomp-portal-BE-common/src/main | |
| parent | 52ef94725081dff105d9c96c60985f1334f39e96 (diff) | |
Repair user notification defects.
Issue: PORTAL-50
Change-Id: I15347d69b7b85a2658f114f53029bed67f7e810d
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-portal-BE-common/src/main')
| -rw-r--r-- | ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/TicketEventController.java | 5 | ||||
| -rw-r--r-- | ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/TicketEventController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/TicketEventController.java index 102f7709..222f4502 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/TicketEventController.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/TicketEventController.java @@ -180,15 +180,16 @@ public class TicketEventController implements BasicAuthenticationController { JsonNode application = ticketEventNotif.get("application"); JsonNode event = ticketEventNotif.get("event"); JsonNode header = event.get("header"); + JsonNode eventSource=header.get("eventSource"); JsonNode body = event.get("body"); JsonNode SubscriberInfo = ticketEventNotif.get("SubscriberInfo"); JsonNode userList = SubscriberInfo.get("UserList"); - if (application == null) + if (application == null||application.asText().length()==0||application.asText().equalsIgnoreCase("null")) return "Application is mandatory"; if (body == null) return "body is mandatory"; - if (header.get("eventSource") == null) + if (eventSource == null||eventSource.asText().trim().length()==0||eventSource.asText().equalsIgnoreCase("null")) return "Message Source is mandatory"; if (userList == null) return "At least one user Id is mandatory"; diff --git a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml index 342a6e8c..1574a9a2 100644 --- a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml +++ b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml @@ -1911,9 +1911,12 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' and fn_role.active_y <return alias="getUserRolesListForLeftMenu" class="org.openecomp.portalapp.portal.domain.UserRole" /> <![CDATA[ - - SELECT DISTINCT user.USER_ID, role.ROLE_ID, user.org_user_id, user.FIRST_NAME, user.LAST_NAME, role.ROLE_NAME FROM fn_user_role userrole INNER JOIN fn_user user ON user.USER_ID = userrole.USER_ID INNER JOIN fn_role role ON role.ROLE_ID = userrole.ROLE_ID WHERE user.org_user_id =:org_user_id and (userrole.app_id = 1 or role.role_id = 999) - ; + SELECT DISTINCT user.USER_ID, role.ROLE_ID, user.org_user_id, user.FIRST_NAME, user.LAST_NAME, role.ROLE_NAME FROM fn_user_role userrole + INNER JOIN fn_user user ON user.USER_ID = userrole.USER_ID + INNER JOIN fn_app app ON app.app_id= userrole.app_id + INNER JOIN fn_role role ON role.ROLE_ID = userrole.ROLE_ID + WHERE user.org_user_id =:org_user_id and (userrole.app_id = 1 or role.role_id = 999) and (app.enabled='Y' or app.app_id=1) + ; ]]> </sql-query> |