fix34

Author: ivanvznkv

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

@@ -1,6 +1,8 @@
 package ru.practicum.ewm.compilation.controller;
 
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.PositiveOrZero;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.annotation.Validated;
@@ -10,6 +12,8 @@
 import ru.practicum.ewm.compilation.dto.UpdateCompilationRequest;
 import ru.practicum.ewm.compilation.service.CompilationService;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/admin/compilations")
 @RequiredArgsConstructor
@@ -23,6 +27,13 @@ public CompilationDto createCompilation(@Valid @RequestBody NewCompilationDto dt
         return compilationService.createCompilation(dto);
     }
 
+    @GetMapping
+    public List<CompilationDto> getCompilations(@RequestParam(required = false) Boolean pinned,
+                                                @RequestParam(defaultValue = "0") @PositiveOrZero int from,
+                                                @RequestParam(defaultValue = "10") @Positive int size) {
+        return compilationService.getCompilations(pinned, from, size);
+    }
+
     @PatchMapping("/{compId}")
     public CompilationDto updateCompilation(@PathVariable Long compId,
                                             @Valid @RequestBody UpdateCompilationRequest req) {

ewm-service/src/main/java/ru/practicum/ewm/compilation/service/CompilationServiceImpl.java

@@ -15,6 +15,7 @@
 import ru.practicum.ewm.event.dto.EventShortDto;
 import ru.practicum.ewm.event.mapper.EventMapper;
 import ru.practicum.ewm.event.model.Event;
+import ru.practicum.ewm.event.model.EventState;
 import ru.practicum.ewm.event.repository.EventRepository;
 import ru.practicum.ewm.exception.NotFoundException;
 
@@ -87,20 +88,36 @@ public List<CompilationDto> getCompilations(Boolean pinned, int from, int size)
         }
         return compilations.stream()
                 .map(comp -> {
+//                    Set<EventShortDto> eventDtos = comp.getEvents().stream()
+//                            .map(event -> EventMapper.toEventShortDto(event, 0L, 0L))
+//                            .collect(Collectors.toSet());
                     Set<EventShortDto> eventDtos = comp.getEvents().stream()
+                            .filter(event -> event.getState() == EventState.PUBLISHED)
                             .map(event -> EventMapper.toEventShortDto(event, 0L, 0L))
                             .collect(Collectors.toSet());
                     return CompilationMapper.toCompilationDto(comp, eventDtos);
                 })
                 .collect(Collectors.toList());
     }
 
+//    @Override
+//    @Transactional(readOnly = true)
+//    public CompilationDto getCompilation(Long compId) {
+//        Compilation compilation = compilationRepository.findById(compId)
+//                .orElseThrow(() -> new NotFoundException("Подборка с id=" + compId + " не найдена"));
+//        Set<EventShortDto> eventDtos = compilation.getEvents().stream()
+//                .map(event -> EventMapper.toEventShortDto(event, 0L, 0L))
+//                .collect(Collectors.toSet());
+//        return CompilationMapper.toCompilationDto(compilation, eventDtos);
+//    }
+
     @Override
     @Transactional(readOnly = true)
     public CompilationDto getCompilation(Long compId) {
         Compilation compilation = compilationRepository.findById(compId)
                 .orElseThrow(() -> new NotFoundException("Подборка с id=" + compId + " не найдена"));
         Set<EventShortDto> eventDtos = compilation.getEvents().stream()
+                .filter(event -> event.getState() == EventState.PUBLISHED)
                 .map(event -> EventMapper.toEventShortDto(event, 0L, 0L))
                 .collect(Collectors.toSet());
         return CompilationMapper.toCompilationDto(compilation, eventDtos);

ewm-service/src/main/java/ru/practicum/ewm/event/repository/EventRepository.java

@@ -2,6 +2,7 @@
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -16,13 +17,26 @@ public interface EventRepository extends JpaRepository<Event, Long> {
 
     boolean existsByCategoryId(Long categoryId);
 
-    @Query("SELECT DISTINCT e FROM Event e " +
-            "LEFT JOIN FETCH e.category " +
-            "LEFT JOIN FETCH e.initiator " +
+//    @Query("SELECT DISTINCT e FROM Event e " +
+//            "LEFT JOIN FETCH e.category " +
+//            "LEFT JOIN FETCH e.initiator " +
+//            "WHERE (:users IS NULL OR e.initiator.id IN :users) " +
+//            "AND (:states IS NULL OR e.state IN :states) " +
+//            "AND (:categories IS NULL OR e.category.id IN :categories) " +
+//            "AND (CAST(:rangeStart AS timestamp) IS NULL OR CAST(:rangeEnd AS timestamp) IS NULL OR e.eventDate BETWEEN :rangeStart AND :rangeEnd)")
+//    Page<Event> searchEventsAdmin(@Param("users") List<Long> users,
+//                                  @Param("states") List<EventState> states,
+//                                  @Param("categories") List<Long> categories,
+//                                  @Param("rangeStart") LocalDateTime rangeStart,
+//                                  @Param("rangeEnd") LocalDateTime rangeEnd,
+//                                  Pageable pageable);
+
+    @Query("SELECT e FROM Event e " +
             "WHERE (:users IS NULL OR e.initiator.id IN :users) " +
             "AND (:states IS NULL OR e.state IN :states) " +
             "AND (:categories IS NULL OR e.category.id IN :categories) " +
             "AND (CAST(:rangeStart AS timestamp) IS NULL OR CAST(:rangeEnd AS timestamp) IS NULL OR e.eventDate BETWEEN :rangeStart AND :rangeEnd)")
+    @EntityGraph(attributePaths = {"category", "initiator"})
     Page<Event> searchEventsAdmin(@Param("users") List<Long> users,
                                   @Param("states") List<EventState> states,
                                   @Param("categories") List<Long> categories,