@@ -12,6 +12,7 @@ import ru.soune.nocopy.entity.user.AuthToken;
|
|||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.nocopy.service.violation.ViolationNotionService;
|
import ru.soune.nocopy.service.violation.ViolationNotionService;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@@ -35,7 +36,7 @@ public class ViolationNotionHandler implements RequestHandler {
|
|||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.INVALID_TOKEN.getCode(),
|
MessageCode.INVALID_TOKEN.getCode(),
|
||||||
"Token is required",
|
"Token is required",
|
||||||
null);
|
"field: token");
|
||||||
}
|
}
|
||||||
|
|
||||||
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(notionRequest.getToken());
|
Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(notionRequest.getToken());
|
||||||
@@ -44,7 +45,7 @@ public class ViolationNotionHandler implements RequestHandler {
|
|||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.INVALID_TOKEN.getCode(),
|
MessageCode.INVALID_TOKEN.getCode(),
|
||||||
"Invalid token",
|
"Invalid token",
|
||||||
null);
|
notionRequest.getToken());
|
||||||
}
|
}
|
||||||
|
|
||||||
Long userId = tokenOptional.get().getUser().getId();
|
Long userId = tokenOptional.get().getUser().getId();
|
||||||
@@ -55,7 +56,9 @@ public class ViolationNotionHandler implements RequestHandler {
|
|||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.INVALID_ACTION.getCode(),
|
MessageCode.INVALID_ACTION.getCode(),
|
||||||
"Action is required",
|
"Action is required",
|
||||||
null);
|
List.of("get_notions", "get_notion",
|
||||||
|
"add_notion", "update_notion",
|
||||||
|
"delete_notion"));
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (action) {
|
switch (action) {
|
||||||
@@ -74,7 +77,9 @@ public class ViolationNotionHandler implements RequestHandler {
|
|||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.INVALID_ACTION.getCode(),
|
MessageCode.INVALID_ACTION.getCode(),
|
||||||
"Invalid action: " + action,
|
"Invalid action: " + action,
|
||||||
null);
|
List.of("get_notions", "get_notion",
|
||||||
|
"add_notion", "update_notion",
|
||||||
|
"delete_notion"));
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (IllegalArgumentException e) {
|
} catch (IllegalArgumentException e) {
|
||||||
@@ -83,21 +88,21 @@ public class ViolationNotionHandler implements RequestHandler {
|
|||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.VALIDATION_ERROR.getCode(),
|
MessageCode.VALIDATION_ERROR.getCode(),
|
||||||
e.getMessage(),
|
e.getMessage(),
|
||||||
null);
|
"Validation error: " + e.getMessage());
|
||||||
} catch (SecurityException e) {
|
} catch (SecurityException e) {
|
||||||
log.error("Security error: {}", e.getMessage());
|
log.error("Security error: {}", e.getMessage());
|
||||||
return new BaseResponse(
|
return new BaseResponse(
|
||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.ACCESS_DENIED.getCode(),
|
MessageCode.ACCESS_DENIED.getCode(),
|
||||||
e.getMessage(),
|
e.getMessage(),
|
||||||
null);
|
"Security error: " + e.getMessage());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("Unexpected error", e);
|
log.error("Unexpected error", e);
|
||||||
return new BaseResponse(
|
return new BaseResponse(
|
||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.INTERNAL_ERROR.getCode(),
|
MessageCode.INTERNAL_ERROR.getCode(),
|
||||||
"Internal server error",
|
"Internal server error",
|
||||||
null);
|
"Unexpected error: " + e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -107,7 +112,7 @@ public class ViolationNotionHandler implements RequestHandler {
|
|||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.INVALID_JSON_BODY.getCode(),
|
MessageCode.INVALID_JSON_BODY.getCode(),
|
||||||
"ViolationId is required for get_notions action",
|
"ViolationId is required for get_notions action",
|
||||||
null);
|
"field: violation_id");
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -122,7 +127,7 @@ public class ViolationNotionHandler implements RequestHandler {
|
|||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.NOTION_NOT_FOUND.getCode(),
|
MessageCode.NOTION_NOT_FOUND.getCode(),
|
||||||
e.getMessage(),
|
e.getMessage(),
|
||||||
null);
|
"Unexpected error: " + e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -132,7 +137,7 @@ public class ViolationNotionHandler implements RequestHandler {
|
|||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.INVALID_JSON_BODY.getCode(),
|
MessageCode.INVALID_JSON_BODY.getCode(),
|
||||||
"NotionId is required for get_notion action",
|
"NotionId is required for get_notion action",
|
||||||
null);
|
"field: notion_id");
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -147,7 +152,7 @@ public class ViolationNotionHandler implements RequestHandler {
|
|||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.NOTION_NOT_FOUND.getCode(),
|
MessageCode.NOTION_NOT_FOUND.getCode(),
|
||||||
e.getMessage(),
|
e.getMessage(),
|
||||||
null);
|
"Unexpected error: " + e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -157,7 +162,7 @@ public class ViolationNotionHandler implements RequestHandler {
|
|||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.INVALID_JSON_BODY.getCode(),
|
MessageCode.INVALID_JSON_BODY.getCode(),
|
||||||
"ViolationId is required for add_notion action",
|
"ViolationId is required for add_notion action",
|
||||||
null);
|
"field: notion_id");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (notionRequest.getMessage() == null || notionRequest.getMessage().trim().isEmpty()) {
|
if (notionRequest.getMessage() == null || notionRequest.getMessage().trim().isEmpty()) {
|
||||||
@@ -165,7 +170,7 @@ public class ViolationNotionHandler implements RequestHandler {
|
|||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.INVALID_JSON_BODY.getCode(),
|
MessageCode.INVALID_JSON_BODY.getCode(),
|
||||||
"Message is required for add_notion action",
|
"Message is required for add_notion action",
|
||||||
null);
|
"field: message");
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -180,7 +185,7 @@ public class ViolationNotionHandler implements RequestHandler {
|
|||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.NOTION_NOT_FOUND.getCode(),
|
MessageCode.NOTION_NOT_FOUND.getCode(),
|
||||||
e.getMessage(),
|
e.getMessage(),
|
||||||
null);
|
"Unexpected error: " + e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -190,7 +195,7 @@ public class ViolationNotionHandler implements RequestHandler {
|
|||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.INVALID_JSON_BODY.getCode(),
|
MessageCode.INVALID_JSON_BODY.getCode(),
|
||||||
"NotionId is required for update_notion action",
|
"NotionId is required for update_notion action",
|
||||||
null);
|
"field: notion_id");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (notionRequest.getMessage() == null || notionRequest.getMessage().trim().isEmpty()) {
|
if (notionRequest.getMessage() == null || notionRequest.getMessage().trim().isEmpty()) {
|
||||||
@@ -198,7 +203,7 @@ public class ViolationNotionHandler implements RequestHandler {
|
|||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.INVALID_JSON_BODY.getCode(),
|
MessageCode.INVALID_JSON_BODY.getCode(),
|
||||||
"Message is required for update_notion action",
|
"Message is required for update_notion action",
|
||||||
null);
|
"field: message");
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -213,13 +218,13 @@ public class ViolationNotionHandler implements RequestHandler {
|
|||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.NOTION_NOT_FOUND.getCode(),
|
MessageCode.NOTION_NOT_FOUND.getCode(),
|
||||||
e.getMessage(),
|
e.getMessage(),
|
||||||
null);
|
"IllegalArgumentException error: " + e);
|
||||||
} catch (SecurityException e) {
|
} catch (SecurityException e) {
|
||||||
return new BaseResponse(
|
return new BaseResponse(
|
||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.ACCESS_DENIED.getCode(),
|
MessageCode.ACCESS_DENIED.getCode(),
|
||||||
e.getMessage(),
|
e.getMessage(),
|
||||||
null);
|
"SecurityException error: " + e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -229,7 +234,7 @@ public class ViolationNotionHandler implements RequestHandler {
|
|||||||
request.getMsgId(),
|
request.getMsgId(),
|
||||||
MessageCode.INVALID_JSON_BODY.getCode(),
|
MessageCode.INVALID_JSON_BODY.getCode(),
|
||||||
"NotionId is required for delete_notion action",
|
"NotionId is required for delete_notion action",
|
||||||
null);
|
"field: notion_id");
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
Reference in New Issue
Block a user