From 80cd9ef064758a58583f511d84edb1074a106fb6 Mon Sep 17 00:00:00 2001 From: "adel.ka" Date: Fri, 14 Mar 2025 13:26:20 +0300 Subject: [PATCH] SUPPORT-9001: remove ugly --- .../controller/AdminController.java | 6 ------ .../dao/UserApplicationListDao.java | 8 -------- .../service/UserApplicationListService.java | 8 -------- ...314_SUPPORT-9001_add_password_last_update.xml | 16 ---------------- .../resources/config/v_1.0/changelog-1.0.xml | 1 - .../component/field/FieldChecker.ts | 13 ------------- 6 files changed, 52 deletions(-) delete mode 100644 backend/src/main/resources/config/v_1.0/20250314_SUPPORT-9001_add_password_last_update.xml diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/controller/AdminController.java b/backend/src/main/java/ru/micord/ervu/account_applications/controller/AdminController.java index 8adb5ddb..cfe4f413 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/controller/AdminController.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/controller/AdminController.java @@ -134,12 +134,6 @@ public class AdminController { return doRequestAndSaveTraceId(request, dto.appNumber()); } - @GetMapping("/password/check") - public ResponseEntity passwordCheck(@RequestParam(name = "login") String login) { - boolean result = applicationListService.isPasswordExpired(login); - return ResponseEntity.ok(result); - } - private ResponseEntity doRequestAndSaveTraceId(ProcessRequest request, long appNumber) { ResponseEntity responseEntity = doRequest(request); diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/dao/UserApplicationListDao.java b/backend/src/main/java/ru/micord/ervu/account_applications/dao/UserApplicationListDao.java index 99e5b917..6f444540 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/dao/UserApplicationListDao.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/dao/UserApplicationListDao.java @@ -33,7 +33,6 @@ public class UserApplicationListDao { dslContext.update(USER_APPLICATION_LIST) .set(USER_APPLICATION_LIST.APPLICATION_STATUS, ApplicationStatus.ACCEPTED.name()) .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)) .execute(); } @@ -59,11 +58,4 @@ public class UserApplicationListDao { .from(USER_APPLICATION_LIST) .where(USER_APPLICATION_LIST.USER_LOGIN.eq(login))); } - - public Optional 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); - } } diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/service/UserApplicationListService.java b/backend/src/main/java/ru/micord/ervu/account_applications/service/UserApplicationListService.java index b17d093a..2101fddf 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/service/UserApplicationListService.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/service/UserApplicationListService.java @@ -1,7 +1,5 @@ package ru.micord.ervu.account_applications.service; -import java.time.LocalDateTime; -import java.time.temporal.ChronoUnit; import org.springframework.stereotype.Service; import ru.micord.ervu.account_applications.dao.UserApplicationListDao; @@ -30,12 +28,6 @@ public class UserApplicationListService { 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) { dao.saveAcceptedStatus(traceId); } diff --git a/backend/src/main/resources/config/v_1.0/20250314_SUPPORT-9001_add_password_last_update.xml b/backend/src/main/resources/config/v_1.0/20250314_SUPPORT-9001_add_password_last_update.xml deleted file mode 100644 index f9c50506..00000000 --- a/backend/src/main/resources/config/v_1.0/20250314_SUPPORT-9001_add_password_last_update.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - add password_last_updated column to user_application_list table - - ALTER TABLE user_application_list ADD COLUMN IF NOT EXISTS password_last_updated TIMESTAMP; - COMMENT ON COLUMN user_application_list.password_last_updated IS 'Дата последнего обновления пароля'; - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/changelog-1.0.xml b/backend/src/main/resources/config/v_1.0/changelog-1.0.xml index d56a0dc3..229b52c8 100644 --- a/backend/src/main/resources/config/v_1.0/changelog-1.0.xml +++ b/backend/src/main/resources/config/v_1.0/changelog-1.0.xml @@ -16,5 +16,4 @@ - \ No newline at end of file diff --git a/frontend/src/ts/account_applications/component/field/FieldChecker.ts b/frontend/src/ts/account_applications/component/field/FieldChecker.ts index 54e66e0e..4ccdf06d 100644 --- a/frontend/src/ts/account_applications/component/field/FieldChecker.ts +++ b/frontend/src/ts/account_applications/component/field/FieldChecker.ts @@ -12,19 +12,6 @@ export class FieldChecker extends Behavior { this.control = this.getScript('component.ControlWithValue'); } - @Visible() - passwordCheck(login: string) { - return this.client.get(`user/password/check?login=${encodeURIComponent(login)}`) - .toPromise() - .then((isExpired: boolean) => { - this.control.setValue(isExpired); - }) - .catch((error) => { - console.error("Ошибка при проверке пароля:", error); - this.control.setValue(null); - }); - } - @Visible() userExists(login: string) { return this.client.get(`user/exists?login=${encodeURIComponent(login)}`)