diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/api/query/MemberGroupQueryApi.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/api/query/MemberGroupQueryApi.java index 803c81b57..9d4efaebc 100644 --- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/api/query/MemberGroupQueryApi.java +++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/api/query/MemberGroupQueryApi.java @@ -8,10 +8,9 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement; import java.time.ZonedDateTime; import org.springframework.http.ResponseEntity; +import site.timecapsulearchive.core.domain.group.data.response.GroupMemberInfosResponse; import site.timecapsulearchive.core.domain.member_group.data.response.GroupReceivingInvitesSliceResponse; import site.timecapsulearchive.core.domain.member_group.data.response.GroupSendingInvitesResponse; -import site.timecapsulearchive.core.domain.group.data.response.GroupMemberInfosResponse; -import site.timecapsulearchive.core.domain.member_group.data.response.GroupInviteSummaryResponses; import site.timecapsulearchive.core.global.common.response.ApiSpec; public interface MemberGroupQueryApi { diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/service/MemberGroupCommandService.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/service/MemberGroupCommandService.java index 25cf1fe49..35dc7b94c 100644 --- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/service/MemberGroupCommandService.java +++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/service/MemberGroupCommandService.java @@ -20,11 +20,9 @@ import site.timecapsulearchive.core.domain.member_group.exception.MemberGroupKickDuplicatedIdException; import site.timecapsulearchive.core.domain.member_group.exception.MemberGroupNotFoundException; import site.timecapsulearchive.core.domain.member_group.exception.NoGroupAuthorityException; -import site.timecapsulearchive.core.domain.member_group.repository.groupInviteRepository.GroupInviteRepository; -import site.timecapsulearchive.core.domain.member_group.repository.memberGroupRepository.MemberGroupRepository; -import site.timecapsulearchive.core.global.config.redis.RedissonLock; import site.timecapsulearchive.core.domain.member_group.repository.group_invite_repository.GroupInviteRepository; import site.timecapsulearchive.core.domain.member_group.repository.member_group_repository.MemberGroupRepository; +import site.timecapsulearchive.core.global.config.redis.RedissonLock; import site.timecapsulearchive.core.infra.queue.manager.SocialNotificationManager; @Service @@ -98,7 +96,8 @@ public GroupAcceptNotificationDto acceptGroupInvite(final Long memberId, final L return new GroupAcceptNotificationDto(groupMember.getNickname(), groupOwnerId); } - private void deleteGroupInvite(final Long memberId, final Long groupId, final Long groupOwnerId) { + private void deleteGroupInvite(final Long memberId, final Long groupId, + final Long groupOwnerId) { final int isDenyRequest = groupInviteRepository.deleteGroupInviteByGroupIdAndGroupOwnerIdAndGroupMemberId( groupId, groupOwnerId, memberId); if (isDenyRequest != 1) { diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/service/MemberGroupQueryService.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/service/MemberGroupQueryService.java index e62f7b264..dd8141997 100644 --- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/service/MemberGroupQueryService.java +++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/service/MemberGroupQueryService.java @@ -9,10 +9,9 @@ import site.timecapsulearchive.core.domain.group.data.dto.GroupMemberDto; import site.timecapsulearchive.core.domain.group.exception.GroupNotFoundException; import site.timecapsulearchive.core.domain.member_group.data.dto.GroupInviteSummaryDto; -import site.timecapsulearchive.core.domain.member_group.repository.groupInviteRepository.GroupInviteRepository; -import site.timecapsulearchive.core.domain.member_group.repository.memberGroupRepository.MemberGroupRepository; import site.timecapsulearchive.core.domain.member_group.data.dto.GroupSendingInviteMemberDto; import site.timecapsulearchive.core.domain.member_group.repository.group_invite_repository.GroupInviteRepository; +import site.timecapsulearchive.core.domain.member_group.repository.member_group_repository.MemberGroupRepository; @Service @RequiredArgsConstructor diff --git a/backend/core/src/test/java/site/timecapsulearchive/core/domain/member_group/service/MemberGroupCommandServiceTest.java b/backend/core/src/test/java/site/timecapsulearchive/core/domain/member_group/service/MemberGroupCommandServiceTest.java index 4f983a78c..955a6eaf4 100644 --- a/backend/core/src/test/java/site/timecapsulearchive/core/domain/member_group/service/MemberGroupCommandServiceTest.java +++ b/backend/core/src/test/java/site/timecapsulearchive/core/domain/member_group/service/MemberGroupCommandServiceTest.java @@ -38,8 +38,6 @@ import site.timecapsulearchive.core.domain.member_group.exception.MemberGroupNotFoundException; import site.timecapsulearchive.core.domain.member_group.exception.NoGroupAuthorityException; import site.timecapsulearchive.core.domain.member_group.facade.MemberGroupFacade; -import site.timecapsulearchive.core.domain.member_group.repository.groupInviteRepository.GroupInviteRepository; -import site.timecapsulearchive.core.domain.member_group.repository.memberGroupRepository.MemberGroupRepository; import site.timecapsulearchive.core.domain.member_group.repository.group_invite_repository.GroupInviteRepository; import site.timecapsulearchive.core.domain.member_group.repository.member_group_repository.MemberGroupRepository; import site.timecapsulearchive.core.global.error.ErrorCode; @@ -213,7 +211,8 @@ class MemberGroupCommandServiceTest { given(memberRepository.findMemberById(memberId)).willReturn(Optional.of(groupMember)); given(groupRepository.findGroupById(groupId)).willReturn( Optional.of(GroupFixture.group())); - given(memberGroupRepository.findGroupOwnerId(groupId)).willReturn(Optional.of(groupOwnerId)); + given(memberGroupRepository.findGroupOwnerId(groupId)).willReturn( + Optional.of(groupOwnerId)); given(groupInviteRepository.deleteGroupInviteByGroupIdAndGroupOwnerIdAndGroupMemberId( groupId, groupOwnerId, memberId)).willReturn(1); @@ -225,7 +224,8 @@ class MemberGroupCommandServiceTest { //then SoftAssertions.assertSoftly( softly -> { - assertThat(groupAcceptNotificationDto.groupMemberNickname()).isEqualTo(groupMember.getNickname()); + assertThat(groupAcceptNotificationDto.groupMemberNickname()).isEqualTo( + groupMember.getNickname()); assertThat(groupAcceptNotificationDto.groupOwnerId()).isEqualTo(groupOwnerId); } ); diff --git a/backend/core/src/test/java/site/timecapsulearchive/core/infrastructure/RedisConcurrencyTest.java b/backend/core/src/test/java/site/timecapsulearchive/core/infrastructure/RedisConcurrencyTest.java index dfebd87e9..b86d3999b 100644 --- a/backend/core/src/test/java/site/timecapsulearchive/core/infrastructure/RedisConcurrencyTest.java +++ b/backend/core/src/test/java/site/timecapsulearchive/core/infrastructure/RedisConcurrencyTest.java @@ -27,8 +27,8 @@ import site.timecapsulearchive.core.domain.member.entity.Member; import site.timecapsulearchive.core.domain.member.repository.MemberRepository; import site.timecapsulearchive.core.domain.member_group.facade.MemberGroupFacade; -import site.timecapsulearchive.core.domain.member_group.repository.groupInviteRepository.GroupInviteRepository; -import site.timecapsulearchive.core.domain.member_group.repository.memberGroupRepository.MemberGroupRepository; +import site.timecapsulearchive.core.domain.member_group.repository.group_invite_repository.GroupInviteRepository; +import site.timecapsulearchive.core.domain.member_group.repository.member_group_repository.MemberGroupRepository; import site.timecapsulearchive.core.domain.member_group.service.MemberGroupCommandService; import site.timecapsulearchive.core.global.error.ErrorCode; import site.timecapsulearchive.core.global.error.exception.RedisLockException;