Add item requests and gateway

.run/ShareitGateway.run.xml

@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+<configuration default="false" name="ru.practicum.shareit.ShareItGateway" type="Application" factoryName="Application" nameIsGenerated="true">
+    <option name="MAIN_CLASS_NAME" value="ru.practicum.shareit.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,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/postgres
+      - SPRING_DATASOURCE_USERNAME=user
+      - SPRING_DATASOURCE_PASSWORD=12345
+
+  db:
+    image: postgres:16.1
+    container_name: postgres
+    ports:
+      - "6541:5432"
+    environment:
+      - POSTGRES_PASSWORD=12345
+      - POSTGRES_USER=user
+      - 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,92 @@
+<?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 http://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>
+        <dependency>
+            <groupId>ru.practicum</groupId>
+            <artifactId>shareit-server</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.38</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </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,57 @@
+package ru.practicum.shareit.booking;
+
+import java.util.Map;
+
+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.BookingRequestDto;
+import ru.practicum.shareit.booking.dto.BookingState;
+import ru.practicum.shareit.client.BaseClient;
+
+@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> addBooking(Long userId, BookingRequestDto requestDto) {
+            return post("", userId, requestDto);
+    }
+
+    public ResponseEntity<Object> getBooking(Long bookingId, Long userId) {
+        return get("/" + bookingId, userId);
+    }
+
+    public ResponseEntity<Object> bookingApprove(long bookingId, long userId, boolean approved) {
+
+        return patch("/" + bookingId + "?approved=" + approved, userId);
+    }
+
+    public ResponseEntity<Object> getBookingsByUser(Long userId, String state) {
+        Map<String, Object> parameters = Map.of(
+                "state", state
+        );
+        return get("", userId, parameters);
+    }
+
+    public ResponseEntity<Object> getBookingsByOwner(Long userId, BookingState state) {
+        Map<String, Object> parameters = Map.of(
+                "state", state
+        );
+        return get("/owner", userId, parameters);
+    }
+}

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

@@ -0,0 +1,47 @@
+package ru.practicum.shareit.booking;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import ru.practicum.shareit.booking.dto.BookingRequestDto;
+import ru.practicum.shareit.booking.dto.BookingState;
+
+@RestController
+@RequestMapping(path = "/bookings")
+@RequiredArgsConstructor
+public class BookingController {
+    private final BookingClient bookingService;
+    public static final String USER_ID = "X-Sharer-User-Id";
+
+    @PostMapping
+    public ResponseEntity<Object> addBooking(@RequestBody @Valid BookingRequestDto booking,
+                                         @RequestHeader(USER_ID) Long bookerId) {
+        return bookingService.addBooking(bookerId, booking);
+    }
+
+    @PatchMapping("/{bookingId}")
+    public ResponseEntity<Object> bookingApprove(@PathVariable Long bookingId,
+                                                 @RequestHeader (USER_ID) Long ownerId,
+                                                 @RequestParam Boolean approved) {
+        return bookingService.bookingApprove(bookingId, ownerId, approved);
+    }
+
+    @GetMapping("/{bookingId}")
+    public ResponseEntity<Object> getBooking(@PathVariable Long bookingId,
+                                             @RequestHeader(USER_ID) Long userId) {
+        return bookingService.getBooking(bookingId, userId);
+    }
+
+    @GetMapping
+    public ResponseEntity<Object> getBookingsByUser(@RequestHeader (USER_ID) Long userId,
+                                                    @RequestParam(name = "state", defaultValue = "all") String state) {
+        return bookingService.getBookingsByUser(userId, state);
+    }
+
+    @GetMapping("/owner")
+    public ResponseEntity<Object> getBookingsByOwner(@RequestHeader (USER_ID) Long userId,
+                                                     @RequestParam(name = "state", defaultValue = "all") BookingState state) {
+        return bookingService.getBookingsByOwner(userId, state);
+    }
+}

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

@@ -6,7 +6,6 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import ru.practicum.shareit.booking.model.BookingStatus;
 
 import java.time.LocalDateTime;
 
@@ -19,6 +18,7 @@ public class BookingRequestDto {
 
     @NotNull
     @Future
+
     private LocalDateTime start;
 
     @NotNull
@@ -30,5 +30,5 @@ public class BookingRequestDto {
 
     private Long bookerId;
 
-    private BookingStatus status;
+    private BookingState status;
 }

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

@@ -0,0 +1,30 @@
+package ru.practicum.shareit.booking.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import ru.practicum.shareit.item.dto.ItemBookerDto;
+import ru.practicum.shareit.user.dto.UserBookingDto;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BookingResponseDto {
+
+    @JsonProperty("id")
+    private Long bookingId;
+
+    private LocalDateTime start;
+
+    private LocalDateTime end;
+
+    private ItemBookerDto item;
+
+    private UserBookingDto booker;
+
+    private BookingState status;
+
+}

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

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