This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
package ru.soune.no_copy.controller;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -13,17 +12,14 @@ import org.springframework.web.bind.annotation.*;
|
||||
import ru.soune.no_copy.dto.BaseRequest;
|
||||
import ru.soune.no_copy.dto.MessageCode;
|
||||
import ru.soune.no_copy.dto.RegRequest;
|
||||
import ru.soune.no_copy.entity.AuthToken;
|
||||
import ru.soune.no_copy.exception.UserAlreadyExistsException;
|
||||
import ru.soune.no_copy.handler.RegRequestValidator;
|
||||
import ru.soune.no_copy.repository.UserRepository;
|
||||
import ru.soune.no_copy.service.AuthService;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Slf4j
|
||||
@@ -42,11 +38,9 @@ public class ApiController {
|
||||
private AuthService authService;
|
||||
|
||||
@PostMapping("/v{version}/data")
|
||||
public ResponseEntity<?> handlePostRequest(
|
||||
@RequestBody BaseRequest request,
|
||||
@PathVariable("version") int version) {
|
||||
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request, @PathVariable("version") int version) {
|
||||
Integer msgId = request.getMsgId();
|
||||
Map<String, ? extends Serializable> response = new HashMap<>();
|
||||
Map<String, Object> response;
|
||||
|
||||
switch (msgId) {
|
||||
case 20002:
|
||||
@@ -65,30 +59,24 @@ public class ApiController {
|
||||
return createValidationErrorResponse(bindingResult, msgId);
|
||||
} else {
|
||||
authService.register(regRequest);
|
||||
|
||||
response = Map.of(
|
||||
"msg_id", msgId,
|
||||
"message_code", MessageCode.SUCCESS.getCode(),
|
||||
"message_desc", MessageCode.SUCCESS.getDescription());
|
||||
response = fillResponseInfo(msgId, MessageCode.SUCCESS.getCode(),
|
||||
MessageCode.SUCCESS.getDescription());
|
||||
}
|
||||
break;
|
||||
case 20001:
|
||||
default:
|
||||
return ResponseEntity.ok().body(Map.of(
|
||||
"msg_id", msgId,
|
||||
"message_code", MessageCode.MSG_ID_NOT_FOUND.getCode(),
|
||||
"message_desc", MessageCode.MSG_ID_NOT_FOUND.getDescription()));
|
||||
return ResponseEntity.ok().body(fillResponseInfo(msgId, MessageCode.MSG_ID_NOT_FOUND.getCode(),
|
||||
MessageCode.MSG_ID_NOT_FOUND.getDescription()));
|
||||
}
|
||||
|
||||
return ResponseEntity.status(MessageCode.SUCCESS.getCode()).body(response);
|
||||
return ResponseEntity.ok().body(response);
|
||||
}
|
||||
|
||||
private ResponseEntity<Map<String, Object>> createValidationErrorResponse(
|
||||
BindingResult bindingResult, Integer msgId) {
|
||||
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("msg_id", msgId);
|
||||
response.put("message_code", MessageCode.INVALID_FIELD.getCode());
|
||||
response.put("message_desc", MessageCode.INVALID_FIELD.getDescription());
|
||||
Map<String, Object> response = fillResponseInfo(msgId, MessageCode.INVALID_FIELD.getCode(),
|
||||
MessageCode.INVALID_FIELD.getDescription());
|
||||
|
||||
List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
|
||||
.stream()
|
||||
@@ -113,4 +101,13 @@ public class ApiController {
|
||||
|
||||
return errorDetail;
|
||||
}
|
||||
|
||||
private Map<String, Object> fillResponseInfo(Integer msgId, Integer messageCode, String messageDesc) {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("msg_id", msgId);
|
||||
response.put("message_code", messageCode);
|
||||
response.put("message_desc", messageDesc);
|
||||
|
||||
return response;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user