X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fwebapp%2FWEB-INF%2Ffusion%2Form%2FEP.hbm.xml;h=e03c9762b29d02519132bcf6e49c76f964415af5;hb=b75f35b0a1824aab32b4329fa62076b0f0307853;hp=34bd66af03730e9304e60dc0db2d3534f9bebadb;hpb=2845910b34682056c1949f82e39d9205a26554e9;p=portal.git 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 34bd66af..e03c9762 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 @@ -3,7 +3,7 @@ ============LICENSE_START========================================== ONAP Portal =================================================================== - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. =================================================================== Unless otherwise specified, all software contained herein is licensed @@ -40,9 +40,32 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - + + + + + + + + + + + + + + + + + + + + + + + + @@ -206,6 +229,8 @@ + + @@ -287,8 +312,8 @@ - - + + @@ -528,6 +553,25 @@ + + + + + + + + + + + + + @@ -1117,7 +1161,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' and fn_role.active_y @@ -1306,9 +1350,12 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' and fn_role.active_y where a.user_id =:userId and b.app_id = c.app_id and a.app_id = c.role_app_id and b.enabled = 'Y' and c.role_id = d.role_id and d.active_yn='Y' and a.role_id = d.role_id and e.app_id = c.app_id ) A left outer join - (select distinct - c.AFFECTED_RECORD_ID, c.AUDIT_DATE - from FN_AUDIT_LOG c + (select FN_AUDIT_LOG.AFFECTED_RECORD_ID, max(FN_AUDIT_LOG.AUDIT_DATE) AS AUDIT_DATE + from FN_APP LEFT JOIN FN_AUDIT_LOG + on FN_APP.APP_ID = FN_AUDIT_LOG.AFFECTED_RECORD_ID + where FN_APP.ENABLED = 'Y' and FN_AUDIT_LOG.user_id=:userId + and (audit_date) BETWEEN (CURDATE() - INTERVAL 90 DAY) and CURDATE() + group by FN_AUDIT_LOG.AFFECTED_RECORD_ID )B on A.app_id = B.Affected_record_id order by AUDIT_DATE DESC; @@ -1349,9 +1396,12 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' and fn_role.active_y ) A left outer join - (select distinct - c.AFFECTED_RECORD_ID, c.AUDIT_DATE - from FN_AUDIT_LOG c + (select FN_AUDIT_LOG.AFFECTED_RECORD_ID, max(FN_AUDIT_LOG.AUDIT_DATE) AS AUDIT_DATE + from FN_APP LEFT JOIN FN_AUDIT_LOG + on FN_APP.APP_ID = FN_AUDIT_LOG.AFFECTED_RECORD_ID + where FN_APP.ENABLED = 'Y' and FN_AUDIT_LOG.user_id=:userId + and (audit_date) BETWEEN (CURDATE() - INTERVAL 90 DAY) and CURDATE() + group by FN_AUDIT_LOG.AFFECTED_RECORD_ID )B on A.app_id = B.Affected_record_id order by AUDIT_DATE DESC; @@ -1941,7 +1991,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' and fn_role.active_y class="org.onap.portalapp.portal.transport.EPUserAppCurrentRoles" /> @@ -2072,6 +2122,51 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' and fn_role.active_y ]]> + + + + + + + + + + + + + + + + @@ -2408,5 +2503,82 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' and fn_role.active_y order by role_id; ]]> + + + + + + + + + + + + + + + + + + + + + + + +