style: auto-formatting

woowacourse-teams · Oct 28, 2021 · bf18137 · bf18137
1 parent 0237e91
commit bf18137
Show file tree

Hide file tree

Showing 23 changed files with 346 additions and 371 deletions.
diff --git a/...end/domain-cvi/src/main/java/com/cvi/comment/domain/repository/CommentRepositoryImpl.java b/...end/domain-cvi/src/main/java/com/cvi/comment/domain/repository/CommentRepositoryImpl.java
@@ -23,21 +23,21 @@ public CommentRepositoryImpl(EntityManager em) {
     @Override
     public List<Comment> findByUserId(Long userId) {
         return queryFactory.selectFrom(comment)
-                .leftJoin(comment.user, user).fetchJoin()
-                .where(userIdEq(userId))
-                .orderBy(comment.createdAt.desc())
-                .fetch();
+            .leftJoin(comment.user, user).fetchJoin()
+            .where(userIdEq(userId))
+            .orderBy(comment.createdAt.desc())
+            .fetch();
     }
 
     @Override
     public List<Comment> findByUserId(Long userId, int offset, int size) {
         return queryFactory.selectFrom(comment)
-                .leftJoin(comment.user, user).fetchJoin()
-                .where(userIdEq(userId))
-                .orderBy(comment.createdAt.desc())
-                .offset(offset)
-                .limit(size)
-                .fetch();
+            .leftJoin(comment.user, user).fetchJoin()
+            .where(userIdEq(userId))
+            .orderBy(comment.createdAt.desc())
+            .offset(offset)
+            .limit(size)
+            .fetch();
     }
 
     private BooleanExpression userIdEq(Long userId) {

diff --git a/backend/domain-cvi/src/main/java/com/cvi/image/domain/Image.java b/backend/domain-cvi/src/main/java/com/cvi/image/domain/Image.java
@@ -4,21 +4,16 @@
 import com.cvi.config.entity.BaseEntity;
 import com.cvi.exception.NotFoundException;
 import com.cvi.post.domain.model.Post;
-import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.Objects;
-import javax.persistence.AttributeOverride;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ForeignKey;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.*;
+import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.Objects;
+
 @Getter
 @Entity
 @NoArgsConstructor(access = AccessLevel.PROTECTED)

diff --git a/backend/domain-cvi/src/main/java/com/cvi/like/domain/repository/LikeRepositoryImpl.java b/backend/domain-cvi/src/main/java/com/cvi/like/domain/repository/LikeRepositoryImpl.java
@@ -22,21 +22,21 @@ public LikeRepositoryImpl(EntityManager em) {
     @Override
     public List<Like> findByUserId(Long userId) {
         return queryFactory.selectFrom(like)
-                .leftJoin(like.user, user).fetchJoin()
-                .where(userIdEq(userId))
-                .orderBy(like.createdAt.desc())
-                .fetch();
+            .leftJoin(like.user, user).fetchJoin()
+            .where(userIdEq(userId))
+            .orderBy(like.createdAt.desc())
+            .fetch();
     }
 
     @Override
     public List<Like> findByUserId(Long userId, int offset, int size) {
         return queryFactory.selectFrom(like)
-                .leftJoin(like.user, user).fetchJoin()
-                .where(userIdEq(userId))
-                .orderBy(like.createdAt.desc())
-                .offset(offset)
-                .limit(size)
-                .fetch();
+            .leftJoin(like.user, user).fetchJoin()
+            .where(userIdEq(userId))
+            .orderBy(like.createdAt.desc())
+            .offset(offset)
+            .limit(size)
+            .fetch();
     }
 
     private BooleanExpression userIdEq(Long userId) {

diff --git a/backend/domain-cvi/src/main/java/com/cvi/post/domain/model/Images.java b/backend/domain-cvi/src/main/java/com/cvi/post/domain/model/Images.java
@@ -2,16 +2,17 @@
 
 import com.cvi.exception.NotFoundException;
 import com.cvi.image.domain.Image;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.persistence.Embeddable;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Embeddable;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Embeddable

diff --git a/backend/domain-cvi/src/main/java/com/cvi/post/domain/model/Post.java b/backend/domain-cvi/src/main/java/com/cvi/post/domain/model/Post.java
@@ -7,29 +7,16 @@
 import com.cvi.image.domain.Image;
 import com.cvi.like.domain.model.Like;
 import com.cvi.user.domain.model.User;
+import lombok.*;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import javax.persistence.AttributeOverride;
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.ForeignKey;
-import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.validation.constraints.NotBlank;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
 
 @Getter
 @Entity
@@ -62,7 +49,7 @@ public class Post extends BaseEntity {
 
     @Builder
     public Post(Long id, LocalDateTime createdAt, LocalDateTime lastModifiedAt, User user,
-        String content, int viewCount, VaccinationType vaccinationType) {
+                String content, int viewCount, VaccinationType vaccinationType) {
         super(id, createdAt, lastModifiedAt);
         this.user = user;
         this.content = content;

diff --git a/backend/domain-cvi/src/main/java/com/cvi/post/domain/model/Sort.java b/backend/domain-cvi/src/main/java/com/cvi/post/domain/model/Sort.java
@@ -1,12 +1,10 @@
 package com.cvi.post.domain.model;
 
-import static com.cvi.post.domain.model.QPost.post;
-
-import com.cvi.exception.InvalidInputException;
 import com.querydsl.core.types.OrderSpecifier;
-import java.util.Arrays;
 import lombok.Getter;
 
+import static com.cvi.post.domain.model.QPost.post;
+
 @Getter
 public enum Sort {
     LIKE_COUNT_ASC(post.likes.likes.size().asc()),

diff --git a/backend/domain-cvi/src/main/java/com/cvi/post/domain/repository/PostRepositoryImpl.java b/backend/domain-cvi/src/main/java/com/cvi/post/domain/repository/PostRepositoryImpl.java
@@ -1,21 +1,22 @@
 package com.cvi.post.domain.repository;
 
-import static com.cvi.comment.domain.model.QComment.comment;
-import static com.cvi.like.domain.model.QLike.like;
-import static com.cvi.post.domain.model.QPost.post;
-import static com.cvi.user.domain.model.QUser.user;
-
 import com.cvi.post.domain.model.Post;
 import com.cvi.post.domain.model.QPost;
 import com.cvi.post.domain.model.VaccinationType;
 import com.querydsl.core.types.OrderSpecifier;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.JPQLQueryFactory;
 import com.querydsl.jpa.impl.JPAQueryFactory;
+
+import javax.persistence.EntityManager;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import javax.persistence.EntityManager;
+
+import static com.cvi.comment.domain.model.QComment.comment;
+import static com.cvi.like.domain.model.QLike.like;
+import static com.cvi.post.domain.model.QPost.post;
+import static com.cvi.user.domain.model.QUser.user;
 
 public class PostRepositoryImpl implements PostQueryDsl {
 

diff --git a/backend/domain-cvi/src/main/java/com/cvi/publicdata/domain/model/RegionPopulation.java b/backend/domain-cvi/src/main/java/com/cvi/publicdata/domain/model/RegionPopulation.java
@@ -1,9 +1,10 @@
 package com.cvi.publicdata.domain.model;
 
+import lombok.Getter;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import lombok.Getter;
 
 @Getter
 public enum RegionPopulation {

diff --git a/backend/domain-cvi/src/main/java/com/cvi/publicdata/domain/model/VaccinationStatistic.java b/backend/domain-cvi/src/main/java/com/cvi/publicdata/domain/model/VaccinationStatistic.java
@@ -39,8 +39,8 @@ public class VaccinationStatistic extends PublicData {
 
     @Builder
     public VaccinationStatistic(Long id, LocalDateTime createdAt, LocalDateTime lastModifiedAt, RegionPopulation regionPopulation,
-        LocalDate baseDate, long firstCnt, long secondCnt, long totalFirstCnt, long totalSecondCnt, long accumulatedFirstCnt,
-        long accumulatedSecondCnt, BigDecimal totalFirstRate, BigDecimal totalSecondRate) {
+                                LocalDate baseDate, long firstCnt, long secondCnt, long totalFirstCnt, long totalSecondCnt, long accumulatedFirstCnt,
+                                long accumulatedSecondCnt, BigDecimal totalFirstRate, BigDecimal totalSecondRate) {
         super(id, createdAt, lastModifiedAt, regionPopulation);
         this.baseDate = baseDate;
         this.firstCnt = firstCnt;

diff --git a/backend/domain-cvi/src/main/java/com/cvi/user/domain/model/User.java b/backend/domain-cvi/src/main/java/com/cvi/user/domain/model/User.java
@@ -4,15 +4,10 @@
 import com.cvi.exception.InvalidInputException;
 import lombok.*;
 import lombok.extern.slf4j.Slf4j;
-import org.hibernate.validator.constraints.Length;
-import org.springframework.util.StringUtils;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.Objects;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 @Slf4j

diff --git a/backend/domain-cvi/src/test/java/com/cvi/comment/domain/model/CommentTest.java b/backend/domain-cvi/src/test/java/com/cvi/comment/domain/model/CommentTest.java
@@ -1,8 +1,5 @@
 package com.cvi.comment.domain.model;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
 import com.cvi.exception.InvalidOperationException;
 import com.cvi.exception.NotFoundException;
 import com.cvi.exception.UnAuthorizedException;
@@ -11,11 +8,15 @@
 import com.cvi.user.domain.model.AgeRange;
 import com.cvi.user.domain.model.SocialProvider;
 import com.cvi.user.domain.model.User;
-import java.time.LocalDateTime;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+import java.time.LocalDateTime;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
 @DisplayName("댓글 도메인 테스트")
 class CommentTest {
 

diff --git a/...end/domain-cvi/src/test/java/com/cvi/comment/domain/repository/CommentRepositoryTest.java b/...end/domain-cvi/src/test/java/com/cvi/comment/domain/repository/CommentRepositoryTest.java
@@ -1,7 +1,6 @@
 package com.cvi.comment.domain.repository;
 
 import com.cvi.comment.domain.model.Comment;
-import com.cvi.image.domain.Image;
 import com.cvi.post.domain.model.Post;
 import com.cvi.post.domain.model.VaccinationType;
 import com.cvi.post.domain.repository.PostRepository;
@@ -15,8 +14,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 
-import java.util.Arrays;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DisplayName("CommentRepository 테스트")
@@ -49,51 +46,51 @@ void setUp() {
 
     private void initUsers() {
         user1 = User.builder()
-                .nickname("인비")
-                .ageRange(AgeRange.TEENS)
-                .socialProvider(SocialProvider.KAKAO)
-                .socialId("1000")
-                .profileUrl("profile url 1")
-                .build();
+            .nickname("인비")
+            .ageRange(AgeRange.TEENS)
+            .socialProvider(SocialProvider.KAKAO)
+            .socialId("1000")
+            .profileUrl("profile url 1")
+            .build();
         user2 = User.builder()
-                .nickname("검프")
-                .ageRange(AgeRange.FIFTIES)
-                .socialProvider(SocialProvider.NAVER)
-                .socialId("1001")
-                .profileUrl("profile url 2")
-                .build();
+            .nickname("검프")
+            .ageRange(AgeRange.FIFTIES)
+            .socialProvider(SocialProvider.NAVER)
+            .socialId("1001")
+            .profileUrl("profile url 2")
+            .build();
         userRepository.save(user1);
         userRepository.save(user2);
     }
 
     private void initPost() {
         post1 = Post.builder()
-                .user(user1)
-                .content("내용 1")
-                .vaccinationType(VaccinationType.PFIZER)
-                .build();
+            .user(user1)
+            .content("내용 1")
+            .vaccinationType(VaccinationType.PFIZER)
+            .build();
         postRepository.save(post1);
     }
 
     private void initComments() {
         comment1 = Comment.builder()
-                .content("댓글 내용1")
-                .user(user1)
-                .build();
+            .content("댓글 내용1")
+            .user(user1)
+            .build();
         comment1.assignPost(post1);
         commentRepository.save(comment1);
 
         comment2 = Comment.builder()
-                .content("댓글 내용2")
-                .user(user2)
-                .build();
+            .content("댓글 내용2")
+            .user(user2)
+            .build();
         comment2.assignPost(post1);
         commentRepository.save(comment2);
 
         comment3 = Comment.builder()
-                .content("댓글 내용3")
-                .user(user2)
-                .build();
+            .content("댓글 내용3")
+            .user(user2)
+            .build();
         comment3.assignPost(post1);
         commentRepository.save(comment3);
     }

diff --git a/backend/domain-cvi/src/test/java/com/cvi/config/entity/BooleanToYNConverterTest.java b/backend/domain-cvi/src/test/java/com/cvi/config/entity/BooleanToYNConverterTest.java
@@ -4,7 +4,6 @@
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
 
 @DisplayName("Boolean 을 Y/N로 변환 테스트")
 class BooleanToYNConverterTest {