diff --git a/src/main/java/ku_rum/backend/domain/friend/application/FriendManageService.java b/src/main/java/ku_rum/backend/domain/friend/application/FriendManageService.java index 172d5fd1..27e54fce 100644 --- a/src/main/java/ku_rum/backend/domain/friend/application/FriendManageService.java +++ b/src/main/java/ku_rum/backend/domain/friend/application/FriendManageService.java @@ -67,7 +67,7 @@ public void deleteSentRequest(final FriendRequest friendSendRequest) { User currentUser = userUtil.getUser(); User toUser = userQueryService.getUserById(friendSendRequest.receiverId()); - Friend friend = friendRepository.findByFromUserAndToUserAndStatus(toUser, currentUser, PENDING) + Friend friend = friendRepository.findByFromUserAndToUserAndStatus(currentUser, toUser, PENDING) .orElseThrow(() -> new GlobalException(NO_PENDING_LIST)); if (!friend.getFromUser().equals(currentUser)) { diff --git a/src/main/java/ku_rum/backend/domain/notice/application/NoticeService.java b/src/main/java/ku_rum/backend/domain/notice/application/NoticeService.java index 321d5d75..cc28f31c 100644 --- a/src/main/java/ku_rum/backend/domain/notice/application/NoticeService.java +++ b/src/main/java/ku_rum/backend/domain/notice/application/NoticeService.java @@ -1,5 +1,10 @@ package ku_rum.backend.domain.notice.application; +import static ku_rum.backend.global.support.status.BaseExceptionResponseStatus.NO_SUCH_NOTICE; +import static ku_rum.backend.global.support.status.BaseExceptionResponseStatus.NO_SUCH_NOTICE_DETAIL; + +import java.util.List; +import java.util.Optional; import ku_rum.backend.domain.bookmark.domain.NoticeBookmark; import ku_rum.backend.domain.bookmark.domain.repository.BookmarkRepository; import ku_rum.backend.domain.notice.domain.Notice; @@ -20,12 +25,6 @@ import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Optional; - -import static ku_rum.backend.global.support.status.BaseExceptionResponseStatus.NO_SUCH_NOTICE; -import static ku_rum.backend.global.support.status.BaseExceptionResponseStatus.NO_SUCH_NOTICE_DETAIL; - @Service @RequiredArgsConstructor public class NoticeService { @@ -50,11 +49,14 @@ public NoticeDetailResponse findByNoticeId(Long noticeId) { NoticeDetail noticeDetail = noticeDetailRepository.findByNotice(notice) .orElseThrow(() -> new GlobalException(NO_SUCH_NOTICE_DETAIL)); String encodedHtml = noticeDetail.getHtmlContent(); - Optional noticeBookmark = bookmarkRepository.findByUserAndNotice(user, notice); - if(noticeBookmark.isPresent()) { - return new NoticeDetailResponse(noticeDetail.getNotice().getId(), encodedHtml, notice.getLink(), noticeDetail.getNotice().getTitle(), noticeDetail.getNotice().getPubDate(), noticeBookmark.get().getId(), true); + Optional noticeBookmark = bookmarkRepository.findByUserAndNotice(user, notice); + if (noticeBookmark.isPresent()) { + return new NoticeDetailResponse(noticeDetail.getNotice().getId(), encodedHtml, notice.getLink(), + noticeDetail.getNotice().getTitle(), noticeDetail.getNotice().getPubDate(), + noticeBookmark.get().getId(), true); } - return new NoticeDetailResponse(noticeDetail.getNotice().getId(), encodedHtml, notice.getLink(), noticeDetail.getNotice().getTitle(), noticeDetail.getNotice().getPubDate(), -1L, false); + return new NoticeDetailResponse(noticeDetail.getNotice().getId(), encodedHtml, notice.getLink(), + noticeDetail.getNotice().getTitle(), noticeDetail.getNotice().getPubDate(), -1L, false); } public Notice findNoticeByNoticeId(Long noticeId) { diff --git a/src/main/java/ku_rum/backend/domain/user/domain/User.java b/src/main/java/ku_rum/backend/domain/user/domain/User.java index 7fb692d2..43c35a86 100644 --- a/src/main/java/ku_rum/backend/domain/user/domain/User.java +++ b/src/main/java/ku_rum/backend/domain/user/domain/User.java @@ -1,19 +1,30 @@ package ku_rum.backend.domain.user.domain; -import jakarta.persistence.*; +import static ku_rum.backend.domain.user.domain.UserRole.USER; + +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import java.util.ArrayList; +import java.util.List; import ku_rum.backend.domain.department.domain.Department; import ku_rum.backend.domain.oauth.domain.OAuth2MemberInfo; import ku_rum.backend.domain.oauth.domain.ProviderType; import ku_rum.backend.domain.user.dto.request.UserSaveRequest; import ku_rum.backend.global.support.type.BaseEntity; -import lombok.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import org.hibernate.annotations.SQLDelete; -import java.util.ArrayList; -import java.util.List; - -import static ku_rum.backend.domain.user.domain.UserRole.*; - @Getter @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) @@ -80,10 +91,13 @@ public void changeActiveBuildingName(String buildingName) { this.activeBuildingName = buildingName; } - public void setLocationSharingActive(boolean value) { this.active = value;} + public void setLocationSharingActive(boolean value) { + this.active = value; + } @Builder - private User(String loginId, String oauthId, String email, String nickname, String password, String studentId, AgreementStatus agreementStatus, ProviderType providerType, String imageUrl) { + private User(String loginId, String oauthId, String email, String nickname, String password, String studentId, + AgreementStatus agreementStatus, ProviderType providerType, String imageUrl) { this.loginId = loginId; this.oauthId = oauthId; this.email = email; @@ -106,7 +120,8 @@ public void changeProfile(UserSaveRequest userSaveRequest, String password) { firstLogin = false; } - public static User of(String loginId, String email, String nickname, String password, String studentId, Department department, AgreementStatus agreementStatus, ProviderType providerType) { + public static User of(String loginId, String email, String nickname, String password, String studentId, + Department department, AgreementStatus agreementStatus, ProviderType providerType) { return User.builder() .loginId(loginId) .email(email) diff --git a/src/test/java/ku_rum/backend/domain/friend/presentation/FriendManageControllerTest.java b/src/test/java/ku_rum/backend/domain/friend/presentation/FriendManageControllerTest.java index 01d4fd5c..af39f7bc 100644 --- a/src/test/java/ku_rum/backend/domain/friend/presentation/FriendManageControllerTest.java +++ b/src/test/java/ku_rum/backend/domain/friend/presentation/FriendManageControllerTest.java @@ -134,15 +134,15 @@ void rejectFriendRequest() throws Exception { @DisplayName("보낸 친구 요청 삭제 API") @WithMockUser void deleteFriendRequest() throws Exception { - Long requestId = 1L; - FriendRequest request = new FriendRequest(requestId); // FriendRequest DTO에 맞게 생성자/빌더 필요 + Long receiverId = 1L; + FriendRequest request = new FriendRequest(receiverId); // FriendRequest DTO에 맞게 생성자/빌더 필요 doNothing().when(friendManageService).deleteSentRequest(request); mockMvc.perform(delete("/api/v1/friends/request") .header("Authorization", "Bearer your.jwt.token") .contentType(MediaType.APPLICATION_JSON) - .content("{\"requestId\":1}")) + .content("{\"receiverId\":1}")) .andDo(print()) .andExpect(status().isOk()) .andExpectAll(RestDocsTestUtils.expectCommonSuccess()) @@ -154,7 +154,7 @@ void deleteFriendRequest() throws Exception { headerWithName("Authorization").description("발급 받은 엑세스 토큰입니다.") ) .requestFields( - fieldWithPath("requestId").description("삭제할 친구 요청 ID") + fieldWithPath("receiverId").description("삭제할 친구 요청 ID") ) .responseFields(RestDocsFieldSnippets.COMMON_RESPONSE_FIELDS) .build())