add-item-requests-and-gateway

.gitignore

@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/

.run/ShareItGateway.run.xml

@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ShareItGateway" type="Application" factoryName="Application" nameIsGenerated="true">
+    <option name="MAIN_CLASS_NAME" value="ru.practicum.shareit.ShareItGateway" />
+    <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,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ShareItServer" type="Application" factoryName="Application" nameIsGenerated="true">
+    <option name="MAIN_CLASS_NAME" value="ru.practicum.shareit.ShareItServer" />
+    <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>

README.md

@@ -1,4 +1 @@
 # java-shareit
-
-### Database map
-![SchemaDatabase.png](SchemaDatabase.png)

docker-compose.yml

@@ -0,0 +1,47 @@
+services:
+  gateway:
+    build:
+      context: ./gateway
+      dockerfile: Dockerfile
+    image: shareit-gateway
+    container_name: shareit-gateway
+    ports:
+      - "8080:8080"
+    depends_on:
+      - server
+    environment:
+#      - TZ=Europe/Moscow
+      - SHAREIT_SERVER_URL=http://server:9090
+
+  server:
+    build:
+      context: ./server
+      dockerfile: Dockerfile
+    image: shareit-server
+    container_name: shareit-server
+    ports:
+      - "9090:9090"
+    depends_on:
+      - db
+    environment:
+#      - TZ=Europe/Moscow
+      - 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:
+#      - TZ=Europe/Moscow
+      - POSTGRES_DB=shareit
+      - POSTGRES_USER=shareit
+      - POSTGRES_PASSWORD=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,65 @@
+<?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>
+
+    <name>ShareIt Gateway</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <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>
+    </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,11 @@
+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,66 @@
+package ru.practicum.shareit.booking;
+
+import jakarta.validation.ValidationException;
+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.BookingState;
+import ru.practicum.shareit.booking.dto.GBookingDto;
+import ru.practicum.shareit.client.BaseClient;
+
+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 serverUrl, RestTemplateBuilder builder) {
+		super(
+				builder
+						.uriTemplateHandler(new DefaultUriBuilderFactory(serverUrl + API_PREFIX))
+						.requestFactory(() -> new HttpComponentsClientHttpRequestFactory())
+						.build()
+		);
+	}
+
+	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, GBookingDto requestDto) {
+		LocalDateTime start = requestDto.getStart();
+		LocalDateTime end = requestDto.getEnd();
+		if (start.isAfter(end) || start.isEqual(end)) {
+			throw new ValidationException("Дата начала бронирования должна быть раньше даты окончания");
+		}
+		return post("", userId, requestDto);
+	}
+
+	public ResponseEntity<Object> getBooking(long userId, Long bookingId) {
+		return get("/" + bookingId, userId);
+	}
+
+	public ResponseEntity<Object> getBookingsByOwner(long userId, BookingState state, Integer from, Integer size) {
+		Map<String, Object> parameters = Map.of(
+				"state", state.name(),
+				"from", from,
+				"size", size
+		);
+		return get("/owner?state={state}&from={from}&size={size}", userId, parameters);
+	}
+
+	public ResponseEntity<Object> approveBooking(long userId, long bookingId, boolean approved) {
+		return patch("/" + bookingId + "?approved=" + approved, userId);
+	}
+}

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

@@ -0,0 +1,70 @@
+package ru.practicum.shareit.booking;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.PositiveOrZero;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import ru.practicum.shareit.booking.dto.BookingState;
+import ru.practicum.shareit.booking.dto.GBookingDto;
+import ru.practicum.shareit.util.Marker;
+
+@Controller
+@RequestMapping(path = "/bookings")
+@RequiredArgsConstructor
+@Slf4j
+@Validated
+public class BookingController {
+	private final BookingClient bookingClient;
+
+	@GetMapping
+	public ResponseEntity<Object> getBookingsByBooker(
+			@RequestHeader("X-Sharer-User-Id") long userId,
+			@RequestParam(name = "state", defaultValue = "all") String stateParam,
+			@PositiveOrZero @RequestParam(name = "from", defaultValue = "0") Integer from,
+			@Positive @RequestParam(name = "size", defaultValue = "10") Integer size) {
+		BookingState state = BookingState.from(stateParam)
+				.orElseThrow(() -> new IllegalArgumentException("Unknown state: " + stateParam));
+		log.info("Get booking with state {}, userId={}, from={}, size={}", stateParam, userId, from, size);
+		return bookingClient.getBookings(userId, state, from, size);
+	}
+
+	@GetMapping("/owner")
+	public ResponseEntity<Object> getAllBookingsByOwner(
+			@RequestHeader("X-Sharer-User-Id") long userId,
+			@RequestParam(name = "state", defaultValue = "all") String stateParam,
+			@PositiveOrZero @RequestParam(name = "from", defaultValue = "0") Integer from,
+			@Positive @RequestParam(name = "size", defaultValue = "10") Integer size) {
+		BookingState state = BookingState.from(stateParam)
+				.orElseThrow(() -> new IllegalArgumentException("Unknown state: " + stateParam));
+		log.info("Get booking by Owner with state {}, userId={}, from={}, size={}", stateParam, userId, from, size);
+		return bookingClient.getBookingsByOwner(userId, state, from, size);
+	}
+
+	@GetMapping("/{bookingId}")
+	public ResponseEntity<Object> getBookingById(@RequestHeader("X-Sharer-User-Id") long userId,
+	                                             @PathVariable Long bookingId) {
+		log.info("Get booking {}, userId={}", bookingId, userId);
+		return bookingClient.getBooking(userId, bookingId);
+	}
+
+	@PostMapping
+	@Validated(Marker.OnCreate.class)
+	public ResponseEntity<Object> bookItem(@RequestHeader("X-Sharer-User-Id") long userId,
+	                                       @RequestBody @Valid GBookingDto requestDto) {
+		log.info("Creating booking {}, userId={}", requestDto.toString(), userId);
+		return bookingClient.bookItem(userId, requestDto);
+	}
+
+	@PatchMapping("/{bookingId}")
+	public ResponseEntity<Object> approveBooking(@RequestHeader("X-Sharer-User-Id") long userId,
+	                                             @PathVariable long bookingId,
+	                                             @RequestParam boolean approved) {
+		log.info("Approve booking {}, userId={}", bookingId, userId);
+		return bookingClient.approveBooking(userId, bookingId, approved);
+	}
+}

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