Merge pull request #3 from ivanvznkv/main_svc

stage 2 - add ewm-service

Author: ivanvznkv

docker-compose.yml

@@ -53,4 +53,5 @@ services:
     environment:
       SPRING_DATASOURCE_URL: jdbc:postgresql://ewm-db:5432/ewmdb
       SPRING_DATASOURCE_USERNAME: postgres
-      SPRING_DATASOURCE_PASSWORD: password
+      SPRING_DATASOURCE_PASSWORD: password
+      STATS_SERVER_URL: http://stats-server:9090

ewm-service/pom.xml

@@ -27,6 +27,34 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ru.practicum</groupId>
+            <artifactId>statistics-client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -3,7 +3,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {"ru.practicum.ewm", "ru.practicum.statistics.client"})
 public class EwmServiceApp {
     public static void main(String[] args) {
         SpringApplication.run(EwmServiceApp.class, args);

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

@@ -0,0 +1,36 @@
+package ru.practicum.ewm.category.controller;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import ru.practicum.ewm.category.dto.CategoryDto;
+import ru.practicum.ewm.category.dto.NewCategoryDto;
+import ru.practicum.ewm.category.service.CategoryService;
+
+@RestController
+@RequestMapping("/admin/categories")
+@RequiredArgsConstructor
+@Validated
+public class AdminCategoryController {
+    private final CategoryService categoryService;
+
+    @PostMapping
+    @ResponseStatus(HttpStatus.CREATED)
+    public CategoryDto createCategory(@Valid @RequestBody NewCategoryDto dto) {
+        return categoryService.createCategory(dto);
+    }
+
+    @PatchMapping("/{catId}")
+    public CategoryDto updateCategory(@PathVariable Long catId,
+                                      @Valid @RequestBody CategoryDto dto) {
+        return categoryService.updateCategory(catId, dto);
+    }
+
+    @DeleteMapping("/{catId}")
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void deleteCategory(@PathVariable Long catId) {
+        categoryService.deleteCategory(catId);
+    }
+}

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

@@ -0,0 +1,31 @@
+package ru.practicum.ewm.category.controller;
+
+import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.PositiveOrZero;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import ru.practicum.ewm.category.dto.CategoryDto;
+import ru.practicum.ewm.category.service.CategoryService;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/categories")
+@RequiredArgsConstructor
+@Validated
+public class PublicCategoryController {
+    private final CategoryService categoryService;
+
+    @GetMapping
+    public List<CategoryDto> getCategories(
+            @RequestParam(defaultValue = "0") @PositiveOrZero int from,
+            @RequestParam(defaultValue = "10") @Positive int size) {
+        return categoryService.getCategories(from, size);
+    }
+
+    @GetMapping("/{catId}")
+    public CategoryDto getCategory(@PathVariable Long catId) {
+        return categoryService.getCategory(catId);
+    }
+}

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

@@ -0,0 +1,16 @@
+package ru.practicum.ewm.category.dto;
+
+import jakarta.validation.constraints.Size;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CategoryDto {
+    private Long id;
+
+    @Size(max = 50)
+    private String name;
+}

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

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

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

@@ -0,0 +1,18 @@
+package ru.practicum.ewm.category.mapper;
+
+import ru.practicum.ewm.category.dto.CategoryDto;
+import ru.practicum.ewm.category.dto.NewCategoryDto;
+import ru.practicum.ewm.category.model.Category;
+
+public class CategoryMapper {
+
+    public static Category toCategory(NewCategoryDto dto) {
+        Category category = new Category();
+        category.setName(dto.getName());
+        return category;
+    }
+
+    public static CategoryDto toCategoryDto(Category category) {
+        return new CategoryDto(category.getId(), category.getName());
+    }
+}

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

@@ -0,0 +1,20 @@
+package ru.practicum.ewm.category.model;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Table(name = "categories")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Category {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false, length = 50, unique = true)
+    private String name;
+}

ewm-service/src/main/java/ru/practicum/ewm/category/repository/CategoryRepository.java

@@ -0,0 +1,8 @@
+package ru.practicum.ewm.category.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import ru.practicum.ewm.category.model.Category;
+
+public interface CategoryRepository extends JpaRepository<Category, Long> {
+    boolean existsByName(String name);
+}