Merge pull request #74 from team-tiki-taka/feat/card

🐞 fix(recommend): 추천인 인증 오류 수정
team-tiki-taka · Nov 6, 2022 · 081ef8f · 081ef8f
2 parents 632eb1c + fa85ece
commit 081ef8f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/src/main/java/com/tikitaka/naechinso/domain/card/dto/CardThumbnailResponseDTO.java b/src/main/java/com/tikitaka/naechinso/domain/card/dto/CardThumbnailResponseDTO.java
@@ -24,9 +24,6 @@ public class CardThumbnailResponseDTO {
     private Boolean isActive;
     private String createdAt;
 
-    @Builder.Default
-    private long dueDate = 0L;
-
     private String image;
     private String name;
     private int age;
@@ -78,7 +75,6 @@ public static CardThumbnailResponseDTO of(Card card, Member targetMember) {
                 .targetMemberId(card.getTargetMemberId())
                 .isActive(card.getIsActive())
                 .createdAt(card.getCreatedAt().toString())
-                .dueDate(DateUtil.getDueDay(card.getCreatedAt(), 7L))
                 .image(topImage)
                 .name(dto.getName())
                 .age(dto.getAge())

diff --git a/src/main/java/com/tikitaka/naechinso/domain/member/MemberService.java b/src/main/java/com/tikitaka/naechinso/domain/member/MemberService.java
@@ -148,6 +148,10 @@ public MemberCommonJoinResponseDTO joinCommonMember(String phone, MemberCommonJo
         Member member = MemberCommonJoinRequestDTO.toCommonMember(phone, dto);
         memberRepository.save(member);
 
+        //내 번호로 받았던 추천서 저장
+        List<Recommend> recommendList = recommendRepository.findAllByReceiverPhone(phone);
+        recommendList.forEach(recommend -> recommend.setReceiver(member));
+
         TokenResponseDTO tokenResponseDTO
                 = jwtTokenProvider.generateToken(new JwtDTO(phone, "ROLE_USER"));
 

diff --git a/src/main/java/com/tikitaka/naechinso/domain/member/entity/Member.java b/src/main/java/com/tikitaka/naechinso/domain/member/entity/Member.java
@@ -195,6 +195,15 @@ public void setDeleted(){
     @Builder.Default
     private List<Card> cards = new ArrayList<>();
 
+
+    public void addRecommend(Recommend recommend) {
+        this.recommends.add(recommend);
+    }
+
+    public void addRecommendReceived(Recommend recommend) {
+        this.recommendReceived.add(recommend);
+    }
+
     public void setDetail(MemberDetail memberDetail) {
         this.detail = memberDetail;
     }

diff --git a/src/main/java/com/tikitaka/naechinso/domain/recommend/RecommendService.java b/src/main/java/com/tikitaka/naechinso/domain/recommend/RecommendService.java
@@ -143,8 +143,7 @@ public RecommendResponseDTO acceptRecommendByUuid(Member authMember, String uuid
             throw new BadRequestException(ErrorCode.CANNOT_RECOMMEND_MYSELF);
         }
 
-        //추천사 업데이트
-        recommend.update(dto);
+        recommend.update(sender, dto);
         recommendRepository.save(recommend);
 
         return RecommendResponseDTO.of(recommend);

diff --git a/src/main/java/com/tikitaka/naechinso/domain/recommend/entity/Recommend.java b/src/main/java/com/tikitaka/naechinso/domain/recommend/entity/Recommend.java
@@ -104,8 +104,12 @@ public class Recommend extends BaseEntity {
     @Column(name = "rec_period")
     private String receiverPeriod;
 
+    public void setReceiver(Member receiver) {
+        this.receiver = receiver;
+    }
 
-    public void update(RecommendAcceptRequestDTO requestDTO) {
+    public void update(Member sender, RecommendAcceptRequestDTO requestDTO) {
+        this.sender = sender;
         this.receiverAppeals = StringUtils.join(requestDTO.getAppeals(), ",");
         this.receiverAppealDetail = requestDTO.getAppealDetail();
         this.receiverMeet = requestDTO.getMeet();