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 @@ -145,7 +145,6 @@ public ResponseEntity<String> logout(@RequestHeader("Authorization") String toke
public ResponseEntity<Map<String, Object>> addProfile(@RequestHeader("Authorization") String token,
@RequestBody @Valid ProfileInputDto profileInputDto){
Member member = loginUser.extractMemberId(token);
Long memberId = member.getId();
memberService.completeProfile(member, profileInputDto);

Map<String, Object> tokens = new HashMap<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,19 @@
@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",
"SMS",
"NONE" })
private MarketingAgree isMarketingAgreed;

@NotNull(message = "회원 직업 정보는 필수 값입니다.")
@Schema(description = "회원 직업 정보", example = "JOB_SEEKER", type = "array"/*, allowableValues = {
"MIDDLE_OR_HIGH_SCHOOL", // 중/고등학생
"JOB_SEEKER", // 취준생
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -166,6 +167,10 @@ public Member createUserWithKakaoId(String kakaoId, Map<String, Object> 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);
Expand Down Expand Up @@ -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);


Expand All @@ -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);
Expand Down
Loading