Skip to content

Commit 6df3deb

Browse files
committed
fix: 가이드 평가 상태 조회 응답 수정
1 parent 888e19e commit 6df3deb

4 files changed

Lines changed: 19 additions & 8 deletions

File tree

src/main/java/com/forink/forink/member/entity/Member.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.forink.forink.member.entity;
22

33
import static com.forink.forink.global.error.ErrorCode.ONLY_REGULAR_MEMBER_ELIGIBLE_FOR_PREGUIDE;
4+
import static com.forink.forink.member.entity.MemberRoleType.ROLE_가이드;
45
import static com.forink.forink.member.entity.MemberRoleType.ROLE_예비가이드;
56
import static com.forink.forink.member.entity.MemberRoleType.ROLE_회원;
67

@@ -63,7 +64,7 @@ private Member(final String name, final String googleId, final String email, fin
6364
}
6465

6566
public void qualifyAsPreGuide() {
66-
if (this.memberRoleType != ROLE_회원) {
67+
if (!ROLE_회원.equals(this.memberRoleType)) {
6768
throw new BusinessException(ONLY_REGULAR_MEMBER_ELIGIBLE_FOR_PREGUIDE);
6869
}
6970
this.memberRoleType = ROLE_예비가이드;
@@ -76,4 +77,8 @@ public void addPartFeedbackPoints() {
7677
public void addEntireFeedbackPoints() {
7778
this.point += 10;
7879
}
80+
81+
public boolean isGuide() {
82+
return ROLE_가이드.equals(this.memberRoleType);
83+
}
7984
}

src/main/java/com/forink/forink/roadmap/api/RoadmapFeedbackController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public ResponseEntity<List<RoadmapFeedbackRatingListResponse>> getPreGuideRoadma
5555
@GetMapping("/ratings/status")
5656
@Secured("ROLE_예비가이드")
5757
public ResponseEntity<RoadmapFeedbackRatingStatusResponse> getPreGuideRoadmapFeedbackRatingStatus(@LoginMember final Member member) {
58-
return ResponseEntity.ok(roadmapFeedbackService.getPreGuideRoadmapFeedbackRatingStatus(member.getId()));
58+
return ResponseEntity.ok(roadmapFeedbackService.getPreGuideRoadmapFeedbackRatingStatus(member));
5959
}
6060

6161
}

src/main/java/com/forink/forink/roadmap/application/RoadmapFeedbackService.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22

33
import com.forink.forink.global.error.BusinessException;
44
import static com.forink.forink.global.error.ErrorCode.ROADMAP_FEEDBACK_NOT_FOUND;
5-
import static com.forink.forink.roadmap.entity.RoadmapFeedbackRatingStatusType.ALMOST;
6-
import static com.forink.forink.roadmap.entity.RoadmapFeedbackRatingStatusType.IN_PROGRESS;
7-
5+
import com.forink.forink.member.entity.Member;
86
import com.forink.forink.roadmap.application.dto.request.RoadmapFeedbackRatingRequest;
97
import com.forink.forink.roadmap.application.dto.response.RoadmapFeedbackListResponse;
108
import com.forink.forink.roadmap.application.dto.response.RoadmapFeedbackRatingListResponse;
119
import com.forink.forink.roadmap.application.dto.response.RoadmapFeedbackRatingStatusResponse;
1210
import com.forink.forink.roadmap.entity.RoadmapCompletionFeedback;
1311
import com.forink.forink.roadmap.entity.RoadmapCompletionFeedbackRating;
1412
import com.forink.forink.roadmap.entity.RoadmapFeedbackRatingStatusType;
13+
import static com.forink.forink.roadmap.entity.RoadmapFeedbackRatingStatusType.ALMOST;
14+
import static com.forink.forink.roadmap.entity.RoadmapFeedbackRatingStatusType.FORMAL_GUIDE;
15+
import static com.forink.forink.roadmap.entity.RoadmapFeedbackRatingStatusType.IN_PROGRESS;
1516
import com.forink.forink.roadmap.entity.dao.RoadmapCompletionFeedbackRatingRepository;
1617
import com.forink.forink.roadmap.entity.dao.RoadmapCompletionFeedbackRepository;
1718
import jakarta.transaction.Transactional;
@@ -54,8 +55,12 @@ public List<RoadmapFeedbackRatingListResponse> getPreGuideRoadmapFeedbackRatingL
5455
return roadmapFeedbackRatingRepository.findAllStatsByAuthor(memberId);
5556
}
5657

57-
public RoadmapFeedbackRatingStatusResponse getPreGuideRoadmapFeedbackRatingStatus(final Long memberId) {
58-
boolean isAlmost = roadmapFeedbackRatingRepository.checkAuthorRatingStatus(memberId).isPresent();
58+
public RoadmapFeedbackRatingStatusResponse getPreGuideRoadmapFeedbackRatingStatus(final Member member) {
59+
if (member.isGuide()) {
60+
return new RoadmapFeedbackRatingStatusResponse(FORMAL_GUIDE);
61+
}
62+
63+
boolean isAlmost = roadmapFeedbackRatingRepository.checkAuthorRatingStatus(member.getId()).isPresent();
5964

6065
RoadmapFeedbackRatingStatusType status = IN_PROGRESS;
6166
if (isAlmost) {

src/main/java/com/forink/forink/roadmap/entity/RoadmapFeedbackRatingStatusType.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
public enum RoadmapFeedbackRatingStatusType {
44

55
IN_PROGRESS,
6-
ALMOST
6+
ALMOST,
7+
FORMAL_GUIDE
78
}

0 commit comments

Comments
 (0)