Skip to content

Commit

Permalink
feat : 약관동의 변경에 따른 회원가입 API 수정 (#204)
Browse files Browse the repository at this point in the history
  • Loading branch information
thalals authored May 2, 2024
1 parent 6ae2efb commit 4f45a46
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@AllArgsConstructor
public enum AgreementCategory implements EnumModel{

SERVICE_USER_AGREE("serviceUserAgree"),
SERVICE_USE_AGREE("serviceUseAgree"),
PERSONAL_PRIVACY_INFO_AGREE("personalPrivacyInfoAgree"),
LOCATION_SERVICE_AGREE("locationServiceAgree"),
MARKETING_AGREE("marketingAgree");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/tht/api/app/entity/user/UserAgreement.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ public UserAgreement(final Long idx, final String userUuid, final boolean servic
}

public static UserAgreement create(final String userUuid, final boolean serviceUseAgree,
final boolean personalPrivacyInfoAgree, final boolean locationServiceAgree,
final boolean personalPrivacyInfoAgree,
final boolean marketingAgree) {

return UserAgreement.builder()
.userUuid(userUuid)
.serviceUseAgree(serviceUseAgree)
.personalPrivacyInfoAgree(personalPrivacyInfoAgree)
.locationServiceAgree(locationServiceAgree)
.locationServiceAgree(false)
.marketingAgree(marketingAgree)
.build();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ public record UserAgreementRequest(
boolean serviceUseAgree,
@AssertTrue(message = "개인 정보 수집 및 이용 동의는 필수입니다.")
boolean personalPrivacyInfoAgree,
@AssertTrue(message = "위치 기반 서비스 약관 동의는 필수입니다.")
boolean locationServiceAgree,
boolean marketingAgree
){

Expand All @@ -18,7 +16,6 @@ public UserAgreement toEntity(final String userUuid) {
userUuid,
serviceUseAgree,
personalPrivacyInfoAgree,
locationServiceAgree,
marketingAgree
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ void normalUserJoin() throws Exception {
fieldWithPath("agreement.serviceUseAgree").description("서비스 약관 동의"),
fieldWithPath("agreement.personalPrivacyInfoAgree").description(
"개인정보 이용 약관 동의"),
fieldWithPath("agreement.locationServiceAgree").description("위치 동의 내역"),
fieldWithPath("agreement.marketingAgree").description("마케팅 동의 내역"),

fieldWithPath("locationRequest").description("유저 위치 정보"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ private UserAgreementRequestFixture() {

public static UserAgreementRequest make() {
return new UserAgreementRequest(
serviceUseAgree, personalPrivacyInfoAgree, locationServiceAgree, marketingAgree);
serviceUseAgree, personalPrivacyInfoAgree, marketingAgree);
}
}

0 comments on commit 4f45a46

Please sign in to comment.