From 08a4707d884ec5f95ad3065847d66accbaeb8523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BF=D0=B0=D0=BD=20=D0=91=D0=BE=D0=BA?= =?UTF-8?q?=D0=B0=D1=80=D0=B5=D0=B2?= Date: Sun, 14 Jul 2024 21:20:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/ru/practicum/shareit/ShareItApp.java | 6 +++--- .../ru/practicum/shareit/booking/BookingController.java | 4 +--- .../ru/practicum/shareit/item/repository/ItemStorage.java | 3 +++ .../java/ru/practicum/shareit/item/service/ItemService.java | 4 ++++ .../ru/practicum/shareit/user/repository/UserStorage.java | 3 +++ .../java/ru/practicum/shareit/user/service/UserService.java | 4 ++++ 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/java/ru/practicum/shareit/ShareItApp.java b/src/main/java/ru/practicum/shareit/ShareItApp.java index a00ad567..a10a87da 100644 --- a/src/main/java/ru/practicum/shareit/ShareItApp.java +++ b/src/main/java/ru/practicum/shareit/ShareItApp.java @@ -6,8 +6,8 @@ @SpringBootApplication public class ShareItApp { - public static void main(String[] args) { - SpringApplication.run(ShareItApp.class, args); - } + public static void main(String[] args) { + SpringApplication.run(ShareItApp.class, args); + } } diff --git a/src/main/java/ru/practicum/shareit/booking/BookingController.java b/src/main/java/ru/practicum/shareit/booking/BookingController.java index b94493d4..e5a016b1 100644 --- a/src/main/java/ru/practicum/shareit/booking/BookingController.java +++ b/src/main/java/ru/practicum/shareit/booking/BookingController.java @@ -3,9 +3,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -/** - * TODO Sprint add-bookings. - */ + @RestController @RequestMapping(path = "/bookings") public class BookingController { diff --git a/src/main/java/ru/practicum/shareit/item/repository/ItemStorage.java b/src/main/java/ru/practicum/shareit/item/repository/ItemStorage.java index 2d2afa96..afd3cc5b 100644 --- a/src/main/java/ru/practicum/shareit/item/repository/ItemStorage.java +++ b/src/main/java/ru/practicum/shareit/item/repository/ItemStorage.java @@ -6,7 +6,10 @@ public interface ItemStorage { Item save(Item item); + Item findById(Long itemId); + List findByOwnerId(Long ownerId); + List search(String text); } \ No newline at end of file diff --git a/src/main/java/ru/practicum/shareit/item/service/ItemService.java b/src/main/java/ru/practicum/shareit/item/service/ItemService.java index 8a0017f8..69ac9249 100644 --- a/src/main/java/ru/practicum/shareit/item/service/ItemService.java +++ b/src/main/java/ru/practicum/shareit/item/service/ItemService.java @@ -6,8 +6,12 @@ public interface ItemService { ItemDto addItem(Long userId, ItemDto itemDto); + ItemDto updateItem(Long userId, Long itemId, ItemDto itemDto); + ItemDto getItem(Long itemId); + List getItemsByOwner(Long userId); + List searchItems(String text); } \ No newline at end of file diff --git a/src/main/java/ru/practicum/shareit/user/repository/UserStorage.java b/src/main/java/ru/practicum/shareit/user/repository/UserStorage.java index 39dd167a..ed60ed3d 100644 --- a/src/main/java/ru/practicum/shareit/user/repository/UserStorage.java +++ b/src/main/java/ru/practicum/shareit/user/repository/UserStorage.java @@ -6,8 +6,11 @@ public interface UserStorage { User save(User user); + User findById(Long userId); + List findAll(); + void deleteById(Long userId); boolean existsByEmail(String email); diff --git a/src/main/java/ru/practicum/shareit/user/service/UserService.java b/src/main/java/ru/practicum/shareit/user/service/UserService.java index 8f550289..ccc366a2 100644 --- a/src/main/java/ru/practicum/shareit/user/service/UserService.java +++ b/src/main/java/ru/practicum/shareit/user/service/UserService.java @@ -6,8 +6,12 @@ public interface UserService { UserDto addUser(UserDto userDto); + UserDto updateUser(Long userId, UserDto userDto); + UserDto getUser(Long userId); + List getAllUsers(); + void deleteUser(Long userId); } \ No newline at end of file