Skip to content

Commit 5d451a1

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent d86d7cb commit 5d451a1

File tree

17 files changed

+639
-46
lines changed

17 files changed

+639
-46
lines changed

‎.idea/dataSources.local.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎etc/db2.sql‎

Lines changed: 596 additions & 0 deletions
Large diffs are not rendered by default.

‎src/main/java/org/woehlke/java/simpleworklist/domain/UserPasswordRecoveryController.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService;
1212
import org.woehlke.java.simpleworklist.domain.user.account.UserAccountForm;
1313
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
14-
import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery;
14+
import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserAccountPasswordRecovery;
1515
import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService;
1616
import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationForm;
1717

@@ -98,12 +98,12 @@ public final String enterNewPasswordFormular(
9898
@PathVariable String confirmId,
9999
Model model
100100
) {
101-
UserPasswordRecovery oUserPasswordRecovery = userPasswordRecoveryService.findByToken(confirmId);
102-
if (oUserPasswordRecovery != null) {
103-
userPasswordRecoveryService.passwordRecoveryClickedInEmail(oUserPasswordRecovery);
104-
UserAccount ua = userAccountService.findByUserEmail(oUserPasswordRecovery.getEmail());
101+
UserAccountPasswordRecovery oUserAccountPasswordRecovery = userPasswordRecoveryService.findByToken(confirmId);
102+
if (oUserAccountPasswordRecovery != null) {
103+
userPasswordRecoveryService.passwordRecoveryClickedInEmail(oUserAccountPasswordRecovery);
104+
UserAccount ua = userAccountService.findByUserEmail(oUserAccountPasswordRecovery.getEmail());
105105
UserAccountForm userAccountForm = new UserAccountForm();
106-
userAccountForm.setUserEmail(oUserPasswordRecovery.getEmail());
106+
userAccountForm.setUserEmail(oUserAccountPasswordRecovery.getEmail());
107107
userAccountForm.setUserFullname(ua.getUserFullname());
108108
model.addAttribute("userAccountForm", userAccountForm);
109109
return "user/resetPassword/resetPasswordConfirmed";
@@ -128,7 +128,7 @@ public final String enterNewPasswordPost(
128128
@PathVariable String confirmId,
129129
Model model
130130
) {
131-
UserPasswordRecovery o = userPasswordRecoveryService.findByToken(confirmId);
131+
UserAccountPasswordRecovery o = userPasswordRecoveryService.findByToken(confirmId);
132132
boolean passwordsMatch = userAccountForm.passwordsAreTheSame();
133133
if (o != null) {
134134
if (!result.hasErrors() && passwordsMatch) {

‎src/main/java/org/woehlke/java/simpleworklist/domain/context/Context.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
@Entity
2222
@Table(
23-
name="context",
23+
name="data_context",
2424
uniqueConstraints = {
2525
@UniqueConstraint(
2626
name="ux_context",

‎src/main/java/org/woehlke/java/simpleworklist/domain/project/Project.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
@Entity
2525
@Table(
26-
name="project",
26+
name="data_project",
2727
uniqueConstraints = {
2828
@UniqueConstraint(
2929
name = "ux_project",

‎src/main/java/org/woehlke/java/simpleworklist/domain/task/Task.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
//TODO: test all three UniqueConstraints
3838
@Entity
3939
@Table(
40-
name="task",
40+
name="data_task",
4141
uniqueConstraints = {
4242
@UniqueConstraint(
4343
name="ux_task",

‎src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecovery.java‎ renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserAccountPasswordRecovery.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
@Entity
1313
@Table(
14-
name="user_password_recovery",
14+
name="user_account_password_recovery",
1515
uniqueConstraints = {
1616
@UniqueConstraint(
1717
name="ux_user_password_recovery",
@@ -27,7 +27,7 @@
2727
@Index(name = "ix_user_password_recovery_row_created_at", columnList = "row_created_at")
2828
}
2929
)
30-
public class UserPasswordRecovery extends AuditModel implements Serializable {
30+
public class UserAccountPasswordRecovery extends AuditModel implements Serializable {
3131

3232
private static final long serialVersionUID = 6860716425733119940L;
3333

@@ -106,9 +106,9 @@ public void setNumberOfRetries(Integer numberOfRetries) {
106106
@Override
107107
public boolean equals(Object o) {
108108
if (this == o) return true;
109-
if (!(o instanceof UserPasswordRecovery)) return false;
109+
if (!(o instanceof UserAccountPasswordRecovery)) return false;
110110
if (!super.equals(o)) return false;
111-
UserPasswordRecovery that = (UserPasswordRecovery) o;
111+
UserAccountPasswordRecovery that = (UserAccountPasswordRecovery) o;
112112
return Objects.equals(getId(), that.getId()) &&
113113
getEmail().equals(that.getEmail()) &&
114114
getToken().equals(that.getToken()) &&

‎src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryRepository.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import org.springframework.stereotype.Repository;
55

66
@Repository
7-
public interface UserPasswordRecoveryRepository extends JpaRepository<UserPasswordRecovery, Long> {
7+
public interface UserPasswordRecoveryRepository extends JpaRepository<UserAccountPasswordRecovery, Long> {
88

9-
UserPasswordRecovery findByToken(String token);
9+
UserAccountPasswordRecovery findByToken(String token);
1010

11-
UserPasswordRecovery findByEmail(String email);
11+
UserAccountPasswordRecovery findByEmail(String email);
1212
}

‎src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryService.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
public interface UserPasswordRecoveryService {
44

5-
UserPasswordRecovery findByToken(String confirmId);
5+
UserAccountPasswordRecovery findByToken(String confirmId);
66

77
boolean passwordRecoveryIsRetryAndMaximumNumberOfRetries(String email);
88

99
void passwordRecoveryCheckIfResponseIsInTime(String email);
1010

1111
void passwordRecoverySendEmailTo(String email);
1212

13-
void passwordRecoverySentEmail(UserPasswordRecovery o);
13+
void passwordRecoverySentEmail(UserAccountPasswordRecovery o);
1414

15-
void passwordRecoveryClickedInEmail(UserPasswordRecovery o);
15+
void passwordRecoveryClickedInEmail(UserAccountPasswordRecovery o);
1616

17-
void passwordRecoveryDone(UserPasswordRecovery o);
17+
void passwordRecoveryDone(UserAccountPasswordRecovery o);
1818
}

‎src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryServiceImpl.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ public UserPasswordRecoveryServiceImpl(UserPasswordRecoveryRepository userPasswo
3434
}
3535

3636
@Override
37-
public UserPasswordRecovery findByToken(String token) {
37+
public UserAccountPasswordRecovery findByToken(String token) {
3838
return userPasswordRecoveryRepository.findByToken(token);
3939
}
4040

4141
@Override
4242
public boolean passwordRecoveryIsRetryAndMaximumNumberOfRetries(String email) {
43-
UserPasswordRecovery earlierOptIn = userPasswordRecoveryRepository.findByEmail(email);
43+
UserAccountPasswordRecovery earlierOptIn = userPasswordRecoveryRepository.findByEmail(email);
4444
return earlierOptIn == null?false:earlierOptIn.getNumberOfRetries() >= simpleworklistProperties.getRegistration().getMaxRetries();
4545
}
4646

4747
@Override
4848
public void passwordRecoveryCheckIfResponseIsInTime(String email) {
49-
UserPasswordRecovery earlierOptIn = userPasswordRecoveryRepository.findByEmail(email);
49+
UserAccountPasswordRecovery earlierOptIn = userPasswordRecoveryRepository.findByEmail(email);
5050
if (earlierOptIn != null) {
5151
Date now = new Date();
5252
if ((simpleworklistProperties.getRegistration().getTtlEmailVerificationRequest() + earlierOptIn.getRowCreatedAt().getTime()) < now.getTime()) {
@@ -59,8 +59,8 @@ public void passwordRecoveryCheckIfResponseIsInTime(String email) {
5959
@Override
6060
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
6161
public void passwordRecoverySendEmailTo(String email) {
62-
UserPasswordRecovery earlierOptIn = userPasswordRecoveryRepository.findByEmail(email);
63-
UserPasswordRecovery o = new UserPasswordRecovery();
62+
UserAccountPasswordRecovery earlierOptIn = userPasswordRecoveryRepository.findByEmail(email);
63+
UserAccountPasswordRecovery o = new UserAccountPasswordRecovery();
6464
if (earlierOptIn != null) {
6565
o = earlierOptIn;
6666
o.increaseNumberOfRetries();
@@ -79,28 +79,28 @@ public void passwordRecoverySendEmailTo(String email) {
7979

8080
@Override
8181
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
82-
public void passwordRecoverySentEmail(UserPasswordRecovery o) {
82+
public void passwordRecoverySentEmail(UserAccountPasswordRecovery o) {
8383
o.setDoubleOptInStatus(UserPasswordRecoveryStatus.PASSWORD_RECOVERY_SENT_EMAIL);
8484
log.info("about to save: " + o.toString());
8585
userPasswordRecoveryRepository.saveAndFlush(o);
8686
}
8787

8888
@Override
8989
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
90-
public void passwordRecoveryClickedInEmail(UserPasswordRecovery o) {
90+
public void passwordRecoveryClickedInEmail(UserAccountPasswordRecovery o) {
9191
o.setDoubleOptInStatus(UserPasswordRecoveryStatus.PASSWORD_RECOVERY_CLICKED_IN_MAIL);
9292
userPasswordRecoveryRepository.saveAndFlush(o);
9393
}
9494

9595
@Override
9696
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
97-
public void passwordRecoveryDone(UserPasswordRecovery o) {
97+
public void passwordRecoveryDone(UserAccountPasswordRecovery o) {
9898
o.setDoubleOptInStatus(UserPasswordRecoveryStatus.PASSWORD_RECOVERY_STORED_CHANGED);
9999
o = userPasswordRecoveryRepository.saveAndFlush(o);
100100
userPasswordRecoveryRepository.delete(o);
101101
}
102102

103-
private void sendEmailForPasswordReset(UserPasswordRecovery o) {
103+
private void sendEmailForPasswordReset(UserAccountPasswordRecovery o) {
104104
String urlHost = simpleworklistProperties.getRegistration().getUrlHost();
105105
String mailFrom= simpleworklistProperties.getRegistration().getMailFrom();
106106
boolean success = true;

0 commit comments

Comments
 (0)