# Conflicts: # src/main/java/ru/soune/nocopy/configuration/HandlerConfig.java
This commit is contained in:
@@ -61,7 +61,8 @@ public class FileEntityHandler implements RequestHandler {
|
||||
.action(action)
|
||||
.availableActions(Arrays.asList(
|
||||
"file_info", "file_by_session", "user_files",
|
||||
"search_files", "storage_usage", "delete_file"))
|
||||
"search_files", "storage_usage", "delete_file",
|
||||
"user_files_info"))
|
||||
.build();
|
||||
|
||||
return new BaseResponse(request.getMsgId(),
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
package ru.soune.nocopy.handler;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.soune.nocopy.dto.BaseRequest;
|
||||
import ru.soune.nocopy.dto.BaseResponse;
|
||||
import ru.soune.nocopy.dto.MessageCode;
|
||||
import ru.soune.nocopy.dto.file.ImageSearchRequest;
|
||||
import ru.soune.nocopy.dto.file.YandexSearchResponse;
|
||||
import ru.soune.nocopy.service.YandexSearchService;
|
||||
|
||||
@Slf4j
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class ImageFoundRequestHandler implements RequestHandler {
|
||||
|
||||
private final ObjectMapper objectMapper;
|
||||
|
||||
private final YandexSearchService yandexSearchService;
|
||||
|
||||
@Override
|
||||
public BaseResponse handle(BaseRequest request) throws Exception {
|
||||
ImageSearchRequest imageSearchRequest = objectMapper.convertValue(request.getMessageBody(),
|
||||
ImageSearchRequest.class);
|
||||
|
||||
String fileId = imageSearchRequest.getFileId();
|
||||
|
||||
YandexSearchResponse response = yandexSearchService.searchByFileEntity(fileId);
|
||||
|
||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||
MessageCode.SUCCESS.getDescription(), response);
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@ import java.util.*;
|
||||
|
||||
@Component
|
||||
public class RegRequestValidator implements Validator {
|
||||
private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()]{0,200}$";
|
||||
private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()\"\"«»„‟”“”‘'’‹›❛❜❝❞〝〞〟]{1,200}$";
|
||||
|
||||
private static final String NAME_REGEX = "^[a-zA-Zа-яА-ЯёЁ\\s\\-'.]{2,100}$";
|
||||
|
||||
@@ -74,21 +74,6 @@ public class RegRequestValidator implements Validator {
|
||||
errors.rejectValue("companyName", "companyName.invalid.chars",
|
||||
"Company name contains invalid characters");
|
||||
}
|
||||
|
||||
validateForbiddenWords(trimmedCompany, "companyName", errors,
|
||||
Arrays.asList("admin", "root", "system", "test"));
|
||||
}
|
||||
|
||||
private void validateForbiddenWords(String text, String fieldName,
|
||||
Errors errors, List<String> forbiddenWords) {
|
||||
String lowerText = text.toLowerCase();
|
||||
for (String word : forbiddenWords) {
|
||||
if (lowerText.contains(word)) {
|
||||
errors.rejectValue(fieldName, fieldName + ".forbidden.word",
|
||||
"Contains forbidden word: " + word);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void validateEmail(String email, Errors errors) {
|
||||
|
||||
Reference in New Issue
Block a user