Main svc events

main-service/pom.xml

@@ -56,8 +56,43 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-jpa</artifactId>
+            <classifier>jakarta</classifier>
+        </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.mysema.maven</groupId>
+                <artifactId>apt-maven-plugin</artifactId>
+                <version>1.1.3</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/generated-sources/java</outputDirectory>
+                            <processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.querydsl</groupId>
+                        <artifactId>querydsl-apt</artifactId>
+                        <classifier>jakarta</classifier>
+                        <version>${querydsl.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
         <profile>
             <id>dev</id>

main-service/src/main/java/ru/practicum/config/DateTimeProperties.java

@@ -0,0 +1,13 @@
+package ru.practicum.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Component
+@ConfigurationProperties(prefix = "app")
+public class DateTimeProperties {
+    @Getter @Setter private String dateTimeFormat = "yyyy-MM-dd HH:mm:ss";
+}

main-service/src/main/java/ru/practicum/config/JsonConfig.java

@@ -9,18 +9,23 @@
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 
+import lombok.RequiredArgsConstructor;
+
 @Configuration
+@RequiredArgsConstructor
 public class JsonConfig {
-    private static final String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+    private final DateTimeProperties properties;
 
     @Bean
     public Jackson2ObjectMapperBuilderCustomizer jsonCustomizer() {
         return builder -> {
-            builder.simpleDateFormat(DATE_TIME_PATTERN);
+            builder.simpleDateFormat(properties.getDateTimeFormat());
             builder.serializers(
-                    new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DATE_TIME_PATTERN)));
+                    new LocalDateTimeSerializer(
+                            DateTimeFormatter.ofPattern(properties.getDateTimeFormat())));
             builder.deserializers(
-                    new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DATE_TIME_PATTERN)));
+                    new LocalDateTimeDeserializer(
+                            DateTimeFormatter.ofPattern(properties.getDateTimeFormat())));
         };
     }
 }

main-service/src/main/java/ru/practicum/config/WebConfig.java

@@ -0,0 +1,38 @@
+package ru.practicum.config;
+
+import java.text.ParseException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Locale;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.format.Formatter;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import lombok.RequiredArgsConstructor;
+
+@Configuration
+@RequiredArgsConstructor
+public class WebConfig implements WebMvcConfigurer {
+    private final DateTimeProperties properties;
+
+    @Override
+    public void addFormatters(FormatterRegistry registry) {
+        registry.addFormatter(
+                new Formatter<LocalDateTime>() {
+
+                    @Override
+                    public String print(LocalDateTime object, Locale locale) {
+                        return object.format(
+                                DateTimeFormatter.ofPattern(properties.getDateTimeFormat()));
+                    }
+
+                    @Override
+                    public LocalDateTime parse(String text, Locale locale) throws ParseException {
+                        return LocalDateTime.parse(
+                                text, DateTimeFormatter.ofPattern(properties.getDateTimeFormat()));
+                    }
+                });
+    }
+}

main-service/src/main/java/ru/practicum/event/controller/EventAdminController.java

@@ -0,0 +1,49 @@
+package ru.practicum.event.controller;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.List;
+
+import jakarta.validation.Valid;
+
+import ru.practicum.event.dto.EventFullDto;
+import ru.practicum.event.dto.UpdateEventAdminRequest;
+import ru.practicum.event.model.EventState;
+import ru.practicum.event.service.EventService;
+import ru.practicum.event.service.EventsAdminGetRequest;
+
+import org.springframework.web.bind.annotation.*;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/admin/events")
+public class EventAdminController {
+    private final EventService eventService;
+
+    @GetMapping
+    public Collection<EventFullDto> getEventsFiltered(
+            @RequestParam(required = false) List<Long> users,
+            @RequestParam(required = false) List<EventState> states,
+            @RequestParam(required = false) List<Long> categories,
+            @RequestParam(required = false) LocalDateTime rangeStart,
+            @RequestParam(required = false) LocalDateTime rangeEnd,
+            @RequestParam(defaultValue = "0") int from,
+            @RequestParam(defaultValue = "10") int size) {
+        EventsAdminGetRequest getRequest =
+                new EventsAdminGetRequest(
+                        users, states, categories, rangeStart, rangeEnd, from, size);
+        log.info("Admin get events requested with params= {}", getRequest);
+        return eventService.getEvents(getRequest);
+    }
+
+    @PatchMapping("/{eventId}")
+    public EventFullDto updateEvent(
+            @PathVariable Long eventId, @RequestBody @Valid UpdateEventAdminRequest updateRequest) {
+        log.info("Admin update event requested with body= {}", updateRequest);
+        return eventService.updateEvent(eventId, updateRequest);
+    }
+}

main-service/src/main/java/ru/practicum/event/controller/EventPrivateController.java

@@ -0,0 +1,63 @@
+package ru.practicum.event.controller;
+
+import java.util.Collection;
+
+import jakarta.validation.Valid;
+
+import ru.practicum.event.dto.EventFullDto;
+import ru.practicum.event.dto.EventShortDto;
+import ru.practicum.event.dto.NewEventDto;
+import ru.practicum.event.dto.UpdateEventUserRequest;
+import ru.practicum.event.service.EventService;
+import ru.practicum.event.service.EventsPrivateGetRequest;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/users/{userId}/events")
+public class EventPrivateController {
+    private final EventService eventService;
+
+    @GetMapping()
+    public Collection<EventShortDto> getEventsOfUserPaged(
+            @PathVariable Long userId,
+            @RequestParam(defaultValue = "0") int from,
+            @RequestParam(defaultValue = "10") int size) {
+        EventsPrivateGetRequest getRequest = new EventsPrivateGetRequest(userId, from, size);
+        log.info("Private get events requested with params= {}", getRequest);
+        return eventService.getEvents(getRequest);
+    }
+
+    @PostMapping()
+    @ResponseStatus(HttpStatus.CREATED)
+    public EventFullDto createEvent(
+            @PathVariable Long userId, @RequestBody @Valid NewEventDto newEventDto) {
+        log.info("Create event requested with body= {}", newEventDto);
+        return eventService.createEvent(userId, newEventDto);
+    }
+
+    @GetMapping("/{eventId}")
+    public EventFullDto getEvent(@PathVariable Long userId, @PathVariable Long eventId) {
+        log.info("Private get event requested with userId= {}, eventId= {}", userId, eventId);
+        return eventService.getByUserById(userId, eventId);
+    }
+
+    @PatchMapping("/{eventId}")
+    public EventFullDto updateEvent(
+            @PathVariable Long userId,
+            @PathVariable Long eventId,
+            @RequestBody @Valid UpdateEventUserRequest updateRequest) {
+        log.info(
+                "Private update event requested with userId= {}, eventId= {}, body = {}",
+                userId,
+                eventId,
+                updateRequest);
+        return eventService.updateEventByUser(userId, eventId, updateRequest);
+    }
+}

main-service/src/main/java/ru/practicum/event/controller/EventPublicController.java

@@ -0,0 +1,65 @@
+package ru.practicum.event.controller;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.List;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+import ru.practicum.event.dto.EventFullDto;
+import ru.practicum.event.dto.EventShortDto;
+import ru.practicum.event.service.EventService;
+import ru.practicum.event.service.EventsPublicGetRequest;
+import ru.practicum.exception.ValidationException;
+
+import org.springframework.web.bind.annotation.*;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/events")
+public class EventPublicController {
+    private final EventService eventService;
+
+    @GetMapping()
+    public Collection<EventShortDto> getEventsFiltered(
+            @RequestParam(required = false) String text,
+            @RequestParam(required = false) List<Long> categories,
+            @RequestParam(required = false) Boolean paid,
+            @RequestParam(required = false) LocalDateTime rangeStart,
+            @RequestParam(required = false) LocalDateTime rangeEnd,
+            @RequestParam(defaultValue = "false") boolean onlyAvailable,
+            @RequestParam(required = false) EventSortBy sort,
+            @RequestParam(defaultValue = "0") int from,
+            @RequestParam(defaultValue = "10") int size,
+            HttpServletRequest request) {
+        EventsPublicGetRequest getRequest =
+                new EventsPublicGetRequest(
+                        text,
+                        categories,
+                        paid,
+                        rangeStart,
+                        rangeEnd,
+                        onlyAvailable,
+                        sort,
+                        from,
+                        size,
+                        request);
+        if (getRequest.hasRangeStart() && getRequest.hasRangeEnd()) {
+            if (getRequest.rangeEnd().isBefore(getRequest.rangeStart())) {
+                throw new ValidationException("End date must be before start date");
+            }
+        }
+        log.info("Public get events requested with params= {}", getRequest);
+        return eventService.getEvents(getRequest);
+    }
+
+    @GetMapping("/{eventId}")
+    public EventFullDto getEventById(@PathVariable Long eventId, HttpServletRequest request) {
+        log.info("Public get event with eventId={} requested", eventId);
+        return eventService.getById(eventId, request);
+    }
+}

main-service/src/main/java/ru/practicum/event/controller/EventSortBy.java

@@ -0,0 +1,6 @@
+package ru.practicum.event.controller;
+
+public enum EventSortBy {
+    EVENT_DATE,
+    VIEWS
+}

main-service/src/main/java/ru/practicum/event/dto/NewEventDto.java

@@ -2,16 +2,13 @@
 
 import java.time.LocalDateTime;
 
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.PositiveOrZero;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
 
 public record NewEventDto(
         @NotBlank @Size(min = 20, max = 2000) String annotation,
         @NotNull Long category,
         @NotBlank @Size(min = 20, max = 7000) String description,
-        @NotNull LocalDateTime eventDate,
+        @NotNull @Future LocalDateTime eventDate,
         @NotNull LocationDto location,
         Boolean paid,
         @PositiveOrZero Integer participantLimit,

main-service/src/main/java/ru/practicum/event/dto/UpdatableEvent.java

@@ -0,0 +1,39 @@
+package ru.practicum.event.dto;
+
+import java.time.LocalDateTime;
+
+public interface UpdatableEvent {
+    boolean hasAnnotation();
+
+    String annotation();
+
+    boolean hasEventDate();
+
+    LocalDateTime eventDate();
+
+    boolean hasCategory();
+
+    boolean hasLocation();
+
+    LocationDto location();
+
+    boolean hasParticipantLimit();
+
+    Integer participantLimit();
+
+    boolean hasPaid();
+
+    Boolean paid();
+
+    boolean hasRequestModeration();
+
+    Boolean requestModeration();
+
+    boolean hasTitle();
+
+    String title();
+
+    boolean hasDescription();
+
+    String description();
+}

main-service/src/main/java/ru/practicum/event/dto/UpdateEventAdminRequest.java

@@ -2,22 +2,24 @@
 
 import java.time.LocalDateTime;
 
+import jakarta.validation.constraints.Future;
 import jakarta.validation.constraints.PositiveOrZero;
 import jakarta.validation.constraints.Size;
 
-import ru.practicum.event.model.StateAction;
+import ru.practicum.event.model.AdminStateAction;
 
 public record UpdateEventAdminRequest(
         @Size(min = 20, max = 2000) String annotation,
         Long category,
         @Size(min = 20, max = 7000) String description,
-        LocalDateTime eventDate,
+        @Future LocalDateTime eventDate,
         LocationDto location,
         Boolean paid,
         @PositiveOrZero Integer participantLimit,
         Boolean requestModeration,
-        StateAction stateAction,
-        @Size(min = 3, max = 120) String title) {
+        AdminStateAction stateAction,
+        @Size(min = 3, max = 120) String title)
+        implements UpdatableEvent {
 
     public boolean hasAnnotation() {
         return annotation != null && !annotation.isBlank();