From 7155b7df069592fcdb2cb5ca2b9f0e65fc7611cb Mon Sep 17 00:00:00 2001
From: lynxwq2 <kolav628@gmail.com>
Date: Fri, 5 Dec 2025 15:57:07 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=D1=83=D0=B6=D0=B5=D0=BB=D0=B8=20?=
 =?UTF-8?q?=D0=B2=D1=81=D1=91=20>=5F<?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nto/controller/BookingController.java     | 30 ++++---------------
 .../java/com/example/nto/entity/Booking.java  |  4 +--
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/example/nto/controller/BookingController.java b/src/main/java/com/example/nto/controller/BookingController.java
index cc1f76f..45457a1 100644
--- a/src/main/java/com/example/nto/controller/BookingController.java
+++ b/src/main/java/com/example/nto/controller/BookingController.java
@@ -5,6 +5,8 @@ import com.example.nto.exception.BookingConflictException;
 import com.example.nto.exception.EmployeeNotFoundException;
 import com.example.nto.exception.InvalidBookingException;
 import com.example.nto.service.BookingService;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -55,42 +57,22 @@ public class BookingController {
             @RequestBody Booking.CreateBookingRequest request
     ) {
         try {
-            Booking booking = bookingService.createBooking(
-                    code,
-                    request.getDate(),
-                    request.getPlaceId()
-            );
-
-            // Возвращаем только статус 201 без тела
+            Booking booking = bookingService.createBooking(code, request.getDate(), request.getPlaceId());
             return ResponseEntity.status(HttpStatus.CREATED).build();
 
         } catch (EmployeeNotFoundException e) {
-            // 401 - кода не существует
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
-
         } catch (BookingConflictException e) {
-            // 409 - конфликт (уже забронировано)
             return ResponseEntity.status(HttpStatus.CONFLICT).build();
-
         } catch (InvalidBookingException e) {
-            // 400 - невалидные данные
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
-
         } catch (Exception e) {
-            // 500 - внутренняя ошибка сервера
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
         }
     }
 
-    private Booking.BookingResponse convertToResponse(Booking booking) {
-        Booking.BookingResponse response = new Booking.BookingResponse();
-        response.setId(booking.getId());
-        response.setDate(booking.getDate());
-        response.setPlaceId(booking.getPlace().getId());
-        response.setPlaceName(booking.getPlace().getPlace());
-        response.setEmployeeId(booking.getEmployee().getId());
-        response.setEmployeeName(booking.getEmployee().getName());
-        return response;
-    }
 }
 
+
+
+
diff --git a/src/main/java/com/example/nto/entity/Booking.java b/src/main/java/com/example/nto/entity/Booking.java
index 0c15862..5bc8a84 100644
--- a/src/main/java/com/example/nto/entity/Booking.java
+++ b/src/main/java/com/example/nto/entity/Booking.java
@@ -47,13 +47,13 @@ public class Booking {
         private String place;
     }
     @Data
-    public class CreateBookingRequest {
+    public static class CreateBookingRequest {
         @JsonFormat(pattern = "yyyy-MM-dd")
         private LocalDate date;
         private long placeId;
     }
     @Data
-    public class ErrorResponse {
+    public static class ErrorResponse {
         private String error;
         private String message;