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

SUPPORT-8470: Fix

Browse source
This commit is contained in:
Eduard Tihomirov 2024-09-13 12:16:30 +03:00
parent a494f43555
commit c6b9815947
8 changed files with 374 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Keys.java
View file

@ -6,9 +6,11 @@ package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Files;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.InteractionLog;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfRecords;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OrgOkved;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.FilesRecord;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.InteractionLogRecord;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.OkopfRecordsRecord;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.OrgOkvedRecord;
import org.jooq.TableField;
@ -30,5 +32,7 @@ public class Keys {
public static final UniqueKey<FilesRecord> FILES_PKEY = Internal.createUniqueKey(Files.FILES, DSL.name("files_pkey"), new TableField[] { Files.FILES.FILE_ID }, true);
public static final UniqueKey<InteractionLogRecord> INTERACTION_LOG_PKEY = Internal.createUniqueKey(InteractionLog.INTERACTION_LOG, DSL.name("interaction_log_pkey"), new TableField[] { InteractionLog.INTERACTION_LOG.ID }, true);
public static final UniqueKey<OkopfRecordsRecord> OKOPF_RECORDS_NAME_KEY = Internal.createUniqueKey(OkopfRecords.OKOPF_RECORDS, DSL.name("okopf_records_name_key"), new TableField[] { OkopfRecords.OKOPF_RECORDS.NAME }, true);
public static final UniqueKey<OkopfRecordsRecord> OKOPF_RECORDS_PKEY = Internal.createUniqueKey(OkopfRecords.OKOPF_RECORDS, DSL.name("okopf_records_pkey"), new TableField[] { OkopfRecords.OKOPF_RECORDS.OKOPF_RECORDS_ID }, true);
public static final UniqueKey<OrgOkvedRecord> ORG_OKVED_PKEY = Internal.createUniqueKey(OrgOkved.ORG_OKVED, DSL.name("org_okved_pkey"), new TableField[] { OrgOkved.ORG_OKVED.ID }, true);
}

7
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Public.java
View file

@ -7,6 +7,7 @@ package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.DefaultCatalog;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Files;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.InteractionLog;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfRecords;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OrgOkved;
import java.util.Arrays;
@ -40,6 +41,11 @@ public class Public extends SchemaImpl {
*/
public final InteractionLog INTERACTION_LOG = InteractionLog.INTERACTION_LOG;
/**
* The table <code>public.okopf_records</code>.
*/
public final OkopfRecords OKOPF_RECORDS = OkopfRecords.OKOPF_RECORDS;
/**
* The table <code>public.org_okved</code>.
*/
@ -63,6 +69,7 @@ public class Public extends SchemaImpl {
return Arrays.asList(
Files.FILES,
InteractionLog.INTERACTION_LOG,
OkopfRecords.OKOPF_RECORDS,
OrgOkved.ORG_OKVED
);
}

6
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Tables.java
View file

@ -6,6 +6,7 @@ package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Files;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.InteractionLog;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfRecords;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OrgOkved;
@ -25,6 +26,11 @@ public class Tables {
*/
public static final InteractionLog INTERACTION_LOG = InteractionLog.INTERACTION_LOG;
/**
* The table <code>public.okopf_records</code>.
*/
public static final OkopfRecords OKOPF_RECORDS = OkopfRecords.OKOPF_RECORDS;
/**
* The table <code>public.org_okved</code>.
*/

5
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/InteractionLog.java
View file

@ -96,6 +96,11 @@ public class InteractionLog extends TableImpl<InteractionLogRecord> {
*/
public final TableField<InteractionLogRecord, String> FILE_ID = createField(DSL.name("file_id"), SQLDataType.VARCHAR(36), this, "");
/**
* The column <code>public.interaction_log.ervu_id</code>.
*/
public final TableField<InteractionLogRecord, String> ERVU_ID = createField(DSL.name("ervu_id"), SQLDataType.VARCHAR(36), this, "");
private InteractionLog(Name alias, Table<InteractionLogRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}

235
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/OkopfRecords.java Normal file
View file

@ -0,0 +1,235 @@
/*
* This file is generated by jOOQ.
*/
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Keys;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.OkopfRecordsRecord;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.Name;
import org.jooq.PlainSQL;
import org.jooq.QueryPart;
import org.jooq.SQL;
import org.jooq.Schema;
import org.jooq.Select;
import org.jooq.Stringly;
import org.jooq.Table;
import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.UniqueKey;
import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class OkopfRecords extends TableImpl<OkopfRecordsRecord> {
private static final long serialVersionUID = 1L;
/**
* The reference instance of <code>public.okopf_records</code>
*/
public static final OkopfRecords OKOPF_RECORDS = new OkopfRecords();
/**
* The class holding records for this type
*/
@Override
public Class<OkopfRecordsRecord> getRecordType() {
return OkopfRecordsRecord.class;
}
/**
* The column <code>public.okopf_records.okopf_records_id</code>.
*/
public final TableField<OkopfRecordsRecord, String> OKOPF_RECORDS_ID = createField(DSL.name("okopf_records_id"), SQLDataType.VARCHAR.nullable(false), this, "");
/**
* The column <code>public.okopf_records.name</code>.
*/
public final TableField<OkopfRecordsRecord, String> NAME = createField(DSL.name("name"), SQLDataType.VARCHAR, this, "");
/**
* The column <code>public.okopf_records.version</code>.
*/
public final TableField<OkopfRecordsRecord, Integer> VERSION = createField(DSL.name("version"), SQLDataType.INTEGER.nullable(false), this, "");
private OkopfRecords(Name alias, Table<OkopfRecordsRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
private OkopfRecords(Name alias, Table<OkopfRecordsRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
* Create an aliased <code>public.okopf_records</code> table reference
*/
public OkopfRecords(String alias) {
this(DSL.name(alias), OKOPF_RECORDS);
}
/**
* Create an aliased <code>public.okopf_records</code> table reference
*/
public OkopfRecords(Name alias) {
this(alias, OKOPF_RECORDS);
}
/**
* Create a <code>public.okopf_records</code> table reference
*/
public OkopfRecords() {
this(DSL.name("okopf_records"), null);
}
@Override
public Schema getSchema() {
return aliased() ? null : Public.PUBLIC;
}
@Override
public UniqueKey<OkopfRecordsRecord> getPrimaryKey() {
return Keys.OKOPF_RECORDS_PKEY;
}
@Override
public List<UniqueKey<OkopfRecordsRecord>> getUniqueKeys() {
return Arrays.asList(Keys.OKOPF_RECORDS_NAME_KEY);
}
@Override
public OkopfRecords as(String alias) {
return new OkopfRecords(DSL.name(alias), this);
}
@Override
public OkopfRecords as(Name alias) {
return new OkopfRecords(alias, this);
}
@Override
public OkopfRecords as(Table<?> alias) {
return new OkopfRecords(alias.getQualifiedName(), this);
}
/**
* Rename this table
*/
@Override
public OkopfRecords rename(String name) {
return new OkopfRecords(DSL.name(name), null);
}
/**
* Rename this table
*/
@Override
public OkopfRecords rename(Name name) {
return new OkopfRecords(name, null);
}
/**
* Rename this table
*/
@Override
public OkopfRecords rename(Table<?> name) {
return new OkopfRecords(name.getQualifiedName(), null);
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfRecords where(Condition condition) {
return new OkopfRecords(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfRecords where(Collection<? extends Condition> conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfRecords where(Condition... conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfRecords where(Field<Boolean> condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public OkopfRecords where(SQL condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public OkopfRecords where(@Stringly.SQL String condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public OkopfRecords where(@Stringly.SQL String condition, Object... binds) {
return where(DSL.condition(condition, binds));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public OkopfRecords where(@Stringly.SQL String condition, QueryPart... parts) {
return where(DSL.condition(condition, parts));
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfRecords whereExists(Select<?> select) {
return where(DSL.exists(select));
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfRecords whereNotExists(Select<?> select) {
return where(DSL.notExists(select));
}
}

17
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/InteractionLogRecord.java
View file

@ -146,6 +146,20 @@ public class InteractionLogRecord extends UpdatableRecordImpl<InteractionLogReco
return (String) get(8);
}
/**
* Setter for <code>public.interaction_log.ervu_id</code>.
*/
public void setErvuId(String value) {
set(9, value);
}
/**
* Getter for <code>public.interaction_log.ervu_id</code>.
*/
public String getErvuId() {
return (String) get(9);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@ -169,7 +183,7 @@ public class InteractionLogRecord extends UpdatableRecordImpl<InteractionLogReco
/**
* Create a detached, initialised InteractionLogRecord
*/
public InteractionLogRecord(Long id, Timestamp sentDate, String form, String sender, String status, Integer recordsSent, Integer recordsAccepted, String fileName, String fileId) {
public InteractionLogRecord(Long id, Timestamp sentDate, String form, String sender, String status, Integer recordsSent, Integer recordsAccepted, String fileName, String fileId, String ervuId) {
super(InteractionLog.INTERACTION_LOG);
setId(id);
@ -181,6 +195,7 @@ public class InteractionLogRecord extends UpdatableRecordImpl<InteractionLogReco
setRecordsAccepted(recordsAccepted);
setFileName(fileName);
setFileId(fileId);
setErvuId(ervuId);
resetChangedOnNotNull();
}
}

94
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/OkopfRecordsRecord.java Normal file
View file

@ -0,0 +1,94 @@
/*
* This file is generated by jOOQ.
*/
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfRecords;
import org.jooq.Record1;
import org.jooq.impl.UpdatableRecordImpl;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class OkopfRecordsRecord extends UpdatableRecordImpl<OkopfRecordsRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for <code>public.okopf_records.okopf_records_id</code>.
*/
public void setOkopfRecordsId(String value) {
set(0, value);
}
/**
* Getter for <code>public.okopf_records.okopf_records_id</code>.
*/
public String getOkopfRecordsId() {
return (String) get(0);
}
/**
* Setter for <code>public.okopf_records.name</code>.
*/
public void setName(String value) {
set(1, value);
}
/**
* Getter for <code>public.okopf_records.name</code>.
*/
public String getName() {
return (String) get(1);
}
/**
* Setter for <code>public.okopf_records.version</code>.
*/
public void setVersion(Integer value) {
set(2, value);
}
/**
* Getter for <code>public.okopf_records.version</code>.
*/
public Integer getVersion() {
return (Integer) get(2);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<String> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached OkopfRecordsRecord
*/
public OkopfRecordsRecord() {
super(OkopfRecords.OKOPF_RECORDS);
}
/**
* Create a detached, initialised OkopfRecordsRecord
*/
public OkopfRecordsRecord(String okopfRecordsId, String name, Integer version) {
super(OkopfRecords.OKOPF_RECORDS);
setOkopfRecordsId(okopfRecordsId);
setName(name);
setVersion(version);
resetChangedOnNotNull();
}
}

7
backend/src/main/resources/config/v_1.0/2024-09-11--01-add-new-column-interaction-log.xml
View file

@ -10,4 +10,11 @@
<column name="file_id" type="varchar(36)"/>
</addColumn>
</changeSet>
<changeSet id="002" author="tihomirov">
<comment>add ervu id column into interaction_log table</comment>
<addColumn schemaName="public" tableName="interaction_log">
<column name="ervu_id" type="varchar(36)"/>
</addColumn>
</changeSet>
</databaseChangeLog>