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

Merge remote-tracking branch 'origin/release/1.9.12' into develop

Browse source 
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/account_applications/component/service/AuditFormDaoImpl.java
#	backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/UserApplicationListAudit.java
#	backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/UserApplicationListAuditRecord.java
#	backend/src/main/resources/config/v_1.0/changelog-1.0.xml
#	resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page
#	resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на изменение пользователя.page
This commit is contained in:
gulnaz 2025-04-21 14:23:09 +03:00
commit dfb6c493b1
8 changed files with 15 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

42
backend/src/main/java/ru/micord/ervu/account_applications/component/dao/AuditDao.java
View file

@ -1,42 +0,0 @@
package ru.micord.ervu.account_applications.component.dao;
import java.sql.Timestamp;
import java.util.List;
import org.jooq.DSLContext;
import org.springframework.stereotype.Repository;
import static ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationList.USER_APPLICATION_LIST;
import static ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT;
/**
* @author Eduard Tihomirov
*/
@Repository
public class AuditDao {
private final DSLContext dslContext;
public AuditDao(DSLContext dslContext) {
this.dslContext = dslContext;
}
public void insert(Long listId, String fio, String login, String status, Timestamp timestamp) {
dslContext.insertInto(USER_APPLICATION_LIST_AUDIT)
.set(USER_APPLICATION_LIST_AUDIT.USER_APPLICATION_LIST_ID, listId)
.set(USER_APPLICATION_LIST_AUDIT.FIO, fio)
.set(USER_APPLICATION_LIST_AUDIT.STATUS, status)
.set(USER_APPLICATION_LIST_AUDIT.DATE, timestamp)
.set(USER_APPLICATION_LIST_AUDIT.LOGIN, login)
.execute();
}
public List<Long> selectAppListIdsByTraceId(String traceId) {
return dslContext.select(USER_APPLICATION_LIST.USER_APPLICATION_LIST_ID)
.from(USER_APPLICATION_LIST)
.where(USER_APPLICATION_LIST.TRACE_ID.eq(traceId))
.fetch(USER_APPLICATION_LIST.USER_APPLICATION_LIST_ID);
}
}

7
backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Public.java
View file

@ -24,7 +24,6 @@ import ru.micord.ervu.account_applications.db_beans.public_.tables.Recruitment;
import ru.micord.ervu.account_applications.db_beans.public_.tables.Shedlock;
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationDocument;
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationList;
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationListAudit;
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationRole;
@ -98,11 +97,6 @@ public class Public extends SchemaImpl {
*/
public final UserApplicationList USER_APPLICATION_LIST = UserApplicationList.USER_APPLICATION_LIST;
/**
* The table <code>public.user_application_list_audit</code>.
*/
public final UserApplicationListAudit USER_APPLICATION_LIST_AUDIT = UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT;
/**
* The table <code>public.user_application_role</code>.
*/
@ -145,7 +139,6 @@ public class Public extends SchemaImpl {
Shedlock.SHEDLOCK,
UserApplicationDocument.USER_APPLICATION_DOCUMENT,
UserApplicationList.USER_APPLICATION_LIST,
UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT,
UserApplicationRole.USER_APPLICATION_ROLE
);
}

6
backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/Tables.java
View file

@ -15,7 +15,6 @@ import ru.micord.ervu.account_applications.db_beans.public_.tables.Recruitment;
import ru.micord.ervu.account_applications.db_beans.public_.tables.Shedlock;
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationDocument;
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationList;
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationListAudit;
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationRole;
@ -82,11 +81,6 @@ public class Tables {
*/
public static final UserApplicationList USER_APPLICATION_LIST = UserApplicationList.USER_APPLICATION_LIST;
/**
* The table <code>public.user_application_list_audit</code>.
*/
public static final UserApplicationListAudit USER_APPLICATION_LIST_AUDIT = UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT;
/**
* The table <code>public.user_application_role</code>.
*/

30
backend/src/main/java/ru/micord/ervu/account_applications/service/UserApplicationListService.java
View file

@ -1,19 +1,8 @@
package ru.micord.ervu.account_applications.service;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.List;
import org.apache.kafka.common.protocol.types.Field;
import org.springframework.stereotype.Service;
import ru.micord.ervu.account_applications.component.dao.AuditDao;
import ru.micord.ervu.account_applications.dao.UserApplicationListDao;
import ru.micord.ervu.account_applications.security.context.SecurityContext;
import ru.micord.ervu.account_applications.security.model.jwt.UserSession;
import static ru.micord.ervu.account_applications.enums.ApplicationStatus.ACCEPTED;
import static ru.micord.ervu.account_applications.enums.ApplicationStatus.AGREED;
/**
* @author gulnaz
@ -22,13 +11,9 @@ import static ru.micord.ervu.account_applications.enums.ApplicationStatus.AGREED
public class UserApplicationListService {
private final UserApplicationListDao dao;
private final AuditDao auditDao;
private final SecurityContext securityContext;
public UserApplicationListService(UserApplicationListDao dao, AuditDao auditDao, SecurityContext securityContext) {
public UserApplicationListService(UserApplicationListDao dao) {
this.dao = dao;
this.auditDao = auditDao;
this.securityContext = securityContext;
}
public void saveTraceId(String traceId, long appNumber) {
@ -37,7 +22,6 @@ public class UserApplicationListService {
public void savePassword(String traceId, String encodedPass) {
dao.savePassword(traceId, encodedPass);
saveAuditStatusByTraceId(traceId, ACCEPTED.name());
}
public boolean userExists(String login){
@ -46,7 +30,6 @@ public class UserApplicationListService {
public void saveAcceptedStatus(String traceId) {
dao.saveAcceptedStatus(traceId);
saveAuditStatusByTraceId(traceId, ACCEPTED.name());
}
public void saveAgreedStatus(long appNumber) {
@ -55,16 +38,5 @@ public class UserApplicationListService {
public void saveError(String traceId, String errorMsg) {
dao.saveError(traceId, errorMsg);
saveAuditStatusByTraceId(traceId, AGREED.name());
}
private void saveAuditStatusByTraceId(String traceId, String status) {
List<Long> appListIds = auditDao.selectAppListIdsByTraceId(traceId);
UserSession userSession = securityContext.getUserSession();
String name = userSession.name();
String userId = userSession.userId();
appListIds.forEach(id -> {
auditDao.insert(id, name, userId, status, Timestamp.valueOf(LocalDateTime.now()));
});
}
}

28
backend/src/main/resources/config/v_1.0/20250411_SUPPORT-9099_add_audit.xml
View file

@ -1,28 +0,0 @@
<?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="tihomirov">
<comment>add audit table</comment>
<sql>
CREATE TABLE IF NOT EXISTS public.user_application_list_audit (
id uuid NOT NULL DEFAULT uuid_generate_v4(),
user_application_list_id bigserial,
date TIMESTAMP WITHOUT TIME ZONE DEFAULT now(),
status character varying(100),
fio character varying(1000),
login character varying(1000)
)
TABLESPACE pg_default;
ALTER TABLE IF EXISTS public.user_application_list_audit
OWNER TO ervu_account_applications;
GRANT ALL ON TABLE public.user_application_role TO ervu_account_applications;
</sql>
</changeSet>
</databaseChangeLog>

4
resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page
View file

@ -799,10 +799,6 @@
<entry>
<key>formDao</key>
<value>
<implRef type="JAVA">
<className>AuditFormDaoImpl</className>
<packageName>ru.micord.ervu.account_applications.component.service</packageName>
</implRef>
<complex>
<entry>
<key>graph</key>

7
resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на активацию.page
View file

@ -8870,6 +8870,13 @@
<container>false</container>
<removed>true</removed>
</children>
<children id="5b8c5ac4-549d-411f-80ff-d29293638e5f">
<prototypeId>887d2044-9e34-46a5-852c-e9ce07b42f30</prototypeId>
<componentRootId>5b8c5ac4-549d-411f-80ff-d29293638e5f</componentRootId>
<name>Пол</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="39040b94-4780-4067-864e-64ad3d22a2a3">
<prototypeId>4d981f15-5535-45f7-882b-3647b251ad05</prototypeId>
<componentRootId>39040b94-4780-4067-864e-64ad3d22a2a3</componentRootId>

7
resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на деактивацию.page
View file

@ -8871,6 +8871,13 @@
<container>false</container>
<removed>true</removed>
</children>
<children id="5b8c5ac4-549d-411f-80ff-d29293638e5f">
<prototypeId>887d2044-9e34-46a5-852c-e9ce07b42f30</prototypeId>
<componentRootId>5b8c5ac4-549d-411f-80ff-d29293638e5f</componentRootId>
<name>Пол</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="39040b94-4780-4067-864e-64ad3d22a2a3">
<prototypeId>4d981f15-5535-45f7-882b-3647b251ad05</prototypeId>
<componentRootId>39040b94-4780-4067-864e-64ad3d22a2a3</componentRootId>