Google Java Format

HongDam-org · Mar 14, 2024 · 1e78431 · 1e78431
1 parent 1a7b40b
commit 1e78431
Show file tree

Hide file tree

Showing 43 changed files with 263 additions and 90 deletions.
diff --git a/backend/src/main/java/com/twtw/backend/domain/friend/entity/Friend.java b/backend/src/main/java/com/twtw/backend/domain/friend/entity/Friend.java
@@ -6,8 +6,11 @@
 import com.twtw.backend.global.audit.AuditListener;
 import com.twtw.backend.global.audit.Auditable;
 import com.twtw.backend.global.audit.BaseTime;
+
 import jakarta.persistence.*;
+
 import lombok.*;
+
 import org.hibernate.annotations.Where;
 
 import java.time.LocalDateTime;
@@ -90,6 +93,7 @@ private boolean isRequestNotExpired() {
     }
 
     public boolean nicknameContains(final String nickname) {
-        return this.fromMember.nicknameContains(nickname) || this.toMember.nicknameContains(nickname);
+        return this.fromMember.nicknameContains(nickname)
+                || this.toMember.nicknameContains(nickname);
     }
 }
diff --git a/backend/src/main/java/com/twtw/backend/domain/friend/repository/FriendCommandRepository.java b/backend/src/main/java/com/twtw/backend/domain/friend/repository/FriendCommandRepository.java
@@ -1,6 +1,7 @@
 package com.twtw.backend.domain.friend.repository;
 
 import com.twtw.backend.domain.friend.entity.Friend;
+
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -9,5 +10,6 @@
 @Repository
 public interface FriendCommandRepository {
     Friend save(final Friend friend);
+
     List<Friend> findByMemberAndMemberNickname(final UUID memberId, final String nickname);
 }
diff --git a/.../src/main/java/com/twtw/backend/domain/friend/repository/FriendCommandRepositoryImpl.java b/.../src/main/java/com/twtw/backend/domain/friend/repository/FriendCommandRepositoryImpl.java
@@ -1,6 +1,7 @@
 package com.twtw.backend.domain.friend.repository;
 
 import com.twtw.backend.domain.friend.entity.Friend;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -10,9 +11,20 @@
 import java.util.UUID;
 
 @Repository
-public interface FriendCommandRepositoryImpl extends JpaRepository<Friend, UUID>, FriendCommandRepository {
+public interface FriendCommandRepositoryImpl
+        extends JpaRepository<Friend, UUID>, FriendCommandRepository {
+
+    @Query(
+            value =
+                    "SELECT f.* FROM friend f JOIN member fm ON f.from_member_id = fm.id JOIN"
+                        + " member tm ON f.to_member_id = tm.id WHERE f.friend_status = 'ACCEPTED'"
+                        + " AND ((f.to_member_id = UNHEX(REPLACE(:memberId, '-', '')) AND"
+                        + " MATCH(fm.nickname) AGAINST(:nickname IN BOOLEAN MODE)) OR"
+                        + " (f.from_member_id = UNHEX(REPLACE(:memberId, '-', '')) AND"
+                        + " MATCH(tm.nickname) AGAINST(:nickname IN BOOLEAN MODE)))",
+            nativeQuery = true)
+    List<Friend> findByMemberAndMemberNickname(
+            @Param("memberId") final UUID memberId, @Param("nickname") final String nickname);
 
-    @Query(value = "SELECT f.* FROM friend f JOIN member fm ON f.from_member_id = fm.id JOIN member tm ON f.to_member_id = tm.id WHERE f.friend_status = 'ACCEPTED' AND ((f.to_member_id = UNHEX(REPLACE(:memberId, '-', '')) AND MATCH(fm.nickname) AGAINST(:nickname IN BOOLEAN MODE)) OR (f.from_member_id = UNHEX(REPLACE(:memberId, '-', '')) AND MATCH(tm.nickname) AGAINST(:nickname IN BOOLEAN MODE)))", nativeQuery = true)
-    List<Friend> findByMemberAndMemberNickname(@Param("memberId") final UUID memberId, @Param("nickname") final String nickname);
     Friend save(final Friend friend);
 }
diff --git a/backend/src/main/java/com/twtw/backend/domain/friend/repository/FriendQueryRepository.java b/backend/src/main/java/com/twtw/backend/domain/friend/repository/FriendQueryRepository.java
@@ -3,6 +3,7 @@
 import com.twtw.backend.domain.friend.entity.Friend;
 import com.twtw.backend.domain.friend.entity.FriendStatus;
 import com.twtw.backend.domain.member.entity.Member;
+
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -17,5 +18,6 @@ public interface FriendQueryRepository {
 
     List<Friend> findByMemberAndFriendStatus(final Member member, final FriendStatus friendStatus);
 
-    List<Friend> findByMemberAndMemberNicknameContaining(final UUID memberId, final String nickname);
+    List<Friend> findByMemberAndMemberNicknameContaining(
+            final UUID memberId, final String nickname);
 }
diff --git a/...nd/src/main/java/com/twtw/backend/domain/friend/repository/FriendQueryRepositoryImpl.java b/...nd/src/main/java/com/twtw/backend/domain/friend/repository/FriendQueryRepositoryImpl.java
@@ -1,18 +1,20 @@
 package com.twtw.backend.domain.friend.repository;
 
+import static com.twtw.backend.domain.friend.entity.QFriend.friend;
+
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import com.twtw.backend.domain.friend.entity.Friend;
 import com.twtw.backend.domain.friend.entity.FriendStatus;
 import com.twtw.backend.domain.member.entity.Member;
+
 import lombok.RequiredArgsConstructor;
+
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
-import static com.twtw.backend.domain.friend.entity.QFriend.friend;
-
 @Repository
 @RequiredArgsConstructor
 public class FriendQueryRepositoryImpl implements FriendQueryRepository {
@@ -59,13 +61,22 @@ public List<Friend> findByMemberAndFriendStatus(
     }
 
     @Override
-    public List<Friend> findByMemberAndMemberNicknameContaining(final UUID memberId, final String nickname) {
-        return jpaQueryFactory.selectFrom(friend)
+    public List<Friend> findByMemberAndMemberNicknameContaining(
+            final UUID memberId, final String nickname) {
+        return jpaQueryFactory
+                .selectFrom(friend)
                 .where(
                         (friend.friendStatus.eq(FriendStatus.ACCEPTED))
-                                .and
-                        (friend.toMember.id.eq(memberId).and(friend.fromMember.nickname.contains(nickname)))
-                                .or(friend.fromMember.id.eq(memberId).and(friend.toMember.nickname.contains(nickname))))
+                                .and(
+                                        friend.toMember
+                                                .id
+                                                .eq(memberId)
+                                                .and(friend.fromMember.nickname.contains(nickname)))
+                                .or(
+                                        friend.fromMember
+                                                .id
+                                                .eq(memberId)
+                                                .and(friend.toMember.nickname.contains(nickname))))
                 .fetch();
     }
 }
diff --git a/backend/src/main/java/com/twtw/backend/domain/friend/service/FriendService.java b/backend/src/main/java/com/twtw/backend/domain/friend/service/FriendService.java
@@ -17,7 +17,9 @@
 import com.twtw.backend.global.constant.NotificationTitle;
 import com.twtw.backend.global.exception.EntityNotFoundException;
 import com.twtw.backend.utils.QueryParseUtils;
+
 import lombok.RequiredArgsConstructor;
+
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -139,7 +141,9 @@ public List<FriendResponse> getFriendsByStatusWithCache(final FriendStatus frien
     private List<FriendResponse> getFriendResponsesByStatus(final FriendStatus friendStatus) {
         final Member loginMember = authService.getMemberByJwt();
         final List<Member> friends =
-                friendQueryRepository.findByMemberAndFriendStatus(loginMember, friendStatus).stream()
+                friendQueryRepository
+                        .findByMemberAndFriendStatus(loginMember, friendStatus)
+                        .stream()
                         .map(friend -> friend.getFriendMember(loginMember))
                         .toList();
 
@@ -174,13 +178,17 @@ private List<FriendResponse> getFriendResponsesByNickname(final String nickname)
 
     private List<Member> findFriendsByNickname(final Member loginMember, final String nickname) {
         if (nickname.length() < 2) {
-            return friendQueryRepository.findByMemberAndMemberNicknameContaining(loginMember.getId(), nickname).stream()
+            return friendQueryRepository
+                    .findByMemberAndMemberNicknameContaining(loginMember.getId(), nickname)
+                    .stream()
                     .map(friend -> friend.getFriendMember(loginMember))
                     .toList();
         }
-        return friendCommandRepository.findByMemberAndMemberNickname(loginMember.getId(), QueryParseUtils.parse(nickname)).stream()
-                        .filter(friend -> friend.nicknameContains(nickname))
-                        .map(friend -> friend.getFriendMember(loginMember))
-                        .toList();
+        return friendCommandRepository
+                .findByMemberAndMemberNickname(loginMember.getId(), QueryParseUtils.parse(nickname))
+                .stream()
+                .filter(friend -> friend.nicknameContains(nickname))
+                .map(friend -> friend.getFriendMember(loginMember))
+                .toList();
     }
 }
diff --git a/backend/src/main/java/com/twtw/backend/domain/group/entity/Group.java b/backend/src/main/java/com/twtw/backend/domain/group/entity/Group.java
@@ -7,8 +7,11 @@
 import com.twtw.backend.global.audit.AuditListener;
 import com.twtw.backend.global.audit.Auditable;
 import com.twtw.backend.global.audit.BaseTime;
+
 import jakarta.persistence.*;
+
 import lombok.*;
+
 import org.hibernate.annotations.Where;
 
 import java.util.ArrayList;

diff --git a/backend/src/main/java/com/twtw/backend/domain/group/entity/GroupMember.java b/backend/src/main/java/com/twtw/backend/domain/group/entity/GroupMember.java
@@ -6,11 +6,14 @@
 import com.twtw.backend.global.audit.AuditListener;
 import com.twtw.backend.global.audit.Auditable;
 import com.twtw.backend.global.audit.BaseTime;
+
 import jakarta.persistence.*;
+
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+
 import org.hibernate.annotations.Where;
 
 import java.time.LocalDateTime;

diff --git a/backend/src/main/java/com/twtw/backend/domain/group/repository/GroupRepository.java b/backend/src/main/java/com/twtw/backend/domain/group/repository/GroupRepository.java
@@ -1,6 +1,7 @@
 package com.twtw.backend.domain.group.repository;
 
 import com.twtw.backend.domain.group.entity.Group;
+
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
@@ -9,5 +10,6 @@
 @Repository
 public interface GroupRepository {
     Optional<Group> findById(final UUID groupId);
+
     Group save(final Group group);
 }
diff --git a/backend/src/main/java/com/twtw/backend/domain/group/service/GroupService.java b/backend/src/main/java/com/twtw/backend/domain/group/service/GroupService.java
@@ -16,6 +16,7 @@
 import com.twtw.backend.global.constant.NotificationBody;
 import com.twtw.backend.global.constant.NotificationTitle;
 import com.twtw.backend.global.exception.EntityNotFoundException;
+
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;

diff --git a/backend/src/main/java/com/twtw/backend/domain/member/entity/RefreshToken.java b/backend/src/main/java/com/twtw/backend/domain/member/entity/RefreshToken.java
@@ -1,9 +1,11 @@
 package com.twtw.backend.domain.member.entity;
 
 import com.github.f4b6a3.ulid.UlidCreator;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
+
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

diff --git a/backend/src/main/java/com/twtw/backend/domain/member/repository/JpaMemberRepository.java b/backend/src/main/java/com/twtw/backend/domain/member/repository/JpaMemberRepository.java
@@ -17,7 +17,9 @@ public interface JpaMemberRepository extends JpaRepository<Member, UUID>, Member
 
     @Query(
             value =
-                    "SELECT * FROM member m WHERE MATCH (m.nickname) AGAINST(:nickname IN BOOLEAN MODE)", nativeQuery = true)
+                    "SELECT * FROM member m WHERE MATCH (m.nickname) AGAINST(:nickname IN BOOLEAN"
+                        + " MODE)",
+            nativeQuery = true)
     List<Member> findAllByNickname(@Param("nickname") String nickname);
 
     @Query(

diff --git a/...nd/src/main/java/com/twtw/backend/domain/member/repository/JpaRefreshTokenRepository.java b/...nd/src/main/java/com/twtw/backend/domain/member/repository/JpaRefreshTokenRepository.java
@@ -1,10 +1,12 @@
 package com.twtw.backend.domain.member.repository;
 
 import com.twtw.backend.domain.member.entity.RefreshToken;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.UUID;
 
 @Repository
-public interface JpaRefreshTokenRepository extends JpaRepository<RefreshToken, UUID>, RefreshTokenRepository {}
+public interface JpaRefreshTokenRepository
+        extends JpaRepository<RefreshToken, UUID>, RefreshTokenRepository {}
diff --git a/backend/src/main/java/com/twtw/backend/domain/member/repository/MemberRepository.java b/backend/src/main/java/com/twtw/backend/domain/member/repository/MemberRepository.java
@@ -2,6 +2,7 @@
 
 import com.twtw.backend.domain.member.entity.AuthType;
 import com.twtw.backend.domain.member.entity.Member;
+
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -11,11 +12,18 @@
 @Repository
 public interface MemberRepository {
     List<Member> findAllByNickname(final String nickname);
+
     List<Member> findAllByNicknameContainingIgnoreCase(final String nickname);
+
     Optional<Member> findByOAuthIdAndAuthType(final String oAuthId, final AuthType authType);
+
     boolean existsByNickname(final String nickname);
+
     Member save(final Member member);
+
     Optional<Member> findById(final UUID id);
+
     List<Member> findAllByIds(final List<UUID> friendMemberIds);
+
     void deleteById(final UUID memberId);
 }
diff --git a/backend/src/main/java/com/twtw/backend/domain/member/repository/RefreshTokenRepository.java b/backend/src/main/java/com/twtw/backend/domain/member/repository/RefreshTokenRepository.java
@@ -1,12 +1,14 @@
 package com.twtw.backend.domain.member.repository;
 
 import com.twtw.backend.domain.member.entity.RefreshToken;
+
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
 
 @Repository
 public interface RefreshTokenRepository {
     Optional<RefreshToken> findByTokenKey(final String tokenKey);
+
     RefreshToken save(final RefreshToken refreshToken);
 }
diff --git a/backend/src/main/java/com/twtw/backend/domain/member/service/AuthService.java b/backend/src/main/java/com/twtw/backend/domain/member/service/AuthService.java
@@ -18,6 +18,7 @@
 import com.twtw.backend.domain.member.repository.MemberRepository;
 import com.twtw.backend.domain.member.repository.RefreshTokenRepository;
 import com.twtw.backend.global.exception.EntityNotFoundException;
+
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -121,7 +122,8 @@ public TokenDto refreshToken(TokenRequest tokenRequest) {
     }
 
     public String getRefreshTokenValue(String tokenKey) {
-        return refreshTokenRepository.findByTokenKey(tokenKey)
+        return refreshTokenRepository
+                .findByTokenKey(tokenKey)
                 .orElseThrow(EntityNotFoundException::new)
                 .getTokenValue();
     }

diff --git a/backend/src/main/java/com/twtw/backend/domain/member/service/MemberService.java b/backend/src/main/java/com/twtw/backend/domain/member/service/MemberService.java
@@ -8,6 +8,7 @@
 import com.twtw.backend.domain.plan.entity.Plan;
 import com.twtw.backend.global.exception.EntityNotFoundException;
 import com.twtw.backend.utils.QueryParseUtils;
+
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -62,8 +63,9 @@ public List<Member> getMembersByNickname(final String nickname) {
         if (nickname.length() < 2) {
             return memberRepository.findAllByNicknameContainingIgnoreCase(nickname);
         }
-        return memberRepository.findAllByNickname(QueryParseUtils.parse(nickname))
-                        .stream().filter(member -> member.nicknameContains(nickname)).toList();
+        return memberRepository.findAllByNickname(QueryParseUtils.parse(nickname)).stream()
+                .filter(member -> member.nicknameContains(nickname))
+                .toList();
     }
 
     @Cacheable(

diff --git a/backend/src/main/java/com/twtw/backend/domain/place/entity/Place.java b/backend/src/main/java/com/twtw/backend/domain/place/entity/Place.java
@@ -4,8 +4,11 @@
 import com.twtw.backend.global.audit.AuditListener;
 import com.twtw.backend.global.audit.Auditable;
 import com.twtw.backend.global.audit.BaseTime;
+
 import jakarta.persistence.*;
+
 import lombok.*;
+
 import org.hibernate.annotations.Where;
 
 import java.util.UUID;

diff --git a/backend/src/main/java/com/twtw/backend/domain/plan/entity/Plan.java b/backend/src/main/java/com/twtw/backend/domain/plan/entity/Plan.java
@@ -9,8 +9,11 @@
 import com.twtw.backend.global.audit.AuditListener;
 import com.twtw.backend.global.audit.Auditable;
 import com.twtw.backend.global.audit.BaseTime;
+
 import jakarta.persistence.*;
+
 import lombok.*;
+
 import org.hibernate.annotations.Where;
 
 import java.time.LocalDateTime;
@@ -35,11 +38,16 @@ public class Plan implements Auditable {
     private String name;
 
     @JoinColumn(columnDefinition = "BINARY(16)")
-    @OneToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE}, orphanRemoval = true)
+    @OneToOne(
+            fetch = FetchType.LAZY,
+            cascade = {CascadeType.PERSIST, CascadeType.MERGE},
+            orphanRemoval = true)
     private Place place;
 
     @JoinColumn(name = "group_id")
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE})
+    @ManyToOne(
+            fetch = FetchType.LAZY,
+            cascade = {CascadeType.PERSIST, CascadeType.MERGE})
     private Group group;
 
     @OneToMany(