add-controllers. Добавить апи для пользователей и вещей.

Author: walder86

src/main/java/ru/practicum/shareit/booking/Booking.java

@@ -1,7 +1,28 @@
 package ru.practicum.shareit.booking;
 
+import lombok.Data;
+import ru.practicum.shareit.item.model.Item;
+import ru.practicum.shareit.user.model.User;
+
+import java.time.LocalDateTime;
+
 /**
  * TODO Sprint add-bookings.
  */
+@Data
 public class Booking {
+    private Long id;
+    private LocalDateTime start;
+    private LocalDateTime end;
+    private Item item;
+    private User booker;
+    private Status status;
+
+    enum Status {
+        WAITING,
+        APPROVED,
+        REJECTED,
+        CANCELED
+    }
+
 }

src/main/java/ru/practicum/shareit/exception/AlreadyExistException.java

@@ -0,0 +1,7 @@
+package ru.practicum.shareit.exception;
+
+public class AlreadyExistException extends RuntimeException {
+  public AlreadyExistException(String message) {
+    super(message);
+  }
+}

src/main/java/ru/practicum/shareit/exception/ErrorHandler.java

@@ -0,0 +1,41 @@
+package ru.practicum.shareit.exception;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+@Slf4j
+@RestControllerAdvice
+public class ErrorHandler {
+
+    @ExceptionHandler
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ErrorResponse handleValidationException(MethodArgumentNotValidException e) {
+        log.debug(e.getBindingResult().getAllErrors().getFirst().getDefaultMessage(), e);
+        return new ErrorResponse(HttpStatus.BAD_REQUEST.value(), e.getBindingResult().getAllErrors().getFirst().getDefaultMessage());
+    }
+
+    @ExceptionHandler
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    public ErrorResponse handleValidationException(NotFoundException e) {
+        log.debug(e.getMessage(), e);
+        return new ErrorResponse(HttpStatus.BAD_REQUEST.value(), e.getMessage());
+    }
+
+    @ExceptionHandler
+    @ResponseStatus(HttpStatus.CONFLICT)
+    public ErrorResponse handleValidationException(AlreadyExistException e) {
+        log.debug(e.getMessage(), e);
+        return new ErrorResponse(HttpStatus.BAD_REQUEST.value(), e.getMessage());
+    }
+
+    @ExceptionHandler
+    @ResponseStatus(HttpStatus.FORBIDDEN)
+    public ErrorResponse handleValidationException(NotAccessException e) {
+        log.debug(e.getMessage(), e);
+        return new ErrorResponse(HttpStatus.FORBIDDEN.value(), e.getMessage());
+    }
+}

src/main/java/ru/practicum/shareit/exception/ErrorResponse.java

@@ -0,0 +1,11 @@
+package ru.practicum.shareit.exception;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class ErrorResponse {
+    private Integer statusCode;
+    private String error;
+}

src/main/java/ru/practicum/shareit/exception/NotAccessException.java

@@ -0,0 +1,7 @@
+package ru.practicum.shareit.exception;
+
+public class NotAccessException extends RuntimeException {
+    public NotAccessException(String message) {
+        super(message);
+    }
+}

src/main/java/ru/practicum/shareit/exception/NotFoundException.java

@@ -0,0 +1,7 @@
+package ru.practicum.shareit.exception;
+
+public class NotFoundException extends RuntimeException {
+    public NotFoundException(String message) {
+        super(message);
+    }
+}

src/main/java/ru/practicum/shareit/item/ItemController.java

@@ -1,12 +1,47 @@
 package ru.practicum.shareit.item;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import jakarta.validation.Valid;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import ru.practicum.shareit.item.dto.ItemDto;
+import ru.practicum.shareit.item.service.ItemService;
+
+import java.util.List;
 
-/**
- * TODO Sprint add-controllers.
- */
 @RestController
+@AllArgsConstructor
 @RequestMapping("/items")
 public class ItemController {
+
+    private final ItemService itemService;
+
+    @GetMapping
+    public List<ItemDto> getItemsByUserId(@RequestHeader("X-Sharer-User-Id") Long userId) {
+        return itemService.getItemsByUserId(userId);
+    }
+
+    @GetMapping("/{itemId}")
+    public ItemDto getItemById(@PathVariable Long itemId) {
+        return itemService.getItemById(itemId);
+    }
+
+    @PostMapping
+    public ItemDto createItem(
+            @Valid @RequestBody ItemDto itemDto,
+            @RequestHeader("X-Sharer-User-Id") Long userId) {
+        return itemService.createItem(itemDto, userId);
+    }
+
+    @PatchMapping("/{itemId}")
+    public ItemDto updateItem(
+            @RequestBody ItemDto itemDto,
+            @PathVariable Long itemId,
+            @RequestHeader("X-Sharer-User-Id") Long userId) {
+        return itemService.updateItem(itemDto, itemId, userId);
+    }
+
+    @GetMapping("/search")
+    public List<ItemDto> getItemsSearchByText(@RequestParam String text) {
+        return itemService.searchItemsByText(text);
+    }
 }

src/main/java/ru/practicum/shareit/item/dto/ItemDto.java

@@ -1,7 +1,19 @@
 package ru.practicum.shareit.item.dto;
 
-/**
- * TODO Sprint add-controllers.
- */
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
 public class ItemDto {
+    private Long id;
+    @NotBlank(message = "Название не может быть пустым")
+    private String name;
+    @NotBlank(message = "Описание не может быть пустым")
+    private String description;
+    @NotNull(message = "Статус о доступности не может быть пустым")
+    private Boolean available;
+    private Long requestId;
 }

src/main/java/ru/practicum/shareit/item/mapper/ItemMapper.java

@@ -0,0 +1,31 @@
+package ru.practicum.shareit.item.mapper;
+
+import ru.practicum.shareit.item.dto.ItemDto;
+import ru.practicum.shareit.item.model.Item;
+import ru.practicum.shareit.request.ItemRequest;
+import ru.practicum.shareit.user.model.User;
+
+public class ItemMapper {
+
+    public static ItemDto toItemDto(Item item) {
+        return new ItemDto(
+                item.getId(),
+                item.getName(),
+                item.getDescription(),
+                item.getAvailable(),
+                item.getRequest() != null ? item.getRequest().getId() : null
+        );
+    }
+
+    public static Item toItem(Long itemId, ItemDto itemDto, User owner, ItemRequest request) {
+        return new Item(
+                itemId,
+                itemDto.getName(),
+                itemDto.getDescription(),
+                itemDto.getAvailable(),
+                owner,
+                request
+        );
+    }
+
+}

src/main/java/ru/practicum/shareit/item/model/Item.java

@@ -1,7 +1,18 @@
 package ru.practicum.shareit.item.model;
 
-/**
- * TODO Sprint add-controllers.
- */
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import ru.practicum.shareit.request.ItemRequest;
+import ru.practicum.shareit.user.model.User;
+
+@Data
+@AllArgsConstructor
 public class Item {
+    private Long id;
+    private String name;
+    private String description;
+    private Boolean available;
+    private User owner;
+    private ItemRequest request;
 }