fix2

Author: ivanvznkv

docker-compose.yml

@@ -25,4 +25,32 @@ services:
     environment:
       STATS_DB_URL: jdbc:postgresql://stats-db:5432/statsdb
       STATS_DB_USER: postgres
-      STATS_DB_PASSWORD: password
+      STATS_DB_PASSWORD: password
+
+  ewm-db:
+    image: postgres:16.1
+    container_name: ewm-db
+    ports:
+      - "5433:5432"
+    environment:
+      POSTGRES_DB: ewmdb
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: password
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  ewm-service:
+    build: ./ewm-service
+    container_name: ewm-service
+    ports:
+      - "8080:8080"
+    depends_on:
+      ewm-db:
+        condition: service_healthy
+    environment:
+      SPRING_DATASOURCE_URL: jdbc:postgresql://ewm-db:5432/ewmdb
+      SPRING_DATASOURCE_USERNAME: postgres
+      SPRING_DATASOURCE_PASSWORD: password

ewm-service/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"]

ewm-service/pom.xml

@@ -0,0 +1,40 @@
+<?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>explore-with-me</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>ewm-service</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>

ewm-service/src/main/java/ru/practicum/ewm/EwmServiceApp.java

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

ewm-service/src/main/resources/application.properties

@@ -0,0 +1,2 @@
+server.port=8080
+spring.application.name=ewm-service

pom.xml

@@ -26,6 +26,7 @@
 		<module>statistics/dto</module>
 		<module>statistics/client</module>
 		<module>statistics/server</module>
+		<module>ewm-service</module>
 	</modules>
 
 	<build>

statistics/client/src/main/java/ru/practicum/statistics/client/StatsClient.java

@@ -18,6 +18,8 @@
 
 @Service
 public class StatsClient {
+    private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
     private final RestTemplate rest;
     private final String serverUrl;
 
@@ -33,9 +35,8 @@ public void sendHit(EndpointHit hit) {
     }
 
     public List<ViewStats> getStats(LocalDateTime start, LocalDateTime end, List<String> uris, boolean unique) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        String startStr = URLEncoder.encode(start.format(formatter), StandardCharsets.UTF_8);
-        String endStr = URLEncoder.encode(end.format(formatter), StandardCharsets.UTF_8);
+        String startStr = URLEncoder.encode(start.format(DATE_TIME_FORMATTER), StandardCharsets.UTF_8);
+        String endStr = URLEncoder.encode(end.format(DATE_TIME_FORMATTER), StandardCharsets.UTF_8);
 
         UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(serverUrl + "/stats")
                 .queryParam("start", startStr)

statistics/dto/pom.xml

@@ -23,5 +23,9 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
     </dependencies>
 </project>

statistics/dto/src/main/java/ru/practicum/statistics/dto/EndpointHit.java

@@ -1,6 +1,8 @@
 package ru.practicum.statistics.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -12,9 +14,17 @@
 @AllArgsConstructor
 public class EndpointHit {
     private Long id;
+
+    @NotBlank(message = "Название приложения не может быть пустым")
     private String app;
+
+    @NotBlank(message = "URI не может быть пустым")
     private String uri;
+
+    @NotBlank(message = "IP-адрес не может быть пустым")
     private String ip;
+
+    @NotNull(message = "Временная метка не может быть null")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime timestamp;
 }

statistics/server/pom.xml

@@ -42,7 +42,6 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>