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

SUPPORT-8971: fix naming

Browse source
This commit is contained in:
Emir Suleimanov 2025-03-12 12:35:02 +03:00
parent f9ec8a77cd
commit fa1df28901
4 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/src/main/java/ru/micord/ervu/account_applications/component/rpc/IdmValidatorRpcService.java
View file

@ -16,7 +16,7 @@ public class IdmValidatorRpcService extends Behavior {
public IdmValidatorService validatorService;
@RpcCall
public boolean valueExists(String login) {
return validatorService.valueExists(login);
public boolean valueExists(String value) {
return validatorService.valueExists(value);
}
}

6
frontend/src/ts/account_applications/component/field/AbstractIdmValidator.ts
View file

@ -1,13 +1,11 @@
import {SimpleValidator, TextField} from "@webbpm/base-package";
import {Observable} from "rxjs";
import {
IdmValidatorRpcService
} from "../../../generated/ru/micord/ervu/account_applications/component/rpc/IdmValidatorRpcService";
import {first} from "rxjs/operators";
export abstract class AbstractIdmValidator extends SimpleValidator {
protected abstract ERROR_MESSAGE: string;
protected abstract checkValueExists(value: string): Observable<boolean>;
protected abstract checkValueExists(value: string): Promise<boolean>;
protected textField: TextField;
protected rpcService: IdmValidatorRpcService;
@ -28,7 +26,7 @@ export abstract class AbstractIdmValidator extends SimpleValidator {
const cleanedValue = this.cleanValue(inputValue);
if (!this.isPatternValid(cleanedValue)) return Promise.resolve(false);
return this.checkValueExists(cleanedValue).pipe(first()).toPromise()
return this.checkValueExists(cleanedValue)
.then(exists => {
this.pushError(!exists, this.ERROR_MESSAGE);
return !exists;

5
frontend/src/ts/account_applications/component/field/IdmLoginValidator.ts
View file

@ -1,11 +1,10 @@
import {from, Observable} from "rxjs";
import {AbstractIdmValidator} from "./AbstractIdmValidator";
export class IdmLoginValidator extends AbstractIdmValidator {
protected ERROR_MESSAGE = "Пользователь с указанным логином уже существует";
protected checkValueExists(value: string): Observable<boolean> {
return from(this.rpcService.valueExists(value));
protected checkValueExists(value: string): Promise<boolean> {
return this.rpcService.valueExists(value);
}
protected isPatternValid(value: string): boolean {

5
frontend/src/ts/account_applications/component/field/IdmSnilsValidator.ts
View file

@ -1,11 +1,10 @@
import {from, Observable} from "rxjs";
import {AbstractIdmValidator} from "./AbstractIdmValidator";
export class IdmSnilsValidator extends AbstractIdmValidator {
protected ERROR_MESSAGE = "Пользователь с указанным СНИЛС уже существует";
protected checkValueExists(value: string): Observable<boolean> {
return from(this.rpcService.valueExists(value));
protected checkValueExists(value: string): Promise<boolean> {
return this.rpcService.valueExists(value);
}
protected cleanValue(value: string): string {