Revision 19:7cf9c07e21e6

View differences:

src/com/ib/ibss/enterprise/services/ss102_user_admin/constants/IBSSUserConstants.java
167 167
	public static final String SEARCH_LAST_LOGIN_DATE_FROM			= "searchLastLoginDateFrom";
168 168
	public static final String SEARCH_LAST_LOGIN_DATE_TO			= "searchLastLoginDateTo";
169 169
	public static final String SEARCH_USER_TYPE						= "searchUserType";
170
	public static final String SEARCH_USER_APPLICATION				= "searchUserApplication";
170 171
	/* Pagination */
171 172
	public static final String ENQUIRY_SEGMENT						= "userEnquirySegment";
172 173
	public static final String PAGINATION							= "pagination";
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryDeleteServices.java
13 13

  
14 14
import java.util.Date;
15 15

  
16
import org.hibernate.Session;
17

  
18
import my.com.upass.MinimalUPassControllerV2;
19
import my.com.upass.UPassControllerV2;
20
import net.penril.generic.hibernate.HibernateUtils;
16 21
import net.penril.ibss.audit.log.AuditLogConstants;
17 22
import net.penril.ibss.core.hibernate.IbCustProfile;
18 23

  
......
64 69
	String c_sLogReason;
65 70
	Long c_oAdminID;
66 71
	Long c_oUserID;
72
	String upassAdmin					= "UpassAdmin";
73
	String upassAdminPass				= "password";
67 74
	
68 75
	IBSSDynaBean c_oDetailBean;
69 76
	
......
90 97
			Long actionId = RIBPermission.RESET_RIB_USER_PASSWORD.getActionId();			
91 98
			boolean isMakerChecker = m_oSharedServices.determineMakerChecker (actionId, getAdminActionDAO(), getIBSSessionObjects());	
92 99
			
100
			Session session = HibernateUtils.currentSession();
101
			session.beginTransaction();
102
			
93 103
			/* Delete User */
104
			UPassControllerV2 upass = new UPassControllerV2();
105
			int response = upass.deleteUserWithTheProfile(upassAdmin, upassAdminPass, c_sUserAlias, null);
94 106
			
95
			
107
			switch(response)
108
			{
109
				case StatusConstants.ERR_SUCCESS:
110
					m_oLogStatus = AuditLogConstants.SUCCESSFUL;
111
					
112
					setBeanMessage (IBSSUserConstants.JSP_TITLE, 
113
							ResourcesUtils.getApplicationResourceMessage ("user.user") + ": " + c_sUserAlias + " " +
114
							ResourcesUtils.getApplicationResourceMessage ("user.has.been.successfully") + " " +
115
							ResourcesUtils.getApplicationResourceMessage ("user.reset.desc"));
116
					c_sLogReason = "Update Successful";
117
					break;
118
				default:
119
					c_sLogReason = "Unhandled response: " + response;
120
					throw IBSSErrorHandler.createBusinessException (IBSSBusinessException.LOGIN, ExceptionErrors.ERR_SYSTEM_NOT_READY);
121
			}
96 122
				/* Log successful */
97
				m_oLogStatus = AuditLogConstants.SUCCESSFUL;
98 123
				
99
				setBeanMessage (IBSSUserConstants.JSP_TITLE, 
100
						ResourcesUtils.getApplicationResourceMessage ("user.user") + ": " + c_sUserAlias + " " +
101
						ResourcesUtils.getApplicationResourceMessage ("user.has.been.successfully") + " " +
102
						ResourcesUtils.getApplicationResourceMessage ("user.reset.desc"));
103 124
		}
104 125
		catch (Exception e)
105 126
		{
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryDetailsServices.java
17 17
import java.util.LinkedHashMap;
18 18
import java.util.Map;
19 19

  
20
import org.hibernate.Session;
21

  
22
import my.com.upass.MinimalUPassControllerV2;
20 23
import my.com.upass.maybank.entities.IbccUser;
21 24
import my.com.upass.maybank.entities.Im2uUser;
22 25
import my.com.upass.maybank.entities.M2uUser;
23 26
import my.com.upass.maybank.entities.StockUser;
24 27
import my.com.upass.maybank.entities.TicketingUser;
28
import my.com.upass.maybank.entities.UserProfile;
25 29
import my.com.upass.pojo.ClientApp;
30
import net.penril.generic.hibernate.HibernateUtils;
26 31
import net.penril.ibss.core.hibernate.IbCustProfile;
27 32

  
28 33
import com.ib.common.utils.DateTimeUtils;
......
80 85
		IBSSDynaBean m_oDetailBean;
81 86
		IBSSDynaBean m_oUserBean;
82 87
		
88
		String upassAdmin					= "UpassAdmin";
89
		String upassAdminPass				= "password";
90
		
83 91
		Map<String, IBSSDynaBean> userMap 	= new HashMap<String, IBSSDynaBean> ();
84 92
		LinkedHashMap<String, String> detailMap = new LinkedHashMap<String, String> ();
85 93
		
......
110 118
					userId = Long.valueOf((String)m_oUserBean.get(IBSSUserConstants.USER_ID));
111 119
				}
112 120
				
121
				MinimalUPassControllerV2 upass = new MinimalUPassControllerV2();
122
				
123
				Session session = HibernateUtils.currentSession();
124
				session.beginTransaction();
125
				
126
				UserProfile userProfile = upass.findProfile(upassAdmin, upassAdminPass, (String)m_oUserBean.get(IBSSUserConstants.USER_ALIAS), userType, session);
127
				
113 128
				switch (userType){
114 129
					case 1:{//M2U Retail Internet Banking
115
						M2uUser user = getM2Uuser(userId);
130
						M2uUser user = (M2uUser) userProfile;
116 131
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.pan.1"), user.getPan1());
117 132
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.pan.2"), user.getPan2());
118 133
						break;
119 134
					}
120 135
					case 2:{//Maybank Online Stock
121
						StockUser user = getStockUser(userId);
136
						StockUser user = (StockUser) userProfile;
122 137
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.id.no"), user.getIdNo());
123 138
						break;
124 139
					}
125 140
					case 3:{//Maybank Online Ticketing
126
						TicketingUser user = getTicketingUser(userId);
141
						TicketingUser user = (TicketingUser) userProfile;
127 142
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.first.name"), user.getFirstName());
128 143
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.full.name"), user.getFullName());
129 144
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.last.name"), user.getLastName());
......
131 146
						break;
132 147
					}
133 148
					case 4:{//Maybank CCPP
134
						IbccUser user = getIbccUser(userId);
149
						IbccUser user = (IbccUser) userProfile;
135 150
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.pan.cc"), user.getPanCc());
136 151
						break;
137 152
					}
138 153
					case 5:{//M2U Singapore Integration
139
						Im2uUser user = getIM2Uuser(userId);
154
						Im2uUser user = (Im2uUser) userProfile;
140 155
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.ws.flag"), user.getWsFlag());
141 156
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.ws.ident.code"), user.getWsIdentCode());
142 157
						detailMap.put(ResourcesUtils.getApplicationResourceMessage("user.ws.my.sg.id"), user.getWsMySgId());
......
162 177
		}
163 178
		IBSSLogger.debug (c_oClass, "Exiting execute");
164 179
	}
165
	
166
	public IbccUser getIbccUser(long userId){
167
		IbccUser user = new IbccUser();
168
		user.setUserId(userId);
169
		user.setPanCc("123");
170
		
171
		return user;
172
	}
173
	
174
	public TicketingUser getTicketingUser (long userId){
175
		TicketingUser user = new TicketingUser();
176
		user.setUserId(userId);
177
		user.setFirstName("fist name");
178
		user.setFullName("full Name");
179
		user.setLastName("Last name");
180
		user.setPayeeCode("ABC");
181
		
182
		return user;
183
	}
184
	
185
	public M2uUser getM2Uuser (long userId){
186
		M2uUser user = new M2uUser();
187
		user.setUserId(userId);
188
		user.setPan1("pan1");
189
		user.setPan2("pan2");
190
		
191
		return user;
192
	}
193
	
194
	public Im2uUser getIM2Uuser (long userId){
195
		Im2uUser user = new Im2uUser();
196
		user.setUserId(userId);
197
		user.setWsFlag("0");
198
		user.setWsIdentCode("12345");
199
		user.setWsMySgId("1234");
200
		user.setWsMySgId("sgid");
201
		user.setWsRegTimeStamp(new Date());
202
		
203
		return user;
204
	}
205
	
206
	public StockUser getStockUser (long userId){
207
		StockUser user = new StockUser();
208
		user.setUserId(userId);
209
		user.setIdNo("123456789");
210
		
211
		return user;
212
	}
213 180
}
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserEnquiryMainServices.java
21 21

  
22 22
import javax.servlet.http.HttpServletRequest;
23 23

  
24
import org.apache.taglibs.standard.lang.jstl.MinusOperator;
25
import org.hibernate.Session;
26

  
27
import my.com.upass.MinimalUPassControllerV2;
24 28
import my.com.upass.dao.UserDAO;
25 29
import my.com.upass.maybank.entities.IbccUser;
26 30
import my.com.upass.maybank.entities.Im2uUser;
......
29 33
import my.com.upass.maybank.entities.TicketingUser;
30 34
import my.com.upass.maybank.entities.UserProfile;
31 35
import my.com.upass.pojo.MinimalUserBean;
36
import net.penril.generic.hibernate.HibernateUtils;
32 37
import net.penril.ibss.core.hibernate.IbCustProfile;
33 38

  
34 39
import com.ib.common.utils.IBDateTime;
......
92 97
		int m_iStartIndex 					= 0;
93 98
		int m_iEndIndex 					= 0;
94 99
		List<Integer> m_lPaginationList 	= new ArrayList<Integer> ();
100
		String upassAdmin					= "UpassAdmin";
101
		String upassAdminPass				= "password";
102
		Date creationDateFrom 				= null;
103
		Date creationDateTo 				= null;
95 104
		
96 105
		IBSSDynaBean m_oUserGroupViewBean 		= null;
97 106
		IBSSDynaBean m_oUserGroupListViewBean 	= null;
......
105 114
		Map<String, String> authModeMap 				= new HashMap<String, String> ();
106 115
		Map<Long, String> m_mGroupMap					= null;
107 116
		
108
		SimpleDateFormat m_oDateFormat = new SimpleDateFormat(IBSSCommonConstants.STANDARD_DATE_FORMAT_DDMMYYYY);
117
		SimpleDateFormat m_oDateFormat = new SimpleDateFormat(IBSSCommonConstants.STANDARD_DATE_FORMAT_SHORT_DDMMYYYY);
109 118
		
110 119
		try
111 120
		{
112 121
			m_oUserGroupViewBean = (IBSSDynaBean) getIBSSDynaBean ().get(IBSSUserConstants.IBSS_USER_VIEW);
122
			String userAlias	= getBeanMessage (IBSSUserConstants.SEARCH_USER_ALIAS);
123
			String userStatus	= getBeanMessage (IBSSUserConstants.SEARCH_USER_STATUS);
124
			String userApplication	= getBeanMessage (IBSSUserConstants.SEARCH_USER_APPLICATION);
113 125
			String m_sCreateFr	= getBeanMessage (IBSSUserConstants.SEARCH_CREATION_DATE_FROM);
114 126
			String m_sCreateTo	= getBeanMessage (IBSSUserConstants.SEARCH_CREATION_DATE_TO);
115 127
			
......
120 132
				}
121 133
			}
122 134
			
123
			List<MinimalUserBean> userList = dummyList();
135
			List<UserProfile> uList = new ArrayList<UserProfile>();
136
			
137
			UserProfile ibccUser = new IbccUser();
138
			UserProfile im2uUser = new Im2uUser();
139
			UserProfile m2uUser = new M2uUser();
140
			UserProfile stockUser = new StockUser();
141
			UserProfile ticketUser = new TicketingUser();
142
			MinimalUserBean user = new MinimalUserBean();
143
			
144
			if (!DataValidator.isEmptyString(userAlias)){
145
				user.setUserAlias(userAlias);
146
			}else if (!DataValidator.isEmptyString(userStatus)){
147
				user.setUstate(Integer.valueOf(userStatus));
148
			}else if (!DataValidator.isEmptyString(userApplication)){
149
				user.setUserType(Integer.valueOf(userApplication));
150
			}else if (!DataValidator.isEmptyString(userStatus)){
151
				user.setUstate(Integer.valueOf(userStatus));
152
			}
153
			
154
			if (DataValidator.isEmptyString(userApplication)){
155
				ibccUser.setMinUser(user);
156
				im2uUser.setMinUser(user);
157
				m2uUser.setMinUser(user);
158
				stockUser.setMinUser(user);
159
				ticketUser.setMinUser(user);
160
				
161
				uList.add(ibccUser);
162
				uList.add(im2uUser);
163
				uList.add(m2uUser);
164
				uList.add(stockUser);
165
				uList.add(ticketUser);
166
			}else if (userApplication.equals("1")){
167
				m2uUser.setMinUser(user);
168
				uList.add(m2uUser);
169
			}else if (userApplication.equals("2")){
170
				stockUser.setMinUser(user);
171
				uList.add(stockUser);
172
			}else if (userApplication.equals("3")){
173
				ticketUser.setMinUser(user);
174
				uList.add(ticketUser);
175
			}else if (userApplication.equals("4")){
176
				ibccUser.setMinUser(user);
177
				uList.add(ibccUser);
178
			}else if (userApplication.equals("5")){
179
				im2uUser.setMinUser(user);
180
				uList.add(im2uUser);
181
			}
182
			
183
			MinimalUPassControllerV2 upass = new MinimalUPassControllerV2();
184
			Session session = HibernateUtils.currentSession();
185
			session.beginTransaction();
186
			
187
			if (!DataValidator.isEmptyString(m_sCreateFr)){
188
				creationDateFrom = m_oDateFormat.parse(m_sCreateFr);
189
			}
190
			if (!DataValidator.isEmptyString(m_sCreateTo)){
191
				creationDateTo = m_oDateFormat.parse(m_sCreateTo);
192
			}
193
				
194
				
195
			@SuppressWarnings("unchecked")
196
			List<UserProfile> userList = upass.listProfilesByExamples(upassAdmin, upassAdminPass, uList, creationDateFrom, creationDateTo, session);
124 197
			
125 198
			int m_iIndexNo 	= 0;
126 199
			m_iUserListSize = userList.size();
......
156 229
					m_iEndIndex = userList.size();
157 230
				}
158 231
				
232
				String userApp = "";
233
				
159 234
				for(int i = m_iStartIndex; i < m_iEndIndex; i++)
160 235
				{
161
					m_oUser 					= userList.get (i);
236
					m_oUser 					= userList.get (i).getMinUser();
162 237
					m_oUserGroupListViewBean 	= IBSSDynaBeanManager.createIBSSDynaBean(IBSSUserConstants.IBSS_USER_VIEW, getIBSSDynaBean().getActionMapping());
163 238
					
164 239
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_ID, String.valueOf (m_oUser.getUserID()));
......
166 241
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_ALIAS, m_oUser.getUserAlias() == null ? "" : m_oUser.getUserAlias());
167 242
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_STATE_KEY, Long.valueOf(String.valueOf(m_oUser.getUstate())));
168 243
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_STATE, m_mUStatusMap.get(String.valueOf (m_oUser.getUstate())));
169
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_APPLICATION, applicationMap.get(String.valueOf (m_oUser.getUserType())));
170
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_APPLICATION_KEY, String.valueOf (m_oUser.getUserType()));
244
					
245
					if (userList.get (i).getClass().equals(M2uUser.class)){
246
						userApp = "1";
247
					}else if (userList.get (i).getClass().equals(StockUser.class)){
248
						userApp = "2";
249
					}else if (userList.get (i).getClass().equals(TicketingUser.class)){
250
						userApp = "3";
251
					}else if (userList.get (i).getClass().equals(IbccUser.class)){
252
						userApp = "4";
253
					}else if (userList.get (i).getClass().equals(Im2uUser.class)){
254
						userApp = "5";
255
					}
256
					
257
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_APPLICATION, applicationMap.get(userApp));
258
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_APPLICATION_KEY, userApp);
171 259
//					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_AUTH_MODE, authModeMap.get(""));
172 260
					m_oUserGroupListViewBean.set(IBSSUserConstants.CREATION_DATE, m_oUser.getUdateCreated() != null ? m_oDateFormat.format (m_oUser.getUdateCreated()) : "");
173 261
					m_oUserGroupListViewBean.set(IBSSUserConstants.USER_VBEAN_INDEXNO, String.valueOf(m_iIndexNo));
......
198 286
		IBSSLogger.debug (c_oClass, "Exiting createEnquiryScreen");
199 287
	}
200 288
	
201
	private List<MinimalUserBean> dummyList() throws Exception{
202
		List<MinimalUserBean> returnList = new ArrayList<MinimalUserBean>();
203
		
204
		MinimalUserBean userBean = new MinimalUserBean();
205
		userBean.setUserID(1L);
206
		userBean.setUsername("user1");
207
		userBean.setUserType(1);
208
		userBean.setUstate(0);
209
		userBean.setUdateCreated(new Date());
210
		returnList.add(userBean);
211
		
212
		MinimalUserBean userBean2 = new MinimalUserBean();
213
		userBean2.setUserID(2L);
214
		userBean2.setUsername("user2");
215
		userBean2.setUserType(2);
216
		userBean2.setUstate(0);
217
		userBean2.setUdateCreated(new Date());
218
		returnList.add(userBean2);
219
		
220
		MinimalUserBean userBean3 = new MinimalUserBean();
221
		userBean3.setUserID(3L);
222
		userBean3.setUsername("user3");
223
		userBean3.setUserType(3);
224
		userBean3.setUstate(0);
225
		userBean3.setUdateCreated(new Date());
226
		returnList.add(userBean3);
227
		
228
		MinimalUserBean userBean4 = new MinimalUserBean();
229
		userBean4.setUserID(4L);
230
		userBean4.setUsername("user4");
231
		userBean4.setUserType(4);
232
		userBean4.setUstate(0);
233
		userBean4.setUdateCreated(new Date());
234
		returnList.add(userBean4);
235
		
236
		MinimalUserBean userBean5 = new MinimalUserBean();
237
		userBean5.setUserID(5L);
238
		userBean5.setUsername("user5");
239
		userBean5.setUserType(5);
240
		userBean5.setUstate(0);
241
		userBean5.setUdateCreated(new Date());
242
		returnList.add(userBean5);
243
		
244
		return returnList;
245
	}
246 289
}

Also available in: Unified diff