micord/ervu-account-applications
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPPORT-9416: fix from review

Browse source
This commit is contained in:
adel.ka 2025-09-22 09:21:32 +03:00
parent 9fc4d61269
commit cf09440280
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
backend/src/main/java/ru/micord/ervu/account_applications/kafka/ApplicationStatusListener.java
View file

@ -8,7 +8,7 @@ import org.springframework.kafka.annotation.KafkaListener;
import org.springframework.messaging.handler.annotation.Header;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import ru.micord.ervu.account_applications.kafka.model.ApplicationStatus;
import ru.micord.ervu.account_applications.kafka.model.DeclarationStatus;
import ru.micord.ervu.account_applications.security.model.jwt.UserClaims;
import ru.micord.ervu.account_applications.security.service.EncryptionService;
import ru.micord.ervu.account_applications.security.service.JwtTokenService;
@ -43,11 +43,11 @@ public class ApplicationStatusListener {
String name = userClaims.name();
String userId = userClaims.userId();
ApplicationStatus applicationStatus = mapper.readValue(kafkaMessage, ApplicationStatus.class);
Long applicationNumber = applicationStatus.applicationNumber();
if (applicationStatus.status()) {
DeclarationStatus declarationStatus = mapper.readValue(kafkaMessage, DeclarationStatus.class);
Long applicationNumber = declarationStatus.applicationNumber();
if (declarationStatus.status()) {
LOGGER.info("update by appNumber = {}", applicationNumber);
String tempPass = applicationStatus.password();
String tempPass = declarationStatus.password();
if (StringUtils.hasText(tempPass)) {
String encryptedPassword = encryptionService.encrypt(tempPass);
applicationService.savePassword(applicationNumber, encryptedPassword, name, userId);
@ -57,7 +57,7 @@ public class ApplicationStatusListener {
}
}
else {
String errorMsg = applicationStatus.errorMsg();
String errorMsg = declarationStatus.errorMsg();
LOGGER.error("error by appNumber = {}, message: {}", applicationNumber, errorMsg);
applicationService.saveError(applicationNumber, errorMsg, name, userId);
}

2
backend/src/main/java/ru/micord/ervu/account_applications/kafka/model/ApplicationStatus.java → backend/src/main/java/ru/micord/ervu/account_applications/kafka/model/DeclarationStatus.java
View file

@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
/**
* @author Adel Kalimullin
*/
public record ApplicationStatus(
public record DeclarationStatus(
@JsonProperty("applicationNumber") Long applicationNumber,
@JsonProperty("password") String password,
@JsonProperty("status") boolean status,

4
backend/src/main/java/ru/micord/ervu/account_applications/service/UserApplicationListService.java
View file

@ -6,6 +6,7 @@ import java.util.List;
import java.util.Map;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import ru.micord.ervu.account_applications.component.dao.AuditDao;
import ru.micord.ervu.account_applications.dao.UserApplicationListDao;
import utils.DateTimeUtil;
@ -31,6 +32,7 @@ public class UserApplicationListService {
return dao.getStatusesBatch(appNumbers);
}
@Transactional
public void savePassword(Long appNumber, String encodedPass, String name, String userId) {
dao.savePassword(appNumber, encodedPass);
saveAuditStatusByAppNumber(appNumber, ACCEPTED.name(), name, userId);
@ -40,11 +42,13 @@ public class UserApplicationListService {
return dao.userExists(login);
}
@Transactional
public void saveAcceptedStatus(long appNumber, String name, String userId) {
dao.saveAcceptedStatus(appNumber);
saveAuditStatusByAppNumber(appNumber, ACCEPTED.name(), name, userId);
}
@Transactional
public void saveError(long appNumber, String errorMsg, String name, String userId) {
dao.saveError(appNumber, errorMsg);
saveAuditStatusByAppNumber(appNumber, AGREED.name(), name, userId);