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

SUPPORT-9212: фикс после правок в idm

Browse source
This commit is contained in:
adel.kalimullin 2025-06-10 15:53:09 +03:00
parent 6a61ffb1ca
commit 579ef5d713
12 changed files with 115 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

9
backend/src/main/java/ervu_business_metrics/model/idm/AccountData.java
View file

@ -15,7 +15,6 @@ import ervu_business_metrics.deserializer.ReferenceEntityDeserializer;
public class AccountData {
private String id;
private boolean active;
private boolean blocked;
private long start;
private long finish;
private long created;
@ -44,14 +43,6 @@ public class AccountData {
this.active = active;
}
public boolean getBlocked() {
return blocked;
}
public void setBlocked(boolean blocked) {
this.blocked = blocked;
}
public long getStart() {
return start;
}

18
backend/src/main/java/ervu_business_metrics/model/idm/DomainData.java
View file

@ -15,7 +15,6 @@ public class DomainData {
private String id;
@JsonProperty("codeDomainType")
private String type;
private String regionCode;
private String name;
private String fullName;
private String shortName;
@ -30,6 +29,7 @@ public class DomainData {
private String timeZone;
private String subpoenaSeriesCode;
private int version;
private RegionInfo region;
private ReferenceEntity parent;
public String getId() {
@ -48,14 +48,6 @@ public class DomainData {
this.type = type;
}
public String getRegionCode() {
return regionCode;
}
public void setRegionCode(String regionCode) {
this.regionCode = regionCode;
}
public String getName() {
return name;
}
@ -175,4 +167,12 @@ public class DomainData {
public void setVersion(int version) {
this.version = version;
}
public RegionInfo getRegion() {
return region;
}
public void setRegion(RegionInfo region) {
this.region = region;
}
}

18
backend/src/main/java/ervu_business_metrics/model/idm/PersonData.java
View file

@ -19,6 +19,8 @@ public class PersonData {
private long created;
private long modified;
private long deleted;
private long blocked;
private long blockUntil;
private int version;
private boolean active;
@ -117,4 +119,20 @@ public class PersonData {
public void setActive(boolean active) {
this.active = active;
}
public long getBlocked() {
return blocked;
}
public void setBlocked(long blocked) {
this.blocked = blocked;
}
public long getBlockUntil() {
return blockUntil;
}
public void setBlockUntil(long blockUntil) {
this.blockUntil = blockUntil;
}
}

19
backend/src/main/java/ervu_business_metrics/model/idm/RegionInfo.java Normal file
View file

@ -0,0 +1,19 @@
package ervu_business_metrics.model.idm;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
/**
* @author Adel Kalimullin
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class RegionInfo {
private String code;
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
}

1
backend/src/main/java/ervu_business_metrics/service/processor/impl/AccountDataProcessor.java
View file

@ -57,7 +57,6 @@ public class AccountDataProcessor implements DataProcessor<AccountData, AccountR
acc.setFinish(data.getFinish());
acc.setAppointment(data.getAppointment());
acc.setSessionLimit(data.getSessionLimit());
acc.setBlocked(data.getBlocked());
if (data.getDomain() != null) {
acc.setDomainId(data.getDomain().getId());
}

2
backend/src/main/java/ervu_business_metrics/service/processor/impl/DomainDataProcessor.java
View file

@ -37,7 +37,7 @@ public class DomainDataProcessor implements DataProcessor<DomainData, DomainReco
DomainRecord domainRecord = dao.newRecord();
domainRecord.setId(data.getId());
domainRecord.setType(data.getType());
domainRecord.setRegionCode(data.getRegionCode());
domainRecord.setRegionCode(data.getRegion().getCode());
domainRecord.setName(data.getName());
domainRecord.setFullName(data.getFullName());
domainRecord.setShortName(data.getShortName());

2
backend/src/main/java/ervu_business_metrics/service/processor/impl/PersonDataProcessor.java
View file

@ -51,6 +51,8 @@ public class PersonDataProcessor implements DataProcessor<PersonData, PersonReco
person.setCreated(data.getCreated());
person.setModified(data.getModified());
person.setDeleted(data.getDeleted());
person.setBlocked(data.getBlocked());
person.setBlockUntil(data.getBlockUntil());
person.setLogin(data.getLogin());
person.setSecondFactorEnabled(data.getSecondFactorEnabled());
person.setActive(data.isActive());

6
backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/Account.java
View file

@ -115,12 +115,6 @@ public class Account extends TableImpl<AccountRecord> {
*/
public final TableField<AccountRecord, Integer> VERSION = createField(DSL.name("version"), SQLDataType.INTEGER.nullable(false), this, "Версия записи аккаунта");
/**
* The column <code>idm_reconcile.account.blocked</code>. Флаг блокировки
* аккаунта
*/
public final TableField<AccountRecord, Boolean> BLOCKED = createField(DSL.name("blocked"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "Флаг блокировки аккаунта");
/**
* The column <code>idm_reconcile.account.domain_id</code>. Идентификатор
* домена, связанного с

14
backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/Person.java
View file

@ -111,6 +111,20 @@ public class Person extends TableImpl<PersonRecord> {
*/
public final TableField<PersonRecord, Long> DELETED = createField(DSL.name("deleted"), SQLDataType.BIGINT, this, "Дата и время логического удаления записи\n (UNIX timestamp)");
/**
* The column <code>idm_reconcile.person.blocked</code>. Дата и время
* логической блокировки записи
* (UNIX timestamp)
*/
public final TableField<PersonRecord, Long> BLOCKED = createField(DSL.name("blocked"), SQLDataType.BIGINT, this, "Дата и время логической блокировки записи\n (UNIX timestamp)");
/**
* The column <code>idm_reconcile.person.block_until</code>. Дата и время
* логического окончания блокировки записи
* (UNIX timestamp)
*/
public final TableField<PersonRecord, Long> BLOCK_UNTIL = createField(DSL.name("block_until"), SQLDataType.BIGINT, this, "Дата и время логического окончания блокировки записи\n (UNIX timestamp)");
/**
* The column <code>idm_reconcile.person.version</code>. Версия записи
*/

27
backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/records/AccountRecord.java
View file

@ -190,29 +190,13 @@ public class AccountRecord extends UpdatableRecordImpl<AccountRecord> {
return (Integer) get(9);
}
/**
* Setter for <code>idm_reconcile.account.blocked</code>. Флаг блокировки
* аккаунта
*/
public void setBlocked(Boolean value) {
set(10, value);
}
/**
* Getter for <code>idm_reconcile.account.blocked</code>. Флаг блокировки
* аккаунта
*/
public Boolean getBlocked() {
return (Boolean) get(10);
}
/**
* Setter for <code>idm_reconcile.account.domain_id</code>. Идентификатор
* домена, связанного с
* аккаунтом
*/
public void setDomainId(String value) {
set(11, value);
set(10, value);
}
/**
@ -221,7 +205,7 @@ public class AccountRecord extends UpdatableRecordImpl<AccountRecord> {
* аккаунтом
*/
public String getDomainId() {
return (String) get(11);
return (String) get(10);
}
/**
@ -230,7 +214,7 @@ public class AccountRecord extends UpdatableRecordImpl<AccountRecord> {
* аккаунтом
*/
public void setPersonId(String value) {
set(12, value);
set(11, value);
}
/**
@ -239,7 +223,7 @@ public class AccountRecord extends UpdatableRecordImpl<AccountRecord> {
* аккаунтом
*/
public String getPersonId() {
return (String) get(12);
return (String) get(11);
}
// -------------------------------------------------------------------------
@ -265,7 +249,7 @@ public class AccountRecord extends UpdatableRecordImpl<AccountRecord> {
/**
* Create a detached, initialised AccountRecord
*/
public AccountRecord(String id, Boolean active, Long start, Long finish, Long created, Long modified, String appointment, Long deleted, Short sessionLimit, Integer version, Boolean blocked, String domainId, String personId) {
public AccountRecord(String id, Boolean active, Long start, Long finish, Long created, Long modified, String appointment, Long deleted, Short sessionLimit, Integer version, String domainId, String personId) {
super(Account.ACCOUNT);
setId(id);
@ -278,7 +262,6 @@ public class AccountRecord extends UpdatableRecordImpl<AccountRecord> {
setDeleted(deleted);
setSessionLimit(sessionLimit);
setVersion(version);
setBlocked(blocked);
setDomainId(domainId);
setPersonId(personId);
resetChangedOnNotNull();

44
backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/records/PersonRecord.java
View file

@ -182,18 +182,54 @@ public class PersonRecord extends UpdatableRecordImpl<PersonRecord> {
return (Long) get(9);
}
/**
* Setter for <code>idm_reconcile.person.blocked</code>. Дата и время
* логической блокировки записи
* (UNIX timestamp)
*/
public void setBlocked(Long value) {
set(10, value);
}
/**
* Getter for <code>idm_reconcile.person.blocked</code>. Дата и время
* логической блокировки записи
* (UNIX timestamp)
*/
public Long getBlocked() {
return (Long) get(10);
}
/**
* Setter for <code>idm_reconcile.person.block_until</code>. Дата и время
* логического окончания блокировки записи
* (UNIX timestamp)
*/
public void setBlockUntil(Long value) {
set(11, value);
}
/**
* Getter for <code>idm_reconcile.person.block_until</code>. Дата и время
* логического окончания блокировки записи
* (UNIX timestamp)
*/
public Long getBlockUntil() {
return (Long) get(11);
}
/**
* Setter for <code>idm_reconcile.person.version</code>. Версия записи
*/
public void setVersion(Integer value) {
set(10, value);
set(12, value);
}
/**
* Getter for <code>idm_reconcile.person.version</code>. Версия записи
*/
public Integer getVersion() {
return (Integer) get(10);
return (Integer) get(12);
}
// -------------------------------------------------------------------------
@ -219,7 +255,7 @@ public class PersonRecord extends UpdatableRecordImpl<PersonRecord> {
/**
* Create a detached, initialised PersonRecord
*/
public PersonRecord(String id, String login, String firstName, String lastName, String middleName, Boolean secondFactorEnabled, Boolean active, Long created, Long modified, Long deleted, Integer version) {
public PersonRecord(String id, String login, String firstName, String lastName, String middleName, Boolean secondFactorEnabled, Boolean active, Long created, Long modified, Long deleted, Long blocked, Long blockUntil, Integer version) {
super(Person.PERSON);
setId(id);
@ -232,6 +268,8 @@ public class PersonRecord extends UpdatableRecordImpl<PersonRecord> {
setCreated(created);
setModified(modified);
setDeleted(deleted);
setBlocked(blocked);
setBlockUntil(blockUntil);
setVersion(version);
resetChangedOnNotNull();
}

8
backend/src/main/resources/config/v_1.0/20250530-SUPPORT-9212_idmv3.xml
View file

@ -70,6 +70,8 @@
created bigint NOT NULL,
modified bigint,
deleted bigint,
blocked bigint,
block_until bigint,
version int NOT NULL
);
@ -91,6 +93,10 @@
(UNIX timestamp)';
COMMENT ON COLUMN idm_reconcile.person.deleted IS 'Дата и время логического удаления записи
(UNIX timestamp)';
COMMENT ON COLUMN idm_reconcile.person.blocked IS 'Дата и время логической блокировки записи
(UNIX timestamp)';
COMMENT ON COLUMN idm_reconcile.person.block_until IS 'Дата и время логического окончания блокировки записи
(UNIX timestamp)';
COMMENT ON COLUMN idm_reconcile.person.version IS 'Версия записи';
</sql>
</changeSet>
@ -112,7 +118,6 @@
deleted bigint,
session_limit smallint,
version int NOT NULL,
blocked boolean DEFAULT false,
domain_id varchar(36),
person_id varchar(36)
);
@ -137,7 +142,6 @@
COMMENT ON COLUMN idm_reconcile.account.session_limit IS 'Максимально допустимое количество
сессий';
COMMENT ON COLUMN idm_reconcile.account.version IS 'Версия записи аккаунта';
COMMENT ON COLUMN idm_reconcile.account.blocked IS 'Флаг блокировки аккаунта';
COMMENT ON COLUMN idm_reconcile.account.domain_id IS 'Идентификатор домена, связанного с
аккаунтом';
COMMENT ON COLUMN idm_reconcile.account.person_id IS 'Идентификатор персоны, связанной с