Sprint 17 Stage 2 solution

.github/copilot-instructions.md

@@ -0,0 +1 @@
+Комментарии в Pull Request обязательно должны быть на русском языке!

.gitignore

@@ -20,3 +20,4 @@ target/
 *.iws
 *.iml
 *.ipr
+/.run/

.run/Deployment compose-local.run.xml

@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Deployment compose-local" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
+    <deployment type="docker-compose.yml">
+      <settings>
+        <option name="envFilePath" value="" />
+        <option name="sourceFilePath" value="compose-local.yaml" />
+      </settings>
+    </deployment>
+    <method v="2" />
+  </configuration>
+</component>

.run/MainApplication (local).run.xml

@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="MainApplication (local)" type="Application" factoryName="Application">
+        <option name="ALTERNATIVE_JRE_PATH" value="21"/>
+        <option name="MAIN_CLASS_NAME" value="ru.practicum.MainApplication"/>
+        <module name="main-service"/>
+        <option name="VM_PARAMETERS" value="-Dspring.profiles.active=local"/>
+        <method v="2">
+            <option name="Make" enabled="true"/>
+        </method>
+    </configuration>
+</component>

.run/MainApplication (docker).run.xml → .run/MainApplication.run.xml

@@ -1,9 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="MainApplication (docker)" type="Application" factoryName="Application">
-    <option name="ALTERNATIVE_JRE_PATH" value="23" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+  <configuration default="false" name="MainApplication" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="ru.practicum.MainApplication" />
     <module name="main-service" />
+    <option name="VM_PARAMETERS" value="-Dspring.profiles.active=test" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>

.run/StatApplication (local).run.xml

@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="StatApplication (local)" type="Application" factoryName="Application">
+        <option name="ALTERNATIVE_JRE_PATH" value="21"/>
+        <option name="MAIN_CLASS_NAME" value="ru.practicum.StatApplication"/>
+        <module name="stats-server"/>
+        <option name="VM_PARAMETERS" value="-Dspring.profiles.active=local"/>
+        <method v="2">
+            <option name="Make" enabled="true"/>
+        </method>
+    </configuration>
+</component>

.run/StatApplication.run.xml

@@ -1,12 +1,11 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StatApplication" type="Application" factoryName="Application">
-    <option name="ALTERNATIVE_JRE_PATH" value="23" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="MAIN_CLASS_NAME" value="ru.practicum.StatApplication" />
-    <module name="stats-server" />
-    <option name="VM_PARAMETERS" value="-Dspring.profiles.active=test" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
+    <configuration default="false" name="StatApplication" type="Application" factoryName="Application">
+        <option name="ALTERNATIVE_JRE_PATH" value="21"/>
+        <option name="MAIN_CLASS_NAME" value="ru.practicum.StatApplication"/>
+        <module name="stats-server"/>
+        <option name="VM_PARAMETERS" value="-Dspring.profiles.active=test"/>
+        <method v="2">
+            <option name="Make" enabled="true"/>
+        </method>
+    </configuration>
 </component>

compose-local.yaml

@@ -0,0 +1,31 @@
+name: java-explore-with-me-local
+services:
+  stats-db-local:
+    image: postgres:16.1
+    container_name: stats_db_local
+    ports:
+      - "6542:5432"
+    environment:
+      - POSTGRES_DB=statDB_local
+      - POSTGRES_USER=localuser
+      - POSTGRES_PASSWORD=localpass
+    healthcheck:
+      test: pg_isready -q -d $$POSTGRES_DB -U $$POSTGRES_USER
+      timeout: 5s
+      interval: 5s
+      retries: 10
+
+  main-db-local:
+    image: postgres:16.1
+    container_name: main_db_local
+    ports:
+      - "6543:5432"
+    environment:
+      - POSTGRES_DB=mainDB_local
+      - POSTGRES_USER=localuser
+      - POSTGRES_PASSWORD=localpass
+    healthcheck:
+      test: pg_isready -q -d $$POSTGRES_DB -U $$POSTGRES_USER
+      timeout: 5s
+      interval: 5s
+      retries: 10

compose.yaml

@@ -1,3 +1,4 @@
+name: java-explore-with-me
 services:
   stats-db:
     image: postgres:16.1
@@ -14,13 +15,13 @@ services:
       interval: 5s
       retries: 10
 
-  main-db:
+  ewm-db:
     image: postgres:16.1
-    container_name: main_db
+    container_name: ewm_db
     ports:
-      - "6542:5432"
+      - "5433:5432"
     environment:
-      - POSTGRES_DB=mainDB
+      - POSTGRES_DB=ewmDB
       - POSTGRES_USER=dbuser
       - POSTGRES_PASSWORD=12345
     healthcheck:
@@ -41,14 +42,16 @@ services:
       - SPRING_DATASOURCE_USERNAME=dbuser
       - SPRING_DATASOURCE_PASSWORD=12345
 
-  main-service:
+  ewm-service:
     build: ./main-service
-    container_name: main_service
+    container_name: ewm_service
     ports:
       - "8080:8080"
     depends_on:
-      - main-db
+      - stats-server
+      - ewm-db
     environment:
-      - SPRING_DATASOURCE_URL=jdbc:postgresql://main-db:5432/mainDB
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://ewm-db:5432/ewmDB
       - SPRING_DATASOURCE_USERNAME=dbuser
       - SPRING_DATASOURCE_PASSWORD=12345
+      - STATS_SERVER_URL=http://stats-server:9090

main-service/pom.xml

@@ -15,50 +15,48 @@
     <name>Main Service</name>
 
     <dependencies>
+        <dependency>
+            <groupId>ru.practicum</groupId>
+            <artifactId>stats-client</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</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-actuator</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>ru.practicum</groupId>
-            <artifactId>stats-client</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <scope>runtime</scope>
         </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>${mapstruct.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -67,6 +65,10 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 

main-service/src/main/java/ru/practicum/category/controller/AdminCategoryController.java

@@ -0,0 +1,40 @@
+package ru.practicum.category.controller;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Positive;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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.CategoryService;
+
+@Slf4j
+@RestController
+@RequestMapping("/admin/categories")
+@RequiredArgsConstructor
+public class AdminCategoryController {
+    private final CategoryService categoryService;
+
+    @PostMapping
+    @ResponseStatus(HttpStatus.CREATED)
+    public CategoryDto createCategory(@RequestBody @Valid NewCategoryDto newCategoryDto) {
+        log.debug("Controller: createCategory data {}", newCategoryDto);
+        return categoryService.createCategory(newCategoryDto);
+    }
+
+    @DeleteMapping("/{categoryId}")
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void deleteCategory(@PathVariable @Positive Long categoryId) {
+        log.debug("Controller: deleteCategory id={}", categoryId);
+        categoryService.deleteCategory(categoryId);
+    }
+
+    @PatchMapping("/{categoryId}")
+    public CategoryDto updateCategory(@PathVariable @Positive Long categoryId,
+                                      @RequestBody @Valid NewCategoryDto newCategoryDto) {
+        log.debug("Controller: updateCategory id={}, data={}", categoryId, newCategoryDto);
+        return categoryService.updateCategory(categoryId, newCategoryDto);
+    }
+}

main-service/src/main/java/ru/practicum/category/controller/PublicCategoryController.java

@@ -0,0 +1,37 @@
+package ru.practicum.category.controller;
+
+import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.PositiveOrZero;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.web.bind.annotation.*;
+import ru.practicum.category.dto.CategoryDto;
+import ru.practicum.category.service.CategoryService;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping("/categories")
+@RequiredArgsConstructor
+public class PublicCategoryController {
+    private final CategoryService categoryService;
+
+    @GetMapping
+    public List<CategoryDto> getCategories(
+            @RequestParam(defaultValue = "0") @PositiveOrZero Integer from,
+            @RequestParam(defaultValue = "10") @Positive Integer size) {
+        int page = from / size;
+        Pageable pageable = PageRequest.of(page, size);
+        log.debug("Controller: getCategories with from={}, size={}", from, size);
+        return categoryService.getCategories(pageable);
+    }
+
+    @GetMapping("/{categoryId}")
+    public CategoryDto getCategoryById(@PathVariable @Positive Long categoryId) {
+        log.debug("Controller: getCategoryById with id={}", categoryId);
+        return categoryService.getCategoryById(categoryId);
+    }
+}

main-service/src/main/java/ru/practicum/category/dto/CategoryDto.java

@@ -0,0 +1,13 @@
+package ru.practicum.category.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+public record CategoryDto(
+      Long id,
+
+      @NotBlank(message = "Название категории не может быть пустым")
+      @Size(min = 1, max = 50, message = "Название категории должно содержать от {min} до {max} символов")
+      String name
+) {
+}

main-service/src/main/java/ru/practicum/category/dto/NewCategoryDto.java

@@ -0,0 +1,11 @@
+package ru.practicum.category.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+public record NewCategoryDto(
+        @NotBlank(message = "Название категории не может быть пустым")
+        @Size(min = 1, max = 50, message = "Название категории должно содержать от {min} до {max} символов")
+        String name
+) {
+}

main-service/src/main/java/ru/practicum/category/mapper/CategoryMapper.java

@@ -0,0 +1,22 @@
+package ru.practicum.category.mapper;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.MappingTarget;
+import ru.practicum.category.dto.CategoryDto;
+import ru.practicum.category.dto.NewCategoryDto;
+import ru.practicum.category.model.Category;
+
+@Mapper(componentModel = "spring")
+public interface CategoryMapper {
+
+    @Mapping(target = "id", ignore = true)
+    Category toEntity(NewCategoryDto newCategoryDto);
+
+    CategoryDto toDto(Category category);
+
+    @Mapping(target = "id", ignore = true)
+    void updateCategoryFromDto(NewCategoryDto dto, @MappingTarget Category category);
+
+    Category toEntityFromDto(CategoryDto dto);
+}

main-service/src/main/java/ru/practicum/category/model/Category.java

@@ -0,0 +1,23 @@
+package ru.practicum.category.model;
+
+import jakarta.persistence.*;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Entity
+@Table(name = "categories")
+@Getter
+@Setter
+@ToString
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+public class Category {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @EqualsAndHashCode.Include
+    private Long id;
+
+    @Column(name = "name", unique = true, nullable = false, length = 50)
+    private String name;
+}