Updated changes for useractivity log creation

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@196425 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dashboard/ibase/dashboard/common/webService/DashboardService.java

@@ -30,6 +30,7 @@ import ibase.ejb.UserEventLogEJB;
 import ibase.utility.BaseException;
 import ibase.utility.CommonConstants;
 import ibase.utility.UserInfoBean;
+import ibase.webitm.utility.ITMException;
 
 @Path("/dashboard")
 public class DashboardService {
@@ -52,22 +53,25 @@ public class DashboardService {
 		UserEventLogEJB userEventLogEJB=new UserEventLogEJB();
 		Date startTime=new Date();
 		String argParam="";
-		
+		String sessionID="";
+		String editorId="";
+		try
+		{
 			if(userInfo != null ) {
 				userInfo.setSessionId( sessionId );
 				System.out.println("session id ");
 				System.out.println("user info:::::"+userInfo);
-			String sessionID=userInfo.getSesstionId();
+				sessionID=userInfo.getSesstionId();
 				System.out.println("sessionID info:::::"+sessionID);
-			String editorId="" + new Date().getTime();
+				editorId="" + new Date().getTime();
 				System.out.println("getDashboardMetadata ["+CommonConstants.JBOSSHOME+"] dashboardFileName[" + dashboardFileName + "] ");
 				String dashboardMetadataFilePath = CommonConstants.JBOSSHOME + File.separator + "server" + File.separator + "default" + File.separator + "deploy" + File.separator + "ibase.ear" + File.separator + "ibase.war" + File.separator + "dashboard" + File.separator + "metadataxml" + File.separator +dashboardFileName+".xml";
 				System.out.println("Final File Path =" + dashboardMetadataFilePath);
 				DashboardUtil util = new DashboardUtil();
 				
 				// Commented by Prajyot on 29-Dec-2018
-			//userEventLogEJB.setEventLog(userInfo.getLoginCode(), dashboardFileName, sessionID,editorId,"Dashboard Metadata Retrive","Dashboard Metadata Retrive",  startTime, 
-			//		null,  argParam,"" ,  "Pending",  "Dashboard" ) ;
+				userEventLogEJB.setEventLog(userInfo.getLoginCode(), dashboardFileName, sessionID,editorId,"Dashboard Metadata Retrive","Dashboard Metadata Retrive",  startTime, 
+						null,  argParam,"" ,  "Pending",  "Dashboard","" ) ;
 				System.out.println("Dashboard Service end set event log");
 				boolean fileCheck=false;
 				
@@ -97,8 +101,8 @@ public class DashboardService {
 				}
 				
 				// Commented by Prajyot on 29-Dec-2018
-			//userEventLogEJB.updateEventLog(userInfo.getLoginCode(), dashboardFileName, sessionID, editorId, "Dashboard Metadata Retrive" , "Dashboard Metadata Retrive", startTime,
-			//		new Date(),  argParam,"" , "Success","Dashboard");
+				userEventLogEJB.updateEventLog(userInfo.getLoginCode(), dashboardFileName, sessionID, editorId, "Dashboard Metadata Retrive" , "Dashboard Metadata Retrive", startTime,
+						new Date(),  argParam,"" , "Success","Dashboard","");
 			}
 			else {
 				dashboardMetadata.put("status","failure" );
@@ -107,8 +111,18 @@ public class DashboardService {
 			}
 			System.out.println("Dashboard Service end update event log");
 			System.out.println("dashboard service final data "+dashboardMetadata.toString());
+		}
+		
+		catch (Exception e)
+		{
+			ITMException ie = new ITMException(e);
+			System.out.println("Inside getDashboardMetadata exception::::"+e);
+			userEventLogEJB.updateEventLog(userInfo.getLoginCode(), dashboardFileName, sessionID, editorId, "Dashboard Metadata Retrive" , "Dashboard Metadata Retrive", startTime,
+					new Date(),  argParam,"" , "Exception","Dashboard",ie.getMessage());
+		}
 		return dashboardMetadata.toString();
 	}
+	
 }