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

SUPPORT-9001: remove ugly

Browse source
This commit is contained in:
adel.ka 2025-03-14 13:26:20 +03:00
parent 5d5b02ec83
commit 80cd9ef064
6 changed files with 0 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backend/src/main/java/ru/micord/ervu/account_applications/controller/AdminController.java
View file

@ -134,12 +134,6 @@ public class AdminController {
return doRequestAndSaveTraceId(request, dto.appNumber()); return doRequestAndSaveTraceId(request, dto.appNumber());
} }
@GetMapping("/password/check")
public ResponseEntity<Boolean> passwordCheck(@RequestParam(name = "login") String login) {
boolean result = applicationListService.isPasswordExpired(login);
return ResponseEntity.ok(result);
}
private <R> ResponseEntity<?> doRequestAndSaveTraceId(ProcessRequest<R> request, long appNumber) { private <R> ResponseEntity<?> doRequestAndSaveTraceId(ProcessRequest<R> request, long appNumber) {
ResponseEntity<?> responseEntity = doRequest(request); ResponseEntity<?> responseEntity = doRequest(request);

8
backend/src/main/java/ru/micord/ervu/account_applications/dao/UserApplicationListDao.java
View file

@ -33,7 +33,6 @@ public class UserApplicationListDao {
dslContext.update(USER_APPLICATION_LIST) dslContext.update(USER_APPLICATION_LIST)
.set(USER_APPLICATION_LIST.APPLICATION_STATUS, ApplicationStatus.ACCEPTED.name()) .set(USER_APPLICATION_LIST.APPLICATION_STATUS, ApplicationStatus.ACCEPTED.name())
.set(USER_APPLICATION_LIST.USER_PASSWORD, encodedPass) .set(USER_APPLICATION_LIST.USER_PASSWORD, encodedPass)
.set(USER_APPLICATION_LIST.PASSWORD_LAST_UPDATED, Timestamp.valueOf(LocalDateTime.now()))
.where(USER_APPLICATION_LIST.TRACE_ID.eq(traceId)) .where(USER_APPLICATION_LIST.TRACE_ID.eq(traceId))
.execute(); .execute();
} }
@ -59,11 +58,4 @@ public class UserApplicationListDao {
.from(USER_APPLICATION_LIST) .from(USER_APPLICATION_LIST)
.where(USER_APPLICATION_LIST.USER_LOGIN.eq(login))); .where(USER_APPLICATION_LIST.USER_LOGIN.eq(login)));
} }
public Optional<LocalDateTime> getPasswordLastUpdated(String login) {
return dslContext.select(USER_APPLICATION_LIST.PASSWORD_LAST_UPDATED)
.from(USER_APPLICATION_LIST)
.where(USER_APPLICATION_LIST.USER_LOGIN.eq(login))
.fetchOptionalInto(LocalDateTime.class);
}
} }

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

@ -1,7 +1,5 @@
package ru.micord.ervu.account_applications.service; package ru.micord.ervu.account_applications.service;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.micord.ervu.account_applications.dao.UserApplicationListDao; import ru.micord.ervu.account_applications.dao.UserApplicationListDao;
@ -30,12 +28,6 @@ public class UserApplicationListService {
return dao.userExists(login); return dao.userExists(login);
} }
public boolean isPasswordExpired(String login) {
return dao.getPasswordLastUpdated(login)
.map(date -> ChronoUnit.DAYS.between(date, LocalDateTime.now()) > 20)
.orElse(true);
}
public void saveAcceptedStatus(String traceId) { public void saveAcceptedStatus(String traceId) {
dao.saveAcceptedStatus(traceId); dao.saveAcceptedStatus(traceId);
} }

16
backend/src/main/resources/config/v_1.0/20250314_SUPPORT-9001_add_password_last_update.xml
View file

@ -1,16 +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="a.kalimullin">
<comment>add password_last_updated column to user_application_list table</comment>
<sql>
ALTER TABLE user_application_list ADD COLUMN IF NOT EXISTS password_last_updated TIMESTAMP;
COMMENT ON COLUMN user_application_list.password_last_updated IS 'Дата последнего обновления пароля';
</sql>
</changeSet>
</databaseChangeLog>

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

@ -16,5 +16,4 @@
<include file="20250307_ERVU-308_create_table_update.xml" relativeToChangelogFile="true"/> <include file="20250307_ERVU-308_create_table_update.xml" relativeToChangelogFile="true"/>
<include file="20250312-SUPPORT-8696_add_column_role.xml" relativeToChangelogFile="true"/> <include file="20250312-SUPPORT-8696_add_column_role.xml" relativeToChangelogFile="true"/>
<include file="20250313-SUPPORT-8957_add_trace_id.xml" relativeToChangelogFile="true"/> <include file="20250313-SUPPORT-8957_add_trace_id.xml" relativeToChangelogFile="true"/>
<include file="20250314_SUPPORT-9001_add_password_last_update.xml" relativeToChangelogFile="true"/>
</databaseChangeLog> </databaseChangeLog>

13
frontend/src/ts/account_applications/component/field/FieldChecker.ts
View file

@ -12,19 +12,6 @@ export class FieldChecker extends Behavior {
this.control = this.getScript('component.ControlWithValue'); this.control = this.getScript('component.ControlWithValue');
} }
@Visible()
passwordCheck(login: string) {
return this.client.get<boolean>(`user/password/check?login=${encodeURIComponent(login)}`)
.toPromise()
.then((isExpired: boolean) => {
this.control.setValue(isExpired);
})
.catch((error) => {
console.error("Ошибка при проверке пароля:", error);
this.control.setValue(null);
});
}
@Visible() @Visible()
userExists(login: string) { userExists(login: string) {
return this.client.get<boolean>(`user/exists?login=${encodeURIComponent(login)}`) return this.client.get<boolean>(`user/exists?login=${encodeURIComponent(login)}`)