diff --git a/src/main/java/com/tenten/linkhub/domain/space/controller/SpaceController.java b/src/main/java/com/tenten/linkhub/domain/space/controller/SpaceController.java index 2fad0ac7..8620a7f9 100644 --- a/src/main/java/com/tenten/linkhub/domain/space/controller/SpaceController.java +++ b/src/main/java/com/tenten/linkhub/domain/space/controller/SpaceController.java @@ -1,6 +1,7 @@ package com.tenten.linkhub.domain.space.controller; import com.tenten.linkhub.domain.auth.MemberDetails; + import com.tenten.linkhub.domain.space.controller.dto.comment.CommentUpdateApiRequest; import com.tenten.linkhub.domain.space.controller.dto.comment.CommentUpdateApiResponse; import com.tenten.linkhub.domain.space.controller.dto.comment.RepliesFindApiRequest; @@ -31,6 +32,7 @@ import com.tenten.linkhub.domain.space.controller.mapper.CommentApiMapper; import com.tenten.linkhub.domain.space.controller.mapper.FavoriteApiMapper; import com.tenten.linkhub.domain.space.controller.mapper.SpaceApiMapper; +import com.tenten.linkhub.domain.space.controller.annotation.SpaceViewList; import com.tenten.linkhub.domain.space.facade.CommentFacade; import com.tenten.linkhub.domain.space.facade.SpaceFacade; import com.tenten.linkhub.domain.space.facade.dto.CommentAndChildCountAndMemberInfoResponses; @@ -49,15 +51,17 @@ import com.tenten.linkhub.domain.space.service.dto.space.PublicSpacesFindByQueryRequest; import com.tenten.linkhub.domain.space.service.dto.space.SpacesFindByQueryResponses; import com.tenten.linkhub.domain.space.service.dto.space.SpaceTagGetResponses; -import com.tenten.linkhub.domain.space.controller.annotation.SpaceViewList; + import com.tenten.linkhub.global.response.ErrorResponse; import com.tenten.linkhub.global.response.ErrorWithDetailCodeResponse; + import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; + import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; @@ -67,6 +71,7 @@ import java.util.Objects; import lombok.RequiredArgsConstructor; + import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.http.MediaType; @@ -99,6 +104,7 @@ public class SpaceController { private final CommentFacade commentFacade; private final CommentService commentService; private final FavoriteService favoriteService; + private final SpaceApiMapper spaceMapper; private final CommentApiMapper commentMapper; private final FavoriteApiMapper favoriteMapper; diff --git a/src/main/java/com/tenten/linkhub/domain/space/controller/SpaceInvitationController.java b/src/main/java/com/tenten/linkhub/domain/space/controller/SpaceInvitationController.java index 043ad7b1..ea1dfd6d 100644 --- a/src/main/java/com/tenten/linkhub/domain/space/controller/SpaceInvitationController.java +++ b/src/main/java/com/tenten/linkhub/domain/space/controller/SpaceInvitationController.java @@ -8,19 +8,23 @@ import com.tenten.linkhub.domain.space.controller.mapper.SpaceInvitationApiMapper; import com.tenten.linkhub.domain.space.facade.SpaceInvitationFacade; import com.tenten.linkhub.domain.space.service.dto.invitation.SpaceInvitationAcceptRequest; + import com.tenten.linkhub.global.response.ErrorResponse; import com.tenten.linkhub.global.response.ErrorWithDetailCodeResponse; + import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; + import jakarta.validation.Valid; + import lombok.RequiredArgsConstructor; + import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/tenten/linkhub/domain/space/facade/CommentFacade.java b/src/main/java/com/tenten/linkhub/domain/space/facade/CommentFacade.java index 9e6be753..94d6fa37 100644 --- a/src/main/java/com/tenten/linkhub/domain/space/facade/CommentFacade.java +++ b/src/main/java/com/tenten/linkhub/domain/space/facade/CommentFacade.java @@ -2,6 +2,7 @@ import com.tenten.linkhub.domain.member.service.MemberService; import com.tenten.linkhub.domain.member.service.dto.MemberInfos; + import com.tenten.linkhub.domain.space.facade.dto.CommentAndChildCountAndMemberInfoResponses; import com.tenten.linkhub.domain.space.facade.dto.RepliesAndMemberInfoResponses; import com.tenten.linkhub.domain.space.service.CommentService; @@ -9,8 +10,11 @@ import com.tenten.linkhub.domain.space.service.dto.comment.CommentAndChildCountResponses; import com.tenten.linkhub.domain.space.service.dto.comment.RepliesFindResponse; import com.tenten.linkhub.domain.space.service.dto.comment.RepliesFindResponses; + import java.util.List; + import lombok.RequiredArgsConstructor; + import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -22,7 +26,7 @@ public class CommentFacade { private final MemberService memberService; public CommentAndChildCountAndMemberInfoResponses findRootComments(Long spaceId, Long myMemberId, - Pageable pageable) { + Pageable pageable) { CommentAndChildCountResponses commentAndChildCount = commentService.findRootComments(spaceId, pageable); List memberIds = getMemberIds(commentAndChildCount); diff --git a/src/main/java/com/tenten/linkhub/domain/space/facade/SpaceFacade.java b/src/main/java/com/tenten/linkhub/domain/space/facade/SpaceFacade.java index 667bf825..8f333f2c 100644 --- a/src/main/java/com/tenten/linkhub/domain/space/facade/SpaceFacade.java +++ b/src/main/java/com/tenten/linkhub/domain/space/facade/SpaceFacade.java @@ -2,6 +2,7 @@ import com.tenten.linkhub.domain.member.service.MemberService; import com.tenten.linkhub.domain.member.service.dto.MemberInfos; + import com.tenten.linkhub.domain.space.facade.dto.NewSpacesScrapFacadeRequest; import com.tenten.linkhub.domain.space.facade.dto.SpaceCreateFacadeRequest; import com.tenten.linkhub.domain.space.facade.dto.SpaceDetailGetByIdFacadeRequest; @@ -11,18 +12,19 @@ import com.tenten.linkhub.domain.space.handler.dto.ScrapSaveEvent; import com.tenten.linkhub.domain.space.handler.dto.SpaceImageDeleteEvent; import com.tenten.linkhub.domain.space.handler.dto.SpaceDetailFindEvent; -import com.tenten.linkhub.domain.link.service.LinkService; import com.tenten.linkhub.domain.space.service.SpaceImageUploader; import com.tenten.linkhub.domain.space.service.SpaceService; import com.tenten.linkhub.domain.space.service.dto.space.DeletedSpaceImageNames; import com.tenten.linkhub.domain.space.service.dto.space.SpaceMemberInfo; import com.tenten.linkhub.domain.space.service.dto.space.SpaceWithSpaceImageAndSpaceMemberInfo; + import com.tenten.linkhub.global.aws.dto.ImageInfo; import java.util.List; import java.util.Optional; import lombok.RequiredArgsConstructor; + import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -34,7 +36,6 @@ public class SpaceFacade { private final SpaceService spaceService; private final MemberService memberService; private final SpaceImageUploader spaceImageUploader; - private final LinkService linkService; private final SpaceFacadeMapper mapper; private final ApplicationEventPublisher eventPublisher; diff --git a/src/main/java/com/tenten/linkhub/domain/space/facade/SpaceInvitationFacade.java b/src/main/java/com/tenten/linkhub/domain/space/facade/SpaceInvitationFacade.java index 2fcd8d4d..693d8871 100644 --- a/src/main/java/com/tenten/linkhub/domain/space/facade/SpaceInvitationFacade.java +++ b/src/main/java/com/tenten/linkhub/domain/space/facade/SpaceInvitationFacade.java @@ -6,7 +6,9 @@ import com.tenten.linkhub.domain.space.facade.mapper.SpaceInvitationFacadeMapper; import com.tenten.linkhub.domain.space.service.SpaceInvitationService; import com.tenten.linkhub.domain.space.service.dto.invitation.SpaceInvitationAcceptRequest; + import lombok.RequiredArgsConstructor; + import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/tenten/linkhub/domain/space/service/CommentService.java b/src/main/java/com/tenten/linkhub/domain/space/service/CommentService.java index da834968..76a94c9d 100644 --- a/src/main/java/com/tenten/linkhub/domain/space/service/CommentService.java +++ b/src/main/java/com/tenten/linkhub/domain/space/service/CommentService.java @@ -11,7 +11,9 @@ import com.tenten.linkhub.domain.space.service.dto.comment.ReplyCreateRequest; import com.tenten.linkhub.domain.space.service.dto.comment.RootCommentCreateRequest; import com.tenten.linkhub.domain.space.service.mapper.CommentMapper; + import lombok.RequiredArgsConstructor; + import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/tenten/linkhub/domain/space/service/DefaultSpaceService.java b/src/main/java/com/tenten/linkhub/domain/space/service/DefaultSpaceService.java index f924b87a..00e2ade0 100644 --- a/src/main/java/com/tenten/linkhub/domain/space/service/DefaultSpaceService.java +++ b/src/main/java/com/tenten/linkhub/domain/space/service/DefaultSpaceService.java @@ -1,19 +1,15 @@ package com.tenten.linkhub.domain.space.service; -import com.tenten.linkhub.domain.link.service.LinkService; import com.tenten.linkhub.domain.space.model.space.Scrap; import com.tenten.linkhub.domain.space.model.space.Space; import com.tenten.linkhub.domain.space.model.space.SpaceImage; import com.tenten.linkhub.domain.space.model.space.SpaceMember; import com.tenten.linkhub.domain.space.repository.common.dto.SpaceAndSpaceImageOwnerNickName; import com.tenten.linkhub.domain.space.repository.favorite.FavoriteRepository; -import com.tenten.linkhub.domain.link.repository.link.LinkRepository; import com.tenten.linkhub.domain.space.repository.scrap.ScrapRepository; import com.tenten.linkhub.domain.space.repository.space.SpaceRepository; import com.tenten.linkhub.domain.space.repository.space.dto.MemberSpacesQueryCondition; import com.tenten.linkhub.domain.space.repository.spacemember.SpaceMemberRepository; -import com.tenten.linkhub.domain.link.repository.tag.TagRepository; -import com.tenten.linkhub.domain.link.repository.tag.dto.TagInfo; import com.tenten.linkhub.domain.space.service.dto.space.DeletedSpaceImageNames; import com.tenten.linkhub.domain.space.service.dto.space.MemberSpacesFindRequest; import com.tenten.linkhub.domain.space.service.dto.space.NewSpacesScrapRequest; @@ -26,9 +22,17 @@ import com.tenten.linkhub.domain.space.service.dto.space.SpacesFindByQueryResponses; import com.tenten.linkhub.domain.space.service.dto.spacemember.SpaceMemberRoleChangeRequest; import com.tenten.linkhub.domain.space.service.mapper.SpaceMapper; + +import com.tenten.linkhub.domain.link.service.LinkService; +import com.tenten.linkhub.domain.link.repository.link.LinkRepository; +import com.tenten.linkhub.domain.link.repository.tag.TagRepository; +import com.tenten.linkhub.domain.link.repository.tag.dto.TagInfo; + import com.tenten.linkhub.global.exception.PolicyViolationException; import com.tenten.linkhub.global.exception.UnauthorizedAccessException; + import lombok.RequiredArgsConstructor; + import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/tenten/linkhub/domain/space/service/FavoriteService.java b/src/main/java/com/tenten/linkhub/domain/space/service/FavoriteService.java index c1f521a7..736e69c5 100644 --- a/src/main/java/com/tenten/linkhub/domain/space/service/FavoriteService.java +++ b/src/main/java/com/tenten/linkhub/domain/space/service/FavoriteService.java @@ -12,9 +12,12 @@ import com.tenten.linkhub.domain.space.service.dto.favorite.MyFavoriteSpacesFindRequest; import com.tenten.linkhub.domain.space.service.dto.favorite.SpaceRegisterInFavoriteResponse; import com.tenten.linkhub.domain.space.service.mapper.FavoriteMapper; + import com.tenten.linkhub.global.exception.DataDuplicateException; import com.tenten.linkhub.global.response.ErrorCode; + import lombok.RequiredArgsConstructor; + import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; @@ -68,7 +71,7 @@ public FavoriteSpacesFindResponses findMyFavoriteSpaces(MyFavoriteSpacesFindRequ } private void checkDuplicateFavorite(Long spaceId, Long memberId) { - if (favoriteRepository.isExist(memberId, spaceId)){ + if (favoriteRepository.isExist(memberId, spaceId)) { throw new DataDuplicateException(ErrorCode.DUPLICATE_FAVORITE); } } diff --git a/src/main/java/com/tenten/linkhub/domain/space/service/SpaceImageUploader.java b/src/main/java/com/tenten/linkhub/domain/space/service/SpaceImageUploader.java index 25782bb8..f6a7ab43 100644 --- a/src/main/java/com/tenten/linkhub/domain/space/service/SpaceImageUploader.java +++ b/src/main/java/com/tenten/linkhub/domain/space/service/SpaceImageUploader.java @@ -3,7 +3,9 @@ import com.tenten.linkhub.global.aws.dto.ImageInfo; import com.tenten.linkhub.global.aws.dto.ImageSaveRequest; import com.tenten.linkhub.global.aws.s3.ImageFileUploader; + import lombok.RequiredArgsConstructor; + import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/tenten/linkhub/domain/space/service/SpaceInvitationService.java b/src/main/java/com/tenten/linkhub/domain/space/service/SpaceInvitationService.java index 263fcdaa..52997008 100644 --- a/src/main/java/com/tenten/linkhub/domain/space/service/SpaceInvitationService.java +++ b/src/main/java/com/tenten/linkhub/domain/space/service/SpaceInvitationService.java @@ -8,9 +8,12 @@ import com.tenten.linkhub.domain.space.repository.space.SpaceRepository; import com.tenten.linkhub.domain.space.service.dto.invitation.SpaceInvitationAcceptRequest; import com.tenten.linkhub.domain.space.service.dto.invitation.SpaceInvitationRequest; + import com.tenten.linkhub.global.exception.DataDuplicateException; import com.tenten.linkhub.global.response.ErrorCode; + import lombok.RequiredArgsConstructor; + import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional;