✨ Feat: Invitation accept 관련 하드코딩 부분 수정

Team-Shaka · Jul 10, 2024 · a890498 · a890498
1 parent d76c526
commit a890498
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 2 deletions.
diff --git a/src/main/java/treehouse/server/api/invitation/business/InvitationMapper.java b/src/main/java/treehouse/server/api/invitation/business/InvitationMapper.java
@@ -23,6 +23,7 @@ public class InvitationMapper {
     public static InvitationResponseDTO.getInvitation toGetInvitation (Invitation invitation, List<String> treeMemberProfileImages) {
         return InvitationResponseDTO.getInvitation.builder()
                 .invitationId(invitation.getId())
+                .treehouseId(invitation.getTreeHouse().getId())
                 .treehouseName(invitation.getTreeHouse().getName())
                 .senderName(invitation.getSender().getName())
                 .senderProfileImageUrl(invitation.getSender().getProfileImageUrl())
@@ -63,6 +64,7 @@ public static Invitation toInvitation(String phoneNumber, Member sender, User re
                 .phone(phoneNumber)
                 .expiredAt(sevenDaysLater)
                 .status(InvitationStatus.PENDING)
+                .treeHouse(treeHouse)
                 .build();
     }
 

diff --git a/src/main/java/treehouse/server/api/invitation/business/InvitationService.java b/src/main/java/treehouse/server/api/invitation/business/InvitationService.java
@@ -15,6 +15,8 @@
 import treehouse.server.global.entity.User.User;
 import treehouse.server.global.entity.member.Member;
 import treehouse.server.global.entity.treeHouse.TreeHouse;
+import treehouse.server.global.exception.GlobalErrorCode;
+import treehouse.server.global.exception.ThrowClass.InvitationException;
 import treehouse.server.global.exception.ThrowClass.UserException;
 
 import java.util.List;
@@ -64,7 +66,6 @@ public InvitationResponseDTO.myInvitationInfo getMyInvitationInfo(User user){
 
     @Transactional
     public InvitationResponseDTO.createInvitation createInvitation(User user, InvitationRequestDTO.createInvitation request){
-
         // 트리 찾기
         TreeHouse treehouse = treehouseQueryAdapter.getTreehouseById(request.getTreehouseId());
         // 초대 멤버 찾기
@@ -92,8 +93,10 @@ public InvitationResponseDTO.createInvitation createInvitation(User user, Invita
     public InvitationResponseDTO.invitationAccept decisionInvitation(User user, InvitationRequestDTO.invitationAcceptDecision request){
         // 해당 User 에게 온 초대장인지 검증하는 로직 추가
         Long treehouseId = 0L;
+        Invitation invitation = invitationQueryAdapter.findById(request.getInvitationId());
+
         if (request.isAcceptDecision()==true) {
-            treehouseId = 1L; // treehouse 관련 로직 개발 후, invitation.getTreeHouse.getId() 등으로 바꾸기
+            treehouseId = invitation.getTreeHouse().getId(); // treehouse 관련 로직 개발 후, invitation.getTreeHouse.getId() 등으로 바꾸기
         }
         return InvitationMapper.toInvitationResult(treehouseId);
     }

diff --git a/src/main/java/treehouse/server/api/invitation/implement/InvitationQueryAdapter.java b/src/main/java/treehouse/server/api/invitation/implement/InvitationQueryAdapter.java
@@ -8,6 +8,7 @@
 import treehouse.server.global.entity.Invitation.Invitation;
 import treehouse.server.global.entity.User.User;
 import treehouse.server.global.exception.GlobalErrorCode;
+import treehouse.server.global.exception.ThrowClass.InvitationException;
 import treehouse.server.global.exception.ThrowClass.UserException;
 
 import java.util.List;
@@ -26,4 +27,9 @@ public List<Invitation> findAllByPhone(String phone) {
     public Boolean existByPhoneNumber(String phoneNumber) {
         return invitationRepository.existsByPhone(phoneNumber);
     }
+
+    public Invitation findById(Long invitationId) {
+        return invitationRepository.findById(invitationId)
+                .orElseThrow(() -> new InvitationException(GlobalErrorCode.INVITATION_NOT_FOUND));
+    }
 }
diff --git a/src/main/java/treehouse/server/api/invitation/presentation/dto/InvitationResponseDTO.java b/src/main/java/treehouse/server/api/invitation/presentation/dto/InvitationResponseDTO.java
@@ -13,6 +13,7 @@ public class InvitationResponseDTO {
     @AllArgsConstructor
     public static class getInvitation {
         private Long invitationId;
+        private Long treehouseId;
         private String treehouseName;
         private String senderName;
         private String senderProfileImageUrl;

diff --git a/src/main/java/treehouse/server/global/entity/Invitation/Invitation.java b/src/main/java/treehouse/server/global/entity/Invitation/Invitation.java
@@ -23,6 +23,7 @@ public class Invitation extends BaseDateTimeEntity {
     private String phone;
 
     @Setter
+    @Enumerated(EnumType.STRING)
     private InvitationStatus status;
 
     private LocalDateTime expiredAt; //초대장 만료일자

diff --git a/src/main/java/treehouse/server/global/exception/ThrowClass/InvitationException.java b/src/main/java/treehouse/server/global/exception/ThrowClass/InvitationException.java
@@ -0,0 +1,10 @@
+package treehouse.server.global.exception.ThrowClass;
+
+import treehouse.server.global.exception.BaseErrorCode;
+
+public class InvitationException extends GeneralException{
+
+    public InvitationException(BaseErrorCode errorCode) {
+        super(errorCode);
+    }
+}