diff options
| author |   GUJJA <kg811t@research.att.com> | 2018-02-16 11:45:40 -0500 |
|---|---|---|
| committer | GUJJA <kg811t@research.att.com> | 2018-02-16 12:13:32 -0500 |
| commit | 1376951553a11ed93a9fde45b7f26b51c0b31e9c (patch) | |
| tree | b4a62851ba83a49507dff0da3913e476b1309c58 /ecomp-portal-BE-common/src/main/webapp | |
| parent | 2036d5039c90736c54484e539f37dfb8f661e4f1 (diff) | |
Added Junits
Issue-ID: PORTAL-162, PORTAL-163, PORTAL-168
Includes JUNITS, maven dependency version changes
Change-Id: Ib13b03ece5816bffa263dd9180180d9c6070cebd
Signed-off-by:GUJJA <kg811t@research.att.com>
Diffstat (limited to 'ecomp-portal-BE-common/src/main/webapp')
| -rw-r--r-- | ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml | 30 | ||||
| -rw-r--r-- | ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml | 4 |
2 files changed, 17 insertions, 17 deletions
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 2488a2e5..5968b3ce 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 @@ -2106,10 +2106,12 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' and fn_role.active_y from fn_user fu, fn_role fr, fn_user_role fur where fu.user_id = fur.user_id and fu.active_yn='Y' and fur.role_id = fr.role_id and fr.app_id =:appId and fr.active_yn='Y' union - select distinct fu.org_id, fu.manager_id, fu.first_name, fu.middle_name, fu.last_name, fu.phone, fu.email, fu.hrid, fu.org_user_id, fu.org_code, fu.org_manager_userid, fu.job_title, fu.login_id, fu.active_yn , fr.role_id, fr.role_name - from fn_user fu, fn_role fr, fn_user_role fur - where fu.user_id = fur.user_id and fu.active_yn='Y' and fur.app_id=:appId and fr.role_name like 'global%' and fr.active_yn='Y' - ; + select distinct fu.org_id, fu.manager_id, fu.first_name, fu.middle_name, fu.last_name, fu.phone, + fu.email, fu.hrid, fu.org_user_id, fu.org_code, fu.org_manager_userid, fu.job_title, + fu.login_id, fu.active_yn , fr.role_id, fr.role_name + from fn_user_role a, fn_role fr, fn_user fu + where a.role_id in (select b.role_id from ep_app_role_function b where b.role_app_id = 1 and b.app_id =:appId) and a.user_id =fu.user_id and a.role_id = fr.role_id and fr.active_yn='Y' and fu.active_yn='Y' + ; ]]> </sql-query> @@ -2347,14 +2349,16 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' and fn_role.active_y ; ]]> - </sql-query> - - <query name="getBasicauthAccount"> - select id,password from BasicAuthCredentials - </query> + </sql-query> + + <sql-query name="userAppGlobalRoles"> + <return alias="userAppGlobalRoles" class="org.onap.portalapp.portal.domain.EPRole" /> + <![CDATA[ + select fr.role_id , fr.role_name ,fr.active_yn, fr.priority, fr.app_id, fr.app_role_id + from fn_user_role a, fn_role fr, fn_user fu + where a.role_id in (select b.role_id from ep_app_role_function b where b.role_app_id = 1 and b.app_id =:appId) and a.user_id =fu.user_id and a.role_id = fr.role_id and fr.active_yn='Y' and fu.active_yn='Y' and fu.user_id =:userId + ; + ]]> + </sql-query> - <query name="getMicroserviceInfo"> - select id,password from MicroserviceData - </query> - </hibernate-mapping> diff --git a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml index d197bc5f..0487006d 100644 --- a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml +++ b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml @@ -353,9 +353,5 @@ Portal app mappings and features are in EP.hbm.xml. select sum(total_lines) TOTAL_LINES from demo_kpi_sourcecode_stats group by category1 ]]> </sql-query> - - <query name="getAppPassword"> - select id,appPassword from App - </query> </hibernate-mapping> |