From dfbb9b712d8a2708bce96bc12200bce068faca60 Mon Sep 17 00:00:00 2001 From: "adel.ka" Date: Mon, 22 Sep 2025 12:29:11 +0300 Subject: [PATCH] SUPPORT-9422: edit for a new format --- .../account_applications/dao/AbstractDataDao.java | 7 ++++--- .../account_applications/dao/RecruitmentDao.java | 7 +++++-- .../ervu/account_applications/dao/RoleDao.java | 8 +++++--- .../ervu/account_applications/dao/SolutionDao.java | 9 +++++++-- .../kafka/model/ChangeActiveMessage.java | 8 +++++--- .../service/ErvuDirectoriesService.java | 5 +++-- .../service/processor/DataProcessor.java | 4 +++- .../processor/impl/RecruitmentIpProcessor.java | 2 +- .../processor/impl/RecruitmentProcessor.java | 5 +++-- .../impl/RecruitmentSolutionProcessor.java | 2 +- .../service/processor/impl/RoleProcessor.java | 5 +++-- .../service/processor/impl/SolutionProcessor.java | 5 +++-- .../processor/impl/SolutionRoleProcessor.java | 2 +- .../Создание заявки на добавление пользователя.page | 2 +- .../Создать заявку на активацию.page | 2 +- .../Создать заявку на деактивацию.page | 4 ++-- .../Создать заявку на изменение.page | 14 ++++---------- .../Создать заявку на сброс пароля.page | 2 +- 18 files changed, 53 insertions(+), 40 deletions(-) diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/dao/AbstractDataDao.java b/backend/src/main/java/ru/micord/ervu/account_applications/dao/AbstractDataDao.java index 1982e474..c45b16f6 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/dao/AbstractDataDao.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/dao/AbstractDataDao.java @@ -1,5 +1,6 @@ package ru.micord.ervu.account_applications.dao; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Optional; @@ -83,11 +84,11 @@ public abstract class AbstractDataDao> { .fetch(selectField); } - protected void setFieldByField(Field targetField, V value, Field whereField, - F whereValue) { + protected void setFieldWhereIn(Field targetField, V value, Field whereField, + Collection whereValues) { dsl.update(getTable()) .set(targetField, value) - .where(whereField.eq(whereValue)) + .where(whereField.in(whereValues)) .execute(); } diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/dao/RecruitmentDao.java b/backend/src/main/java/ru/micord/ervu/account_applications/dao/RecruitmentDao.java index 69366f82..2692c0f7 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/dao/RecruitmentDao.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/dao/RecruitmentDao.java @@ -78,8 +78,11 @@ public class RecruitmentDao extends AbstractDataDao { return getValueByField(Recruitment.RECRUITMENT.ID, Recruitment.RECRUITMENT.IDM_ID, idmId); } - public void setActiveStatus(String id, boolean active) { - setFieldByField(Recruitment.RECRUITMENT.ACTIVE, active, Recruitment.RECRUITMENT.IDM_ID, id); + public void setActiveStatus(List ids, boolean active) { + setFieldWhereIn( + Recruitment.RECRUITMENT.ACTIVE, active, + Recruitment.RECRUITMENT.IDM_ID, ids + ); } public boolean exists(Long appNumber, String domainId, boolean checkParents) { diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/dao/RoleDao.java b/backend/src/main/java/ru/micord/ervu/account_applications/dao/RoleDao.java index 24f21572..1c6d5d74 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/dao/RoleDao.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/dao/RoleDao.java @@ -1,5 +1,7 @@ package ru.micord.ervu.account_applications.dao; +import java.util.List; + import org.jooq.DSLContext; import org.jooq.Table; import org.springframework.stereotype.Repository; @@ -21,10 +23,10 @@ public class RoleDao extends AbstractDataDao { return Tables.USER_APPLICATION_ROLE; } - public void setActiveStatus(String id, boolean active) { - setFieldByField( + public void setActiveStatus(List ids, boolean active) { + setFieldWhereIn( Tables.USER_APPLICATION_ROLE.ACTIVE, active, - Tables.USER_APPLICATION_ROLE.USER_ROLE_ID, id + Tables.USER_APPLICATION_ROLE.USER_ROLE_ID, ids ); } } diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/dao/SolutionDao.java b/backend/src/main/java/ru/micord/ervu/account_applications/dao/SolutionDao.java index 5d68b52a..9439a37c 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/dao/SolutionDao.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/dao/SolutionDao.java @@ -1,6 +1,8 @@ package ru.micord.ervu.account_applications.dao; +import java.util.List; + import org.jooq.DSLContext; import org.jooq.Table; import org.springframework.stereotype.Repository; @@ -16,8 +18,11 @@ public class SolutionDao extends AbstractDataDao { super(dsl); } - public void setActiveStatus(String id, boolean active) { - setFieldByField(Tables.SOLUTION.ACTIVE, active, Tables.SOLUTION.ID, id); + public void setActiveStatus(List ids, boolean active) { + setFieldWhereIn( + Tables.SOLUTION.ACTIVE, active, + Tables.SOLUTION.ID, ids + ); } @Override diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/kafka/model/ChangeActiveMessage.java b/backend/src/main/java/ru/micord/ervu/account_applications/kafka/model/ChangeActiveMessage.java index efaa341a..6bc17657 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/kafka/model/ChangeActiveMessage.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/kafka/model/ChangeActiveMessage.java @@ -1,5 +1,7 @@ package ru.micord.ervu.account_applications.kafka.model; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import ru.micord.ervu.account_applications.model.ReferenceEntity; @@ -9,13 +11,13 @@ import ru.micord.ervu.account_applications.model.ReferenceEntity; @JsonIgnoreProperties(ignoreUnknown = true) public class ChangeActiveMessage { private boolean success; - private ReferenceEntity data; + private List data; - public ReferenceEntity getData() { + public List getData() { return data; } - public void setData(ReferenceEntity data) { + public void setData(List data) { this.data = data; } diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/service/ErvuDirectoriesService.java b/backend/src/main/java/ru/micord/ervu/account_applications/service/ErvuDirectoriesService.java index f4d1a20a..b9d9c20f 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/service/ErvuDirectoriesService.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/service/ErvuDirectoriesService.java @@ -15,6 +15,7 @@ import org.springframework.context.annotation.DependsOn; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; import ru.micord.ervu.account_applications.exception.IdmDirectoriesException; @@ -98,13 +99,13 @@ public class ErvuDirectoriesService { ChangeActiveMessage.class ); - if (changeActiveMessage.isSuccess() && changeActiveMessage.getData() != null) { + if (changeActiveMessage.isSuccess() && !CollectionUtils.isEmpty(changeActiveMessage.getData())) { DataProcessor processor = (DataProcessor) dataProcessors.get(entityClass); if (processor == null) { throw new IllegalStateException("No processor found for " + entityClass.getSimpleName()); } - processor.changeActiveStatus(changeActiveMessage.getData().getId(), active); + processor.changeActiveStatus(changeActiveMessage.getData(), active); } } catch (Exception e) { diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/DataProcessor.java b/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/DataProcessor.java index 819d489a..8182145d 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/DataProcessor.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/DataProcessor.java @@ -1,12 +1,14 @@ package ru.micord.ervu.account_applications.service.processor; +import java.util.List; + /** * @author Adel Kalimullin */ public interface DataProcessor { void upsertData(T data); - void changeActiveStatus(String id, boolean active); + void changeActiveStatus(List ids, boolean active); Class getType(); diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/RecruitmentIpProcessor.java b/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/RecruitmentIpProcessor.java index b1af07d7..9b36855a 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/RecruitmentIpProcessor.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/RecruitmentIpProcessor.java @@ -54,7 +54,7 @@ public class RecruitmentIpProcessor } @Override - public void changeActiveStatus(String id, boolean active) { + public void changeActiveStatus(List ids, boolean active) { throw new UnsupportedOperationException("Not supported yet."); } diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/RecruitmentProcessor.java b/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/RecruitmentProcessor.java index 70aeda07..3a56a721 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/RecruitmentProcessor.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/RecruitmentProcessor.java @@ -2,6 +2,7 @@ package ru.micord.ervu.account_applications.service.processor.impl; import java.sql.Timestamp; import java.time.Instant; +import java.util.List; import java.util.Optional; import java.util.Set; import java.util.UUID; @@ -56,8 +57,8 @@ public class RecruitmentProcessor implements DataProcessor ids, boolean active) { + dao.setActiveStatus(ids, active); } @Override diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/RecruitmentSolutionProcessor.java b/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/RecruitmentSolutionProcessor.java index 8e9604bf..49c4ca87 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/RecruitmentSolutionProcessor.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/RecruitmentSolutionProcessor.java @@ -57,7 +57,7 @@ public class RecruitmentSolutionProcessor } @Override - public void changeActiveStatus(String id, boolean active) { + public void changeActiveStatus(List ids, boolean active) { throw new UnsupportedOperationException("Not supported yet."); } diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/RoleProcessor.java b/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/RoleProcessor.java index 524c18d5..cab21e98 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/RoleProcessor.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/RoleProcessor.java @@ -4,6 +4,7 @@ package ru.micord.ervu.account_applications.service.processor.impl; import java.sql.Timestamp; import java.time.Instant; import java.util.Arrays; +import java.util.List; import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Value; @@ -41,8 +42,8 @@ public class RoleProcessor implements DataProcessor ids, boolean active) { + dao.setActiveStatus(ids, active); } @Override diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/SolutionProcessor.java b/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/SolutionProcessor.java index 0d43e203..7ed5c21c 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/SolutionProcessor.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/SolutionProcessor.java @@ -2,6 +2,7 @@ package ru.micord.ervu.account_applications.service.processor.impl; import java.sql.Timestamp; import java.time.Instant; +import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -40,8 +41,8 @@ public class SolutionProcessor implements DataProcessor ids, boolean active) { + dao.setActiveStatus(ids, active); } @Override diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/SolutionRoleProcessor.java b/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/SolutionRoleProcessor.java index 5cb94b7e..257cc016 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/SolutionRoleProcessor.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/service/processor/impl/SolutionRoleProcessor.java @@ -57,7 +57,7 @@ public class SolutionRoleProcessor } @Override - public void changeActiveStatus(String id, boolean active) { + public void changeActiveStatus(List ids, boolean active) { throw new UnsupportedOperationException("Not supported yet."); } diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page index 3bae507f..40363974 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page @@ -1974,7 +1974,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"recruitment","entity":"recruitment","name":"active"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на активацию.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на активацию.page index 616f73c7..6a52e521 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на активацию.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на активацию.page @@ -6485,7 +6485,7 @@ graph -{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} +{"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"recruitment","entity":"recruitment","name":"active"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на деактивацию.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на деактивацию.page index e9059bef..a13cedbb 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на деактивацию.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на деактивацию.page @@ -3611,6 +3611,7 @@ 6421e53c-2223-477f-bfb8-f6acaa4935b5 Hbox true + false false @@ -6064,7 +6065,6 @@ ec35c0af-f0ca-486b-953a-ed607a05ac70 Dialog true - false false @@ -6305,7 +6305,7 @@ graph -{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} +{"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"recruitment","entity":"recruitment","name":"active"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page index c6b3f4de..d8fda541 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page @@ -6180,7 +6180,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"recruitment","entity":"recruitment","name":"active"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -6531,7 +6531,6 @@ 71dce844-6df8-4e67-884e-59a5f8714b87 Горизонтальный контейнер true - false false @@ -6653,7 +6652,6 @@ 50e91e58-4c69-4655-b6ac-0db82db915d2 Many to many true - false false @@ -10003,7 +10001,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"recruitment","entity":"recruitment","name":"active"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":351.0,"y":249.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -12960,7 +12958,6 @@ dbe63b25-9614-434e-ba35-a65604eea429 Vbox_1 true - false false @@ -14536,7 +14533,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"user_application_role","entity":"user_application_role","name":"admin_role"},"operation":"IS_NULL","typeCode":"CONST","values":[null]}],"groups":[]},"nodeByIndex":{"0":{"tableName":"user_application_role","schemaName":"public","x":490.0,"y":208.0,"alias":"user_application_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"solution_role","schemaName":"public","x":267.0,"y":296.0,"alias":"solution_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"solution","schemaName":"public","x":113.0,"y":230.0,"alias":"solution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"3":{"tableName":"recruitment_solution","schemaName":"public","x":113.0,"y":132.0,"alias":"recruitment_solution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"4":{"tableName":"recruitment","schemaName":"public","x":115.0,"y":30.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"user_application_role","schemaName":"public","x":490.0,"y":208.0,"alias":"user_application_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"solution_role","schemaName":"public","x":267.0,"y":296.0,"alias":"solution_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"solution","schemaName":"public","x":113.0,"y":230.0,"alias":"solution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment_solution","schemaName":"public","x":113.0,"y":132.0,"alias":"recruitment_solution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"public","x":115.0,"y":30.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"solution":{"tableName":"solution","schemaName":"public","x":113.0,"y":230.0,"alias":"solution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"public","x":115.0,"y":30.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"user_application_role":{"tableName":"user_application_role","schemaName":"public","x":490.0,"y":208.0,"alias":"user_application_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"solution_role":{"tableName":"solution_role","schemaName":"public","x":267.0,"y":296.0,"alias":"solution_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment_solution":{"tableName":"recruitment_solution","schemaName":"public","x":113.0,"y":132.0,"alias":"recruitment_solution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"user_application_role","refToEntityName":"solution_role","refToColumns":[{"schema":"public","table":"solution_role","entity":"solution_role","name":"role_id"}],"refOnColumns":[{"schema":"public","table":"user_application_role","entity":"user_application_role","name":"user_role_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null,null,null],[null,null,{"refOnEntityName":"solution_role","refToEntityName":"solution","refToColumns":[{"schema":"public","table":"solution","entity":"solution","name":"id"}],"refOnColumns":[{"schema":"public","table":"solution_role","entity":"solution_role","name":"solution_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null,null],[null,null,null,{"refOnEntityName":"solution","refToEntityName":"recruitment_solution","refToColumns":[{"schema":"public","table":"recruitment_solution","entity":"recruitment_solution","name":"solution_id"}],"refOnColumns":[{"schema":"public","table":"solution","entity":"solution","name":"id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null],[null,null,null,null,{"refOnEntityName":"recruitment_solution","refToEntityName":"recruitment","refToColumns":[{"schema":"public","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"public","table":"recruitment_solution","entity":"recruitment_solution","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null,null,null,null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"user_application_role","entity":"user_application_role","name":"admin_role"},"operation":"IS_NULL","typeCode":"CONST","values":[null]},{"column":{"schema":"public","table":"user_application_role","entity":"user_application_role","name":"active"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]},"nodeByIndex":{"0":{"tableName":"user_application_role","schemaName":"public","x":490.0,"y":208.0,"alias":"user_application_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"solution_role","schemaName":"public","x":267.0,"y":296.0,"alias":"solution_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"solution","schemaName":"public","x":113.0,"y":230.0,"alias":"solution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"3":{"tableName":"recruitment_solution","schemaName":"public","x":113.0,"y":132.0,"alias":"recruitment_solution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"4":{"tableName":"recruitment","schemaName":"public","x":115.0,"y":30.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"user_application_role","schemaName":"public","x":490.0,"y":208.0,"alias":"user_application_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"solution_role","schemaName":"public","x":267.0,"y":296.0,"alias":"solution_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"solution","schemaName":"public","x":113.0,"y":230.0,"alias":"solution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment_solution","schemaName":"public","x":113.0,"y":132.0,"alias":"recruitment_solution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"public","x":115.0,"y":30.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"solution":{"tableName":"solution","schemaName":"public","x":113.0,"y":230.0,"alias":"solution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"public","x":115.0,"y":30.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"user_application_role":{"tableName":"user_application_role","schemaName":"public","x":490.0,"y":208.0,"alias":"user_application_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"solution_role":{"tableName":"solution_role","schemaName":"public","x":267.0,"y":296.0,"alias":"solution_role","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment_solution":{"tableName":"recruitment_solution","schemaName":"public","x":113.0,"y":132.0,"alias":"recruitment_solution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"user_application_role","refToEntityName":"solution_role","refToColumns":[{"schema":"public","table":"solution_role","entity":"solution_role","name":"role_id"}],"refOnColumns":[{"schema":"public","table":"user_application_role","entity":"user_application_role","name":"user_role_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null,null,null],[null,null,{"refOnEntityName":"solution_role","refToEntityName":"solution","refToColumns":[{"schema":"public","table":"solution","entity":"solution","name":"id"}],"refOnColumns":[{"schema":"public","table":"solution_role","entity":"solution_role","name":"solution_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null,null],[null,null,null,{"refOnEntityName":"solution","refToEntityName":"recruitment_solution","refToColumns":[{"schema":"public","table":"recruitment_solution","entity":"recruitment_solution","name":"solution_id"}],"refOnColumns":[{"schema":"public","table":"solution","entity":"solution","name":"id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null],[null,null,null,null,{"refOnEntityName":"recruitment_solution","refToEntityName":"recruitment","refToColumns":[{"schema":"public","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"public","table":"recruitment_solution","entity":"recruitment_solution","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null,null,null,null]],"mainNodeIndex":0} @@ -17699,7 +17696,6 @@ ea6d5780-3a46-4f4f-8413-4403b2b4d7de Vbox true - false false @@ -17844,7 +17840,7 @@ graph -{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} +{"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"recruitment","entity":"recruitment","name":"active"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -18638,7 +18634,6 @@ e9b9ccaf-03fc-4c42-a194-2fed0e2b1142 Grid true - false false false @@ -19200,7 +19195,6 @@ b1db4ae9-ee1b-4111-bb5a-73a1ae32bce9 Hbox true - false false diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на сброс пароля.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на сброс пароля.page index 1477194d..c9621869 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на сброс пароля.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на сброс пароля.page @@ -6312,7 +6312,7 @@ graph -{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} +{"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"recruitment","entity":"recruitment","name":"active"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}