From f05ea617038e33d4c45f5f3bf5aa8d28a06842bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A8=D0=B8=D0=BC=D1=87=D0=B5=D0=BD=D0=BA=D0=BE?=
 <lev.shimchlev@gmail.com>
Date: Fri, 12 Sep 2025 06:31:15 +0000
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?=
 =?UTF-8?q?=D1=8C=20src/main/java/org/lanit/controllers/JSONController.jav?=
 =?UTF-8?q?a?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/lanit/controllers/JSONController.java | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/lanit/controllers/JSONController.java b/src/main/java/org/lanit/controllers/JSONController.java
index ea2034e..8cd42b3 100644
--- a/src/main/java/org/lanit/controllers/JSONController.java
+++ b/src/main/java/org/lanit/controllers/JSONController.java
@@ -1,4 +1,5 @@
 package org.lanit.controllers;
+
 import org.lanit.models.*;
 import org.lanit.service.JsonProcessingService;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -11,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import java.io.IOException;
 import java.time.Instant;
-import org.springframework.http.MediaType;
+
 @Controller
 public class JSONController {
 
@@ -23,23 +24,19 @@ public class JSONController {
         this.objectMapper = objectMapper;
     }
 
-
+    // ЕДИНЫЙ метод для всех JSON ответов
     private ResponseEntity<Object> createJsonResponse(Object body, HttpStatus status) {
         return ResponseEntity.status(status)
-                .header("Content-Type", "application/json")
+                .header("Content-Type", "application/json") // Без charset!
                 .body(body);
     }
 
-
-    @PostMapping(value = "/json", produces = "application/json", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = "/json", produces = "application/json", consumes = "application/json")
     @ResponseBody
     public ResponseEntity<?> handleJsonRequest(
             @RequestParam("action") String action,
             @RequestBody String jsonBody) throws IOException {
 
-        System.out.println("Received JSON: " + jsonBody);
-        System.out.println("Action: " + action);
-
         try {
             if ("add".equals(action)) {
                 AddRequest addRequest = objectMapper.readValue(jsonBody, AddRequest.class);
@@ -59,13 +56,13 @@ public class JSONController {
                 response.setInfo(modifiedInfo);
                 response.setUuid(deleteRequest.getUuid());
                 response.setLastUpdate(Instant.now().toString());
-                return createJsonResponse(response, HttpStatus.OK);
+                return createJsonResponse(response, HttpStatus.OK); // Используем createJsonResponse
 
             } else {
                 ErrorResponse error = new ErrorResponse();
                 error.setStatus("error");
                 error.setMessage("Передан некорректный action - " + action);
-                return createJsonResponse(error, HttpStatus.OK);
+                return createJsonResponse(error, HttpStatus.BAD_REQUEST); // Используем createJsonResponse
             }
 
         } catch (RuntimeException e) {
@@ -74,12 +71,13 @@ public class JSONController {
             error.setMessage(e.getMessage());
             HttpStatus status = e.getMessage().contains("тикер") || e.getMessage().contains("индекс") 
                 ? HttpStatus.NOT_FOUND : HttpStatus.BAD_REQUEST;
-            return ResponseEntity.status(status).body(error);
+            return createJsonResponse(error, status); // Используем createJsonResponse
+
         } catch (IOException e) {
             ErrorResponse error = new ErrorResponse();
             error.setStatus("error");
             error.setMessage("Ошибка разбора JSON");
-             return createJsonResponse(error, HttpStatus.OK);
+            return createJsonResponse(error, HttpStatus.BAD_REQUEST); // Исправил на BAD_REQUEST
         }
     }
 }
\ No newline at end of file