add-item-requests-and-gateway. Добавить запросы на вещи. Выделить валидацию в отдельный сервис. Написать тесты.

docker-compose.yml

@@ -0,0 +1,39 @@
+services:
+  gateway:
+    build: gateway
+    image: shareit-gateway
+    container_name: shareit-gateway
+    ports:
+      - "8080:8080"
+    depends_on:
+      - server
+    environment:
+      - SHAREIT_SERVER_URL=http://server:9090
+
+  server:
+    build: server
+    image: shareit-server
+    container_name: shareit-server
+    ports:
+      - "9090:9090"
+    depends_on:
+      - db
+    environment:
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/shareit
+      - SPRING_DATASOURCE_USERNAME=shareit
+      - SPRING_DATASOURCE_PASSWORD=shareit
+
+  db:
+    image: postgres:16.1
+    container_name: postgres
+    ports:
+      - "6541:5432"
+    environment:
+      - POSTGRES_PASSWORD=shareit
+      - POSTGRES_USER=shareit
+      - POSTGRES_DB=shareit
+    healthcheck:
+      test: pg_isready -q -d $$POSTGRES_DB -U $$POSTGRES_USER
+      timeout: 5s
+      interval: 5s
+      retries: 10

gateway/Dockerfile

@@ -0,0 +1,5 @@
+FROM eclipse-temurin:21-jre-jammy
+VOLUME /tmp
+ARG JAR_FILE=target/*.jar
+COPY ${JAR_FILE} app.jar
+ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"]

gateway/pom.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>ru.practicum</groupId>
+        <artifactId>shareit</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>shareit-gateway</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <name>ShareIt Gateway</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

gateway/src/main/java/ru/practicum/shareit/ShareItGateway.java

@@ -0,0 +1,12 @@
+package ru.practicum.shareit;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class ShareItGateway {
+	public static void main(String[] args) {
+		SpringApplication.run(ShareItGateway.class, args);
+	}
+
+}

gateway/src/main/java/ru/practicum/shareit/booking/BookingClient.java

@@ -0,0 +1,79 @@
+package ru.practicum.shareit.booking;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.web.util.DefaultUriBuilderFactory;
+import ru.practicum.shareit.booking.dto.BookingDtoRequest;
+import ru.practicum.shareit.booking.dto.BookingState;
+import ru.practicum.shareit.client.BaseClient;
+import ru.practicum.shareit.exception.StateException;
+import ru.practicum.shareit.exception.ValidationException;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+
+@Service
+public class BookingClient extends BaseClient {
+    private static final String API_PREFIX = "/bookings";
+
+    @Autowired
+    public BookingClient(@Value("${shareit-server.url}") String url, RestTemplateBuilder builder) {
+        super(
+                builder
+                        .uriTemplateHandler(new DefaultUriBuilderFactory(url + API_PREFIX))
+                        .requestFactory(() -> new HttpComponentsClientHttpRequestFactory())
+                        .build()
+        );
+    }
+
+    public ResponseEntity<Object> createBooking(Long bookerId, BookingDtoRequest bookingDto) {
+        checkDates(bookingDto.getStart(), bookingDto.getEnd());
+        return post("", bookerId, bookingDto);
+    }
+
+    public ResponseEntity<Object> approveBooking(Long ownerId, String approved, Long bookingId) {
+        Map<String, Object> parameters = Map.of(
+                "approved", approved
+        );
+        return patch("/" + bookingId + "?approved={approved}", ownerId, parameters, null);
+    }
+
+    public ResponseEntity<Object> getBookingById(Long bookingId, Long userId) {
+        return get("/" + bookingId, userId);
+    }
+
+    public ResponseEntity<Object> getBookingByUser(Long userId, String state) {
+        validateState(state);
+        Map<String, Object> parameters = Map.of(
+                "state", state
+        );
+        return get("?state={state}", userId, parameters);
+    }
+
+    public ResponseEntity<Object> getBookingByItemsUser(Long userId, String state) {
+        validateState(state);
+        Map<String, Object> parameters = Map.of(
+                "state", state
+        );
+        return get("/owner?state={state}", userId, parameters);
+    }
+
+    private void validateState(String state) {
+        if (BookingState.from(state).isEmpty()) {
+            throw new StateException("Неизвестное состояние: " + state);
+        }
+    }
+
+    private void checkDates(LocalDateTime start, LocalDateTime end) {
+        if (start.isEqual(end)) {
+            throw new ValidationException("Дата начала и дата окончания бронирования не могут быть равны");
+        }
+        if (start.isAfter(end)) {
+            throw new ValidationException("Дата начала бронирования не может быть позже даты окончания бронирования");
+        }
+    }
+}

gateway/src/main/java/ru/practicum/shareit/booking/BookingController.java

@@ -0,0 +1,52 @@
+package ru.practicum.shareit.booking;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import ru.practicum.shareit.booking.dto.BookingDtoRequest;
+
+@RestController
+@RequestMapping("/bookings")
+@Validated
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class BookingController {
+
+	private final BookingClient bookingClient;
+
+	@PostMapping
+	public ResponseEntity<Object> createBooking(@RequestHeader("X-Sharer-User-Id") Long bookerId,
+												@Valid @RequestBody BookingDtoRequest bookingDto) {
+		return bookingClient.createBooking(bookerId, bookingDto);
+	}
+
+	@PatchMapping("{bookingId}")
+	public ResponseEntity<Object> approveBooking(@RequestHeader("X-Sharer-User-Id") Long ownerId,
+												 @RequestParam String approved,
+												 @PathVariable Long bookingId) {
+		return bookingClient.approveBooking(ownerId, approved, bookingId);
+	}
+
+	@GetMapping("{bookingId}")
+	public ResponseEntity<Object> getBookingById(
+			@PathVariable Long bookingId,
+			@RequestHeader("X-Sharer-User-Id") Long userId) {
+		return bookingClient.getBookingById(bookingId, userId);
+	}
+
+	@GetMapping
+	public ResponseEntity<Object> getBookingByUser(
+			@RequestHeader("X-Sharer-User-Id") Long userId,
+			@RequestParam(defaultValue = "ALL") String state) {
+		return bookingClient.getBookingByUser(userId, state);
+	}
+
+	@GetMapping("owner")
+	public ResponseEntity<Object> getBookingByItemsUser(
+			@RequestHeader("X-Sharer-User-Id") Long userId,
+			@RequestParam(defaultValue = "ALL") String state) {
+		return bookingClient.getBookingByItemsUser(userId, state);
+	}
+}

src/main/java/ru/practicum/shareit/booking/dto/BookingDtoRequest.java → gateway/src/main/java/ru/practicum/shareit/booking/dto/BookingDtoRequest.java

@@ -5,7 +5,6 @@
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import ru.practicum.shareit.booking.enumerated.Status;
 
 import java.time.LocalDateTime;
 

gateway/src/main/java/ru/practicum/shareit/booking/dto/BookingState.java

@@ -0,0 +1,27 @@
+package ru.practicum.shareit.booking.dto;
+
+import java.util.Optional;
+
+public enum BookingState {
+	// Все
+	ALL,
+	// Текущие
+	CURRENT,
+	// Будущие
+	FUTURE,
+	// Завершенные
+	PAST,
+	// Отклоненные
+	REJECTED,
+	// Ожидающие подтверждения
+	WAITING;
+
+	public static Optional<BookingState> from(String stringState) {
+		for (BookingState state : values()) {
+			if (state.name().equalsIgnoreCase(stringState)) {
+				return Optional.of(state);
+			}
+		}
+		return Optional.empty();
+	}
+}

gateway/src/main/java/ru/practicum/shareit/booking/dto/Status.java

@@ -0,0 +1,5 @@
+package ru.practicum.shareit.booking.dto;
+
+public enum Status {
+    WAITING, APPROVED, REJECTED, CANCELED
+}