тз 16ого спринта

.gitignore

@@ -3,6 +3,8 @@ target/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/
+/target/
+
 
 ### STS ###
 .apt_generated
@@ -18,6 +20,7 @@ target/
 *.iws
 *.iml
 *.ipr
+*.class
 
 ### NetBeans ###
 /nbproject/private/

.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,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/practicum/shareit/ShareItGateway.java

@@ -0,0 +1,12 @@
+package ru.practicum.shareit.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/practicum/shareit/booking/BookingClient.java

@@ -0,0 +1,65 @@
+package ru.practicum.shareit.practicum.shareit.booking;
+
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
+import ru.practicum.shareit.practicum.shareit.booking.dto.BookItemRequestDto;
+import ru.practicum.shareit.practicum.shareit.booking.dto.BookingState;
+import ru.practicum.shareit.practicum.shareit.booking.dto.NewBookingDto;
+import ru.practicum.shareit.practicum.shareit.client.BaseClient;
+
+import java.util.Map;
+
+
+public class BookingClient extends BaseClient {
+
+    public BookingClient(RestTemplate restTemplate) {
+        super(restTemplate);
+    }
+
+    public ResponseEntity<Object> getBookings(long userId, BookingState state, Integer from, Integer size) {
+        Map<String, Object> parameters = Map.of(
+                "state", state.name(),
+                "from", from,
+                "size", size
+        );
+        return get("?state={state}&from={from}&size={size}", userId, parameters);
+    }
+
+
+    public ResponseEntity<Object> bookItem(long userId, BookItemRequestDto requestDto) {
+        return post("", userId, requestDto);
+    }
+
+    public ResponseEntity<Object> getBooking(long userId, Long bookingId) {
+        return get("/" + bookingId, userId);
+    }
+
+    public ResponseEntity<Object> create(NewBookingDto newBookingDto, long userId) {
+        return post("", userId, newBookingDto);
+    }
+
+
+    public ResponseEntity<Object> approveBooking(long userId, long bookingId, boolean approved) {
+        Map<String, Object> uriVariables = Map.of("bookingId", bookingId, "approved", approved);
+        return patch("/" + bookingId + "?approved=" + approved, userId, approved);
+    }
+
+    public ResponseEntity<Object> findById(long userId, long bookingId) {
+        return get("/" + bookingId, userId);
+    }
+
+    public ResponseEntity<Object> findByBooker(long userId, BookingState state) {
+        Map<String, Object> parameters = Map.of(
+                "state", state.name()
+        );
+        return get("?state={state}", userId, parameters);
+    }
+
+    public ResponseEntity<Object> findByOwner(long userId, BookingState state) {
+        Map<String, Object> parameters = Map.of(
+                "state", state.name()
+        );
+        return get("/owner", userId, parameters);
+    }
+}

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

@@ -0,0 +1,28 @@
+package ru.practicum.shareit.practicum.shareit.booking;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.DefaultUriBuilderFactory;
+
+@Configuration
+public class BookingClientConfig {
+    @Value("${shareit-server.url}")
+    private String serverUrl;
+
+    @Bean
+    public RestTemplate bookingRestTemplate(RestTemplateBuilder builder) {
+        return builder
+                .uriTemplateHandler(new DefaultUriBuilderFactory(serverUrl + "/bookings"))
+                .requestFactory(() -> new HttpComponentsClientHttpRequestFactory())
+                .build();
+    }
+
+    @Bean
+    public BookingClient bookingClient(RestTemplate bookingRestTemplate) {
+        return new BookingClient(bookingRestTemplate);
+    }
+}

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

@@ -0,0 +1,55 @@
+package ru.practicum.shareit.practicum.shareit.booking;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import ru.practicum.shareit.practicum.shareit.booking.dto.BookingState;
+import ru.practicum.shareit.practicum.shareit.booking.dto.NewBookingDto;
+
+
+/**
+ * TODO Sprint add-bookings.
+ */
+@RestController
+@RequestMapping(path = "/bookings")
+@RequiredArgsConstructor
+@Validated
+public class BookingController {
+    private final BookingClient bookingClient;
+
+    @PostMapping
+    @ResponseStatus(HttpStatus.CREATED)
+    public ResponseEntity<Object> create(@RequestBody @Valid NewBookingDto newBookingDto, @RequestHeader("X-Sharer-User-Id") @NotNull long userId) {
+        return bookingClient.create(newBookingDto, userId);
+    }
+
+    @PatchMapping("/{bookingId}")
+    @ResponseStatus(HttpStatus.OK)
+    public ResponseEntity<Object> approveBooking(@RequestHeader("X-Sharer-User-Id") long userId, @PathVariable Long bookingId, @RequestParam Boolean approved) {
+        return bookingClient.approveBooking(userId, bookingId, approved);
+    }
+
+    @GetMapping
+    @ResponseStatus(HttpStatus.OK)
+    public ResponseEntity<Object> findByBooker(@RequestHeader("X-Sharer-User-Id") @NotNull long userId,
+                                               @RequestParam(defaultValue = "ALL") BookingState state) {
+        return bookingClient.findByBooker(userId, state);
+    }
+
+    @GetMapping("/owner")
+    @ResponseStatus(HttpStatus.OK)
+    public ResponseEntity<Object> findByOwner(@RequestHeader("X-Sharer-User-Id") @NotNull long userId,
+                                              @RequestParam(defaultValue = "ALL") BookingState state) {
+        return bookingClient.findByOwner(userId, state);
+    }
+
+    @GetMapping("/{bookingId}")
+    @ResponseStatus(HttpStatus.OK)
+    public ResponseEntity<Object> findById(@RequestHeader("X-Sharer-User-Id") @NotNull long userId, @PathVariable @NotNull long bookingId) {
+        return bookingClient.findById(userId, bookingId);
+    }
+}

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

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

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

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

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

@@ -0,0 +1,23 @@
+package ru.practicum.shareit.practicum.shareit.booking.dto;
+
+import lombok.Builder;
+import lombok.Data;
+import ru.practicum.shareit.practicum.shareit.booking.BookingStatus;
+import ru.practicum.shareit.practicum.shareit.item.dto.ItemDto;
+import ru.practicum.shareit.practicum.shareit.user.dto.UserDto;
+
+import java.time.LocalDateTime;
+
+/**
+ * TODO Sprint add-bookings.
+ */
+@Data
+@Builder
+public class BookingDto {
+    private Long id;
+    private LocalDateTime start;
+    private LocalDateTime end;
+    private ItemDto item;
+    private UserDto booker;
+    private BookingStatus status;
+}