From e38f1f3d82e033b1dc9c7e3dc9f9a110672ce5b9 Mon Sep 17 00:00:00 2001 From: hyeonda02 Date: Tue, 19 Aug 2025 20:16:26 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Refactor=20:=20=ED=9A=8C=EC=9B=90=EA=B0=80?= =?UTF-8?q?=EC=9E=85=EC=8B=9C,=20=EC=9D=B4=EC=9A=A9=EC=95=BD=EA=B4=80,=20?= =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A7=91=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=ED=95=84=EB=93=9C=20true=EB=A1=9C=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/member/controller/MemberController.java | 1 - .../server/member/service/MemberServiceImpl.java | 11 +++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) 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/service/MemberServiceImpl.java b/src/main/java/umc/kkijuk/server/member/service/MemberServiceImpl.java index ce10c8e..eeacf68 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(true); log.info("신규 사용자 생성 - Kakao ID: {}, 이메일: {}, 이름: {}, 전화번호: {}, 생년월일: {}", kakaoId, email, name, phoneNumber, birthDate); @@ -216,7 +221,10 @@ public Member createUserWithNaverId(String naverId, NaverUserResponse.NaverUserD newMember.setRole(Role.ROLE_USER); newMember.setSocialType(SocialType.NAVER); newMember.setUserState(State.ACTIVATE); - newMember.setProfileComplete(false); + newMember.setTermsAgree(true); + newMember.setPrivacyAgree(true); + newMember.setMarketingAgree(MarketingAgree.NONE); + newMember.setProfileComplete(true); log.info("신규 사용자 생성 - Naver ID: {}, 이메일: {}, 이름: {}, 전화번호: {}, 생년월일: {}", naverId, email, name, phoneNumber, birthDate); @@ -230,7 +238,6 @@ public Member completeProfile(Member member, ProfileInputDto profileInputDto) { member.setPrivacyAgree(profileInputDto.getIsPrivacyAgreed()); member.setMarketingAgree(profileInputDto.getIsMarketingAgreed()); member.setMemberJob(profileInputDto.getMemberJob()); - member.setProfileComplete(true); return memberRepository.save(member); } From 262c29972fefb1a460a408fa86497b994430d9f1 Mon Sep 17 00:00:00 2001 From: hyeonda02 Date: Tue, 19 Aug 2025 20:48:33 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Refactor=20:=20=EC=B6=94=EA=B0=80=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=9E=85=EB=A0=A5=20API=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/umc/kkijuk/server/member/dto/ProfileInputDto.java | 4 ---- .../kkijuk/server/member/service/MemberServiceImpl.java | 7 +++---- 2 files changed, 3 insertions(+), 8 deletions(-) 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 eeacf68..6bf1dd9 100644 --- a/src/main/java/umc/kkijuk/server/member/service/MemberServiceImpl.java +++ b/src/main/java/umc/kkijuk/server/member/service/MemberServiceImpl.java @@ -170,7 +170,7 @@ public Member createUserWithKakaoId(String kakaoId, Map kakaoUse newMember.setTermsAgree(true); newMember.setPrivacyAgree(true); newMember.setMarketingAgree(MarketingAgree.NONE); - newMember.setProfileComplete(true); + newMember.setProfileComplete(false); log.info("신규 사용자 생성 - Kakao ID: {}, 이메일: {}, 이름: {}, 전화번호: {}, 생년월일: {}", kakaoId, email, name, phoneNumber, birthDate); @@ -224,7 +224,7 @@ public Member createUserWithNaverId(String naverId, NaverUserResponse.NaverUserD newMember.setTermsAgree(true); newMember.setPrivacyAgree(true); newMember.setMarketingAgree(MarketingAgree.NONE); - newMember.setProfileComplete(true); + newMember.setProfileComplete(false); log.info("신규 사용자 생성 - Naver ID: {}, 이메일: {}, 이름: {}, 전화번호: {}, 생년월일: {}", naverId, email, name, phoneNumber, birthDate); @@ -234,10 +234,9 @@ 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); return memberRepository.save(member); }