Merge branch 'develop' of https://github.com/Team-TenTen/LinkHub-BE i…

…nto develop

src/main/java/com/tenten/linkhub/domain/member/controller/MemberController.java

@@ -20,8 +20,6 @@
 import com.tenten.linkhub.domain.member.controller.dto.MemberUpdateApiRequest;
 import com.tenten.linkhub.domain.member.controller.dto.MemberUpdateApiResponse;
 import com.tenten.linkhub.domain.member.controller.mapper.MemberApiMapper;
-import com.tenten.linkhub.domain.member.facade.MemberFacade;
-import com.tenten.linkhub.domain.member.facade.dto.MemberSpacesFindByQueryFacadeResponses;
 import com.tenten.linkhub.domain.member.service.MemberService;
 import com.tenten.linkhub.domain.member.service.dto.MailSendResponse;
 import com.tenten.linkhub.domain.member.service.dto.MailVerificationRequest;
@@ -35,6 +33,7 @@
 import com.tenten.linkhub.domain.member.service.dto.MemberSearchResponses;
 import com.tenten.linkhub.domain.member.service.dto.MemberUpdateResponse;
 import com.tenten.linkhub.domain.space.service.SpaceService;
+import com.tenten.linkhub.domain.space.service.dto.space.SpacesFindByQueryResponses;
 import com.tenten.linkhub.global.response.ErrorResponse;
 import com.tenten.linkhub.global.util.email.EmailDto;
 import io.swagger.v3.oas.annotations.Operation;
@@ -68,13 +67,11 @@
 public class MemberController {
     private final MemberService memberService;
     private final SpaceService spaceService;
-    private final MemberFacade memberFacade;
     private final MemberApiMapper mapper;
 
-    public MemberController(MemberService memberService, SpaceService spaceService, MemberFacade memberFacade, MemberApiMapper mapper) {
+    public MemberController(MemberService memberService, SpaceService spaceService, MemberApiMapper mapper) {
         this.memberService = memberService;
         this.spaceService = spaceService;
-        this.memberFacade = memberFacade;
         this.mapper = mapper;
     }
 
@@ -344,7 +341,7 @@ public ResponseEntity<MemberSpacesFindApiResponses> findMySpaces(
         PageRequest pageRequest = PageRequest.of(request.pageNumber(), request.pageSize());
         Long requestMemberId = Objects.isNull(memberDetails) ? null : memberDetails.memberId();
 
-        MemberSpacesFindByQueryFacadeResponses responses = memberFacade.findMemberSpacesByQuery(
+        SpacesFindByQueryResponses responses = spaceService.findMemberSpacesByQuery(
                 mapper.toMemberSpacesFindRequest(pageRequest, request, requestMemberId, memberId)
         );
 

src/main/java/com/tenten/linkhub/domain/member/controller/dto/MemberSpacesFindApiResponses.java

@@ -1,6 +1,6 @@
 package com.tenten.linkhub.domain.member.controller.dto;
 
-import com.tenten.linkhub.domain.member.facade.dto.MemberSpacesFindByQueryFacadeResponses;
+import com.tenten.linkhub.domain.space.service.dto.space.SpacesFindByQueryResponses;
 import com.tenten.linkhub.global.util.PageMetaData;
 import org.springframework.data.domain.Slice;
 
@@ -10,7 +10,7 @@ public record MemberSpacesFindApiResponses(
         List<MemberSpacesFindApiResponse> responses,
         PageMetaData metaData
 ) {
-    public static MemberSpacesFindApiResponses from(MemberSpacesFindByQueryFacadeResponses responses){
+    public static MemberSpacesFindApiResponses from(SpacesFindByQueryResponses responses){
         Slice<MemberSpacesFindApiResponse> mapResponses = responses.responses()
                 .map(r -> new MemberSpacesFindApiResponse(
                         r.spaceId(),

src/main/java/com/tenten/linkhub/domain/member/repository/member/DefaultMemberRepository.java

@@ -75,9 +75,4 @@ public Long findMemberIdByEmail(String email) {
         return memberJpaRepository.findMemberIdByEmail(email);
     }
 
-    @Override
-    public List<Member> findByMemberIds(List<Long> memberIds) {
-        return memberJpaRepository.findByIds(memberIds);
-    }
-
 }

src/main/java/com/tenten/linkhub/domain/member/repository/member/MemberJpaRepository.java

@@ -40,8 +40,5 @@ public interface MemberJpaRepository extends JpaRepository<Member, Long> {
 
     @Query("SELECT m.id FROM Member m WHERE m.newsEmail = :email")
     Long findMemberIdByEmail(String email);
-
-    @Query("SELECT m FROM Member m WHERE m.id IN :memberIds AND m.isDeleted = false")
-    List<Member> findByIds(List<Long> memberIds);
 }
 

src/main/java/com/tenten/linkhub/domain/member/repository/member/MemberRepository.java

@@ -30,6 +30,4 @@ public interface MemberRepository {
     Slice<MemberWithProfileImageAndFollowingStatus> searchMember(MemberSearchQueryCondition queryCond);
 
     Long findMemberIdByEmail(String email);
-
-    List<Member> findByMemberIds(List<Long> memberIds);
 }

src/main/java/com/tenten/linkhub/domain/member/service/MemberService.java

@@ -12,7 +12,6 @@
 import com.tenten.linkhub.domain.member.service.dto.MemberJoinRequest;
 import com.tenten.linkhub.domain.member.service.dto.MemberJoinResponse;
 import com.tenten.linkhub.domain.member.service.dto.MemberMyProfileResponse;
-import com.tenten.linkhub.domain.member.service.dto.MemberNicknames;
 import com.tenten.linkhub.domain.member.service.dto.MemberProfileResponse;
 import com.tenten.linkhub.domain.member.service.dto.MemberSearchRequest;
 import com.tenten.linkhub.domain.member.service.dto.MemberSearchResponses;
@@ -52,6 +51,4 @@ public interface MemberService {
     MemberSearchResponses searchMember(MemberSearchRequest memberSearchRequest);
 
     Long findMemberIdByEmail(String email);
-
-    MemberNicknames findMemberNicknamesByMemberIds(List<Long> memberIds);
 }

src/main/java/com/tenten/linkhub/domain/member/service/MemberServiceImpl.java

@@ -24,7 +24,6 @@
 import com.tenten.linkhub.domain.member.service.dto.MemberJoinRequest;
 import com.tenten.linkhub.domain.member.service.dto.MemberJoinResponse;
 import com.tenten.linkhub.domain.member.service.dto.MemberMyProfileResponse;
-import com.tenten.linkhub.domain.member.service.dto.MemberNicknames;
 import com.tenten.linkhub.domain.member.service.dto.MemberProfileResponse;
 import com.tenten.linkhub.domain.member.service.dto.MemberSearchRequest;
 import com.tenten.linkhub.domain.member.service.dto.MemberSearchResponses;
@@ -273,12 +272,4 @@ public Long findMemberIdByEmail(String email) {
         return memberId;
     }
 
-    @Transactional
-    @Override
-    public MemberNicknames findMemberNicknamesByMemberIds(List<Long> memberIds) {
-        List<Member> members = memberRepository.findByMemberIds(memberIds);
-
-        return MemberNicknames.from(members);
-    }
-
 }

src/main/java/com/tenten/linkhub/domain/space/controller/SpaceController.java

@@ -38,7 +38,6 @@
 import com.tenten.linkhub.domain.space.facade.dto.RepliesAndMemberInfoResponses;
 import com.tenten.linkhub.domain.space.facade.dto.SpaceDetailGetByIdFacadeRequest;
 import com.tenten.linkhub.domain.space.facade.dto.SpaceDetailGetByIdFacadeResponse;
-import com.tenten.linkhub.domain.space.facade.dto.SpacesWithNicknameFindByQueryFacadeResponses;
 import com.tenten.linkhub.domain.space.service.CommentService;
 import com.tenten.linkhub.domain.space.service.FavoriteService;
 import com.tenten.linkhub.domain.space.service.SpaceService;
@@ -48,6 +47,7 @@
 import com.tenten.linkhub.domain.space.service.dto.favorite.FavoriteSpacesFindResponses;
 import com.tenten.linkhub.domain.space.service.dto.favorite.SpaceRegisterInFavoriteResponse;
 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;
@@ -123,7 +123,7 @@ public ResponseEntity<PublicSpacesFindByQueryApiResponses> findPublicSpacesByQue
                 request.pageSize(),
                 StringUtils.hasText(request.sort()) ? Sort.by(request.sort()) : Sort.unsorted());
 
-        SpacesWithNicknameFindByQueryFacadeResponses responses = spaceFacade.findPublicSpacesWithNicknameByQuery(
+        SpacesFindByQueryResponses responses = spaceService.findPublicSpacesByQuery(
                 spaceMapper.toPublicSpacesFindByQueryRequest(request, pageRequest)
         );
 
@@ -291,7 +291,7 @@ public ResponseEntity<PublicSpaceFindWithFilterApiResponses> findPublicSpacesWit
                 StringUtils.hasText(request.sort()) ? Sort.by(request.sort()) : Sort.unsorted());
 
         PublicSpacesFindByQueryRequest serviceRequest = spaceMapper.toPublicSpacesFindByQueryRequest(request, pageRequest);
-        SpacesWithNicknameFindByQueryFacadeResponses responses = spaceFacade.findPublicSpacesWithNicknameByQuery(serviceRequest);
+        SpacesFindByQueryResponses responses = spaceService.findPublicSpacesByQuery(serviceRequest);
 
         PublicSpaceFindWithFilterApiResponses apiResponses = PublicSpaceFindWithFilterApiResponses.from(responses);
 

src/main/java/com/tenten/linkhub/domain/space/controller/dto/space/PublicSpaceFindWithFilterApiResponses.java

@@ -1,6 +1,6 @@
 package com.tenten.linkhub.domain.space.controller.dto.space;
 
-import com.tenten.linkhub.domain.space.facade.dto.SpacesWithNicknameFindByQueryFacadeResponses;
+import com.tenten.linkhub.domain.space.service.dto.space.SpacesFindByQueryResponses;
 import com.tenten.linkhub.global.util.PageMetaData;
 import org.springframework.data.domain.Slice;
 
@@ -10,7 +10,7 @@ public record PublicSpaceFindWithFilterApiResponses(
         List<PublicSpaceFindWithFilterApiResponse> responses,
         PageMetaData metaData
 ) {
-    public static PublicSpaceFindWithFilterApiResponses from(SpacesWithNicknameFindByQueryFacadeResponses responses) {
+    public static PublicSpaceFindWithFilterApiResponses from(SpacesFindByQueryResponses responses) {
         Slice<PublicSpaceFindWithFilterApiResponse> mapResponses = responses.responses()
                 .map(r -> new PublicSpaceFindWithFilterApiResponse(
                         r.spaceId(),

src/main/java/com/tenten/linkhub/domain/space/controller/dto/space/PublicSpacesFindByQueryApiResponses.java

@@ -1,6 +1,6 @@
 package com.tenten.linkhub.domain.space.controller.dto.space;
 
-import com.tenten.linkhub.domain.space.facade.dto.SpacesWithNicknameFindByQueryFacadeResponses;
+import com.tenten.linkhub.domain.space.service.dto.space.SpacesFindByQueryResponses;
 import com.tenten.linkhub.global.util.PageMetaData;
 import org.springframework.data.domain.Slice;
 
@@ -10,7 +10,7 @@ public record PublicSpacesFindByQueryApiResponses(
         List<PublicSpacesFindByQueryApiResponse> responses,
         PageMetaData metaData
 ) {
-    public static PublicSpacesFindByQueryApiResponses from(SpacesWithNicknameFindByQueryFacadeResponses responses) {
+    public static PublicSpacesFindByQueryApiResponses from(SpacesFindByQueryResponses responses) {
         Slice<PublicSpacesFindByQueryApiResponse> mapResponses = responses.responses()
                 .map(r -> new PublicSpacesFindByQueryApiResponse(
                         r.spaceId(),

src/main/java/com/tenten/linkhub/domain/space/facade/SpaceFacade.java

@@ -2,13 +2,11 @@
 
 import com.tenten.linkhub.domain.member.service.MemberService;
 import com.tenten.linkhub.domain.member.service.dto.MemberInfos;
-import com.tenten.linkhub.domain.member.service.dto.MemberNicknames;
 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;
 import com.tenten.linkhub.domain.space.facade.dto.SpaceDetailGetByIdFacadeResponse;
 import com.tenten.linkhub.domain.space.facade.dto.SpaceUpdateFacadeRequest;
-import com.tenten.linkhub.domain.space.facade.dto.SpacesWithNicknameFindByQueryFacadeResponses;
 import com.tenten.linkhub.domain.space.facade.mapper.SpaceFacadeMapper;
 import com.tenten.linkhub.domain.space.handler.dto.ScrapSaveEvent;
 import com.tenten.linkhub.domain.space.handler.dto.SpaceImageDeleteEvent;
@@ -17,11 +15,8 @@
 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.PublicSpacesFindByQueryRequest;
 import com.tenten.linkhub.domain.space.service.dto.space.SpaceMemberInfo;
 import com.tenten.linkhub.domain.space.service.dto.space.SpaceWithSpaceImageAndSpaceMemberInfo;
-import com.tenten.linkhub.domain.space.service.dto.space.SpacesFindByQueryResponse;
-import com.tenten.linkhub.domain.space.service.dto.space.SpacesFindByQueryResponses;
 import com.tenten.linkhub.global.aws.dto.ImageInfo;
 
 import java.util.List;
@@ -93,27 +88,12 @@ public Long scrapAndCreateNewSpace(NewSpacesScrapFacadeRequest request) {
         return savedSpaceId;
     }
 
-    public SpacesWithNicknameFindByQueryFacadeResponses findPublicSpacesWithNicknameByQuery(PublicSpacesFindByQueryRequest request) {
-        SpacesFindByQueryResponses serviceResponses = spaceService.findPublicSpacesByQuery(request);
-
-        List<Long> memberIds = getMemberIds(serviceResponses);
-        MemberNicknames memberNicknames = memberService.findMemberNicknamesByMemberIds(memberIds);
-
-        return SpacesWithNicknameFindByQueryFacadeResponses.of(serviceResponses, memberNicknames);
-    }
-
     private List<Long> getMemberIds(SpaceWithSpaceImageAndSpaceMemberInfo response) {
         return response.spaceMemberInfos().stream()
                 .map(SpaceMemberInfo::memberId)
                 .toList();
     }
 
-    private List<Long> getMemberIds(SpacesFindByQueryResponses response) {
-        return response.responses().getContent().stream()
-                .map(SpacesFindByQueryResponse::ownerId)
-                .toList();
-    }
-
     private List<Long> increaseSpaceViewCountAndSetSpaceViews(List<Long> spaceViews, Long spaceId) {
         if (spaceViews.isEmpty()) {
             eventPublisher.publishEvent(
@@ -135,4 +115,5 @@ private List<Long> increaseSpaceViewCountAndSetSpaceViews(List<Long> spaceViews,
 
         return spaceViews;
     }
+
 }