feature_comments work

README.md

@@ -1,2 +1,7 @@
 # java-explore-with-me
+
 Template repository for ExploreWithMe project.
+
+# pull request feature_comments
+
+# https://github.com/Just-Roman/java-explore-with-me/pull/3

main-service/src/main/java/ewm/comments/Comment.java

@@ -0,0 +1,40 @@
+package ewm.comments;
+
+import ewm.events.Event;
+import ewm.user.User;
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Getter
+@Setter
+@Entity
+@Table(name = "comments")
+public class Comment {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column(nullable = false)
+    private String text;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "author_id", nullable = false)
+    private User author;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "event_id", nullable = false)
+    private Event event;
+
+    @Column(nullable = false)
+    private LocalDateTime created;
+
+    private LocalDateTime edited;
+
+    @Column(name = "confirmed_requests", nullable = false)
+    private Long confirmedRequests;
+}

main-service/src/main/java/ewm/comments/CommentMapper.java

@@ -0,0 +1,52 @@
+package ewm.comments;
+
+import ewm.comments.dto.CommentDto;
+import ewm.comments.dto.CommentRequestDto;
+import ewm.events.Event;
+import ewm.events.EventMapper;
+import ewm.user.User;
+import ewm.user.UserMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+public class CommentMapper {
+    private final UserMapper userMapper;
+    private final EventMapper eventMapper;
+
+
+    public Comment commentRequestDtoToModel(CommentRequestDto dto, User author, Event event) {
+        return Comment.builder()
+                .text(dto.getText())
+                .author(author)
+                .event(event)
+                .created(dto.getCreated() != null ? dto.getCreated() : null)
+                .edited(dto.getEdited() != null ? dto.getEdited() : null)
+                .confirmedRequests(dto.getConfirmedRequests())
+                .build();
+    }
+
+    public CommentDto modelToCommentDto(Comment comment) {
+        return CommentDto.builder()
+                .id(comment.getId())
+                .text(comment.getText())
+                .author(userMapper.modelToUserShortDto(comment.getAuthor()))
+                .event(eventMapper.toEventShortDto(comment.getEvent(), comment.getConfirmedRequests()))
+                .created(comment.getCreated())
+                .edited(comment.getEdited() != null ? comment.getEdited() : null)
+                .build();
+    }
+
+    public List<CommentDto> listModelToCommentDto(List<Comment> comments) {
+        List<CommentDto> commentsDto = new ArrayList<>();
+        for (Comment comment : comments) {
+            commentsDto.add(modelToCommentDto(comment));
+        }
+        return commentsDto;
+    }
+
+}

main-service/src/main/java/ewm/comments/CommentRepository.java

@@ -0,0 +1,14 @@
+package ewm.comments;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface CommentRepository extends JpaRepository<Comment, Long> {
+
+    List<Comment> findAllByAuthorId(Long userId, Pageable pageable);
+
+    List<Comment> findAllByEventId(Long eventId, Pageable pageable);
+
+}

main-service/src/main/java/ewm/comments/controller/CommentControllerAdmin.java

@@ -0,0 +1,19 @@
+package ewm.comments.controller;
+
+import ewm.comments.service.CommentService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/admin/comments")
+@RequiredArgsConstructor
+public class CommentControllerAdmin {
+    private final CommentService commentService;
+
+    @DeleteMapping("/{commentId}")
+    @ResponseStatus(value = HttpStatus.NO_CONTENT)
+    public void deleteComment(@PathVariable Long commentId) {
+        commentService.deleteCommentAdmin(commentId);
+    }
+}

main-service/src/main/java/ewm/comments/controller/CommentControllerPrivate.java

@@ -0,0 +1,57 @@
+package ewm.comments.controller;
+
+import ewm.comments.dto.CommentDto;
+import ewm.comments.dto.CommentRequestDto;
+import ewm.comments.service.CommentService;
+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;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+@Validated
+@RestController
+@RequestMapping("/users/{userId}/comments")
+@RequiredArgsConstructor
+public class CommentControllerPrivate {
+    private final CommentService commentService;
+
+    @PostMapping("/{eventId}")
+    @ResponseStatus(value = HttpStatus.CREATED)
+    public CommentDto addComment(
+            @PathVariable Long userId,
+            @PathVariable Long eventId,
+            @RequestBody @Valid CommentRequestDto commentRequestDto) {
+        return commentService.create(userId, eventId, commentRequestDto);
+    }
+
+    @PatchMapping("/{eventId}/{commentId}")
+    public CommentDto updateComment(
+            @PathVariable Long userId,
+            @PathVariable Long eventId,
+            @PathVariable Long commentId,
+            @RequestBody @Valid CommentRequestDto commentRequestDto) {
+        return commentService.update(userId, eventId, commentId, commentRequestDto);
+    }
+
+    @DeleteMapping("/{commentId}")
+    @ResponseStatus(value = HttpStatus.NO_CONTENT)
+    public void deleteComment(
+            @PathVariable Long userId,
+            @PathVariable Long commentId) {
+        commentService.deleteCommentUser(userId, commentId);
+    }
+
+    @GetMapping
+    public List<CommentDto> getComments(
+            @PathVariable Long userId,
+            @RequestParam(value = "from", defaultValue = "0") @PositiveOrZero Integer from,
+            @RequestParam(value = "size", defaultValue = "10") @Positive Integer size) {
+        return commentService.getCommentsByUserId(userId, from, size);
+    }
+}

main-service/src/main/java/ewm/comments/controller/CommentControllerPublic.java

@@ -0,0 +1,32 @@
+package ewm.comments.controller;
+
+import ewm.comments.dto.CommentDto;
+import ewm.comments.service.CommentService;
+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 java.util.List;
+
+@Validated
+@RestController
+@RequestMapping("/comments")
+@RequiredArgsConstructor
+public class CommentControllerPublic {
+    private final CommentService commentService;
+
+    @GetMapping("/event/{eventId}")
+    List<CommentDto> getComments(
+            @PathVariable Long eventId,
+            @RequestParam(value = "from", defaultValue = "0") @PositiveOrZero Integer from,
+            @RequestParam(value = "size", defaultValue = "10") @Positive Integer size) {
+        return commentService.getCommentsByUserId(eventId, from, size);
+    }
+
+    @GetMapping("/{commentId}")
+    CommentDto getCommentById(@PathVariable Long commentId) {
+        return commentService.getCommentById(commentId);
+    }
+}

main-service/src/main/java/ewm/comments/dto/CommentDto.java

@@ -0,0 +1,23 @@
+package ewm.comments.dto;
+
+import ewm.events.dto.EventShortDto;
+import ewm.user.dto.UserShortDto;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CommentDto {
+    private Long id;
+    private String text;
+    private UserShortDto author;
+    private EventShortDto event;
+    private LocalDateTime created;
+    private LocalDateTime edited;
+}

main-service/src/main/java/ewm/comments/dto/CommentRequestDto.java

@@ -0,0 +1,23 @@
+package ewm.comments.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CommentRequestDto {
+    @Size(max = 1000)
+    @NotBlank
+    @NotNull
+    private String text;
+    private LocalDateTime created;
+    private LocalDateTime edited;
+    private Long confirmedRequests;
+}

main-service/src/main/java/ewm/comments/service/CommentService.java

@@ -0,0 +1,25 @@
+package ewm.comments.service;
+
+import ewm.comments.dto.CommentDto;
+import ewm.comments.dto.CommentRequestDto;
+
+import java.util.List;
+
+public interface CommentService {
+
+    CommentDto create(long userId, long eventId, CommentRequestDto dto);
+
+    CommentDto update(long userId, long eventId, long commentId, CommentRequestDto dto);
+
+    void deleteCommentUser(long userId, long commentId);
+
+    void deleteCommentAdmin(long commentId);
+
+    CommentDto getCommentById(long commentId);
+
+    List<CommentDto> getCommentsByEventId(Long eventId, Integer from, Integer size);
+
+    List<CommentDto> getCommentsByUserId(Long userId, Integer from, Integer size);
+
+
+}