Closed IgorMaksymov closed 8 years ago
You have to fix merge conflict
@roma-ilnitsky @romach fixed, review pls
@IgorMaksymov
generateOtpByUserIdAndSendItToUserEmail()
you have to divided this method because it do not match SOLID.
I offer:
@Override
public void addSubscriber(String username, String password) throws Exception {
User user = UserBuilder.anUser()
.login(username)
.role(roleService.getRoleByName("guest"))
.build();
addUser(user, passwordEncoder.encode(password));
OneTimePassword otp = oneTimePassword.generateOtp(otpLifetime);
registerOtp(otp);
sendOtpToUserEmail(otp);
}
@roma-ilnitsky updated, review pls
@IgorMaksymov Failed merge from master. Previous issues in master deleted.
@vaa25 what?This branch has no conflicts with the base branch and Travis check passed. Check your database. in some cases there may so much changes from diffent Changesets, so it becomes incompatible with other braches. To avoid this we need to do rollback before every checkout.
@IgorMaksymov I checkouted another 48 branch. Why we have three of them?
@vaa25
because we need all of them.
IgorMaksymov wants to merge 16 commits into master from #48-otp
@IgorMaksymov why we need all of them? Maybe you need its locally?
@vaa25 not locally, we need it to share code with partner
@IgorMaksymov has ignored tests @AndriyBaibak 15 min
@ i opened tasks to fix them. i'm out of scope here.
@IgorMaksymov UserService: setOtpToUser is used only in UserService. getUserByOtp is not used anywhewe It seems task is not finished. What is target of this task? No tests, no demos... How to check it? What to check? Only code style?
@vaa25 i dont understand purpose of your comment, it's to criticize me or something else?
which of setOtpToUser? i should make it private or add ot to UserDao.addSubscriber ? what is not tested? demo is after merge.
@IgorMaksymov yes, task seems finished except: UserService:
OtpExpiredServiceExceprion:
MyBatisUserServiceTest:
UserRestControllerTest:
ControllerHandlerTest:
OneTimePasswordTest:
And of course ignored tests of changed methods @AndriyBaibak 1.5 hours
@AndriyBaibak 2 hours
@AndriyBaibak time spent: 1h
generation of OTP and user activation added connect to #48