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

Merge branch 'develop' into feature/SUPPORT-9225_fix_app_processes

Browse source
This commit is contained in:
gulnaz 2025-07-07 10:13:13 +03:00
commit 204c3ee741
8 changed files with 5288 additions and 1006 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);

16
backend/src/main/resources/config/v_1.0/20250704_drop_column.xml Normal file
View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<databaseChangeLog
xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
<changeSet id="0001" author="adel.ka">
<comment>alter table public.recruitment</comment>
<sql>
ALTER TABLE public.recruitment
DROP COLUMN IF EXISTS enabled;
</sql>
</changeSet>
</databaseChangeLog>

1
backend/src/main/resources/config/v_1.0/changelog-1.0.xml
View file

@ -24,4 +24,5 @@
<include file="20250415_SUPPORT-9099_add_pk.xml" relativeToChangelogFile="true"/>
<include file="20250605_SUPPORT-9212_reconcile.xml" relativeToChangelogFile="true"/>
<include file="20250618_add_active_column.xml" relativeToChangelogFile="true"/>
<include file="20250704_drop_column.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>