Merge pull request #117 from Team-Shaka/refactor/116

⚡️ Refactor: 브랜치 뷰 url 변경 및 트리하우스 가입 시, 브랜치 자동 생성

Author: koojun99

src/main/java/treehouse/server/api/branch/business/BranchService.java

@@ -35,19 +35,17 @@ public void createBranch(TreeHouse treeHouse, Member inviter, Member invitee) {
 
     /**
      * 트리하우스 내 두 멤버 사이의 가장 짧은 거리를 계산하여 브랜치 뷰를 반환합니다.
-     * @param user
      * @param treehouseId
+     * @param sourceMemberId
      * @param targetMemberId
      * @return BranchResponseDTO.getMemberBranchView
      */
 
-    public BranchResponseDTO.getMemberBranchView getMemberBranchView(User user, Long treehouseId, Long targetMemberId) {
+    public BranchResponseDTO.getMemberBranchView getMemberBranchView(Long treehouseId, Long sourceMemberId, Long targetMemberId) {
 
         TreeHouse treeHouse = treehouseQueryAdapter.getTreehouseById(treehouseId);
         List<Branch> branches = branchQueryAdapter.findAllByTreeHouse(treeHouse); // 트리하우스 내 모든 브랜치 조회
-        Member member = memberQueryAdapter.findByUserAndTreehouse(user, treeHouse); // 현재 로그인한 트리하우스 멤버
-        Long rootId = member.getId(); // 현재 로그인한 트리하우스 멤버의 ID
-        BranchResponseDTO.ShortestPathResult shortestPathResult = BranchUtil.findShortestDistance(branches, rootId, targetMemberId); // 최단 거리 계산
+        BranchResponseDTO.ShortestPathResult shortestPathResult = BranchUtil.findShortestDistance(branches, sourceMemberId, targetMemberId); // 최단 거리 계산
 
         // 최단 거리 결과를 이용해 브랜치 뷰 생성
         // Node 정보 생성
@@ -63,12 +61,12 @@ public BranchResponseDTO.getMemberBranchView getMemberBranchView(User user, Long
         }
 
         // 브랜치 뷰 생성
-        return BranchMapper.toBranchView(nodes, links, rootId, targetMemberId);
+        return BranchMapper.toBranchView(nodes, links, sourceMemberId, targetMemberId);
 
     }
 
 
-    public BranchResponseDTO.getCompleteBranchView getCompleteBranchView(User user, Long treehouseId) {
+    public BranchResponseDTO.getCompleteBranchView getCompleteBranchView(Long treehouseId) {
         TreeHouse treeHouse = treehouseQueryAdapter.getTreehouseById(treehouseId);
         List<Branch> branches = branchQueryAdapter.findAllByTreeHouse(treeHouse); // 트리하우스 내 모든 브랜치 조회
         Set<Long> memberIds = new HashSet<>();

src/main/java/treehouse/server/api/branch/presentation/BranchApi.java

@@ -25,20 +25,19 @@ public class BranchApi {
     @GetMapping
     public CommonResponse<BranchResponseDTO.getMemberBranchView> getMemberBranchView(
             @PathVariable(name = "treehouseId") Long treehouseId,
-            @RequestParam(name = "targetMemberId") Long targetMemberId,
-            @AuthMember @Parameter(hidden = true) User user
+            @RequestParam(name = "sourceMemberId") Long sourceMemberId,
+            @RequestParam(name = "targetMemberId") Long targetMemberId
     )
     {
-        return CommonResponse.onSuccess(branchService.getMemberBranchView(user, treehouseId, targetMemberId));
+        return CommonResponse.onSuccess(branchService.getMemberBranchView(treehouseId, sourceMemberId, targetMemberId));
     }
 
     @Operation(summary = "트리하우스 전체 브랜치 뷰 API 🔑", description = "트리하우스 내 모든 멤버 사이의 브랜치 뷰를 반환합니다.")
     @GetMapping("/complete")
     public CommonResponse<BranchResponseDTO.getCompleteBranchView> getCompleteBranchView(
-            @PathVariable(name = "treehouseId") Long treehouseId,
-            @AuthMember @Parameter(hidden = true) User user
+            @PathVariable(name = "treehouseId") Long treehouseId
     )
     {
-        return CommonResponse.onSuccess(branchService.getCompleteBranchView(user, treehouseId));
+        return CommonResponse.onSuccess(branchService.getCompleteBranchView(treehouseId));
     }
 }

src/main/java/treehouse/server/api/invitation/business/InvitationService.java

@@ -4,6 +4,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import treehouse.server.api.branch.business.BranchService;
 import treehouse.server.api.invitation.implement.InvitationCommandAdapter;
 import treehouse.server.api.invitation.implement.InvitationQueryAdapter;
 import treehouse.server.api.invitation.presentation.dto.InvitationRequestDTO;
@@ -116,6 +117,8 @@ public InvitationResponseDTO.invitationAccept decisionInvitation(User user, Invi
 
         if (request.isAcceptDecision()==true) {
             treehouseId = invitation.getTreeHouse().getId(); // treehouse 관련 로직 개발 후, invitation.getTreeHouse.getId() 등으로 바꾸기
+            // 초대장 수락
+
         }
         return InvitationMapper.toInvitationResult(treehouseId);
     }

src/main/java/treehouse/server/api/invitation/implement/InvitationQueryAdapter.java

@@ -1,5 +1,6 @@
 package treehouse.server.api.invitation.implement;
 
+import io.swagger.models.auth.In;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 import treehouse.server.api.invitation.persistence.InvitationRepository;
@@ -37,4 +38,9 @@ public Invitation findById(Long invitationId) {
     public Boolean existByPhoneAndTreehouse(String phoneNumber, TreeHouse treehouse) {
         return invitationRepository.existsByPhoneAndTreeHouse(phoneNumber, treehouse);
     }
+
+    public Invitation findByReceiverAndTreeHouse(User user, TreeHouse treeHouse) {
+        return invitationRepository.findByReceiverAndTreeHouse(user, treeHouse)
+                .orElseThrow(() -> new InvitationException(GlobalErrorCode.INVITATION_NOT_FOUND));
+    }
 }

src/main/java/treehouse/server/api/invitation/persistence/InvitationRepository.java

@@ -17,4 +17,6 @@ public interface InvitationRepository extends JpaRepository<Invitation, Long> {
     Boolean existsByPhone(String phoneNumber);
 
     Boolean existsByPhoneAndTreeHouse(String phoneNumber, TreeHouse treehouse);
+
+    Optional<Invitation> findByReceiverAndTreeHouse(User user, TreeHouse treeHouse);
 }

src/main/java/treehouse/server/api/member/business/MemberService.java

@@ -4,12 +4,15 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import treehouse.server.api.branch.business.BranchService;
 import treehouse.server.api.branch.implementation.BranchQueryAdapter;
+import treehouse.server.api.invitation.implement.InvitationQueryAdapter;
 import treehouse.server.api.member.implementation.MemberCommandAdapter;
 import treehouse.server.api.member.implementation.MemberQueryAdapter;
 import treehouse.server.api.member.presentation.dto.MemberRequestDTO;
 import treehouse.server.api.member.presentation.dto.MemberResponseDTO;
 import treehouse.server.api.treehouse.implementation.TreehouseQueryAdapter;
+import treehouse.server.global.entity.Invitation.Invitation;
 import treehouse.server.global.entity.User.User;
 import treehouse.server.global.entity.branch.Branch;
 import treehouse.server.global.entity.member.Member;
@@ -27,6 +30,9 @@ public class MemberService {
     private final MemberCommandAdapter memberCommandAdapter;
     private final TreehouseQueryAdapter treehouseQueryAdapter;
     private final BranchQueryAdapter branchQueryAdapter;
+    private final InvitationQueryAdapter invitationQueryAdapter;
+
+    private final BranchService branchService;
 
     /**
      * 트리하우스에 가입
@@ -43,6 +49,10 @@ public MemberResponseDTO.registerMember register(User user, MemberRequestDTO.reg
         user.addMember(savedMember); // User에 Member 추가
         treeHouse.addMember(savedMember); // TreeHouse에 Member 추가
 
+        // 트리하우스에 초대한 멤버와의 브랜치 생성
+        Invitation invitation = invitationQueryAdapter.findByReceiverAndTreeHouse(user, treeHouse);
+        branchService.createBranch(treeHouse, invitation.getSender(), savedMember);
+
         return MemberMapper.toRegister(savedMember);
     }
 

src/main/java/treehouse/server/global/security/config/SecurityConfig.java

@@ -72,6 +72,7 @@ public SecurityFilterChain JwtFilterChain(HttpSecurity http) throws Exception {
                         authorize -> {
 //                            authorize.requestMatchers("/swagger-ui/**").permitAll();
                             authorize.requestMatchers("/users/**").permitAll();
+                            authorize.requestMatchers("/treehouses/{treehouseId}/branches/**").permitAll();
                             authorize.anyRequest().authenticated();
                         })
                 .exceptionHandling(