From 682c21ba73bb8a075dff425627c0e54a71d23308 Mon Sep 17 00:00:00 2001 From: vladp Date: Fri, 6 Feb 2026 21:22:47 +0700 Subject: [PATCH] fix value --- .../java/ru/soune/nocopy/dto/MessageCode.java | 1 + .../nocopy/handler/RegRequestHandler.java | 19 ++++++++++++++++++- src/main/resources/application.yaml | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/dto/MessageCode.java b/src/main/java/ru/soune/nocopy/dto/MessageCode.java index 42f553e..5366574 100644 --- a/src/main/java/ru/soune/nocopy/dto/MessageCode.java +++ b/src/main/java/ru/soune/nocopy/dto/MessageCode.java @@ -4,6 +4,7 @@ public enum MessageCode { SUCCESS(0, "Operation successful"), REG_EMAIL_EXISTS(1, "Email already registered"), REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"), + REFERRAL_LINK_IS_NOT_EXIST(1, "Refferal link is not exist"), INVALID_FIELD(2, "Invalid field"), INVALID_TOKEN(2, "Invalid token"), TOKEN_IS_ALIVE(2, "Token is alive"), diff --git a/src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java b/src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java index 58a6221..a0865b0 100644 --- a/src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java @@ -10,10 +10,13 @@ import ru.soune.ReferralService; import ru.soune.nocopy.dto.*; import ru.soune.nocopy.dto.register.RegAnswer; import ru.soune.nocopy.dto.register.RegRequest; +import ru.soune.nocopy.entity.referral.Referral; import ru.soune.nocopy.entity.user.AuthToken; import ru.soune.nocopy.exception.NotValidFieldException; import ru.soune.nocopy.exception.ValidationException; import ru.soune.nocopy.handler.validator.RegRequestValidator; +import ru.soune.nocopy.repository.ReferralJpaRepository; +import ru.soune.nocopy.repository.ReferralLevelRepository; import ru.soune.nocopy.repository.UserRepository; import ru.soune.nocopy.service.register.AuthService; import ru.soune.nocopy.service.mail.EmailService; @@ -37,6 +40,8 @@ public class RegRequestHandler implements RequestHandler { private final ReferralService referralService; + private final ReferralJpaRepository referralJpaRepository; + @Override public BaseResponse handle(BaseRequest request) throws ValidationException { RegRequest regRequest = objectMapper.convertValue(request.getMessageBody(), RegRequest.class); @@ -52,6 +57,19 @@ public class RegRequestHandler implements RequestHandler { MessageCode.REG_EMAIL_OR_PHONE_EXISTS.getDescription(), regAnswer)); } + String referralLink = regRequest.getReferralLink(); + + Referral referral = referralJpaRepository.findByReferralLink(referralLink); + + if (referral == null) { + throw new NotValidFieldException("Referral link is not found:" + referralLink + + referralLink, new BaseResponse(request.getMsgId(), + MessageCode.REFERRAL_LINK_IS_NOT_EXIST.getCode(), + MessageCode.REFERRAL_LINK_IS_NOT_EXIST.getDescription(), Map.of( + "referralLink", referralLink + ))); + } + BindingResult bindingResult = new BeanPropertyBindingResult(regRequest, "regRequest"); regRequestValidator.validate(regRequest, bindingResult); @@ -79,7 +97,6 @@ public class RegRequestHandler implements RequestHandler { RegAnswer regAnswer = new RegAnswer(); - regAnswer.setUserId(authToken.getUser().getId()); regAnswer.setToken(token); regAnswer.setVerified(true); diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index fea82f1..c0506d2 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -89,7 +89,7 @@ yandex: search-url: ${YANDEX_SEARCH_URL:https://searchapi.api.cloud.yandex.net/v2/image/search_by_image} searchapi: - api-key: ${SEARCHAPI_API_KEY:2xBChafVmojL7G1ZXzzUuA6o} + api-key: ${SEARCHAPI_API_KEY:AK1Ph7D22gCBoq7Wuqdnq9j2} reverse-image-url: "https://searchapi.io/api/v1/search" app: