diff options
| author |   Christopher Lott (cl778h) <clott@research.att.com> | 2017-09-25 16:07:54 -0400 |
|---|---|---|
| committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-09-25 16:09:15 -0400 |
| commit | 23634dba70b166ad3c79b5eadfbd32b5375d44be (patch) | |
| tree | ab0ea364c8da4f91fb8c7e2819692498939fb419 /ecomp-portal-BE-common/src/main/webapp | |
| parent | 4ba6a0f20a190030700917a6065a6779ca9d308f (diff) | |
MariaDB Connector and Sonar Scans; clean nl
PORTAL-50: Fix to get the Sonar coverage for ONAP
PORTAL-72: Sonar scan - resolving severity Blocker issues
PORTAL-86: Remove internal att.com usages from tests and other files
PORTAL-102: Fixed the page refresh issue on App Account Management page
PORTAL-103: Fix to enhanced notification ticket source for ONAP
PORTAL-104: Replaced mysql DB connector with mariaDB
Issue: PORTAL-50 PORTAL-72 PORTAL-86 PORTAL-102 PORTAL-103 PORTAL-104
Change-Id: Iae78ad34ed9ce5ae1f2d36fcbb93fbc1e39944e5
Signed-off-by: Christopher Lott (cl778h) <clott@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 | 29 |
1 files changed, 16 insertions, 13 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 1574a9a2..5526670a 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 @@ -371,7 +371,7 @@ </class> <!-- User Role class mapping details --> - <class name="EPRole" table="FN_ROLE"> + <class name="EPRole" table="FN_ROLE" > <id name="id" column="role_id"> <generator class="native"> <param name="sequence">seq_fn_role</param> @@ -1800,22 +1800,11 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' and fn_role.active_y class="org.openecomp.portalapp.portal.domain.CentralRoleFunction" /> <![CDATA[ - SELECT * from ep_app_function where function_cd = :functionCode and app_id =:appId + SELECT * from ep_app_function where function_cd like CONCAT('%', :functionCode,'%') and app_id =:appId ; ]]> </sql-query> - - <!-- Gets the record from ep_app_function table and requires two parameters --> - <sql-query name="getAppFunctionDetails"> - <return alias="appFunctionDetails" - class="org.openecomp.portalapp.portal.domain.CentralRoleFunction" /> - <![CDATA[ - - select * from ep_app_function where app_id =:appId and function_cd =:functionCd - ; - ]]> - </sql-query> <!-- Gets the current user app roles records and requires two parameters --> <sql-query name="getUserAppCurrentRoles"> @@ -1940,4 +1929,18 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' and fn_role.active_y ]]> </sql-query> + <sql-query name="ApplicationUserRoles"> + <return alias="ApplicationUserRoles" class="org.openecomp.portalapp.portal.transport.EcompUserRoles" /> + <![CDATA[ + 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.app_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.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' + ; + ]]> + </sql-query> </hibernate-mapping> |