Updated CategoryService, OrderService, UserActivityService

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

ecm/webitm-ecm/trunk/proteus-ecm/proteus/ecm/service/CategoryService.java

@@ -342,6 +342,7 @@ public class CategoryService
 		String uniqueId = getUniqueId();
 		Boolean inCart = false;
 		Boolean inWishlist = false;
+		itemCode = String.format("%-10s", itemCode);
 		
 		System.out.println("\n getItemDetail(itemCode)");
 		ItemDetails itemDetails = productCache.getCachedItemDetail(itemCode, cacheName);

ecm/webitm-ecm/trunk/proteus-ecm/proteus/ecm/service/OrderService.java

@@ -60,7 +60,7 @@ public class OrderService {
 	@POST
 	@Path("/order")
 	@Produces({ "application/json" })
-	public Response saveOrder(String data, @QueryParam("tokenid") String tokenid) throws JSONException {
+	public Response saveOrder(String data,@QueryParam("tokenid") String tokenid) throws JSONException {
 		String xmlResponse = "";
 		JSONObject RequestData = new JSONObject(data);
 		String cacheName = getCacheName();
@@ -68,6 +68,7 @@ public class OrderService {
 		String siteCode = getSiteCode();
 		System.out.println("Response saveOrder cacheName" +cacheName);
 		System.out.println("Response saveOrder uniqueId" +uniqueId);
+		
 		HttpSession session = request.getSession();
 		Object contexObject = context.getAttribute( "pendingWrkflwMap" );
 		System.out.println("contexObject inside order service - "+contexObject );

ecm/webitm-ecm/trunk/proteus-ecm/proteus/ecm/service/UserActivityService.java

@@ -102,10 +102,10 @@ public class UserActivityService {
 		
 		//Check User (Guest/Authorised)
 		HttpSession session = request.getSession();
-		Object auth_user = session.getAttribute("AUTH_USER");
-		if(auth_user != null)
+		Object userObj = session.getAttribute( "USER_INFO" ); //Chitra
+		if(userObj != null)
 		{
-			userDAO.insertOrUpdate((String)auth_user, siteCode, itemCode, UserActivityDAO.ADD_CART, quantity, null);
+			userDAO.insertOrUpdate(uniqueId, siteCode, itemCode, UserActivityDAO.ADD_CART, quantity, null);
 		}
 		userActivityCache.storeCartItem(itemCode, quantity, uniqueId, cacheName);
 		
@@ -136,10 +136,10 @@ public class UserActivityService {
 		
 		//Check User (Guest/Authorised)
 		HttpSession session = request.getSession();
-		Object auth_user = session.getAttribute("AUTH_USER");
-		if(auth_user != null)
+		Object userObj = session.getAttribute( "USER_INFO" ); //chitra
+		if(userObj != null)
 		{
-			userDAO.deleteUserData((String)auth_user, siteCode, itemCode, UserActivityDAO.ADD_CART);
+			userDAO.deleteUserData(uniqueId, siteCode, itemCode, UserActivityDAO.ADD_CART);
 		}
 		userActivityCache.removeCartItem(itemCode, uniqueId, cacheName);
 		
@@ -204,11 +204,11 @@ public class UserActivityService {
 		
 		//Check User (Guest/Authorised)
 		HttpSession session = request.getSession();
-		Object auth_user = session.getAttribute("AUTH_USER");
+		Object userObj = session.getAttribute( "USER_INFO" ); //chitra
 		Date activityDate = new Date();
-		if(auth_user != null)
+		if(userObj != null)
 		{
-			userDAO.insertOrUpdate((String)auth_user, siteCode, itemCode, UserActivityDAO.RECENT_VIEW, extraDetails, activityDate);
+			userDAO.insertOrUpdate(uniqueId, siteCode, itemCode, UserActivityDAO.RECENT_VIEW, extraDetails, activityDate);
 		}
 		
 		userActivityCache.storeRecentViewItem(itemCode, activityDate, cacheName, uniqueId);
@@ -258,10 +258,10 @@ public class UserActivityService {
 		
 		//Check User (Guest/Authorised)
 		HttpSession session = request.getSession();
-		Object auth_user = session.getAttribute("AUTH_USER");
-		if(auth_user != null)
+		Object userObj = session.getAttribute( "USER_INFO" ); //chitra 
+		if(userObj != null)
 		{
-			userDAO.insertOrUpdate((String)auth_user, siteCode, itemCode, UserActivityDAO.WISHLIST, extraDetails, null);
+			userDAO.insertOrUpdate(uniqueId, siteCode, itemCode, UserActivityDAO.WISHLIST, extraDetails, null);
 		}
 		
 		userActivityCache.storeWishlistItem(itemCode, extraDetails, cacheName, uniqueId);
@@ -279,10 +279,10 @@ public class UserActivityService {
 		
 		//Check User (Guest/Authorised)
 		HttpSession session = request.getSession();
-		Object auth_user = session.getAttribute("AUTH_USER");
-		if(auth_user != null)
+		Object userObj = session.getAttribute( "USER_INFO" ); //chitra 
+		if(userObj != null)
 		{
-			userDAO.deleteUserData((String)auth_user, siteCode, itemCode, UserActivityDAO.WISHLIST);
+			userDAO.deleteUserData(uniqueId, siteCode, itemCode, UserActivityDAO.WISHLIST);
 		}
 		
 		userActivityCache.removeWishlistItem(itemCode, uniqueId, cacheName);