Subversion Repositories SmartDukaan

Rev

Rev 2959 | Rev 2996 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2959 Rev 2982
Line 3... Line 3...
3 
 */
 3 
 */
4 
package in.shop2020.serving.controllers;
 4 
package in.shop2020.serving.controllers;
5 
 
 5 
 
6 
import in.shop2020.datalogger.EventType;
 6 
import in.shop2020.datalogger.EventType;
7 
import in.shop2020.model.v1.user.User;
 7 
import in.shop2020.model.v1.user.User;
8 
import in.shop2020.model.v1.user.Widget;
 - 
 
9 
import in.shop2020.model.v1.user.WidgetItem;
 - 
 
10 
import in.shop2020.serving.utils.DesEncrypter;
 8 
import in.shop2020.serving.utils.DesEncrypter;
11 
import in.shop2020.serving.utils.UserMessage;
 9 
import in.shop2020.serving.utils.UserMessage;
12 
import in.shop2020.thrift.clients.UserContextServiceClient;
 10 
import in.shop2020.thrift.clients.UserContextServiceClient;
13 
import in.shop2020.utils.DataLogger;
 11 
import in.shop2020.utils.DataLogger;
14 
 
 12 
 
Line 89... Line 87...
89 
			// called refreshItemCount() that automatically updates the number of
 87 
			// called refreshItemCount() that automatically updates the number of
90 
			// items currently in the cart.
 88 
			// items currently in the cart.
91 
			if(userinfo.getUserId() != -1){
 89 
			if(userinfo.getUserId() != -1){
92 
				userClient.mergeCart(userinfo.getCartId(), user.getActiveCartId());
 90 
				userClient.mergeCart(userinfo.getCartId(), user.getActiveCartId());
93
91
94 
				Widget browseHistory = userClient.getBrowseHistory(userinfo.getUserId());
 92 
				List<Long> items = userClient.getBrowseHistoryItems(userinfo.getUserId());
95 
				if(browseHistory != null){
 - 
 
96 
					List<WidgetItem> items =  browseHistory.getItems();
 - 
 
97 
					if(items != null){
 93 
				if(items != null){
98 
						for(WidgetItem item: items){
 94 
					for(Long itemId: items){
99 
							userClient.updateBrowseHistory(user.getUserId(), item.getItem_id());
 95 
						userClient.updateBrowseHistory(user.getUserId(), itemId);
100 
						}
 - 
 
101 
					}
 96 
					}
102 
				}
 97 
				}
103
98
104 
				Widget myResearch = userClient.getMyResearch(userinfo.getUserId());
 99 
				items = userClient.getMyResearchItems(userinfo.getUserId());
105 
				if(myResearch != null){
 - 
 
106 
					List<WidgetItem> items =  myResearch.getItems();
 - 
 
107 
					if(items != null){
 100 
				if(items != null){
108 
						for(WidgetItem item: items){
 101 
					for(Long itemId: items){
109 
							userClient.updateMyResearch(user.getUserId(), item.getItem_id());
 102 
						userClient.updateMyResearch(user.getUserId(), itemId);
110 
						}
 - 
 
111 
					}
 103 
					}
112 
				}
 104 
				}
113 
			}
 105 
			}
114
106
115
107