Subversion Repositories SmartDukaan

Rev

Rev 555 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 555 Rev 569
Line 86... Line 86...
86 
    	else
 86 
    	else
87 
    		return "failure";
 87 
    		return "failure";
88 
    }
 88 
    }
89
89
90 
    public boolean registerUser() throws Exception{
 90 
    public boolean registerUser() throws Exception{
91 
    	String email, password, userName, mobileNumber, communicationEmail, sex, dobDay, dobYear, dobMonth;
 91 
    	String email, password, userName, mobileNumber, communicationEmail, sex, dateOfBirth;
92
92
93 
    	userName =  this.request.getParameter("nameOfUser");
 93 
    	userName =  this.request.getParameter("nameOfUser");
94 
    	email = this.request.getParameter("email");
94 
    	email = this.request.getParameter("email");
95 
    	password = this.request.getParameter("password");
 95 
    	password = this.request.getParameter("password");
96
96
97 
    	mobileNumber = this.request.getParameter("mobileNumber");
 97 
    	mobileNumber = this.request.getParameter("mobileNumber");
98 
    	communicationEmail = this.request.getParameter("communicationEmail");
 98 
    	communicationEmail = this.request.getParameter("communicationEmail");
99
99
100 
    	dobDay = this.request.getParameter("dobDay");
 - 
 
101 
    	dobMonth = this.request.getParameter("dobMonth");
 100 
    	dateOfBirth = this.request.getParameter("dateOfBirth");
102 
    	dobYear = this.request.getParameter("dobYear");
 - 
 
103 
    	sex =  this.request.getParameter("sex");
 101 
    	sex =  this.request.getParameter("sex");
104
102
105 
		UserContextServiceClient userContextServiceClient = new UserContextServiceClient();
 103 
		UserContextServiceClient userContextServiceClient = new UserContextServiceClient();
106 
		in.shop2020.model.v1.user.UserContextService.Client userClient = userContextServiceClient.getClient();
 104 
		in.shop2020.model.v1.user.UserContextService.Client userClient = userContextServiceClient.getClient();
107 
 
 105 
 
Line 113... Line 111...
113 
		User user = new User();
 111 
		User user = new User();
114 
		user.setName(userName);
 112 
		user.setName(userName);
115 
		user.setEmail(email);
 113 
		user.setEmail(email);
116 
		user.setPassword(password);
 114 
		user.setPassword(password);
117 
		user.setCommunicationEmail(communicationEmail);
 115 
		user.setCommunicationEmail(communicationEmail);
- 
 
 116 
		user.setMobileNumber(mobileNumber);
- 
 
 117 
		user.setDateOfBirth(dateOfBirth);
118 
 
 118 
 
119 
//		if(mobileNumber!=null){
 - 
 
120 
//			Phone phone = new Phone();
 - 
 
121 
//			phone.setNumber(mobileNumber);
 - 
 
122 
//			phone.setType(PhoneType.MOBILE);
 - 
 
123 
//			Set<Phone> phones = new HashSet<Phone>();
 - 
 
124 
//			phones.add(phone);
 - 
 
125 
//			user.setPhones(phones);
 - 
 
126 
//		}
 - 
 
127
119
128 
		user.setSex(Sex.WONT_SAY);
 120 
		user.setSex(Sex.WONT_SAY);
129 
		if (sex != null) {
 121 
		if (sex != null) {
130 
			try {
 122 
			try {
131 
				user.setSex(Sex.findByValue(Integer.parseInt(sex)));
 123 
				user.setSex(Sex.findByValue(Integer.parseInt(sex)));
132 
			} catch (NumberFormatException nfe) {
 124 
			} catch (NumberFormatException nfe) {
133 
				log.error("Unusual value for sex. Leaving it marked as won't say.");
 125 
				log.error("Unusual value for sex. Leaving it marked as won't say.");
134 
			}
 126 
			}
135 
		}
 127 
		}
136 
 
 128 
 
137 
		if (dobDay != null && dobYear != null && dobMonth != null) {
 - 
 
138 
			GregorianCalendar dateOfBirth = new GregorianCalendar(
 - 
 
139 
					Integer.parseInt(dobYear), Integer.parseInt(dobMonth),
 - 
 
140 
					Integer.parseInt(dobDay));
 - 
 
141 
			user.setDateOfBirth(dateOfBirth.getTimeInMillis());
 - 
 
142 
		}
 - 
 
143 
 
 129 
 
144 
		user = userClient.createUser(user);
 130 
		user = userClient.createUser(user);
145 
		long userId = user.getUserId();
 131 
		long userId = user.getUserId();
146 
		userClient.setUserAsLoggedIn(userId, (new Date()).getTime());
 132 
		userClient.setUserAsLoggedIn(userId, (new Date()).getTime());
147 
 
 133