Subversion Repositories SmartDukaan

Rev

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

Rev 2817 Rev 2982
Line 5... Line 5...
5
 
5
 
6
 
6
 
7
import in.shop2020.datalogger.EventType;
7
import in.shop2020.datalogger.EventType;
8
import in.shop2020.model.v1.user.Sex;
8
import in.shop2020.model.v1.user.Sex;
9
import in.shop2020.model.v1.user.User;
9
import in.shop2020.model.v1.user.User;
10
import in.shop2020.model.v1.user.Widget;
-
 
11
import in.shop2020.model.v1.user.WidgetItem;
-
 
12
import in.shop2020.serving.interceptors.TrackingInterceptor;
10
import in.shop2020.serving.interceptors.TrackingInterceptor;
13
import in.shop2020.serving.utils.DesEncrypter;
11
import in.shop2020.serving.utils.DesEncrypter;
14
import in.shop2020.thrift.clients.UserContextServiceClient;
12
import in.shop2020.thrift.clients.UserContextServiceClient;
15
import in.shop2020.utils.DataLogger;
13
import in.shop2020.utils.DataLogger;
16
 
14
 
Line 157... Line 155...
157
		// called refreshItemCount() that automatically updates the number of
155
		// called refreshItemCount() that automatically updates the number of
158
		// items currently in the cart.
156
		// items currently in the cart.
159
		if(userinfo.getUserId() != -1){
157
		if(userinfo.getUserId() != -1){
160
			userClient.mergeCart(userinfo.getCartId(), user.getActiveCartId());
158
			userClient.mergeCart(userinfo.getCartId(), user.getActiveCartId());
161
		
159
		
162
			Widget browseHistory = userClient.getBrowseHistory(userinfo.getUserId());
160
			List<Long> items = userClient.getBrowseHistoryItems(userinfo.getUserId());
163
			if(browseHistory != null){
-
 
164
				List<WidgetItem> items =  browseHistory.getItems();
-
 
165
				if(items != null){
161
			if(items != null){
166
					for(WidgetItem item: items){
162
				for(Long itemId: items){
167
						userClient.updateBrowseHistory(user.getUserId(), item.getItem_id());
163
					userClient.updateBrowseHistory(user.getUserId(), itemId);
168
					}
-
 
169
				}
164
				}
170
			}
165
			}
171
			
166
		
172
			Widget myResearch = userClient.getMyResearch(userinfo.getUserId());
167
			items = userClient.getMyResearchItems(userinfo.getUserId());
173
			if(myResearch != null){
-
 
174
				List<WidgetItem> items =  browseHistory.getItems();
-
 
175
				if(items != null){
168
			if(items != null){
176
					for(WidgetItem item: items){
169
				for(Long itemId: items){
177
						userClient.updateMyResearch(user.getUserId(), item.getItem_id());
170
					userClient.updateMyResearch(user.getUserId(), itemId);
178
					}
-
 
179
				}
171
				}
180
			}
172
			}
181
		}
173
		}
182
		
174
		
183
		userinfo.setUserId(userId);
175
		userinfo.setUserId(userId);