diff --git a/src/main/java/umc/kkijuk/server/member/controller/MemberController.java b/src/main/java/umc/kkijuk/server/member/controller/MemberController.java index ad02187..903290f 100644 --- a/src/main/java/umc/kkijuk/server/member/controller/MemberController.java +++ b/src/main/java/umc/kkijuk/server/member/controller/MemberController.java @@ -145,7 +145,6 @@ public ResponseEntity logout(@RequestHeader("Authorization") String toke public ResponseEntity> addProfile(@RequestHeader("Authorization") String token, @RequestBody @Valid ProfileInputDto profileInputDto){ Member member = loginUser.extractMemberId(token); - Long memberId = member.getId(); memberService.completeProfile(member, profileInputDto); Map tokens = new HashMap<>(); diff --git a/src/main/java/umc/kkijuk/server/member/dto/ProfileInputDto.java b/src/main/java/umc/kkijuk/server/member/dto/ProfileInputDto.java index 44df9d5..4a1a624 100644 --- a/src/main/java/umc/kkijuk/server/member/dto/ProfileInputDto.java +++ b/src/main/java/umc/kkijuk/server/member/dto/ProfileInputDto.java @@ -12,15 +12,12 @@ @NoArgsConstructor public class ProfileInputDto { - @NotNull(message = "서비스 약관 동의 여부는 필수 값입니다.") @Schema(description = "서비스 약관 동의 여부", example = "true", type = "boolean") private Boolean isTermsAgreed; - @NotNull(message = "개인정보 처리 방침 동의 여부는 필수 값입니다.") @Schema(description = "개인정보 처리 방침 동의 여부", example = "true", type = "boolean") private Boolean isPrivacyAgreed; - @NotNull(message = "마케팅 정보 수신 동의 여부는 필수 값입니다.") @Schema(description = "마케팅 정보 수신 동의 여부", example = "BOTH", type = "string",allowableValues = { "BOTH", "EMAIL", @@ -28,7 +25,6 @@ public class ProfileInputDto { "NONE" }) private MarketingAgree isMarketingAgreed; - @NotNull(message = "회원 직업 정보는 필수 값입니다.") @Schema(description = "회원 직업 정보", example = "JOB_SEEKER", type = "array"/*, allowableValues = { "MIDDLE_OR_HIGH_SCHOOL", // 중/고등학생 "JOB_SEEKER", // 취준생 diff --git a/src/main/java/umc/kkijuk/server/member/service/MemberServiceImpl.java b/src/main/java/umc/kkijuk/server/member/service/MemberServiceImpl.java index ce10c8e..6bf1dd9 100644 --- a/src/main/java/umc/kkijuk/server/member/service/MemberServiceImpl.java +++ b/src/main/java/umc/kkijuk/server/member/service/MemberServiceImpl.java @@ -14,6 +14,7 @@ import umc.kkijuk.server.common.domian.status.AuthErrorStatus; import umc.kkijuk.server.member.controller.response.MemberEmailResponse; import umc.kkijuk.server.member.controller.response.MemberInfoResponse; +import umc.kkijuk.server.member.domain.MarketingAgree; import umc.kkijuk.server.member.domain.Member; import umc.kkijuk.server.member.domain.Role; import umc.kkijuk.server.member.domain.SocialType; @@ -166,6 +167,10 @@ public Member createUserWithKakaoId(String kakaoId, Map kakaoUse newMember.setSocialType(SocialType.KAKAO); newMember.setProfileComplete(false); newMember.setUserState(State.ACTIVATE); + newMember.setTermsAgree(true); + newMember.setPrivacyAgree(true); + newMember.setMarketingAgree(MarketingAgree.NONE); + newMember.setProfileComplete(false); log.info("신규 사용자 생성 - Kakao ID: {}, 이메일: {}, 이름: {}, 전화번호: {}, 생년월일: {}", kakaoId, email, name, phoneNumber, birthDate); @@ -216,6 +221,9 @@ public Member createUserWithNaverId(String naverId, NaverUserResponse.NaverUserD newMember.setRole(Role.ROLE_USER); newMember.setSocialType(SocialType.NAVER); newMember.setUserState(State.ACTIVATE); + newMember.setTermsAgree(true); + newMember.setPrivacyAgree(true); + newMember.setMarketingAgree(MarketingAgree.NONE); newMember.setProfileComplete(false); @@ -226,8 +234,6 @@ public Member createUserWithNaverId(String naverId, NaverUserResponse.NaverUserD @Override @Transactional public Member completeProfile(Member member, ProfileInputDto profileInputDto) { - member.setTermsAgree(profileInputDto.getIsTermsAgreed()); - member.setPrivacyAgree(profileInputDto.getIsPrivacyAgreed()); member.setMarketingAgree(profileInputDto.getIsMarketingAgreed()); member.setMemberJob(profileInputDto.getMemberJob()); member.setProfileComplete(true);