Merge pull request #128 from team-winey/refactor/#127

Refactor/#127
team-winey · Aug 21, 2023 · b3c4982 · b3c4982
2 parents 7a99526 + 942d355
commit b3c4982
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 46 deletions.
diff --git a/src/main/java/org/winey/server/controller/CommentController.java b/src/main/java/org/winey/server/controller/CommentController.java
@@ -8,12 +8,9 @@
 import org.winey.server.common.dto.ApiResponse;
 import org.winey.server.config.resolver.UserId;
 import org.winey.server.controller.request.comment.CreateCommentRequestDto;
-import org.winey.server.controller.request.feedLike.CreateFeedLikeRequestDto;
-import org.winey.server.controller.response.comment.CreateCommentResponseDto;
-import org.winey.server.controller.response.feedLike.CreateFeedLikeResponseDto;
+import org.winey.server.controller.response.comment.CommentResponseDto;
 import org.winey.server.exception.Success;
 import org.winey.server.service.CommentService;
-import org.winey.server.service.FeedLikeService;
 
 import javax.validation.Valid;
 
@@ -27,7 +24,7 @@ public class CommentController {
     @PostMapping(value = "/{feedId}")
     @ResponseStatus(HttpStatus.CREATED)
     @Operation(summary = "댓글을 만드는 API", description = "피드의 댓글을 생성합니다.")
-    public ApiResponse<CreateCommentResponseDto> createComment(
+    public ApiResponse<CommentResponseDto> createComment(
             @UserId Long userId,
             @PathVariable Long feedId,
             @RequestBody @Valid CreateCommentRequestDto requestDto

diff --git a/...sponse/comment/GetCommentResponseDto.java → .../response/comment/CommentResponseDto.java b/...sponse/comment/GetCommentResponseDto.java → .../response/comment/CommentResponseDto.java
@@ -4,23 +4,21 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.winey.server.domain.user.User;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class GetCommentResponseDto {
+public class CommentResponseDto {
     private Long commentId;
     private Long authorId;
     private String author;
     private String content;
     private int authorLevel;
     private LocalDateTime createdAt;
 
-    public static GetCommentResponseDto of(Long commentId,Long authorId, String author, String content, int authorLevel, LocalDateTime createdAt) {
-        return new GetCommentResponseDto(commentId, authorId, author, content, authorLevel, createdAt);
+    public static CommentResponseDto of(Long commentId, Long authorId, String author, String content, int authorLevel, LocalDateTime createdAt) {
+        return new CommentResponseDto(commentId, authorId, author, content, authorLevel, createdAt);
     }
 }
diff --git a/src/main/java/org/winey/server/controller/response/comment/CreateCommentResponseDto.java b/src/main/java/org/winey/server/controller/response/comment/CreateCommentResponseDto.java
diff --git a/src/main/java/org/winey/server/controller/response/feed/GetFeedDetailResponseDto.java b/src/main/java/org/winey/server/controller/response/feed/GetFeedDetailResponseDto.java
@@ -4,9 +4,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.winey.server.controller.response.PageResponseDto;
-import org.winey.server.controller.response.comment.CreateCommentResponseDto;
-import org.winey.server.controller.response.comment.GetCommentResponseDto;
+import org.winey.server.controller.response.comment.CommentResponseDto;
 
 import java.util.List;
 
@@ -16,9 +14,9 @@
 public class GetFeedDetailResponseDto {
 
     private GetFeedResponseDto getFeedResponseDto;
-    private List<GetCommentResponseDto> getCommentResponseList;
+    private List<CommentResponseDto> getCommentResponseList;
 
-    public static GetFeedDetailResponseDto of(GetFeedResponseDto getFeedResponseDto, List<GetCommentResponseDto> getCommentResponseList) {
+    public static GetFeedDetailResponseDto of(GetFeedResponseDto getFeedResponseDto, List<CommentResponseDto> getCommentResponseList) {
         return new GetFeedDetailResponseDto(getFeedResponseDto,getCommentResponseList);
     }
 }

diff --git a/src/main/java/org/winey/server/domain/user/User.java b/src/main/java/org/winey/server/domain/user/User.java
@@ -8,6 +8,7 @@
 import org.winey.server.domain.feed.Feed;
 import org.winey.server.domain.feed.FeedLike;
 import org.winey.server.domain.goal.Goal;
+import org.winey.server.domain.notification.Notification;
 import org.winey.server.domain.recommend.Recommend;
 
 import javax.persistence.*;
@@ -54,6 +55,9 @@ public class User extends AuditingTimeEntity {
     @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE, mappedBy = "user", orphanRemoval = true)
     private List<FeedLike> feedLikes;
 
+    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE, mappedBy = "notiReceiver", orphanRemoval = true)
+    private List<Notification> notifications;
+
     @Builder
     public User(String nickname, String socialId, SocialType socialType) {
         this.nickname = nickname;

diff --git a/src/main/java/org/winey/server/service/CommentService.java b/src/main/java/org/winey/server/service/CommentService.java
@@ -3,8 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.winey.server.controller.response.comment.CreateCommentResponseDto;
-import org.winey.server.controller.response.feedLike.CreateFeedLikeResponseDto;
+import org.winey.server.controller.response.comment.CommentResponseDto;
 import org.winey.server.domain.comment.Comment;
 import org.winey.server.domain.notification.NotiType;
 import org.winey.server.domain.notification.Notification;
@@ -29,7 +28,7 @@ public class CommentService {
     private final NotiRepository notiRepository;
 
     @Transactional
-    public CreateCommentResponseDto createComment(Long userId, Long feedId, String content) {
+    public CommentResponseDto createComment(Long userId, Long feedId, String content) {
         User user = userRepository.findByUserId(userId)
                 .orElseThrow(() -> new NotFoundException(Error.NOT_FOUND_USER_EXCEPTION, Error.NOT_FOUND_USER_EXCEPTION.getMessage()));
         Feed feed = feedRepository.findByFeedId(feedId)
@@ -53,7 +52,7 @@ public CreateCommentResponseDto createComment(Long userId, Long feedId, String c
         notification.updateResponseId(comment.getCommentId());
         notification.updateRequestUserId(userId);
         notiRepository.save(notification);
-        return CreateCommentResponseDto.of(comment.getCommentId(), commentRepository.countByFeed(feed),user.getNickname(), comment.getContent());
+        return CommentResponseDto.of(comment.getCommentId(), userId, user.getNickname(), comment.getContent(),user.getUserLevel().getLevelNumber(),comment.getCreatedAt());
     }
 
     @Transactional

diff --git a/src/main/java/org/winey/server/service/FeedService.java b/src/main/java/org/winey/server/service/FeedService.java
@@ -7,7 +7,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.winey.server.controller.request.CreateFeedRequestDto;
 import org.winey.server.controller.response.PageResponseDto;
-import org.winey.server.controller.response.comment.GetCommentResponseDto;
+import org.winey.server.controller.response.comment.CommentResponseDto;
 import org.winey.server.controller.response.feed.*;
 import org.winey.server.domain.feed.Feed;
 import org.winey.server.domain.goal.Goal;
@@ -223,8 +223,8 @@ public GetFeedDetailResponseDto getFeedDetail(Long feedId, Long userId) {
                 .orElseThrow(() -> new NotFoundException(Error.NOT_FOUND_FEED_EXCEPTION, Error.NOT_FOUND_FEED_EXCEPTION.getMessage()));
         User connectedUser = userRepository.findByUserId(userId)
                 .orElseThrow(() -> new NotFoundException(Error.NOT_FOUND_USER_EXCEPTION, Error.NOT_FOUND_USER_EXCEPTION.getMessage()));
-        List<GetCommentResponseDto> comments = commentRepository.findAllByFeedOrderByCreatedAtAsc(detailFeed)
-                .stream().map(comment -> GetCommentResponseDto.of(
+        List<CommentResponseDto> comments = commentRepository.findAllByFeedOrderByCreatedAtAsc(detailFeed)
+                .stream().map(comment -> CommentResponseDto.of(
                         comment.getCommentId(),
                         comment.getUser().getUserId(),
                         comment.getUser().getNickname(),

diff --git a/src/main/java/org/winey/server/service/auth/AuthService.java b/src/main/java/org/winey/server/service/auth/AuthService.java
@@ -27,6 +27,7 @@
 
 import javax.validation.constraints.NotNull;
 import java.util.List;
+import java.util.Random;
 import java.util.stream.Collectors;
 
 @Service
@@ -55,12 +56,18 @@ public SignInResponseDto signIn(String socialAccessToken, SignInRequestDto reque
         Boolean isRegistered = userRepository.existsBySocialIdAndSocialType(socialId, socialType);
 
         if (!isRegistered) {
+            String randomString= new Random().ints(6, 0, 36).mapToObj(i -> Character.toString("abcdefghijklmnopqrstuvwxyz0123456789".charAt(i))).collect(Collectors.joining());
+            while (userRepository.existsByNickname("위니"+randomString)) {
+                randomString = new Random().ints(6, 0, 36).mapToObj(i -> Character.toString("abcdefghijklmnopqrstuvwxyz0123456789".charAt(i))).collect(Collectors.joining());
+            }
+
             User newUser = User.builder()
-                    .nickname(socialType + socialId)
+                    .nickname("위니"+randomString)
                     .socialId(socialId)
                     .socialType(socialType).build();
             userRepository.save(newUser);
 
+
             Notification newNoti = Notification.builder()
                     .notiReciver(newUser)
                     .notiMessage(NotiType.HOWTOLEVELUP.getType())