Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,20 @@ public record MemberStatusResponse(
LocalDate graduationDate,

@Schema(description = "온보딩 여부", example = "true")
boolean onboardingRequired
boolean onboardingRequired,

@Schema(description = "약관 동의 여부", example = "true")
boolean agreedTerm

) {
public static MemberStatusResponse from(Member member, MemberVisa visa, boolean onboardingRequired) {
public static MemberStatusResponse from(Member member, MemberVisa visa, boolean onboardingRequired, boolean agreedTerm) {
return MemberStatusResponse.builder()
.visaType(visa.getVisaType())
.visaExpiredAt(visa.getVisaExpiredAt())
.graduationDate(member.getGraduationDate())
.expectedGraduationDate(member.getExpectedGraduationDate())
.onboardingRequired(onboardingRequired)
.agreedTerm(agreedTerm)
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@ public interface MemberTermRepository extends JpaRepository<MemberTerm, Long> {

boolean existsByMemberId(Long memberId);

boolean existsByMemberIdAndAgreedTrue(Long memberId);

void deleteAllByMemberId(Long memberId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,9 @@ public MemberStatusResponse getMemberStatus(Long memberId) {
.orElseThrow(() -> new MemberException(MemberErrorCode.VISA_NOT_FOUND));

boolean onboardingRequired = member.getStatus().equals(MemberStatus.PENDING);
boolean agreedTerm = memberTermRepository.existsByMemberIdAndAgreedTrue(memberId);

return MemberStatusResponse.from(member, memberVisa, onboardingRequired);
return MemberStatusResponse.from(member, memberVisa, onboardingRequired, agreedTerm);
}

public MypageResponse getMypage(Long memberId) {
Expand Down
Loading