YEL-224 [feat] 게시글/댓글 기능 추가

team-yello · Mar 12, 2024 · c3b89f0 · c3b89f0
1 parent 1dcf26e
commit c3b89f0
Show file tree

Hide file tree

Showing 23 changed files with 587 additions and 6 deletions.
diff --git a/src/main/java/com/yello/server/domain/authorization/filter/JwtExceptionFilter.java b/src/main/java/com/yello/server/domain/authorization/filter/JwtExceptionFilter.java
@@ -50,8 +50,7 @@ protected void doFilterInternal(
             || requestPath.startsWith("/v2/google/notifications")
             || requestPath.startsWith("/api/v1/admob/verify")
             || requestPath.startsWith("/api/v1/statistics")
-            || (requestPath.startsWith("/api/v1/auth")
-            && !requestPath.startsWith("/api/v1/auth/token/issue"))) {
+            || (requestPath.startsWith("/api/v1/auth") && !requestPath.startsWith("/api/v1/auth/token/issue"))) {
             filterChain.doFilter(request, response);
             return;
         }
@@ -68,6 +67,22 @@ protected void doFilterInternal(
                     throw new CustomAuthenticationException(AUTHENTICATION_ERROR);
                 }
 
+                val token = accessHeader.substring(BEARER.length());
+                Long userId = tokenProvider.getUserId(token);
+                request.setAttribute("userId", userId);
+            } else if (requestPath.equals("/api/v1/user/post/comment")) {
+                val accessHeader = request.getHeader(AUTHORIZATION);
+                log.info("Authorization : {}", accessHeader);
+
+                if (accessHeader == null) {
+                    filterChain.doFilter(request, response);
+                    return;
+                }
+
+                if (!accessHeader.startsWith(BEARER)) {
+                    throw new CustomAuthenticationException(AUTHENTICATION_ERROR);
+                }
+
                 val token = accessHeader.substring(BEARER.length());
                 Long userId = tokenProvider.getUserId(token);
                 request.setAttribute("userId", userId);

diff --git a/src/main/java/com/yello/server/domain/authorization/filter/JwtFilter.java b/src/main/java/com/yello/server/domain/authorization/filter/JwtFilter.java
@@ -1,5 +1,7 @@
 package com.yello.server.domain.authorization.filter;
 
+import static org.springframework.http.HttpHeaders.AUTHORIZATION;
+
 import com.yello.server.domain.user.entity.User;
 import com.yello.server.domain.user.repository.UserRepository;
 import jakarta.servlet.FilterChain;
@@ -48,6 +50,11 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
             return;
         }
 
+        if (requestPath.equals("/api/v1/user/post/comment") && request.getHeader(AUTHORIZATION) == null) {
+            filterChain.doFilter(request, response);
+            return;
+        }
+
         final Long userId = (Long) request.getAttribute("userId");
         log.info("Current user's id: {}", userId);
 

diff --git a/src/main/java/com/yello/server/domain/user/controller/UserController.java b/src/main/java/com/yello/server/domain/user/controller/UserController.java
@@ -1,6 +1,8 @@
 package com.yello.server.domain.user.controller;
 
 import static com.yello.server.global.common.SuccessCode.DELETE_USER_SUCCESS;
+import static com.yello.server.global.common.SuccessCode.GET_USER_POST_COMMENT_SUCCESS;
+import static com.yello.server.global.common.SuccessCode.POST_USER_POST_COMMENT_SUCCESS;
 import static com.yello.server.global.common.SuccessCode.READ_USER_DATA_SUCCESS;
 import static com.yello.server.global.common.SuccessCode.READ_USER_SUBSCRIBE_SUCCESS;
 import static com.yello.server.global.common.SuccessCode.READ_USER_SUCCESS;
@@ -11,10 +13,12 @@
 import com.yello.server.domain.user.dto.request.UserDataUpdateRequest;
 import com.yello.server.domain.user.dto.request.UserDeleteReasonRequest;
 import com.yello.server.domain.user.dto.request.UserDeviceTokenRequest;
+import com.yello.server.domain.user.dto.request.UserPostCommentUpdateRequest;
 import com.yello.server.domain.user.dto.request.UserUpdateRequest;
 import com.yello.server.domain.user.dto.response.UserDataResponse;
 import com.yello.server.domain.user.dto.response.UserDetailResponse;
 import com.yello.server.domain.user.dto.response.UserDetailV2Response;
+import com.yello.server.domain.user.dto.response.UserPostCommentResponse;
 import com.yello.server.domain.user.dto.response.UserResponse;
 import com.yello.server.domain.user.dto.response.UserSubscribeDetailResponse;
 import com.yello.server.domain.user.entity.User;
@@ -23,15 +27,18 @@
 import com.yello.server.global.common.annotation.AccessTokenUser;
 import com.yello.server.global.common.dto.BaseResponse;
 import com.yello.server.global.common.dto.EmptyObject;
+import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.val;
+import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -105,4 +112,19 @@ public BaseResponse updateUserData(@AccessTokenUser User user, @PathVariable("ta
         userService.updateUserData(user.getId(), UserDataType.fromCode(tag), request);
         return BaseResponse.success(UPDATE_USER_DATA_SUCCESS);
     }
+
+    @GetMapping("/v1/user/post/comment")
+    public BaseResponse<UserPostCommentResponse> getUserPostComment(@Nullable @AccessTokenUser User user,
+        @RequestParam(value = "postId") Long postId, Pageable pageable) {
+        System.out.println("user = " + user);
+        val data = userService.getUserPostComment(user == null ? null : user.getId(), postId, pageable);
+        return BaseResponse.success(GET_USER_POST_COMMENT_SUCCESS, data);
+    }
+
+    @PostMapping("/v1/user/post/comment")
+    public BaseResponse postUserPostComment(@Nullable @AccessTokenUser User user,
+        @RequestBody UserPostCommentUpdateRequest request) {
+        userService.updatePostComment(user == null ? null : user.getId(), request);
+        return BaseResponse.success(POST_USER_POST_COMMENT_SUCCESS);
+    }
 }
diff --git a/src/main/java/com/yello/server/domain/user/dto/request/UserPostCommentUpdateRequest.java b/src/main/java/com/yello/server/domain/user/dto/request/UserPostCommentUpdateRequest.java
@@ -0,0 +1,16 @@
+package com.yello.server.domain.user.dto.request;
+
+import jakarta.annotation.Nullable;
+
+public record UserPostCommentUpdateRequest(
+    @Nullable Long id,
+    Long postId,
+    String userName,
+    String yelloId,
+    String status,
+    String title,
+    String subtitle,
+    String content
+) {
+
+}
diff --git a/src/main/java/com/yello/server/domain/user/dto/response/UserPostCommentResponse.java b/src/main/java/com/yello/server/domain/user/dto/response/UserPostCommentResponse.java
@@ -0,0 +1,13 @@
+package com.yello.server.domain.user.dto.response;
+
+import java.util.List;
+import lombok.Builder;
+
+@Builder
+public record UserPostCommentResponse(
+    Long pageCount,
+    Long totalCount,
+    List<UserPostCommentVO> postCommentList
+) {
+
+}
diff --git a/src/main/java/com/yello/server/domain/user/dto/response/UserPostCommentVO.java b/src/main/java/com/yello/server/domain/user/dto/response/UserPostCommentVO.java
@@ -0,0 +1,40 @@
+package com.yello.server.domain.user.dto.response;
+
+import com.yello.server.domain.user.entity.User;
+import com.yello.server.domain.user.entity.UserPost;
+import com.yello.server.domain.user.entity.UserPostComment;
+import lombok.Builder;
+
+@Builder
+public record UserPostCommentVO(
+    Long id,
+    Long userPostId,
+    Long userId,
+    String status,
+    String userName,
+    String yelloId,
+    String title,
+    String subtitle,
+    String content,
+    String createdAt,
+    String updatedAt
+) {
+
+    public static UserPostCommentVO of(UserPostComment userPostComment) {
+        UserPost userPost = userPostComment.getUserPost();
+        User user = userPostComment.getUser();
+        return UserPostCommentVO.builder()
+            .id(userPostComment.getId())
+            .userPostId(userPost == null ? null : userPost.getId())
+            .userId(user == null ? null : user.getId())
+            .status(userPostComment.getStatus().getInitial())
+            .userName(userPostComment.getUserName())
+            .yelloId(userPostComment.getYelloId())
+            .title(userPostComment.getTitle())
+            .subtitle(userPostComment.getSubtitle())
+            .content(userPostComment.getContent())
+            .createdAt(String.valueOf(userPostComment.getCreatedAt()))
+            .updatedAt(String.valueOf(userPostComment.getUpdatedAt()))
+            .build();
+    }
+}
diff --git a/src/main/java/com/yello/server/domain/user/entity/UserPost.java b/src/main/java/com/yello/server/domain/user/entity/UserPost.java
@@ -0,0 +1,56 @@
+package com.yello.server.domain.user.entity;
+
+import com.yello.server.global.common.dto.AuditingTimeEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+
+@Getter
+@Entity
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class UserPost extends AuditingTimeEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @OnDelete(action = OnDeleteAction.SET_NULL)
+    @JoinColumn(name = "userId", nullable = true)
+    private User user;
+
+    @Column(nullable = false)
+    @Convert(converter = UserPostStatusConverter.class)
+    private UserPostStatus status;
+
+    @Column
+    private String userName;
+
+    @Column
+    private String yelloId;
+
+    @Column
+    private String title;
+
+    @Column
+    private String subtitle;
+
+    @Column(columnDefinition = "MEDIUMTEXT")
+    private String content;
+
+}
diff --git a/src/main/java/com/yello/server/domain/user/entity/UserPostComment.java b/src/main/java/com/yello/server/domain/user/entity/UserPostComment.java
@@ -0,0 +1,73 @@
+package com.yello.server.domain.user.entity;
+
+import com.yello.server.domain.user.dto.request.UserPostCommentUpdateRequest;
+import com.yello.server.global.common.dto.AuditingTimeEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+
+@Getter
+@Entity
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class UserPostComment extends AuditingTimeEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @OnDelete(action = OnDeleteAction.RESTRICT)
+    @JoinColumn(name = "userPostId", nullable = false)
+    private UserPost userPost;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @OnDelete(action = OnDeleteAction.SET_NULL)
+    @JoinColumn(name = "userId", nullable = true)
+    private User user;
+
+    @Column(nullable = false)
+    @Convert(converter = UserPostCommentStatusConverter.class)
+    private UserPostCommentStatus status;
+
+    @Column
+    private String userName;
+
+    @Column
+    private String yelloId;
+
+    @Column
+    private String title;
+
+    @Column
+    private String subtitle;
+
+    @Column(columnDefinition = "TEXT")
+    private String content;
+
+    public void update(UserPostCommentUpdateRequest request, UserPost userPost, User user,
+        UserPostCommentStatus status) {
+        this.userPost = userPost;
+        this.user = user;
+        this.status = status;
+        this.userName = request.userName();
+        this.yelloId = request.yelloId();
+        this.title = request.title();
+        this.subtitle = request.subtitle();
+        this.content = request.content();
+    }
+}
diff --git a/src/main/java/com/yello/server/domain/user/entity/UserPostCommentStatus.java b/src/main/java/com/yello/server/domain/user/entity/UserPostCommentStatus.java
@@ -0,0 +1,31 @@
+package com.yello.server.domain.user.entity;
+
+import static com.yello.server.global.common.ErrorCode.ENUM_BAD_REQUEST_EXCEPTION;
+
+import com.yello.server.global.exception.EnumIllegalArgumentException;
+import java.util.Arrays;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum UserPostCommentStatus {
+    ACTIVE("ACTIVE"),
+    INACTIVE("INACTIVE");
+
+    private final String initial;
+
+    public static UserPostCommentStatus fromCode(String dbData) {
+        return Arrays.stream(UserPostCommentStatus.values())
+            .filter(v -> v.getInitial().equals(dbData))
+            .findAny()
+            .orElseThrow(() -> new EnumIllegalArgumentException(ENUM_BAD_REQUEST_EXCEPTION));
+    }
+
+    public static UserPostCommentStatus fromName(String name) {
+        return Arrays.stream(UserPostCommentStatus.values())
+            .filter(v -> v.name().equals(name))
+            .findAny()
+            .orElseThrow(() -> new EnumIllegalArgumentException(ENUM_BAD_REQUEST_EXCEPTION));
+    }
+}
diff --git a/src/main/java/com/yello/server/domain/user/entity/UserPostCommentStatusConverter.java b/src/main/java/com/yello/server/domain/user/entity/UserPostCommentStatusConverter.java
@@ -0,0 +1,25 @@
+package com.yello.server.domain.user.entity;
+
+import jakarta.persistence.AttributeConverter;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class UserPostCommentStatusConverter implements AttributeConverter<UserPostCommentStatus, String> {
+
+    @Override
+    public String convertToDatabaseColumn(UserPostCommentStatus userData) {
+        if (userData == null) {
+            return null;
+        }
+        return userData.name();
+    }
+
+    @Override
+    public UserPostCommentStatus convertToEntityAttribute(String dbData) {
+        if (dbData == null) {
+            return null;
+        }
+
+        return UserPostCommentStatus.fromName(dbData);
+    }
+}