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 index 9b82372..8dc925d 100644 --- 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 index a2d727f..8114a8d 100644 --- 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 findByMemberAndMemberNickname(final UUID memberId, final String nickname); } diff --git a/backend/src/main/java/com/twtw/backend/domain/friend/repository/FriendCommandRepositoryImpl.java b/backend/src/main/java/com/twtw/backend/domain/friend/repository/FriendCommandRepositoryImpl.java index 54d67f6..8881802 100644 --- a/backend/src/main/java/com/twtw/backend/domain/friend/repository/FriendCommandRepositoryImpl.java +++ b/backend/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, FriendCommandRepository { +public interface FriendCommandRepositoryImpl + extends JpaRepository, 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 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 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 index e22652f..bd8af9d 100644 --- 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 findByMemberAndFriendStatus(final Member member, final FriendStatus friendStatus); - List findByMemberAndMemberNicknameContaining(final UUID memberId, final String nickname); + List findByMemberAndMemberNicknameContaining( + final UUID memberId, final String nickname); } diff --git a/backend/src/main/java/com/twtw/backend/domain/friend/repository/FriendQueryRepositoryImpl.java b/backend/src/main/java/com/twtw/backend/domain/friend/repository/FriendQueryRepositoryImpl.java index e1c7ac2..d80acd1 100644 --- a/backend/src/main/java/com/twtw/backend/domain/friend/repository/FriendQueryRepositoryImpl.java +++ b/backend/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 findByMemberAndFriendStatus( } @Override - public List findByMemberAndMemberNicknameContaining(final UUID memberId, final String nickname) { - return jpaQueryFactory.selectFrom(friend) + public List 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 index b48badc..2cb0991 100644 --- 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 getFriendsByStatusWithCache(final FriendStatus frien private List getFriendResponsesByStatus(final FriendStatus friendStatus) { final Member loginMember = authService.getMemberByJwt(); final List friends = - friendQueryRepository.findByMemberAndFriendStatus(loginMember, friendStatus).stream() + friendQueryRepository + .findByMemberAndFriendStatus(loginMember, friendStatus) + .stream() .map(friend -> friend.getFriendMember(loginMember)) .toList(); @@ -174,13 +178,17 @@ private List getFriendResponsesByNickname(final String nickname) private List 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 index 249d62e..bfd71b2 100644 --- 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 index 27f9cbc..dbd9db3 100644 --- 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 index d386154..1dc2076 100644 --- 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 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 index e6e3fbb..1df0885 100644 --- 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 index 0b89f54..ea2cea8 100644 --- 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 index 969be7a..724fec0 100644 --- 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 @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 findAllByNickname(@Param("nickname") String nickname); @Query( diff --git a/backend/src/main/java/com/twtw/backend/domain/member/repository/JpaRefreshTokenRepository.java b/backend/src/main/java/com/twtw/backend/domain/member/repository/JpaRefreshTokenRepository.java index e1fe018..9b3164f 100644 --- a/backend/src/main/java/com/twtw/backend/domain/member/repository/JpaRefreshTokenRepository.java +++ b/backend/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, RefreshTokenRepository {} +public interface JpaRefreshTokenRepository + extends JpaRepository, 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 index df95713..95bb404 100644 --- 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 findAllByNickname(final String nickname); + List findAllByNicknameContainingIgnoreCase(final String nickname); + Optional findByOAuthIdAndAuthType(final String oAuthId, final AuthType authType); + boolean existsByNickname(final String nickname); + Member save(final Member member); + Optional findById(final UUID id); + List findAllByIds(final List 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 index bd79ed0..c6dcda6 100644 --- 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,6 +1,7 @@ package com.twtw.backend.domain.member.repository; import com.twtw.backend.domain.member.entity.RefreshToken; + import org.springframework.stereotype.Repository; import java.util.Optional; @@ -8,5 +9,6 @@ @Repository public interface RefreshTokenRepository { Optional 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 index 55af6f1..03e8f6e 100644 --- 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 index 3075904..7b56d56 100644 --- 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 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 index bbd9c26..3885000 100644 --- 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 index cfc3375..7ed32db 100644 --- 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( diff --git a/backend/src/main/java/com/twtw/backend/domain/plan/repository/PlanRepository.java b/backend/src/main/java/com/twtw/backend/domain/plan/repository/PlanRepository.java index 8ee08fb..c9f0429 100644 --- a/backend/src/main/java/com/twtw/backend/domain/plan/repository/PlanRepository.java +++ b/backend/src/main/java/com/twtw/backend/domain/plan/repository/PlanRepository.java @@ -2,6 +2,7 @@ import com.twtw.backend.domain.member.entity.Member; import com.twtw.backend.domain.plan.entity.Plan; + import org.springframework.stereotype.Repository; import java.util.List; @@ -11,7 +12,10 @@ @Repository public interface PlanRepository { List findAllByMember(final Member member); + Plan save(final Plan plan); + void deleteById(final UUID id); + Optional findById(final UUID id); } diff --git a/backend/src/main/java/com/twtw/backend/domain/plan/service/PlanService.java b/backend/src/main/java/com/twtw/backend/domain/plan/service/PlanService.java index 0a77374..02fa1f7 100644 --- a/backend/src/main/java/com/twtw/backend/domain/plan/service/PlanService.java +++ b/backend/src/main/java/com/twtw/backend/domain/plan/service/PlanService.java @@ -28,7 +28,9 @@ import com.twtw.backend.global.constant.NotificationBody; import com.twtw.backend.global.constant.NotificationTitle; import com.twtw.backend.global.exception.EntityNotFoundException; + import lombok.RequiredArgsConstructor; + import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/backend/src/test/java/com/twtw/backend/domain/friend/repository/FriendCommandRepositoryTest.java b/backend/src/test/java/com/twtw/backend/domain/friend/repository/FriendCommandRepositoryTest.java index 78c1d64..13d54c2 100644 --- a/backend/src/test/java/com/twtw/backend/domain/friend/repository/FriendCommandRepositoryTest.java +++ b/backend/src/test/java/com/twtw/backend/domain/friend/repository/FriendCommandRepositoryTest.java @@ -1,5 +1,7 @@ package com.twtw.backend.domain.friend.repository; +import static org.assertj.core.api.Assertions.assertThat; + import com.twtw.backend.domain.friend.entity.Friend; import com.twtw.backend.domain.friend.entity.FriendStatus; import com.twtw.backend.domain.member.entity.AuthType; @@ -8,6 +10,7 @@ import com.twtw.backend.domain.member.repository.MemberRepository; import com.twtw.backend.support.repository.RepositoryTest; import com.twtw.backend.utils.QueryParseUtils; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -15,8 +18,6 @@ import java.util.List; import java.util.UUID; -import static org.assertj.core.api.Assertions.assertThat; - @DisplayName("FriendCommandRepository에") class FriendCommandRepositoryTest extends RepositoryTest { @@ -50,7 +51,10 @@ void findByMemberAndMemberNickname() { final Member from = memberRepository.save( new Member( - "144", "123", new OAuth2Info("321", AuthType.APPLE), "deviceToken1")); + "144", + "123", + new OAuth2Info("321", AuthType.APPLE), + "deviceToken1")); final String toMemberNickname = "277123"; final Member to = memberRepository.save( @@ -65,9 +69,10 @@ void findByMemberAndMemberNickname() { // when final List result = - friendCommandRepository.findByMemberAndMemberNickname(from.getId(), QueryParseUtils.parse(toMemberNickname.substring(2, 5))); + friendCommandRepository.findByMemberAndMemberNickname( + from.getId(), QueryParseUtils.parse(toMemberNickname.substring(2, 5))); // then -// assertThat(result).isNotEmpty(); + // assertThat(result).isNotEmpty(); } } diff --git a/backend/src/test/java/com/twtw/backend/domain/friend/repository/FriendQueryRepositoryImplTest.java b/backend/src/test/java/com/twtw/backend/domain/friend/repository/FriendQueryRepositoryImplTest.java index 432664a..43bc71a 100644 --- a/backend/src/test/java/com/twtw/backend/domain/friend/repository/FriendQueryRepositoryImplTest.java +++ b/backend/src/test/java/com/twtw/backend/domain/friend/repository/FriendQueryRepositoryImplTest.java @@ -1,5 +1,7 @@ package com.twtw.backend.domain.friend.repository; +import static org.assertj.core.api.Assertions.assertThat; + import com.twtw.backend.domain.friend.entity.Friend; import com.twtw.backend.domain.friend.entity.FriendStatus; import com.twtw.backend.domain.member.entity.AuthType; @@ -7,7 +9,9 @@ import com.twtw.backend.domain.member.entity.OAuth2Info; import com.twtw.backend.domain.member.repository.MemberRepository; import com.twtw.backend.support.repository.RepositoryTest; + import jakarta.persistence.EntityManager; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -15,8 +19,6 @@ import java.util.List; -import static org.assertj.core.api.Assertions.assertThat; - @Import(FriendQueryRepositoryImpl.class) @DisplayName("FriendQueryRepository에") class FriendQueryRepositoryImplTest extends RepositoryTest { @@ -84,7 +86,10 @@ void findByMemberAndFriendStatus() { final Member from = memberRepository.save( new Member( - "14312", "123", new OAuth2Info("321", AuthType.APPLE), "deviceToken1")); + "14312", + "123", + new OAuth2Info("321", AuthType.APPLE), + "deviceToken1")); final Member to = memberRepository.save( new Member( @@ -97,7 +102,8 @@ void findByMemberAndFriendStatus() { // when final List result = - friendQueryRepositoryImpl.findByMemberAndFriendStatus(from, friend.getFriendStatus()); + friendQueryRepositoryImpl.findByMemberAndFriendStatus( + from, friend.getFriendStatus()); // 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 index cc92b7c..0ecd36f 100644 --- 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 @@ -1,5 +1,7 @@ package com.twtw.backend.domain.friend.service; +import static org.assertj.core.api.Assertions.assertThat; + import com.twtw.backend.domain.friend.dto.request.FriendRequest; import com.twtw.backend.domain.friend.dto.request.FriendUpdateRequest; import com.twtw.backend.domain.friend.dto.response.FriendResponse; @@ -12,6 +14,7 @@ import com.twtw.backend.domain.member.entity.OAuth2Info; import com.twtw.backend.domain.member.repository.MemberRepository; 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; @@ -20,16 +23,19 @@ import java.util.List; import java.util.UUID; -import static org.assertj.core.api.Assertions.assertThat; - @DisplayName("FriendService의") class FriendServiceTest extends LoginTest { @Autowired private FriendService friendService; - @Autowired @Qualifier("stubFriendQueryRepository") + + @Autowired + @Qualifier("stubFriendQueryRepository") private FriendQueryRepository friendQueryRepository; - @Autowired @Qualifier("stubFriendCommandRepository") + + @Autowired + @Qualifier("stubFriendCommandRepository") private FriendCommandRepository friendCommandRepository; + @Autowired private MemberRepository memberRepository; @Test @@ -51,7 +57,8 @@ void addRequest() { // then final List result = - friendQueryRepository.findByMemberAndFriendStatus(loginUser, FriendStatus.REQUESTED); + friendQueryRepository.findByMemberAndFriendStatus( + loginUser, FriendStatus.REQUESTED); assertThat(result).hasSize(2); } @@ -70,7 +77,11 @@ void updateStatus() { friendService.updateStatus(new FriendUpdateRequest(toMember.getId(), status)); // then - final Friend result = friendQueryRepository.findByTwoMemberId(friend.getToMember().getId(), friend.getFromMember().getId()).orElseThrow(); + final Friend result = + friendQueryRepository + .findByTwoMemberId( + friend.getToMember().getId(), friend.getFromMember().getId()) + .orElseThrow(); assertThat(result.getFriendStatus()).isEqualTo(status); } diff --git a/backend/src/test/java/com/twtw/backend/domain/group/repository/GroupRepositoryTest.java b/backend/src/test/java/com/twtw/backend/domain/group/repository/GroupRepositoryTest.java index 97f6112..d17cc53 100644 --- a/backend/src/test/java/com/twtw/backend/domain/group/repository/GroupRepositoryTest.java +++ b/backend/src/test/java/com/twtw/backend/domain/group/repository/GroupRepositoryTest.java @@ -1,5 +1,7 @@ package com.twtw.backend.domain.group.repository; +import static org.assertj.core.api.Assertions.assertThat; + import com.twtw.backend.domain.group.entity.Group; import com.twtw.backend.domain.group.entity.GroupMember; import com.twtw.backend.domain.member.entity.Member; @@ -10,6 +12,7 @@ import com.twtw.backend.fixture.member.MemberEntityFixture; import com.twtw.backend.fixture.place.PlaceEntityFixture; import com.twtw.backend.support.repository.RepositoryTest; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -17,8 +20,6 @@ import java.time.LocalDateTime; import java.util.List; -import static org.assertj.core.api.Assertions.assertThat; - @DisplayName("GroupRepository의") class GroupRepositoryTest extends RepositoryTest { @@ -26,7 +27,6 @@ class GroupRepositoryTest extends RepositoryTest { @Autowired private MemberRepository memberRepository; - @Test @DisplayName("Group이 정상적으로 저장되는가") void makeGroup() { @@ -63,7 +63,8 @@ void getGroupById() { final Group saveGroup = groupRepository.save(group); // when - GroupMember result = groupRepository.findById(saveGroup.getId()).orElseThrow().getSameMember(member1); + GroupMember result = + groupRepository.findById(saveGroup.getId()).orElseThrow().getSameMember(member1); // then assertThat(result.getGroup().getId()).isEqualTo(saveGroup.getId()); diff --git a/backend/src/test/java/com/twtw/backend/domain/group/service/GroupServiceTest.java b/backend/src/test/java/com/twtw/backend/domain/group/service/GroupServiceTest.java index dcc8713..22dc11d 100644 --- a/backend/src/test/java/com/twtw/backend/domain/group/service/GroupServiceTest.java +++ b/backend/src/test/java/com/twtw/backend/domain/group/service/GroupServiceTest.java @@ -1,5 +1,7 @@ package com.twtw.backend.domain.group.service; +import static org.assertj.core.api.Assertions.assertThat; + import com.twtw.backend.domain.group.dto.request.InviteGroupRequest; import com.twtw.backend.domain.group.dto.request.JoinGroupRequest; import com.twtw.backend.domain.group.dto.request.MakeGroupRequest; @@ -12,6 +14,7 @@ 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; @@ -19,8 +22,6 @@ import java.util.List; -import static org.assertj.core.api.Assertions.assertThat; - @DisplayName("GroupService의") class GroupServiceTest extends LoginTest { @@ -101,7 +102,8 @@ void changeShare() { // when groupService.unShareLocation(saveGroup.getId()); - final GroupMember result = groupRepository.findById(saveGroup.getId()).orElseThrow().getSameMember(loginUser); + final GroupMember result = + groupRepository.findById(saveGroup.getId()).orElseThrow().getSameMember(loginUser); // then assertThat(result.getIsShare()).isFalse(); diff --git a/backend/src/test/java/com/twtw/backend/domain/member/repository/MemberRepositoryTest.java b/backend/src/test/java/com/twtw/backend/domain/member/repository/MemberRepositoryTest.java index 8d208e3..06f14f8 100644 --- a/backend/src/test/java/com/twtw/backend/domain/member/repository/MemberRepositoryTest.java +++ b/backend/src/test/java/com/twtw/backend/domain/member/repository/MemberRepositoryTest.java @@ -1,18 +1,19 @@ package com.twtw.backend.domain.member.repository; +import static org.assertj.core.api.Assertions.assertThat; + import com.twtw.backend.domain.member.dto.request.DeviceTokenRequest; import com.twtw.backend.domain.member.entity.DeviceToken; import com.twtw.backend.domain.member.entity.Member; import com.twtw.backend.fixture.member.MemberEntityFixture; import com.twtw.backend.support.repository.RepositoryTest; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import java.util.UUID; -import static org.assertj.core.api.Assertions.assertThat; - @DisplayName("MemberRepository의") class MemberRepositoryTest extends RepositoryTest { diff --git a/backend/src/test/java/com/twtw/backend/domain/member/service/AuthServiceTest.java b/backend/src/test/java/com/twtw/backend/domain/member/service/AuthServiceTest.java index cbdd6b1..3550a41 100644 --- a/backend/src/test/java/com/twtw/backend/domain/member/service/AuthServiceTest.java +++ b/backend/src/test/java/com/twtw/backend/domain/member/service/AuthServiceTest.java @@ -1,5 +1,7 @@ package com.twtw.backend.domain.member.service; +import static org.assertj.core.api.Assertions.assertThat; + import com.twtw.backend.domain.member.dto.request.MemberSaveRequest; import com.twtw.backend.domain.member.dto.request.OAuthRequest; import com.twtw.backend.domain.member.dto.response.AfterLoginResponse; @@ -11,15 +13,16 @@ import com.twtw.backend.support.service.ServiceTest; import com.twtw.backend.support.stub.StubConfig; import com.twtw.backend.support.testcontainer.ContainerTestConfig; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import static org.assertj.core.api.Assertions.assertThat; - @ServiceTest -@ContextConfiguration(initializers = {ContainerTestConfig.class}, classes = StubConfig.class) +@ContextConfiguration( + initializers = {ContainerTestConfig.class}, + classes = StubConfig.class) @DisplayName("AuthService의") class AuthServiceTest { 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 index 0068acc..8f4e265 100644 --- 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 @@ -1,20 +1,21 @@ package com.twtw.backend.domain.member.service; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.twtw.backend.domain.member.dto.response.DuplicateNicknameResponse; import com.twtw.backend.domain.member.dto.response.MemberResponse; 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; import java.util.List; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertTrue; - @DisplayName("MemberService의") class MemberServiceTest extends LoginTest { @Autowired private MemberService memberService; diff --git a/backend/src/test/java/com/twtw/backend/domain/plan/repository/PlanRepositoryTest.java b/backend/src/test/java/com/twtw/backend/domain/plan/repository/PlanRepositoryTest.java index 0fb0743..b8e2621 100644 --- a/backend/src/test/java/com/twtw/backend/domain/plan/repository/PlanRepositoryTest.java +++ b/backend/src/test/java/com/twtw/backend/domain/plan/repository/PlanRepositoryTest.java @@ -1,5 +1,7 @@ package com.twtw.backend.domain.plan.repository; +import static org.assertj.core.api.Assertions.assertThat; + import com.twtw.backend.domain.group.entity.Group; import com.twtw.backend.domain.group.repository.GroupRepository; import com.twtw.backend.domain.member.entity.Member; @@ -10,6 +12,7 @@ import com.twtw.backend.fixture.member.MemberEntityFixture; import com.twtw.backend.fixture.plan.PlanEntityFixture; import com.twtw.backend.support.repository.RepositoryTest; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -18,8 +21,6 @@ import java.util.List; import java.util.UUID; -import static org.assertj.core.api.Assertions.assertThat; - @DisplayName("PlanRepository의") class PlanRepositoryTest extends RepositoryTest { 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 index 6b07bc0..de25ef7 100644 --- 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 @@ -1,5 +1,7 @@ package com.twtw.backend.domain.plan.service; +import static org.assertj.core.api.Assertions.assertThat; + import com.twtw.backend.domain.group.repository.GroupRepository; import com.twtw.backend.domain.member.entity.Member; import com.twtw.backend.domain.member.repository.MemberRepository; @@ -18,6 +20,7 @@ import com.twtw.backend.fixture.place.PlaceEntityFixture; import com.twtw.backend.fixture.plan.PlanEntityFixture; 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; @@ -28,8 +31,6 @@ import java.util.Optional; import java.util.UUID; -import static org.assertj.core.api.Assertions.assertThat; - @DisplayName("PlanService의") class PlanServiceTest extends LoginTest { diff --git a/backend/src/test/java/com/twtw/backend/support/database/DatabaseTest.java b/backend/src/test/java/com/twtw/backend/support/database/DatabaseTest.java index a4980a4..2d23fcf 100644 --- a/backend/src/test/java/com/twtw/backend/support/database/DatabaseTest.java +++ b/backend/src/test/java/com/twtw/backend/support/database/DatabaseTest.java @@ -1,6 +1,7 @@ package com.twtw.backend.support.database; import com.twtw.backend.config.database.QuerydslConfig; + import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; diff --git a/backend/src/test/java/com/twtw/backend/support/exclude/ExcludeTest.java b/backend/src/test/java/com/twtw/backend/support/exclude/ExcludeTest.java index 8046aca..8ba33ab 100644 --- a/backend/src/test/java/com/twtw/backend/support/exclude/ExcludeTest.java +++ b/backend/src/test/java/com/twtw/backend/support/exclude/ExcludeTest.java @@ -1,14 +1,15 @@ package com.twtw.backend.support.exclude; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doNothing; + import com.twtw.backend.domain.notification.messagequeue.FcmProducer; import com.twtw.backend.support.testcontainer.ContainerTestConfig; + import org.junit.jupiter.api.BeforeEach; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.context.ContextConfiguration; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doNothing; - @ContextConfiguration(initializers = ContainerTestConfig.class) public abstract class ExcludeTest { 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 index b928a5f..7b3d44c 100644 --- a/backend/src/test/java/com/twtw/backend/support/repository/EnableDataJpa.java +++ b/backend/src/test/java/com/twtw/backend/support/repository/EnableDataJpa.java @@ -3,6 +3,7 @@ import com.twtw.backend.config.database.QuerydslConfig; import com.twtw.backend.support.database.ResetDatabase; import com.twtw.backend.support.testcontainer.ContainerTestConfig; + import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.context.annotation.Import; diff --git a/backend/src/test/java/com/twtw/backend/support/repository/RepositoryTest.java b/backend/src/test/java/com/twtw/backend/support/repository/RepositoryTest.java index 4fea96f..725d76e 100644 --- a/backend/src/test/java/com/twtw/backend/support/repository/RepositoryTest.java +++ b/backend/src/test/java/com/twtw/backend/support/repository/RepositoryTest.java @@ -1,6 +1,7 @@ package com.twtw.backend.support.repository; import com.twtw.backend.support.database.ResetDatabase; + import org.junit.jupiter.api.BeforeEach; import org.springframework.beans.factory.annotation.Autowired; diff --git a/backend/src/test/java/com/twtw/backend/support/service/LoginTest.java b/backend/src/test/java/com/twtw/backend/support/service/LoginTest.java index a954ef7..7690429 100644 --- a/backend/src/test/java/com/twtw/backend/support/service/LoginTest.java +++ b/backend/src/test/java/com/twtw/backend/support/service/LoginTest.java @@ -1,5 +1,9 @@ package com.twtw.backend.support.service; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.when; + import com.twtw.backend.domain.member.entity.Member; import com.twtw.backend.domain.member.repository.MemberRepository; import com.twtw.backend.domain.member.service.AuthService; @@ -7,17 +11,16 @@ import com.twtw.backend.fixture.member.MemberEntityFixture; import com.twtw.backend.support.stub.StubConfig; import com.twtw.backend.support.testcontainer.ContainerTestConfig; + import org.junit.jupiter.api.BeforeEach; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.context.ContextConfiguration; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.when; - @ServiceTest -@ContextConfiguration(initializers = {ContainerTestConfig.class}, classes = StubConfig.class) +@ContextConfiguration( + initializers = {ContainerTestConfig.class}, + classes = StubConfig.class) public abstract class LoginTest { @MockBean protected AuthService authService; diff --git a/backend/src/test/java/com/twtw/backend/support/stub/StubConfig.java b/backend/src/test/java/com/twtw/backend/support/stub/StubConfig.java index 1d766b0..001d9ae 100644 --- a/backend/src/test/java/com/twtw/backend/support/stub/StubConfig.java +++ b/backend/src/test/java/com/twtw/backend/support/stub/StubConfig.java @@ -7,6 +7,7 @@ import com.twtw.backend.domain.member.repository.MemberRepository; import com.twtw.backend.domain.member.repository.RefreshTokenRepository; import com.twtw.backend.domain.plan.repository.PlanRepository; + import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Primary; diff --git a/backend/src/test/java/com/twtw/backend/support/stub/StubFriendCommandRepository.java b/backend/src/test/java/com/twtw/backend/support/stub/StubFriendCommandRepository.java index 4d40cee..1f57261 100644 --- a/backend/src/test/java/com/twtw/backend/support/stub/StubFriendCommandRepository.java +++ b/backend/src/test/java/com/twtw/backend/support/stub/StubFriendCommandRepository.java @@ -2,6 +2,7 @@ import com.twtw.backend.domain.friend.entity.Friend; import com.twtw.backend.domain.friend.repository.FriendCommandRepository; + import lombok.RequiredArgsConstructor; import java.util.List; @@ -16,7 +17,14 @@ public class StubFriendCommandRepository implements FriendCommandRepository { @Override public List findByMemberAndMemberNickname(final UUID memberId, final String nickname) { return map.values().stream() - .filter(friend -> (friend.getToMember().getId().equals(memberId) || friend.getFromMember().getId().equals(memberId)) && friend.getToMember().getNickname().toUpperCase().contains(nickname.toUpperCase())) + .filter( + friend -> + (friend.getToMember().getId().equals(memberId) + || friend.getFromMember().getId().equals(memberId)) + && friend.getToMember() + .getNickname() + .toUpperCase() + .contains(nickname.toUpperCase())) .toList(); } diff --git a/backend/src/test/java/com/twtw/backend/support/stub/StubFriendQueryRepository.java b/backend/src/test/java/com/twtw/backend/support/stub/StubFriendQueryRepository.java index 661d1e4..f814c0e 100644 --- a/backend/src/test/java/com/twtw/backend/support/stub/StubFriendQueryRepository.java +++ b/backend/src/test/java/com/twtw/backend/support/stub/StubFriendQueryRepository.java @@ -4,6 +4,7 @@ import com.twtw.backend.domain.friend.entity.FriendStatus; import com.twtw.backend.domain.friend.repository.FriendQueryRepository; import com.twtw.backend.domain.member.entity.Member; + import lombok.RequiredArgsConstructor; import java.util.*; @@ -16,31 +17,52 @@ public class StubFriendQueryRepository implements FriendQueryRepository { @Override public Optional findByTwoMemberId(final UUID loginMemberId, final UUID memberId) { return map.values().stream() - .filter(friend -> - (friend.getToMember().getId().equals(loginMemberId) && friend.getFromMember().getId().equals(memberId)) - || (friend.getFromMember().getId().equals(loginMemberId) && friend.getToMember().getId().equals(memberId))) + .filter( + friend -> + (friend.getToMember().getId().equals(loginMemberId) + && friend.getFromMember().getId().equals(memberId)) + || (friend.getFromMember().getId().equals(loginMemberId) + && friend.getToMember().getId().equals(memberId))) .findFirst(); } @Override public List findByMember(final Member member) { return map.values().stream() - .filter(friend -> friend.getToMember().equals(member) || friend.getFromMember().equals(member)) + .filter( + friend -> + friend.getToMember().equals(member) + || friend.getFromMember().equals(member)) .toList(); } @Override - public List findByMemberAndFriendStatus(final Member member, final FriendStatus friendStatus) { + public List findByMemberAndFriendStatus( + final Member member, final FriendStatus friendStatus) { return map.values().stream() - .filter(friend -> (friend.getToMember().equals(member) || friend.getFromMember().equals(member)) && friend.getFriendStatus().equals(friendStatus)) + .filter( + friend -> + (friend.getToMember().equals(member) + || friend.getFromMember().equals(member)) + && friend.getFriendStatus().equals(friendStatus)) .toList(); } @Override - public List findByMemberAndMemberNicknameContaining(final UUID memberId, final String nickname) { + public List findByMemberAndMemberNicknameContaining( + final UUID memberId, final String nickname) { return map.values().stream() - .filter(friend -> friend.getFriendStatus() == FriendStatus.ACCEPTED && ((friend.getToMember().getId().equals(memberId) && friend.getFromMember().getNickname().contains(nickname)) - || (friend.getFromMember().getId().equals(memberId) && friend.getToMember().getNickname().contains(nickname)))) + .filter( + friend -> + friend.getFriendStatus() == FriendStatus.ACCEPTED + && ((friend.getToMember().getId().equals(memberId) + && friend.getFromMember() + .getNickname() + .contains(nickname)) + || (friend.getFromMember().getId().equals(memberId) + && friend.getToMember() + .getNickname() + .contains(nickname)))) .toList(); } } diff --git a/backend/src/test/java/com/twtw/backend/support/stub/StubMemberRepository.java b/backend/src/test/java/com/twtw/backend/support/stub/StubMemberRepository.java index 9b605dd..016ae1a 100644 --- a/backend/src/test/java/com/twtw/backend/support/stub/StubMemberRepository.java +++ b/backend/src/test/java/com/twtw/backend/support/stub/StubMemberRepository.java @@ -13,21 +13,32 @@ public class StubMemberRepository implements MemberRepository { @Override public List findAllByNickname(final String nickname) { - return map.values().stream().filter(member -> member.getNickname().toUpperCase().contains(nickname.toUpperCase())).toList(); + return map.values().stream() + .filter( + member -> + member.getNickname().toUpperCase().contains(nickname.toUpperCase())) + .toList(); } @Override public List findAllByNicknameContainingIgnoreCase(final String nickname) { - return map.values().stream().filter(member -> member.getNickname().toUpperCase().contains(nickname.toUpperCase())).toList(); + return map.values().stream() + .filter( + member -> + member.getNickname().toUpperCase().contains(nickname.toUpperCase())) + .toList(); } @Override - public Optional findByOAuthIdAndAuthType(final String oAuthId, final AuthType authType) { + public Optional findByOAuthIdAndAuthType( + final String oAuthId, final AuthType authType) { return map.values().stream() - .filter(member -> { - final OAuth2Info oauthInfo = member.getOauthInfo(); - return oauthInfo.getClientId().equals(oAuthId) && oauthInfo.getAuthType().equals(authType); - }) + .filter( + member -> { + final OAuth2Info oauthInfo = member.getOauthInfo(); + return oauthInfo.getClientId().equals(oAuthId) + && oauthInfo.getAuthType().equals(authType); + }) .findFirst(); } @@ -49,7 +60,9 @@ public Optional findById(final UUID id) { @Override public List findAllByIds(final List friendMemberIds) { - return map.values().stream().filter(member -> friendMemberIds.contains(member.getId())).toList(); + return map.values().stream() + .filter(member -> friendMemberIds.contains(member.getId())) + .toList(); } @Override diff --git a/backend/src/test/java/com/twtw/backend/support/stub/StubPlanRepository.java b/backend/src/test/java/com/twtw/backend/support/stub/StubPlanRepository.java index 2970f07..25348b7 100644 --- a/backend/src/test/java/com/twtw/backend/support/stub/StubPlanRepository.java +++ b/backend/src/test/java/com/twtw/backend/support/stub/StubPlanRepository.java @@ -13,7 +13,10 @@ public class StubPlanRepository implements PlanRepository { @Override public List findAllByMember(final Member member) { return map.values().stream() - .filter(plan -> plan.getPlanMembers().stream().anyMatch(planMember -> planMember.isSameMember(member))) + .filter( + plan -> + plan.getPlanMembers().stream() + .anyMatch(planMember -> planMember.isSameMember(member))) .toList(); } diff --git a/backend/src/test/java/com/twtw/backend/support/stub/StubRefreshTokenRepository.java b/backend/src/test/java/com/twtw/backend/support/stub/StubRefreshTokenRepository.java index 45eee6b..82cef20 100644 --- a/backend/src/test/java/com/twtw/backend/support/stub/StubRefreshTokenRepository.java +++ b/backend/src/test/java/com/twtw/backend/support/stub/StubRefreshTokenRepository.java @@ -14,7 +14,9 @@ public class StubRefreshTokenRepository implements RefreshTokenRepository { @Override public Optional findByTokenKey(final String tokenKey) { - return map.values().stream().filter(refreshToken -> refreshToken.getTokenKey().equals(tokenKey)).findFirst(); + return map.values().stream() + .filter(refreshToken -> refreshToken.getTokenKey().equals(tokenKey)) + .findFirst(); } @Override diff --git a/backend/src/test/java/com/twtw/backend/support/testcontainer/ContainerTestConfig.java b/backend/src/test/java/com/twtw/backend/support/testcontainer/ContainerTestConfig.java index b64c177..74b11c2 100644 --- a/backend/src/test/java/com/twtw/backend/support/testcontainer/ContainerTestConfig.java +++ b/backend/src/test/java/com/twtw/backend/support/testcontainer/ContainerTestConfig.java @@ -1,6 +1,7 @@ package com.twtw.backend.support.testcontainer; import com.redis.testcontainers.RedisContainer; + import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; @@ -8,7 +9,8 @@ import org.testcontainers.containers.RabbitMQContainer; import org.testcontainers.utility.DockerImageName; -public class ContainerTestConfig implements ApplicationContextInitializer { +public class ContainerTestConfig + implements ApplicationContextInitializer { private static final RedisContainer REDIS_CONTAINER = new RedisContainer(DockerImageName.parse("redis:latest")).withExposedPorts(6379); @@ -39,7 +41,6 @@ public void initialize(final ConfigurableApplicationContext applicationContext) TestPropertyValues.of( "spring.data.redis.host=" + REDIS_CONTAINER.getHost(), "spring.data.redis.port=" + REDIS_CONTAINER.getFirstMappedPort(), - "spring.rabbitmq.host=" + RABBIT_MQ_CONTAINER.getHost(), "spring.rabbitmq.port=" + RABBIT_MQ_CONTAINER.getMappedPort(5672), "spring.rabbitmq.stomp.port=" + RABBIT_MQ_CONTAINER.getMappedPort(61613), @@ -48,7 +49,6 @@ public void initialize(final ConfigurableApplicationContext applicationContext) "spring.datasource.url=" + jdbcUrl, "spring.datasource.username=" + username, "spring.datasource.password=" + password, - "spring.flyway.url=" + jdbcUrl, "spring.flyway.user=" + username, "spring.flyway.password=" + password)