Main svc

docker-compose.yml

@@ -1,14 +1,65 @@
+version: '3.8'
+
 services:
+
   stats-server:
+    container_name: stats-server
+    image: stats-server
+    build: ./stat/stat-server
     ports:
       - "9090:9090"
+    depends_on:
+      - stats-db
+    environment:
+      SPRING_PROFILES_ACTIVE: docker
+      SPRING_DATASOURCE_URL: jdbc:postgresql://stats-db:5432/stats-service
+      SPRING_DATASOURCE_USERNAME: user
+      SPRING_DATASOURCE_PASSWORD: 12345
 
   stats-db:
     image: postgres:16.1
+    container_name: postgres-stat
+    ports:
+      - "6541:5432"
+    environment:
+      POSTGRES_USER: user
+      POSTGRES_PASSWORD: 12345
+      POSTGRES_DB: stats-service
+    healthcheck:
+      test: pg_isready -q -d $$POSTGRES_DB -U $$POSTGRES_USER
+      interval: 5s
+      timeout: 5s
+      retries: 10
 
   ewm-service:
+    build:
+      context: ./evm-service
+      dockerfile: Dockerfile
+    image: explore-with-me-service
+    container_name: explore-with-me-service
     ports:
       - "8080:8080"
+    environment:
+      SPRING_PROFILES_ACTIVE: docker
+      SPRING_DATASOURCE_URL: jdbc:postgresql://ewm-db:5432/ewm-service
+      SPRING_DATASOURCE_USERNAME: user
+      SPRING_DATASOURCE_PASSWORD: 12345
+    depends_on:
+      - ewm-db
+      - stats-server
 
   ewm-db:
     image: postgres:16.1
+    container_name: postgres-service
+    ports:
+      - "6542:5432"
+    environment:
+      POSTGRES_USER: user
+      POSTGRES_PASSWORD: 12345
+      POSTGRES_DB: ewm-service
+    healthcheck:
+      test: pg_isready -q -d $$POSTGRES_DB -U $$POSTGRES_USER
+      interval: 5s
+      timeout: 5s
+      retries: 10
+

evm-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"]

evm-service/pom.xml

@@ -0,0 +1,154 @@
+<?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>explore-with-me</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>evm-service</artifactId>
+
+    <properties>
+        <querydsl.version>5.0.0</querydsl.version>
+        <org.mapstruct.version>1.6.3</org.mapstruct.version>
+        <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
+    </properties>
+
+    <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.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </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>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>1.6.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok-mapstruct-binding</artifactId>
+            <version>${lombok-mapstruct-binding.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ru.practicum</groupId>
+            <artifactId>stat-dto</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>ru.practicum</groupId>
+            <artifactId>stat-client</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                        <path>
+                            <groupId>org.mapstruct</groupId>
+                            <artifactId>mapstruct-processor</artifactId>
+                            <version>${org.mapstruct.version}</version>
+                        </path>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok-mapstruct-binding</artifactId>
+                            <version>${lombok-mapstruct-binding.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                    <showWarnings>true</showWarnings>
+                    <compilerArgs>
+                        <arg>
+                            -Amapstruct.suppressGeneratorTimestamp=true
+                        </arg>
+                        <arg>
+                            -Amapstruct.suppressGeneratorVersionInfoComment=true
+                        </arg>
+                        <arg>
+                            -Amapstruct.verbose=true
+                        </arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>

evm-service/src/main/java/ru/practicum/Category/Controller/CategoryAdminController.java

@@ -0,0 +1,35 @@
+package ru.practicum.Category.Controller;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+import ru.practicum.Category.DTO.CategoryDTO;
+import ru.practicum.Category.DTO.NewCategoryDTO;
+import ru.practicum.Category.Service.Admin.CategoryAdminServiceImpl;
+
+@RestController
+@RequestMapping("/admin/categories")
+@RequiredArgsConstructor
+public class CategoryAdminController {
+    private final CategoryAdminServiceImpl categoryService;
+
+    @PostMapping
+    @ResponseStatus(HttpStatus.CREATED)
+    public CategoryDTO createCategory(@RequestBody @Valid NewCategoryDTO category) {
+        return categoryService.addCategory(category);
+    }
+
+    @DeleteMapping("/{catId}")
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void deleteCategory(@PathVariable Integer catId) {
+        categoryService.deleteCategory(catId);
+    }
+
+    @PatchMapping("/{catId}")
+    @ResponseStatus(HttpStatus.OK)
+    public CategoryDTO updateCategory(@PathVariable Integer catId, @RequestBody @Valid CategoryDTO category) {
+        return categoryService.updateCategory(catId, category);
+    }
+
+}

evm-service/src/main/java/ru/practicum/Category/Controller/CategoryPublicController.java

@@ -0,0 +1,28 @@
+package ru.practicum.Category.Controller;
+
+import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.PositiveOrZero;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import ru.practicum.Category.DTO.CategoryDTO;
+import ru.practicum.Category.Service.Public.CategoryPublicService;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/categories")
+@RequiredArgsConstructor
+public class CategoryPublicController {
+    private final CategoryPublicService categoryService;
+
+    @GetMapping("/{catId}")
+    public CategoryDTO getCategory(@PathVariable Integer catId) {
+        return categoryService.getCategory(catId);
+    }
+
+    @GetMapping
+    public List<CategoryDTO> getCategories(@RequestParam(defaultValue = "0") @PositiveOrZero Integer from,
+                                           @RequestParam(defaultValue = "10") @Positive Integer size) {
+        return categoryService.getCategories(from, size);
+    }
+}

evm-service/src/main/java/ru/practicum/Category/DTO/CategoryDTO.java

@@ -0,0 +1,18 @@
+package ru.practicum.Category.DTO;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CategoryDTO {
+    private Integer id;
+
+    @NotBlank
+    @Size(max = 50)
+    private String name;
+}

evm-service/src/main/java/ru/practicum/Category/DTO/NewCategoryDTO.java

@@ -0,0 +1,16 @@
+package ru.practicum.Category.DTO;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class NewCategoryDTO {
+    @NotBlank
+    @Size(max = 50)
+    private String name;
+}

evm-service/src/main/java/ru/practicum/Category/Mapper/CategoryMapper.java

@@ -0,0 +1,15 @@
+package ru.practicum.Category.Mapper;
+
+import org.mapstruct.Mapper;
+import ru.practicum.Category.DTO.CategoryDTO;
+import ru.practicum.Category.DTO.NewCategoryDTO;
+import ru.practicum.Category.Model.Category;
+
+@Mapper(componentModel = "spring")
+public interface CategoryMapper {
+    Category toCategory(NewCategoryDTO categoryDTO);
+
+    CategoryDTO toCategoryDTO(Category category);
+
+    Category toCategory(CategoryDTO categoryDTO);
+}

evm-service/src/main/java/ru/practicum/Category/Model/Category.java

@@ -0,0 +1,22 @@
+package ru.practicum.Category.Model;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "categories")
+public class Category {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Integer id;
+
+    @Column(name = "name", length = 50)
+    private String name;
+}

evm-service/src/main/java/ru/practicum/Category/Repository/CategoryRepository.java

@@ -0,0 +1,16 @@
+package ru.practicum.Category.Repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import ru.practicum.Category.Model.Category;
+
+import java.util.Optional;
+
+public interface CategoryRepository extends JpaRepository<Category, Integer> {
+    Category save(Category category);
+
+    void deleteById(Integer id);
+
+    Optional<Category> findById(Integer id);
+
+
+}

evm-service/src/main/java/ru/practicum/Category/Service/Admin/CategoryAdminService.java

@@ -0,0 +1,12 @@
+package ru.practicum.Category.Service.Admin;
+
+import ru.practicum.Category.DTO.CategoryDTO;
+import ru.practicum.Category.DTO.NewCategoryDTO;
+
+public interface CategoryAdminService {
+    CategoryDTO addCategory(NewCategoryDTO categoryDTO);
+
+    void deleteCategory(Integer catId);
+
+    CategoryDTO updateCategory(int id, CategoryDTO categoryDTO);
+}