Спринт 16

.run/ShareItGateway.run.xml

@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ShareItGateway" type="Application" factoryName="Application" nameIsGenerated="true">
+    <option name="MAIN_CLASS_NAME" value="ru.practicum.shareit.ShareItGateway" />
+    <module name="shareit-gateway" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="ru.practicum.shareit.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/ShareItServer.run.xml

@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ShareItServer" type="Application" factoryName="Application" nameIsGenerated="true">
+    <option name="MAIN_CLASS_NAME" value="ru.practicum.shareit.ShareItServer" />
+    <module name="shareit-server" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="ru.practicum.shareit.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

docker-compose.yml

@@ -0,0 +1,41 @@
+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:
+      - "5432:5432"
+    environment:
+      - POSTGRES_PASSWORD=shareit
+      - POSTGRES_USER=shareit
+      - POSTGRES_DB=shareit
+    volumes:
+      - .docker/data/postgres:/var/lib/postgresql/data/
+    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>

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

@@ -4,10 +4,10 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class ShareItApp {
+public class ShareItGateway {
 
     public static void main(String[] args) {
-        SpringApplication.run(ShareItApp.class, args);
+        SpringApplication.run(ShareItGateway.class, args);
     }
 
 }

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

@@ -0,0 +1,63 @@
+package ru.practicum.shareit.booking;
+
+import lombok.extern.slf4j.Slf4j;
+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.BookItemRequestDto;
+import ru.practicum.shareit.booking.dto.BookingState;
+import ru.practicum.shareit.client.BaseClient;
+
+@Slf4j
+@Service
+public class BookingClient extends BaseClient {
+
+    private static final String API_PREFIX = "/bookings";
+
+    @Autowired
+    public BookingClient(
+            @Value("${shareit-server.url}") String serverUrl,
+            RestTemplateBuilder builder
+    ) {
+        super(
+                builder
+                        .uriTemplateHandler(new DefaultUriBuilderFactory(serverUrl + API_PREFIX))
+                        .requestFactory(() -> new HttpComponentsClientHttpRequestFactory())
+                        .build()
+        );
+    }
+
+    public ResponseEntity<Object> getBookings(
+            long userId,
+            BookingState state
+    ) {
+        log.info("Get bookings by user: {}, state: {}", userId, state);
+        return get("?state=" + state, userId);
+    }
+
+    public ResponseEntity<Object> bookItem(long userId, BookItemRequestDto requestDto) {
+        log.info("Booking by user {} and request: {}", userId, requestDto);
+        return post("", userId, requestDto);
+    }
+
+    public ResponseEntity<Object> approve(Long bookingId, Long ownerId, boolean approved) {
+        log.info("Approve booking by bookingId: {}, ownerId: {}", bookingId, ownerId);
+        return patch("/" + bookingId + "?approved=" + approved, ownerId, null, null);
+    }
+
+    public ResponseEntity<Object> getBooking(long userId, Long bookingId) {
+        log.info("Get booking by user {} and bookingId: {}", userId, bookingId);
+        return get("/" + bookingId, userId);
+    }
+
+    public ResponseEntity<Object> getByOwnerAndState(Long ownerId, BookingState state) {
+        log.info("Get booking by owner and state: {}", state);
+        return get("/owner?state=" + state, ownerId);
+    }
+
+}

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

@@ -0,0 +1,81 @@
+package ru.practicum.shareit.booking;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import ru.practicum.shareit.booking.dto.BookItemRequestDto;
+import ru.practicum.shareit.booking.dto.BookingState;
+
+@Controller
+@RequestMapping(path = "/bookings")
+@RequiredArgsConstructor
+@Validated
+public class BookingController {
+
+    private static final String HEADER_USER_ID = "X-Sharer-User-Id";
+
+    private final BookingClient bookingClient;
+
+    @GetMapping
+    public ResponseEntity<Object> getBookings(
+            @RequestHeader(HEADER_USER_ID) long userId,
+            @RequestParam(name = "state", defaultValue = "all") String stateParam
+    ) {
+        BookingState state = getBookingState(stateParam);
+
+        return bookingClient.getBookings(userId, state);
+    }
+
+    @PostMapping
+    public ResponseEntity<Object> bookItem(
+            @RequestHeader(HEADER_USER_ID) long userId,
+            @RequestBody @Valid BookItemRequestDto requestDto
+    ) {
+        return bookingClient.bookItem(userId, requestDto);
+    }
+
+    @PatchMapping("/{bookingId}")
+    public ResponseEntity<Object> approve(
+            @PathVariable Long bookingId,
+            @RequestParam boolean approved,
+            @RequestHeader(name = HEADER_USER_ID) Long ownerId
+    ) {
+        return bookingClient.approve(bookingId, ownerId, approved);
+    }
+
+    @GetMapping("/{bookingId}")
+    public ResponseEntity<Object> getBooking(
+            @RequestHeader(HEADER_USER_ID) long userId,
+            @PathVariable Long bookingId
+    ) {
+        return bookingClient.getBooking(userId, bookingId);
+    }
+
+    @GetMapping("/owner")
+    public ResponseEntity<Object> getByOwnerAndState(
+            @RequestParam(required = false, defaultValue = "all") String stateParam,
+            @RequestHeader(name = HEADER_USER_ID) Long ownerId
+    ) {
+        BookingState state = getBookingState(stateParam);
+
+        return bookingClient.getByOwnerAndState(ownerId, state);
+    }
+
+    private static BookingState getBookingState(String stateParam) {
+       return BookingState.from(stateParam).orElseThrow(
+                () -> new IllegalArgumentException("Unknown state: " + stateParam)
+        );
+    }
+
+}

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

@@ -0,0 +1,29 @@
+package ru.practicum.shareit.booking.dto;
+
+import java.time.LocalDateTime;
+
+import jakarta.validation.constraints.Future;
+import jakarta.validation.constraints.FutureOrPresent;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import ru.practicum.shareit.booking.validator.StartDateIsBeforeEnd;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@StartDateIsBeforeEnd
+public class BookItemRequestDto {
+
+    private Long itemId;
+
+    @NotNull
+    @FutureOrPresent
+    private LocalDateTime start;
+
+    @NotNull
+    @Future
+    private LocalDateTime end;
+
+}

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();
+    }
+}