Skip to content

fix: duplicated confirmationToken when tenant warning is triggered #1152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nicolasSagon wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: duplicated confirmationToken when tenant warning is triggered #1152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,4 @@ zxing-cpp/data/zxing-cpp
# Used in test
7fdad8b1*

CONTEXT.md
8 changes: 6 additions & 2 deletions ...er/src/main/java/fr/dossierfacile/scheduler/tasks/tenantwarning/TenantWarningService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,18 @@ private void handleWarning2(Tenant t) {
}

private void handleWarning1(Tenant t) {
mailSender.sendEmailSecondWarningForDeletionOfDocuments(t, confirmationTokenService.createToken(t));
var confirmationToken = confirmationTokenRepository.findByUser(t).orElse(new ConfirmationToken(t));

mailSender.sendEmailSecondWarningForDeletionOfDocuments(t, confirmationToken);
t.setWarnings(2);
tenantRepository.save(t);
logService.saveLog(LogType.SECOND_ACCOUNT_WARNING_FOR_DOCUMENT_DELETION, t.getId());
}

private void handleWarning0(Tenant t) {
mailSender.sendEmailFirstWarningForDeletionOfDocuments(t, confirmationTokenService.createToken(t));
var confirmationToken = confirmationTokenRepository.findByUser(t).orElse(new ConfirmationToken(t));

mailSender.sendEmailFirstWarningForDeletionOfDocuments(t, confirmationToken);
t.setWarnings(1);
tenantRepository.save(t);
logService.saveLog(LogType.FIRST_ACCOUNT_WARNING_FOR_DOCUMENT_DELETION, t.getId());
Expand Down