Google Java Format

HongDam-org · Nov 23, 2023 · a65aab2 · a65aab2
1 parent 6e0753a
commit a65aab2
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 43 deletions.
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
@@ -28,9 +28,9 @@ public Optional<Friend> findByTwoMemberId(final UUID loginMemberId, final UUID m
                         .selectFrom(friend)
                         .where(
                                 (friend.toMember
-                                                .id
-                                                .eq(loginMemberId)
-                                                .and(friend.fromMember.id.eq(memberId))
+                                        .id
+                                        .eq(loginMemberId)
+                                        .and(friend.fromMember.id.eq(memberId))
                                         .or(
                                                 friend.fromMember
                                                         .id
@@ -43,8 +43,9 @@ public Optional<Friend> findByTwoMemberId(final UUID loginMemberId, final UUID m
     public List<Friend> findByMember(final Member member) {
         return jpaQueryFactory
                 .selectFrom(friend)
-                .where((friend.toMember.eq(member).or(friend.fromMember.eq(member)))
-                        .and(friend.friendStatus.eq(FriendStatus.ACCEPTED)))
+                .where(
+                        (friend.toMember.eq(member).or(friend.fromMember.eq(member)))
+                                .and(friend.friendStatus.eq(FriendStatus.ACCEPTED)))
                 .fetch();
     }
 
@@ -63,12 +64,19 @@ public List<Friend> findByMemberAndFriendStatus(
     public List<Friend> findByMemberAndMemberNickname(final Member member, final String nickname) {
         return jpaQueryFactory
                 .selectFrom(friend)
-                .where(friend.friendStatus.eq(FriendStatus.ACCEPTED)
-                        .and(friend.toMember.eq(member).and(friend.fromMember.nickname.eq(nickname))
-                                .or(
-                                        friend.fromMember
+                .where(
+                        friend.friendStatus
+                                .eq(FriendStatus.ACCEPTED)
+                                .and(
+                                        friend.toMember
                                                 .eq(member)
-                                                .and(friend.toMember.nickname.eq(nickname)))))
+                                                .and(friend.fromMember.nickname.eq(nickname))
+                                                .or(
+                                                        friend.fromMember
+                                                                .eq(member)
+                                                                .and(
+                                                                        friend.toMember.nickname.eq(
+                                                                                nickname)))))
                 .fetch();
     }
 }
diff --git a/backend/src/test/java/com/twtw/backend/domain/friend/repository/FriendRepositoryTest.java b/backend/src/test/java/com/twtw/backend/domain/friend/repository/FriendRepositoryTest.java
@@ -9,12 +9,14 @@
 import com.twtw.backend.domain.member.entity.OAuth2Info;
 import com.twtw.backend.domain.member.repository.MemberRepository;
 import com.twtw.backend.support.repository.RepositoryTest;
-import java.util.List;
-import java.util.UUID;
+
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
+import java.util.UUID;
+
 @DisplayName("FriendRepository에")
 class FriendRepositoryTest extends RepositoryTest {
 
@@ -25,8 +27,12 @@ class FriendRepositoryTest extends RepositoryTest {
     @DisplayName("저장이 수행되는가")
     void save() {
         // given
-        final Member from = memberRepository.save(new Member("1", "123", new OAuth2Info("321", AuthType.APPLE)));
-        final Member to = memberRepository.save(new Member("2", "1234", new OAuth2Info("123", AuthType.KAKAO)));
+        final Member from =
+                memberRepository.save(
+                        new Member("1", "123", new OAuth2Info("321", AuthType.APPLE)));
+        final Member to =
+                memberRepository.save(
+                        new Member("2", "1234", new OAuth2Info("123", AuthType.KAKAO)));
         final Friend friend = new Friend(from, to);
 
         // when
@@ -40,13 +46,18 @@ void save() {
     @DisplayName("두 멤버 pk로 조회가 수행되는가")
     void findByTwoMemberId() {
         // given
-        final Member from = memberRepository.save(new Member("1", "123", new OAuth2Info("321", AuthType.APPLE)));
-        final Member to = memberRepository.save(new Member("2", "1234", new OAuth2Info("123", AuthType.KAKAO)));
+        final Member from =
+                memberRepository.save(
+                        new Member("1", "123", new OAuth2Info("321", AuthType.APPLE)));
+        final Member to =
+                memberRepository.save(
+                        new Member("2", "1234", new OAuth2Info("123", AuthType.KAKAO)));
         final Friend friend = new Friend(from, to);
         final Friend expected = friendRepository.save(friend);
 
         // when
-        final Friend result = friendRepository.findByTwoMemberId(from.getId(), to.getId()).orElseThrow();
+        final Friend result =
+                friendRepository.findByTwoMemberId(from.getId(), to.getId()).orElseThrow();
 
         // then
         assertThat(result.getId()).isEqualTo(expected.getId());
@@ -56,8 +67,12 @@ void findByTwoMemberId() {
     @DisplayName("멤버를 통한 조회가 수행되는가")
     void findByMember() {
         // given
-        final Member from = memberRepository.save(new Member("1", "123", new OAuth2Info("321", AuthType.APPLE)));
-        final Member to = memberRepository.save(new Member("2", "1234", new OAuth2Info("123", AuthType.KAKAO)));
+        final Member from =
+                memberRepository.save(
+                        new Member("1", "123", new OAuth2Info("321", AuthType.APPLE)));
+        final Member to =
+                memberRepository.save(
+                        new Member("2", "1234", new OAuth2Info("123", AuthType.KAKAO)));
         final Friend friend = new Friend(from, to);
         final Friend expected = friendRepository.save(friend);
         expected.updateStatus(FriendStatus.ACCEPTED);
@@ -73,13 +88,18 @@ void findByMember() {
     @DisplayName("멤버와 친구 상태를 통한 조회가 수행되는가")
     void findByMemberAndFriendStatus() {
         // given
-        final Member from = memberRepository.save(new Member("1", "123", new OAuth2Info("321", AuthType.APPLE)));
-        final Member to = memberRepository.save(new Member("2", "1234", new OAuth2Info("123", AuthType.KAKAO)));
+        final Member from =
+                memberRepository.save(
+                        new Member("1", "123", new OAuth2Info("321", AuthType.APPLE)));
+        final Member to =
+                memberRepository.save(
+                        new Member("2", "1234", new OAuth2Info("123", AuthType.KAKAO)));
         final Friend friend = new Friend(from, to);
         friendRepository.save(friend);
 
         // when
-        final List<Friend> result = friendRepository.findByMemberAndFriendStatus(from, friend.getFriendStatus());
+        final List<Friend> result =
+                friendRepository.findByMemberAndFriendStatus(from, friend.getFriendStatus());
 
         // then
         assertThat(result).hasSize(1);
@@ -89,15 +109,20 @@ void findByMemberAndFriendStatus() {
     @DisplayName("멤버와 닉네임을 통한 검색이 수행되는가")
     void findByMemberAndMemberNickname() {
         // given
-        final Member from = memberRepository.save(new Member("1", "123", new OAuth2Info("321", AuthType.APPLE)));
+        final Member from =
+                memberRepository.save(
+                        new Member("1", "123", new OAuth2Info("321", AuthType.APPLE)));
         final String friendNickname = "2";
-        final Member to = memberRepository.save(new Member(friendNickname, "1234", new OAuth2Info("123", AuthType.KAKAO)));
+        final Member to =
+                memberRepository.save(
+                        new Member(friendNickname, "1234", new OAuth2Info("123", AuthType.KAKAO)));
         final Friend friend = new Friend(from, to);
         final Friend expected = friendRepository.save(friend);
         expected.updateStatus(FriendStatus.ACCEPTED);
 
         // when
-        final List<Friend> result = friendRepository.findByMemberAndMemberNickname(from, friendNickname);
+        final List<Friend> result =
+                friendRepository.findByMemberAndMemberNickname(from, friendNickname);
 
         // then
         assertThat(result).hasSize(1);

diff --git a/backend/src/test/java/com/twtw/backend/domain/friend/service/FriendServiceTest.java b/backend/src/test/java/com/twtw/backend/domain/friend/service/FriendServiceTest.java
@@ -12,12 +12,14 @@
 import com.twtw.backend.domain.member.entity.Member;
 import com.twtw.backend.domain.member.entity.OAuth2Info;
 import com.twtw.backend.support.service.LoginTest;
-import java.util.List;
-import java.util.UUID;
+
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
+import java.util.UUID;
+
 @DisplayName("FriendService의")
 class FriendServiceTest extends LoginTest {
 
@@ -28,21 +30,26 @@ class FriendServiceTest extends LoginTest {
     @DisplayName("요청 추가가 수행되는가")
     void addRequest() {
         // given
-        final UUID id = memberRepository.save(new Member("1", "12", new OAuth2Info("123", AuthType.APPLE))).getId();
+        final UUID id =
+                memberRepository
+                        .save(new Member("1", "12", new OAuth2Info("123", AuthType.APPLE)))
+                        .getId();
 
         // when
         friendService.addRequest(new FriendRequest(id));
 
         // then
-        final List<Friend> result = friendRepository.findByMemberAndFriendStatus(loginUser, FriendStatus.REQUESTED);
+        final List<Friend> result =
+                friendRepository.findByMemberAndFriendStatus(loginUser, FriendStatus.REQUESTED);
         assertThat(result).hasSize(1);
     }
 
     @Test
     @DisplayName("상태 업데이트가 수행되는가")
     void updateStatus() {
         // given
-        final Member toMember = memberRepository.save(new Member("1", "12", new OAuth2Info("123", AuthType.APPLE)));
+        final Member toMember =
+                memberRepository.save(new Member("1", "12", new OAuth2Info("123", AuthType.APPLE)));
         final Friend friend = friendRepository.save(new Friend(loginUser, toMember));
 
         // when
@@ -58,9 +65,11 @@ void updateStatus() {
     @DisplayName("친구 목록 조회가 수행되는가")
     void getFriends() {
         // given
-        final Member toMember = memberRepository.save(new Member("1", "12", new OAuth2Info("123", AuthType.APPLE)));
+        final Member toMember =
+                memberRepository.save(new Member("1", "12", new OAuth2Info("123", AuthType.APPLE)));
         friendRepository.save(new Friend(loginUser, toMember));
-        friendService.updateStatus(new FriendUpdateRequest(toMember.getId(), FriendStatus.ACCEPTED));
+        friendService.updateStatus(
+                new FriendUpdateRequest(toMember.getId(), FriendStatus.ACCEPTED));
 
         // when
         final List<FriendResponse> result = friendService.getFriends();
@@ -73,11 +82,13 @@ void getFriends() {
     @DisplayName("상태를 통한 친구 조회가 수행되는가")
     void getFriendsByStatus() {
         // given
-        final Member toMember = memberRepository.save(new Member("1", "12", new OAuth2Info("123", AuthType.APPLE)));
+        final Member toMember =
+                memberRepository.save(new Member("1", "12", new OAuth2Info("123", AuthType.APPLE)));
         friendRepository.save(new Friend(loginUser, toMember));
 
         // when
-        final List<FriendResponse> result = friendService.getFriendsByStatus(FriendStatus.REQUESTED);
+        final List<FriendResponse> result =
+                friendService.getFriendsByStatus(FriendStatus.REQUESTED);
 
         // then
         assertThat(result).hasSize(1);
@@ -88,7 +99,9 @@ void getFriendsByStatus() {
     void getFriendByNickname() {
         // given
         final String nickname = "1";
-        final Member toMember = memberRepository.save(new Member(nickname, "12", new OAuth2Info("123", AuthType.APPLE)));
+        final Member toMember =
+                memberRepository.save(
+                        new Member(nickname, "12", new OAuth2Info("123", AuthType.APPLE)));
         final Friend expected = friendRepository.save(new Friend(loginUser, toMember));
         expected.updateStatus(FriendStatus.ACCEPTED);
 

diff --git a/backend/src/test/java/com/twtw/backend/domain/member/service/MemberServiceTest.java b/backend/src/test/java/com/twtw/backend/domain/member/service/MemberServiceTest.java
@@ -8,8 +8,8 @@
 import com.twtw.backend.domain.member.entity.Member;
 import com.twtw.backend.domain.member.repository.MemberRepository;
 import com.twtw.backend.fixture.member.MemberEntityFixture;
-
 import com.twtw.backend.support.service.LoginTest;
+
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/backend/src/test/java/com/twtw/backend/domain/plan/service/PlanServiceTest.java b/backend/src/test/java/com/twtw/backend/domain/plan/service/PlanServiceTest.java
@@ -19,12 +19,14 @@
 import com.twtw.backend.fixture.place.PlaceEntityFixture;
 import com.twtw.backend.fixture.plan.PlanEntityFixture;
 import com.twtw.backend.support.service.LoginTest;
-import java.util.Optional;
-import java.util.UUID;
+
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.Optional;
+import java.util.UUID;
+
 @DisplayName("PlanService의")
 class PlanServiceTest extends LoginTest {
 
@@ -68,7 +70,12 @@ void savePlan() {
     void joinPlan() {
         // given
         final Member member = memberRepository.save(MemberEntityFixture.FIRST_MEMBER.toEntity());
-        final Plan plan = planRepository.save(new Plan(member, PlaceEntityFixture.FIRST_PLACE.toEntity(), GroupEntityFixture.BTS_GROUP.toEntity()));
+        final Plan plan =
+                planRepository.save(
+                        new Plan(
+                                member,
+                                PlaceEntityFixture.FIRST_PLACE.toEntity(),
+                                GroupEntityFixture.BTS_GROUP.toEntity()));
         final UUID planId = plan.getId();
 
         // when

diff --git a/backend/src/test/java/com/twtw/backend/support/repository/EnableDataJpa.java b/backend/src/test/java/com/twtw/backend/support/repository/EnableDataJpa.java
@@ -1,15 +1,17 @@
 package com.twtw.backend.support.repository;
 
 import com.twtw.backend.config.database.QuerydslConfig;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
 @DataJpaTest
 @ActiveProfiles("test")
 @Target(ElementType.TYPE)