The assembly module has been completed, statistics have been corrected

Author: vs

.github/copilot-instructions.md

@@ -1 +1 @@
-When performing a code review, respond in Russian.
+Комментарии в Pull Request обязательно должны быть на русском языке!

compose.yaml

@@ -15,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:
       - "5433:5432"
     environment:
-      - POSTGRES_DB=mainDB
+      - POSTGRES_DB=ewmDB
       - POSTGRES_USER=dbuser
       - POSTGRES_PASSWORD=12345
     healthcheck:
@@ -42,14 +42,14 @@ 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
+      - 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

main-service/src/main/java/ru/practicum/compilation/controller/AdminCompilationController.java

@@ -1,4 +1,36 @@
 package ru.practicum.compilation.controller;
 
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+import ru.practicum.compilation.dto.CompilationDto;
+import ru.practicum.compilation.dto.NewCompilationDto;
+import ru.practicum.compilation.dto.UpdateCompilationRequest;
+import ru.practicum.compilation.service.CompilationService;
+
+@RestController
+@RequestMapping("/admin/compilations")
+@RequiredArgsConstructor
 public class AdminCompilationController {
+    private final CompilationService compilationService;
+
+    @PostMapping
+    @ResponseStatus(HttpStatus.CREATED)
+    public CompilationDto createCompilation(@RequestBody @Valid NewCompilationDto request) {
+        return compilationService.createCompilation(request);
+    }
+
+    @DeleteMapping("/{compId}")
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void deleteCompilation(@PathVariable Long compId) {
+        compilationService.deleteCompilation(compId);
+    }
+
+    @PatchMapping("/{compId}")
+    public CompilationDto updateCompilation(
+            @PathVariable Long compId,
+            @RequestBody @Valid UpdateCompilationRequest request) {
+        return compilationService.updateCompilation(compId, request);
+    }
 }

main-service/src/main/java/ru/practicum/compilation/controller/PublicCompilationController.java

@@ -1,4 +1,33 @@
 package ru.practicum.compilation.controller;
 
+import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.PositiveOrZero;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.web.bind.annotation.*;
+import ru.practicum.compilation.dto.CompilationDto;
+import ru.practicum.compilation.service.CompilationService;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/compilations")
+@RequiredArgsConstructor
 public class PublicCompilationController {
+    private final CompilationService compilationService;
+
+    @GetMapping
+    public List<CompilationDto> getCompilations(
+            @RequestParam(required = false) Boolean pinned,
+            @RequestParam(defaultValue = "0") @PositiveOrZero Integer from,
+            @RequestParam(defaultValue = "10") @Positive Integer size) {
+        Pageable pageable = PageRequest.of(from / size, size);
+        return compilationService.getCompilations(pinned, pageable);
+    }
+
+    @GetMapping("/{compId}")
+    public CompilationDto getCompilation(@PathVariable Long compId) {
+        return compilationService.getCompilationById(compId);
+    }
 }

main-service/src/main/java/ru/practicum/compilation/dto/CompilationDto.java

@@ -2,12 +2,15 @@
 
 import ru.practicum.event.dto.EventShortDto;
 
-import java.util.List;
+import java.util.Set;
 
 public record CompilationDto(
         Long id,
-        List<EventShortDto> events,
+
+        Set<EventShortDto> events,
+
         boolean pinned,
+
         String title
 ) {
 }

main-service/src/main/java/ru/practicum/compilation/dto/UpdateCompilationRequest.java

@@ -1,6 +1,5 @@
 package ru.practicum.compilation.dto;
 
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
 
 import java.util.Set;
@@ -10,7 +9,6 @@ public record UpdateCompilationRequest(
 
         boolean pinned,
 
-        @NotBlank(message = "Заголовок подборки не может быть пустым")
         @Size(min = 1, max = 50, message = "Заголовок должен содержать от {min} до {max} символов")
         String title
 ) {

main-service/src/main/java/ru/practicum/compilation/mapper/CompilationMapper.java

@@ -1,4 +1,32 @@
 package ru.practicum.compilation.mapper;
 
-public class CompilationMapper {
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Named;
+import ru.practicum.compilation.dto.NewCompilationDto;
+import ru.practicum.compilation.dto.CompilationDto;
+import ru.practicum.compilation.model.Compilation;
+import ru.practicum.event.dto.EventShortDto;
+import ru.practicum.event.mapper.EventMapper;
+import ru.practicum.event.model.Event;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Mapper(componentModel = "spring", uses = EventMapper.class)
+public interface CompilationMapper {
+    @Mapping(target = "id", ignore = true)
+    @Mapping(target = "events", ignore = true)
+    Compilation toEntity(NewCompilationDto request);
+
+    @Mapping(target = "events", source = "events", qualifiedByName = "eventsToEventShortDos")
+    CompilationDto toDto(Compilation compilation);
+
+    @Named("eventsToEventShortDos")
+    default Set<EventShortDto> eventsToEventShortDos(Set<Event> events) {
+        if (events == null) return null;
+        return events.stream()
+                .map(EventMapper.eventMapper::toEventShortWithoutRequestsAndViewsDto)
+                .collect(Collectors.toSet());
+    }
 }

main-service/src/main/java/ru/practicum/compilation/model/Compilation.java

@@ -32,4 +32,4 @@ public class Compilation {
             inverseJoinColumns = @JoinColumn(name = "event_id")
     )
     private Set<Event> events;
-}
+}

main-service/src/main/java/ru/practicum/compilation/repository/CompilationRepository.java

@@ -1,7 +1,36 @@
 package ru.practicum.compilation.repository;
 
+import io.micrometer.common.lang.NonNull;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import ru.practicum.compilation.model.Compilation;
 
+import java.util.List;
+import java.util.Optional;
+
 public interface CompilationRepository extends JpaRepository<Compilation, Long> {
+    Page<Compilation> findByPinned(Boolean pinned, Pageable pageable);
+
+    @Query("""
+            SELECT c FROM Compilation c
+            LEFT JOIN FETCH c.events e
+            LEFT JOIN FETCH e.category
+            LEFT JOIN FETCH e.initiator
+            WHERE c.id = :id""")
+    Optional<Compilation> findByIdWithEvents(@Param("id") Long id);
+
+    boolean existsByTitle(String title);
+
+    boolean existsById(@NonNull Long compId);
+
+    @Query("""
+            SELECT c FROM Compilation c
+            LEFT JOIN FETCH c.events e
+            LEFT JOIN FETCH e.category
+            LEFT JOIN FETCH e.initiator
+            WHERE c.id IN :ids""")
+    List<Compilation> findAllByIdWithEvents(@Param("ids") List<Long> ids);
 }

main-service/src/main/java/ru/practicum/compilation/service/CompilationService.java

@@ -1,4 +1,20 @@
 package ru.practicum.compilation.service;
 
+import org.springframework.data.domain.Pageable;
+import ru.practicum.compilation.dto.CompilationDto;
+import ru.practicum.compilation.dto.NewCompilationDto;
+import ru.practicum.compilation.dto.UpdateCompilationRequest;
+
+import java.util.List;
+
 public interface CompilationService {
+    CompilationDto createCompilation(NewCompilationDto request);
+
+    void deleteCompilation(Long compId);
+
+    CompilationDto updateCompilation(Long compId, UpdateCompilationRequest request);
+
+    List<CompilationDto> getCompilations(Boolean pinned, Pageable pageable);
+
+    CompilationDto getCompilationById(Long compId);
 }