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

Merge branch 'refs/heads/feature/SUPPORT-9213_change_to_Idm3' into develop

Browse source
This commit is contained in:
adel.ka 2025-07-03 09:55:33 +03:00
commit 4c0bfb676d
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backend/src/main/java/ru/micord/ervu/account_applications/model/RecruitmentData.java
View file

@ -31,7 +31,7 @@ public class RecruitmentData {
private int version;
private ReferenceEntity parent;
private List<ReferenceEntity> solutions;
private Set<String> ipAddresses;
private Set<RecruitmentIpData> ipAddresses;
public String getId() {
return id;
@ -178,11 +178,11 @@ public class RecruitmentData {
this.solutions = solutions;
}
public Set<String> getIpAddresses() {
public Set<RecruitmentIpData> getIpAddresses() {
return ipAddresses;
}
public void setIpAddresses(Set<String> ipAddresses) {
public void setIpAddresses(Set<RecruitmentIpData> ipAddresses) {
this.ipAddresses = ipAddresses;
}
}

7
backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/RecruitmentProcessor.java
View file

@ -12,6 +12,7 @@ import org.springframework.util.CollectionUtils;
import ru.micord.ervu.account_applications.dao.RecruitmentDao;
import ru.micord.ervu.account_applications.db_beans.public_.tables.records.RecruitmentRecord;
import ru.micord.ervu.account_applications.model.RecruitmentData;
import ru.micord.ervu.account_applications.model.RecruitmentIpData;
import ru.micord.ervu.account_applications.model.ReferenceEntity;
import ru.micord.ervu.account_applications.service.processor.DataProcessor;
@ -44,7 +45,11 @@ public class RecruitmentProcessor implements DataProcessor<RecruitmentData, Recr
recruitmentSolutionProcessor.upsertRecruitmentSolutions(data.getId(), solutionsIds);
}
if (!CollectionUtils.isEmpty(data.getIpAddresses())) {
recruitmentIpProcessor.upsertRecruitmentIpAddresses(data.getId(), data.getIpAddresses());
Set<String> incomingIps = data.getIpAddresses().stream()
.map(RecruitmentIpData::getIpAddress)
.collect(Collectors.toSet());
recruitmentIpProcessor.upsertRecruitmentIpAddresses(data.getId(), incomingIps);
}
dao.upsertData(recruitmentRecord);