From 4f45a462c4058d506deefc3607564309f5afd97a Mon Sep 17 00:00:00 2001 From: Park Hyeongmin Date: Thu, 2 May 2024 23:39:22 +0900 Subject: [PATCH] =?UTF-8?q?feat=20:=20=EC=95=BD=EA=B4=80=EB=8F=99=EC=9D=98?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=EC=97=90=20=EB=94=B0=EB=A5=B8=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EA=B0=80=EC=9E=85=20API=20=EC=88=98=EC=A0=95=20(#204)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/tht/api/app/entity/enums/AgreementCategory.java | 2 +- src/main/java/com/tht/api/app/entity/user/UserAgreement.java | 4 ++-- .../tht/api/app/facade/user/request/UserAgreementRequest.java | 3 --- .../com/tht/api/app/documentation/UserJoinDocumentation.java | 1 - .../tht/api/app/fixture/user/UserAgreementRequestFixture.java | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/tht/api/app/entity/enums/AgreementCategory.java b/src/main/java/com/tht/api/app/entity/enums/AgreementCategory.java index d5ef0bca..490be5dd 100644 --- a/src/main/java/com/tht/api/app/entity/enums/AgreementCategory.java +++ b/src/main/java/com/tht/api/app/entity/enums/AgreementCategory.java @@ -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"); diff --git a/src/main/java/com/tht/api/app/entity/user/UserAgreement.java b/src/main/java/com/tht/api/app/entity/user/UserAgreement.java index fb89d7a5..b26283a1 100644 --- a/src/main/java/com/tht/api/app/entity/user/UserAgreement.java +++ b/src/main/java/com/tht/api/app/entity/user/UserAgreement.java @@ -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(); } diff --git a/src/main/java/com/tht/api/app/facade/user/request/UserAgreementRequest.java b/src/main/java/com/tht/api/app/facade/user/request/UserAgreementRequest.java index 5c95a9e0..9485443c 100644 --- a/src/main/java/com/tht/api/app/facade/user/request/UserAgreementRequest.java +++ b/src/main/java/com/tht/api/app/facade/user/request/UserAgreementRequest.java @@ -8,8 +8,6 @@ public record UserAgreementRequest( boolean serviceUseAgree, @AssertTrue(message = "개인 정보 수집 및 이용 동의는 필수입니다.") boolean personalPrivacyInfoAgree, - @AssertTrue(message = "위치 기반 서비스 약관 동의는 필수입니다.") - boolean locationServiceAgree, boolean marketingAgree ){ @@ -18,7 +16,6 @@ public UserAgreement toEntity(final String userUuid) { userUuid, serviceUseAgree, personalPrivacyInfoAgree, - locationServiceAgree, marketingAgree ); } diff --git a/src/test/java/com/tht/api/app/documentation/UserJoinDocumentation.java b/src/test/java/com/tht/api/app/documentation/UserJoinDocumentation.java index e25438a4..332410e9 100644 --- a/src/test/java/com/tht/api/app/documentation/UserJoinDocumentation.java +++ b/src/test/java/com/tht/api/app/documentation/UserJoinDocumentation.java @@ -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("유저 위치 정보"), diff --git a/src/test/java/com/tht/api/app/fixture/user/UserAgreementRequestFixture.java b/src/test/java/com/tht/api/app/fixture/user/UserAgreementRequestFixture.java index 41217a25..0aa8cd9c 100644 --- a/src/test/java/com/tht/api/app/fixture/user/UserAgreementRequestFixture.java +++ b/src/test/java/com/tht/api/app/fixture/user/UserAgreementRequestFixture.java @@ -14,6 +14,6 @@ private UserAgreementRequestFixture() { public static UserAgreementRequest make() { return new UserAgreementRequest( - serviceUseAgree, personalPrivacyInfoAgree, locationServiceAgree, marketingAgree); + serviceUseAgree, personalPrivacyInfoAgree, marketingAgree); } }