updated

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

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

@@ -38,7 +38,7 @@ import proteus.ecm.hibernate.dao.CategoryDAO;
 import proteus.ecm.hibernate.dao.ProductDAO;
 import proteus.ecm.hibernate.dao.UserActivityDAO;
 
-@Path("/feeds")
+@Path("/feeds/{siteCode}")
 public class UserActivityService {
 	
 	String successResponse = "{\"message\": \"Added / Deleted / Updated successfully.\", \"status\": \"Success\" } ";
@@ -53,6 +53,8 @@ public class UserActivityService {
 	private UserActivityDAO userDAO = new UserActivityDAO();
 	private ProductDAO productDao = new ProductDAO();
 	
+	@PathParam("siteCode") String siteCode;
+	
 	@GET
 	@Path("/cart")
 	@Produces({ "application/json" })
@@ -89,7 +91,7 @@ public class UserActivityService {
 	public Response addCartItem(String cartData) throws JSONException {
 		String cacheName = getCacheName();
 		String uniqueId = getUniqueId();
-		String siteCode = getSiteCode();
+//		String siteCode = getSiteCode();
 		ItemDetails itemDetail ;
 		
 		
@@ -131,7 +133,7 @@ public class UserActivityService {
 	public Response removeCartItem(@PathParam("itemCode") String itemCode) {
 		String cacheName = getCacheName();
 		String uniqueId = getUniqueId();
-		String siteCode = getSiteCode();
+//		String siteCode = getSiteCode();
 		ItemDetails itemDetail = new ItemDetails();
 		
 		//Check User (Guest/Authorised)
@@ -198,7 +200,7 @@ public class UserActivityService {
 		System.out.println("Inside RecentView Post Method");
 		String cacheName = getCacheName();
 		String uniqueId = getUniqueId();
-		String siteCode = getSiteCode();
+//		String siteCode = getSiteCode();
 		
 		String extraDetails = ""; //TODO
 		
@@ -252,7 +254,7 @@ public class UserActivityService {
 		String cacheName = getCacheName();
 		String uniqueId = getUniqueId();
 		
-		String siteCode = getSiteCode();
+//		String siteCode = getSiteCode();
 		
 		String extraDetails = ""; //TODO
 		
@@ -275,7 +277,7 @@ public class UserActivityService {
 	public Response removeWishlistItem(@PathParam("itemCode") String itemCode) {
 		String cacheName = getCacheName();
 		String uniqueId = getUniqueId();
-		String siteCode = getSiteCode();
+//		String siteCode = getSiteCode();
 		
 		//Check User (Guest/Authorised)
 		HttpSession session = request.getSession();
@@ -311,7 +313,7 @@ public class UserActivityService {
         JSONObject RequestData = new JSONObject(data);
         System.out.println(RequestData);
         
-        String siteCode = getSiteCode();
+//        String siteCode = getSiteCode();
         String reviewBy = RequestData.getString("userId");
         String usefulCnt = RequestData.getString("productUsfulCnt");
         String notUsefulCnt = RequestData.getString("productNotUsfulCnt");
@@ -327,7 +329,7 @@ public class UserActivityService {
 		UserActivityDAO userData = new UserActivityDAO();
 		String cacheName = getCacheName();
 		String uniqueId = getUniqueId();
-        String siteCode = getSiteCode();
+//        String siteCode = getSiteCode();
         System.out.println("User Name from session:["+uniqueId+"]");
         HttpSession session = request.getSession();
         String sessionId = session.getId();
@@ -348,7 +350,7 @@ public class UserActivityService {
         System.out.println(reviewData);
         Date date = new Date();
         
-        String siteCode = getSiteCode();
+//        String siteCode = getSiteCode();
         String itemCode = reviewData.getString("item_code");
         String reviewBy = getUniqueId();
         int productRating = Integer.parseInt(reviewData.getString("productRating"));
@@ -366,7 +368,7 @@ public class UserActivityService {
 	public ECMItemRating getUserReview(@PathParam("itemCode") String itemCode) {
 		
 		String uniqueId = getUniqueId();
-		String siteCode = getSiteCode();
+//		String siteCode = getSiteCode();
 		
 		ECMItemRating userReview= userDAO.getUserReview(uniqueId, itemCode, siteCode);
 		
@@ -379,7 +381,7 @@ public class UserActivityService {
 	public Response removeUserReview(@PathParam("itemCode") String itemCode) {
 		
 		String uniqueId = getUniqueId();
-		String siteCode = getSiteCode();
+//		String siteCode = getSiteCode();
 		
 		userDAO.removeUserReview(uniqueId, itemCode, siteCode);
 		
@@ -622,17 +624,17 @@ public class UserActivityService {
 		return uniqueId;		
 	}
 	
-	private String getSiteCode(){
-		HttpSession session = request.getSession();
-		Object siteObj = session.getAttribute("CURRENT_SITE");
-		if( siteObj != null && siteObj instanceof SiteMaster )
-		{
-			SiteMaster site = (SiteMaster) siteObj;
-			System.out.println("getSiteCode ["+site.getSiteCode()+"]");
-			return site.getSiteCode();
-		}
-		return null;
-	}
+//	private String getSiteCode(){
+//		HttpSession session = request.getSession();
+//		Object siteObj = session.getAttribute("CURRENT_SITE");
+//		if( siteObj != null && siteObj instanceof SiteMaster )
+//		{
+//			SiteMaster site = (SiteMaster) siteObj;
+//			System.out.println("getSiteCode ["+site.getSiteCode()+"]");
+//			return site.getSiteCode();
+//		}
+//		return null;
+//	}
 	
 	private JSONObject getResponseMessage(String successResponse, String status)
 	{