From 2a535f29e7601cca966ee50441d95f3002f28052 Mon Sep 17 00:00:00 2001 From: LHS-11 Date: Sat, 10 Feb 2024 18:00:47 +0900 Subject: [PATCH] =?UTF-8?q?refacotr=20:=20dto=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=EC=97=90=EC=84=9C=20request=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=EC=99=80=20response=20=ED=8C=A8=ED=82=A4=EC=A7=80?= =?UTF-8?q?=EB=A1=9C=20=EB=B6=84=EB=A6=AC=20=EB=B0=8F=20request=20Dto=20@N?= =?UTF-8?q?oArgsConstructor(access=20=3D=20AccessLevel.PROTECTED)=20?= =?UTF-8?q?=EB=A1=9C=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/policy/api/PolicyController.java | 6 ++++-- .../domain/policy/application/PolicyService.java | 6 ++++-- .../domain/policy/dao/PolicyQueryRepository.java | 2 +- .../dto/{ => request}/PolicyListRequestDto.java | 2 +- .../{ => request}/SearchPolicyListRequestDto.java | 2 +- .../CalendarPolicyListResponseDto.java | 4 ++-- .../{ => response}/PolicyCountResponseDto.java | 9 +++------ .../dto/{ => response}/PolicyInfoResponseDto.java | 9 +++------ .../dto/{ => response}/PolicyListInfoDto.java | 15 +-------------- .../dto/{ => response}/PolicyListResponseDto.java | 2 +- .../RecommendPolicyInfoResponseDto.java | 10 ++++------ .../domain/user/api/UserController.java | 7 +++---- .../domain/user/application/UserService.java | 4 +++- .../zenefitserver/domain/user/domain/User.java | 4 ++-- .../user/dto/{ => request}/ModifyRequestDto.java | 2 +- .../user/dto/{ => request}/SignUpRequestDto.java | 2 +- .../dto/{ => response}/HomeInfoResponseDto.java | 5 +++-- .../{ => response}/PrivacyInfoResponseDto.java | 9 +++------ .../dto/{ => response}/SocialInfoResponseDto.java | 9 +++------ .../UserAlarmStatusResponseDto.java | 5 +++-- .../dto/{ => response}/UserInfoResponseDto.java | 9 +++------ .../UserManualStatusResponseDto.java | 5 +++-- .../userpolicy/api/UserPolicyController.java | 6 +++--- .../userpolicy/application/UserPolicyService.java | 6 +++--- .../ApplyPolicyListResponseDto.java | 2 +- .../InterestPolicyListResponseDto.java | 2 +- .../dto/{ => response}/PolicySizeResponseDto.java | 2 +- 27 files changed, 62 insertions(+), 84 deletions(-) rename src/main/java/com/cmc/zenefitserver/domain/policy/dto/{ => request}/PolicyListRequestDto.java (93%) rename src/main/java/com/cmc/zenefitserver/domain/policy/dto/{ => request}/SearchPolicyListRequestDto.java (95%) rename src/main/java/com/cmc/zenefitserver/domain/policy/dto/{ => response}/CalendarPolicyListResponseDto.java (94%) rename src/main/java/com/cmc/zenefitserver/domain/policy/dto/{ => response}/PolicyCountResponseDto.java (78%) rename src/main/java/com/cmc/zenefitserver/domain/policy/dto/{ => response}/PolicyInfoResponseDto.java (95%) rename src/main/java/com/cmc/zenefitserver/domain/policy/dto/{ => response}/PolicyListInfoDto.java (88%) rename src/main/java/com/cmc/zenefitserver/domain/policy/dto/{ => response}/PolicyListResponseDto.java (92%) rename src/main/java/com/cmc/zenefitserver/domain/policy/dto/{ => response}/RecommendPolicyInfoResponseDto.java (95%) rename src/main/java/com/cmc/zenefitserver/domain/user/dto/{ => request}/ModifyRequestDto.java (96%) rename src/main/java/com/cmc/zenefitserver/domain/user/dto/{ => request}/SignUpRequestDto.java (97%) rename src/main/java/com/cmc/zenefitserver/domain/user/dto/{ => response}/HomeInfoResponseDto.java (95%) rename src/main/java/com/cmc/zenefitserver/domain/user/dto/{ => response}/PrivacyInfoResponseDto.java (89%) rename src/main/java/com/cmc/zenefitserver/domain/user/dto/{ => response}/SocialInfoResponseDto.java (81%) rename src/main/java/com/cmc/zenefitserver/domain/user/dto/{ => response}/UserAlarmStatusResponseDto.java (79%) rename src/main/java/com/cmc/zenefitserver/domain/user/dto/{ => response}/UserInfoResponseDto.java (93%) rename src/main/java/com/cmc/zenefitserver/domain/user/dto/{ => response}/UserManualStatusResponseDto.java (79%) rename src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/{ => response}/ApplyPolicyListResponseDto.java (96%) rename src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/{ => response}/InterestPolicyListResponseDto.java (96%) rename src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/{ => response}/PolicySizeResponseDto.java (89%) diff --git a/src/main/java/com/cmc/zenefitserver/domain/policy/api/PolicyController.java b/src/main/java/com/cmc/zenefitserver/domain/policy/api/PolicyController.java index 051b6f4..d330ba0 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/policy/api/PolicyController.java +++ b/src/main/java/com/cmc/zenefitserver/domain/policy/api/PolicyController.java @@ -2,7 +2,9 @@ import com.cmc.zenefitserver.domain.policy.application.PolicyService; import com.cmc.zenefitserver.domain.policy.domain.enums.SearchDateType; -import com.cmc.zenefitserver.domain.policy.dto.*; +import com.cmc.zenefitserver.domain.policy.dto.request.PolicyListRequestDto; +import com.cmc.zenefitserver.domain.policy.dto.request.SearchPolicyListRequestDto; +import com.cmc.zenefitserver.domain.policy.dto.response.*; import com.cmc.zenefitserver.domain.user.domain.User; import com.cmc.zenefitserver.global.annotation.AuthUser; import com.cmc.zenefitserver.global.common.CommonResponse; @@ -40,7 +42,7 @@ public CommonResponse> getPolices(@AuthUser User user, @ @PostMapping("/search") @Operation(summary = "정책 검색 API", description = "키워드를 사용하여 해당하는 정책 목록을 무한 스크롤해서 보여줍니다.") public CommonResponse getSearchPolices(@AuthUser User user, @RequestBody SearchPolicyListRequestDto policyListRequestDto, @RequestParam int page, @RequestParam int size, @RequestParam String sortField, - @RequestParam String sortOrder) { + @RequestParam String sortOrder) { Sort sort = Sort.by(Sort.Direction.fromString(sortOrder), sortField); return CommonResponse.success(policyService.getSearchPolicyList(user, policyListRequestDto, page, size, sort)); } diff --git a/src/main/java/com/cmc/zenefitserver/domain/policy/application/PolicyService.java b/src/main/java/com/cmc/zenefitserver/domain/policy/application/PolicyService.java index 4f70af9..5f5fdbf 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/policy/application/PolicyService.java +++ b/src/main/java/com/cmc/zenefitserver/domain/policy/application/PolicyService.java @@ -7,9 +7,11 @@ import com.cmc.zenefitserver.domain.policy.domain.enums.PolicyMethodType; import com.cmc.zenefitserver.domain.policy.domain.enums.SearchDateType; import com.cmc.zenefitserver.domain.policy.domain.enums.SupportPolicyType; -import com.cmc.zenefitserver.domain.policy.dto.*; +import com.cmc.zenefitserver.domain.policy.dto.request.PolicyListRequestDto; +import com.cmc.zenefitserver.domain.policy.dto.request.SearchPolicyListRequestDto; +import com.cmc.zenefitserver.domain.policy.dto.response.*; import com.cmc.zenefitserver.domain.user.domain.User; -import com.cmc.zenefitserver.domain.user.dto.HomeInfoResponseDto; +import com.cmc.zenefitserver.domain.user.dto.response.HomeInfoResponseDto; import com.cmc.zenefitserver.domain.userpolicy.dao.UserPolicyRepository; import com.cmc.zenefitserver.domain.userpolicy.domain.UserPolicy; import com.cmc.zenefitserver.global.error.ErrorCode; diff --git a/src/main/java/com/cmc/zenefitserver/domain/policy/dao/PolicyQueryRepository.java b/src/main/java/com/cmc/zenefitserver/domain/policy/dao/PolicyQueryRepository.java index 3a29491..d222cf6 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/policy/dao/PolicyQueryRepository.java +++ b/src/main/java/com/cmc/zenefitserver/domain/policy/dao/PolicyQueryRepository.java @@ -4,7 +4,7 @@ import static com.cmc.zenefitserver.domain.userpolicy.domain.QUserPolicy.userPolicy; import com.cmc.zenefitserver.domain.policy.domain.enums.*; -import com.cmc.zenefitserver.domain.policy.dto.PolicyListInfoDto; +import com.cmc.zenefitserver.domain.policy.dto.response.PolicyListInfoDto; import com.cmc.zenefitserver.domain.user.domain.*; import com.querydsl.core.types.*; import com.querydsl.core.types.dsl.BooleanExpression; diff --git a/src/main/java/com/cmc/zenefitserver/domain/policy/dto/PolicyListRequestDto.java b/src/main/java/com/cmc/zenefitserver/domain/policy/dto/request/PolicyListRequestDto.java similarity index 93% rename from src/main/java/com/cmc/zenefitserver/domain/policy/dto/PolicyListRequestDto.java rename to src/main/java/com/cmc/zenefitserver/domain/policy/dto/request/PolicyListRequestDto.java index 5cba3fb..c869598 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/policy/dto/PolicyListRequestDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/policy/dto/request/PolicyListRequestDto.java @@ -1,4 +1,4 @@ -package com.cmc.zenefitserver.domain.policy.dto; +package com.cmc.zenefitserver.domain.policy.dto.request; import com.cmc.zenefitserver.domain.policy.domain.enums.PolicyCode; diff --git a/src/main/java/com/cmc/zenefitserver/domain/policy/dto/SearchPolicyListRequestDto.java b/src/main/java/com/cmc/zenefitserver/domain/policy/dto/request/SearchPolicyListRequestDto.java similarity index 95% rename from src/main/java/com/cmc/zenefitserver/domain/policy/dto/SearchPolicyListRequestDto.java rename to src/main/java/com/cmc/zenefitserver/domain/policy/dto/request/SearchPolicyListRequestDto.java index a70cc04..f564fc6 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/policy/dto/SearchPolicyListRequestDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/policy/dto/request/SearchPolicyListRequestDto.java @@ -1,4 +1,4 @@ -package com.cmc.zenefitserver.domain.policy.dto; +package com.cmc.zenefitserver.domain.policy.dto.request; import com.cmc.zenefitserver.domain.policy.domain.enums.PolicyCode; diff --git a/src/main/java/com/cmc/zenefitserver/domain/policy/dto/CalendarPolicyListResponseDto.java b/src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/CalendarPolicyListResponseDto.java similarity index 94% rename from src/main/java/com/cmc/zenefitserver/domain/policy/dto/CalendarPolicyListResponseDto.java rename to src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/CalendarPolicyListResponseDto.java index c513b96..700f233 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/policy/dto/CalendarPolicyListResponseDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/CalendarPolicyListResponseDto.java @@ -1,4 +1,4 @@ -package com.cmc.zenefitserver.domain.policy.dto; +package com.cmc.zenefitserver.domain.policy.dto.response; import com.cmc.zenefitserver.domain.policy.domain.enums.DenialReasonType; import io.swagger.annotations.ApiModel; @@ -9,7 +9,7 @@ @ToString @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) @ApiModel(description = "특정 날짜에 따른 정책 리스트 검색 API response") public class CalendarPolicyListResponseDto { diff --git a/src/main/java/com/cmc/zenefitserver/domain/policy/dto/PolicyCountResponseDto.java b/src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/PolicyCountResponseDto.java similarity index 78% rename from src/main/java/com/cmc/zenefitserver/domain/policy/dto/PolicyCountResponseDto.java rename to src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/PolicyCountResponseDto.java index cba58a2..538ba92 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/policy/dto/PolicyCountResponseDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/PolicyCountResponseDto.java @@ -1,16 +1,13 @@ -package com.cmc.zenefitserver.domain.policy.dto; +package com.cmc.zenefitserver.domain.policy.dto.response; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; +import lombok.*; @ToString @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) @ApiModel(description = "지원할 수 있는 정책의 수와 유저 닉네임 조회 API response") public class PolicyCountResponseDto { diff --git a/src/main/java/com/cmc/zenefitserver/domain/policy/dto/PolicyInfoResponseDto.java b/src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/PolicyInfoResponseDto.java similarity index 95% rename from src/main/java/com/cmc/zenefitserver/domain/policy/dto/PolicyInfoResponseDto.java rename to src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/PolicyInfoResponseDto.java index a774bf2..0091d5f 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/policy/dto/PolicyInfoResponseDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/PolicyInfoResponseDto.java @@ -1,19 +1,16 @@ -package com.cmc.zenefitserver.domain.policy.dto; +package com.cmc.zenefitserver.domain.policy.dto.response; import com.cmc.zenefitserver.domain.policy.domain.enums.PolicyDateType; import com.cmc.zenefitserver.domain.policy.domain.enums.PolicyMethodType; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; +import lombok.*; import java.math.BigDecimal; @ToString @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) @ApiModel(description = "정책 상세 정보 조회 API response") public class PolicyInfoResponseDto { diff --git a/src/main/java/com/cmc/zenefitserver/domain/policy/dto/PolicyListInfoDto.java b/src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/PolicyListInfoDto.java similarity index 88% rename from src/main/java/com/cmc/zenefitserver/domain/policy/dto/PolicyListInfoDto.java rename to src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/PolicyListInfoDto.java index 3013d88..f945bb6 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/policy/dto/PolicyListInfoDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/PolicyListInfoDto.java @@ -1,4 +1,4 @@ -package com.cmc.zenefitserver.domain.policy.dto; +package com.cmc.zenefitserver.domain.policy.dto.response; import com.cmc.zenefitserver.domain.policy.domain.enums.*; import io.swagger.annotations.ApiModel; @@ -125,17 +125,4 @@ public void updatePolicyMethodType(String applicationProcedureContent) { this.policyMethodTypeDescription = findPolicyMethodType.getDescription(); } -// public PolicyListResponseDto(Long policyId, String policyName, String policyLogo, String policyIntroduction, String areaCode, String cityCode, PolicyDateType policyDateType, int benefit, boolean applyFlag, boolean interestFlag) { -// this.policyId = policyId; -// this.policyName = policyName; -// this.policyLogo = policyLogo; -// this.policyIntroduction = policyIntroduction; -// this.areaCode = areaCode; -// this.cityCode = cityCode; -// this.policyDateType = policyDateType; -// this.benefit = benefit; -// this.applyFlag = applyFlag; -// this.interestFlag = interestFlag; -// } - } diff --git a/src/main/java/com/cmc/zenefitserver/domain/policy/dto/PolicyListResponseDto.java b/src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/PolicyListResponseDto.java similarity index 92% rename from src/main/java/com/cmc/zenefitserver/domain/policy/dto/PolicyListResponseDto.java rename to src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/PolicyListResponseDto.java index 2a6f595..6d9ab88 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/policy/dto/PolicyListResponseDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/PolicyListResponseDto.java @@ -1,4 +1,4 @@ -package com.cmc.zenefitserver.domain.policy.dto; +package com.cmc.zenefitserver.domain.policy.dto.response; import io.swagger.annotations.ApiModel; import lombok.*; diff --git a/src/main/java/com/cmc/zenefitserver/domain/policy/dto/RecommendPolicyInfoResponseDto.java b/src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/RecommendPolicyInfoResponseDto.java similarity index 95% rename from src/main/java/com/cmc/zenefitserver/domain/policy/dto/RecommendPolicyInfoResponseDto.java rename to src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/RecommendPolicyInfoResponseDto.java index 7f4319e..c7651f7 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/policy/dto/RecommendPolicyInfoResponseDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/policy/dto/response/RecommendPolicyInfoResponseDto.java @@ -1,19 +1,17 @@ -package com.cmc.zenefitserver.domain.policy.dto; +package com.cmc.zenefitserver.domain.policy.dto.response; import com.cmc.zenefitserver.domain.policy.domain.enums.PolicyMethodType; import com.cmc.zenefitserver.domain.policy.domain.enums.SupportPolicyType; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; +import lombok.*; import java.util.List; @ToString @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) + @ApiModel(description = "추천 정책 정보 조회 API response") public class RecommendPolicyInfoResponseDto { diff --git a/src/main/java/com/cmc/zenefitserver/domain/user/api/UserController.java b/src/main/java/com/cmc/zenefitserver/domain/user/api/UserController.java index 2309bf0..ca05975 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/user/api/UserController.java +++ b/src/main/java/com/cmc/zenefitserver/domain/user/api/UserController.java @@ -1,9 +1,10 @@ package com.cmc.zenefitserver.domain.user.api; import com.cmc.zenefitserver.domain.user.application.UserService; -import com.cmc.zenefitserver.domain.user.domain.PrivacyType; import com.cmc.zenefitserver.domain.user.domain.User; -import com.cmc.zenefitserver.domain.user.dto.*; +import com.cmc.zenefitserver.domain.user.dto.request.ModifyRequestDto; +import com.cmc.zenefitserver.domain.user.dto.request.SignUpRequestDto; +import com.cmc.zenefitserver.domain.user.dto.response.*; import com.cmc.zenefitserver.global.annotation.AuthUser; import com.cmc.zenefitserver.global.common.CommonResponse; import com.cmc.zenefitserver.global.common.response.TokenResponseDto; @@ -18,8 +19,6 @@ import javax.validation.Valid; import java.util.List; -import static com.cmc.zenefitserver.global.error.ErrorCode.INVALID_NICKNAME; - @Slf4j @Api(tags = "2. user", description = "user API") @RequestMapping("/user") diff --git a/src/main/java/com/cmc/zenefitserver/domain/user/application/UserService.java b/src/main/java/com/cmc/zenefitserver/domain/user/application/UserService.java index c841624..f7fb11d 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/user/application/UserService.java +++ b/src/main/java/com/cmc/zenefitserver/domain/user/application/UserService.java @@ -12,7 +12,9 @@ import com.cmc.zenefitserver.domain.user.domain.Gender; import com.cmc.zenefitserver.domain.user.domain.PrivacyType; import com.cmc.zenefitserver.domain.user.domain.User; -import com.cmc.zenefitserver.domain.user.dto.*; +import com.cmc.zenefitserver.domain.user.dto.request.ModifyRequestDto; +import com.cmc.zenefitserver.domain.user.dto.request.SignUpRequestDto; +import com.cmc.zenefitserver.domain.user.dto.response.*; import com.cmc.zenefitserver.domain.userpolicy.dao.UserPolicyRepository; import com.cmc.zenefitserver.domain.userpolicy.domain.UserPolicy; import com.cmc.zenefitserver.global.auth.jwt.JwtService; diff --git a/src/main/java/com/cmc/zenefitserver/domain/user/domain/User.java b/src/main/java/com/cmc/zenefitserver/domain/user/domain/User.java index d4f7037..54a7f6f 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/user/domain/User.java +++ b/src/main/java/com/cmc/zenefitserver/domain/user/domain/User.java @@ -1,8 +1,8 @@ package com.cmc.zenefitserver.domain.user.domain; -import com.cmc.zenefitserver.domain.user.dto.ModifyRequestDto; -import com.cmc.zenefitserver.domain.user.dto.SignUpRequestDto; +import com.cmc.zenefitserver.domain.user.dto.request.ModifyRequestDto; +import com.cmc.zenefitserver.domain.user.dto.request.SignUpRequestDto; import com.cmc.zenefitserver.domain.userpolicy.domain.UserPolicy; import com.cmc.zenefitserver.global.auth.ProviderType; import com.cmc.zenefitserver.global.common.BaseEntity; diff --git a/src/main/java/com/cmc/zenefitserver/domain/user/dto/ModifyRequestDto.java b/src/main/java/com/cmc/zenefitserver/domain/user/dto/request/ModifyRequestDto.java similarity index 96% rename from src/main/java/com/cmc/zenefitserver/domain/user/dto/ModifyRequestDto.java rename to src/main/java/com/cmc/zenefitserver/domain/user/dto/request/ModifyRequestDto.java index b19d9ff..ecb90df 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/user/dto/ModifyRequestDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/user/dto/request/ModifyRequestDto.java @@ -1,4 +1,4 @@ -package com.cmc.zenefitserver.domain.user.dto; +package com.cmc.zenefitserver.domain.user.dto.request; import com.cmc.zenefitserver.domain.policy.domain.enums.AreaCode; import com.cmc.zenefitserver.domain.policy.domain.enums.CityCode; diff --git a/src/main/java/com/cmc/zenefitserver/domain/user/dto/SignUpRequestDto.java b/src/main/java/com/cmc/zenefitserver/domain/user/dto/request/SignUpRequestDto.java similarity index 97% rename from src/main/java/com/cmc/zenefitserver/domain/user/dto/SignUpRequestDto.java rename to src/main/java/com/cmc/zenefitserver/domain/user/dto/request/SignUpRequestDto.java index e400f5f..85d3696 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/user/dto/SignUpRequestDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/user/dto/request/SignUpRequestDto.java @@ -1,4 +1,4 @@ -package com.cmc.zenefitserver.domain.user.dto; +package com.cmc.zenefitserver.domain.user.dto.request; import com.cmc.zenefitserver.domain.policy.domain.enums.AreaCode; import com.cmc.zenefitserver.domain.policy.domain.enums.CityCode; diff --git a/src/main/java/com/cmc/zenefitserver/domain/user/dto/HomeInfoResponseDto.java b/src/main/java/com/cmc/zenefitserver/domain/user/dto/response/HomeInfoResponseDto.java similarity index 95% rename from src/main/java/com/cmc/zenefitserver/domain/user/dto/HomeInfoResponseDto.java rename to src/main/java/com/cmc/zenefitserver/domain/user/dto/response/HomeInfoResponseDto.java index 9d2e2ce..6a0b72c 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/user/dto/HomeInfoResponseDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/user/dto/response/HomeInfoResponseDto.java @@ -1,9 +1,10 @@ -package com.cmc.zenefitserver.domain.user.dto; +package com.cmc.zenefitserver.domain.user.dto.response; import com.cmc.zenefitserver.domain.policy.domain.enums.SupportPolicyType; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; @@ -13,7 +14,7 @@ //@ToString @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) @ApiModel(description = "홈 정보 조회 API response") public class HomeInfoResponseDto { diff --git a/src/main/java/com/cmc/zenefitserver/domain/user/dto/PrivacyInfoResponseDto.java b/src/main/java/com/cmc/zenefitserver/domain/user/dto/response/PrivacyInfoResponseDto.java similarity index 89% rename from src/main/java/com/cmc/zenefitserver/domain/user/dto/PrivacyInfoResponseDto.java rename to src/main/java/com/cmc/zenefitserver/domain/user/dto/response/PrivacyInfoResponseDto.java index e8b7506..49afc2f 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/user/dto/PrivacyInfoResponseDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/user/dto/response/PrivacyInfoResponseDto.java @@ -1,17 +1,14 @@ -package com.cmc.zenefitserver.domain.user.dto; +package com.cmc.zenefitserver.domain.user.dto.response; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; +import lombok.*; import java.time.LocalDate; @ToString @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) @ApiModel(description = "약관 및 개인정보 처리 동의 조회 API response") public class PrivacyInfoResponseDto { diff --git a/src/main/java/com/cmc/zenefitserver/domain/user/dto/SocialInfoResponseDto.java b/src/main/java/com/cmc/zenefitserver/domain/user/dto/response/SocialInfoResponseDto.java similarity index 81% rename from src/main/java/com/cmc/zenefitserver/domain/user/dto/SocialInfoResponseDto.java rename to src/main/java/com/cmc/zenefitserver/domain/user/dto/response/SocialInfoResponseDto.java index ed9ea04..283344e 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/user/dto/SocialInfoResponseDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/user/dto/response/SocialInfoResponseDto.java @@ -1,17 +1,14 @@ -package com.cmc.zenefitserver.domain.user.dto; +package com.cmc.zenefitserver.domain.user.dto.response; import com.cmc.zenefitserver.global.auth.ProviderType; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; +import lombok.*; import org.springframework.validation.annotation.Validated; @ToString @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) @ApiModel(description = "소셜 로그인 정보 (이메일) 조회 API response") public class SocialInfoResponseDto { diff --git a/src/main/java/com/cmc/zenefitserver/domain/user/dto/UserAlarmStatusResponseDto.java b/src/main/java/com/cmc/zenefitserver/domain/user/dto/response/UserAlarmStatusResponseDto.java similarity index 79% rename from src/main/java/com/cmc/zenefitserver/domain/user/dto/UserAlarmStatusResponseDto.java rename to src/main/java/com/cmc/zenefitserver/domain/user/dto/response/UserAlarmStatusResponseDto.java index 8817e36..43ebf7f 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/user/dto/UserAlarmStatusResponseDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/user/dto/response/UserAlarmStatusResponseDto.java @@ -1,13 +1,14 @@ -package com.cmc.zenefitserver.domain.user.dto; +package com.cmc.zenefitserver.domain.user.dto.response; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) @ApiModel(description = "유저 메뉴얼 조회 API response") public class UserAlarmStatusResponseDto { diff --git a/src/main/java/com/cmc/zenefitserver/domain/user/dto/UserInfoResponseDto.java b/src/main/java/com/cmc/zenefitserver/domain/user/dto/response/UserInfoResponseDto.java similarity index 93% rename from src/main/java/com/cmc/zenefitserver/domain/user/dto/UserInfoResponseDto.java rename to src/main/java/com/cmc/zenefitserver/domain/user/dto/response/UserInfoResponseDto.java index 7e3e978..9f635a5 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/user/dto/UserInfoResponseDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/user/dto/response/UserInfoResponseDto.java @@ -1,17 +1,14 @@ -package com.cmc.zenefitserver.domain.user.dto; +package com.cmc.zenefitserver.domain.user.dto.response; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; +import lombok.*; import java.util.Set; @ToString @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) @ApiModel(description = "소셜 로그인 정보 (이메일) 조회 API response") public class UserInfoResponseDto { diff --git a/src/main/java/com/cmc/zenefitserver/domain/user/dto/UserManualStatusResponseDto.java b/src/main/java/com/cmc/zenefitserver/domain/user/dto/response/UserManualStatusResponseDto.java similarity index 79% rename from src/main/java/com/cmc/zenefitserver/domain/user/dto/UserManualStatusResponseDto.java rename to src/main/java/com/cmc/zenefitserver/domain/user/dto/response/UserManualStatusResponseDto.java index 1d8c7da..abc76b9 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/user/dto/UserManualStatusResponseDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/user/dto/response/UserManualStatusResponseDto.java @@ -1,13 +1,14 @@ -package com.cmc.zenefitserver.domain.user.dto; +package com.cmc.zenefitserver.domain.user.dto.response; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) @ApiModel(description = "유저 메뉴얼 조회 API response") public class UserManualStatusResponseDto { diff --git a/src/main/java/com/cmc/zenefitserver/domain/userpolicy/api/UserPolicyController.java b/src/main/java/com/cmc/zenefitserver/domain/userpolicy/api/UserPolicyController.java index c87cf53..34c8924 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/userpolicy/api/UserPolicyController.java +++ b/src/main/java/com/cmc/zenefitserver/domain/userpolicy/api/UserPolicyController.java @@ -2,9 +2,9 @@ import com.cmc.zenefitserver.domain.user.domain.User; import com.cmc.zenefitserver.domain.userpolicy.application.UserPolicyService; -import com.cmc.zenefitserver.domain.userpolicy.dto.ApplyPolicyListResponseDto; -import com.cmc.zenefitserver.domain.userpolicy.dto.InterestPolicyListResponseDto; -import com.cmc.zenefitserver.domain.userpolicy.dto.PolicySizeResponseDto; +import com.cmc.zenefitserver.domain.userpolicy.dto.response.ApplyPolicyListResponseDto; +import com.cmc.zenefitserver.domain.userpolicy.dto.response.InterestPolicyListResponseDto; +import com.cmc.zenefitserver.domain.userpolicy.dto.response.PolicySizeResponseDto; import com.cmc.zenefitserver.global.annotation.AuthUser; import com.cmc.zenefitserver.global.common.CommonResponse; import io.swagger.annotations.Api; diff --git a/src/main/java/com/cmc/zenefitserver/domain/userpolicy/application/UserPolicyService.java b/src/main/java/com/cmc/zenefitserver/domain/userpolicy/application/UserPolicyService.java index e3f5fb5..5cd9846 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/userpolicy/application/UserPolicyService.java +++ b/src/main/java/com/cmc/zenefitserver/domain/userpolicy/application/UserPolicyService.java @@ -6,9 +6,9 @@ import com.cmc.zenefitserver.domain.user.domain.User; import com.cmc.zenefitserver.domain.userpolicy.dao.UserPolicyRepository; import com.cmc.zenefitserver.domain.userpolicy.domain.UserPolicy; -import com.cmc.zenefitserver.domain.userpolicy.dto.ApplyPolicyListResponseDto; -import com.cmc.zenefitserver.domain.userpolicy.dto.InterestPolicyListResponseDto; -import com.cmc.zenefitserver.domain.userpolicy.dto.PolicySizeResponseDto; +import com.cmc.zenefitserver.domain.userpolicy.dto.response.ApplyPolicyListResponseDto; +import com.cmc.zenefitserver.domain.userpolicy.dto.response.InterestPolicyListResponseDto; +import com.cmc.zenefitserver.domain.userpolicy.dto.response.PolicySizeResponseDto; import com.cmc.zenefitserver.global.error.ErrorCode; import com.cmc.zenefitserver.global.error.exception.BusinessException; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/ApplyPolicyListResponseDto.java b/src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/response/ApplyPolicyListResponseDto.java similarity index 96% rename from src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/ApplyPolicyListResponseDto.java rename to src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/response/ApplyPolicyListResponseDto.java index 5f46eca..df3b4bd 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/ApplyPolicyListResponseDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/response/ApplyPolicyListResponseDto.java @@ -1,4 +1,4 @@ -package com.cmc.zenefitserver.domain.userpolicy.dto; +package com.cmc.zenefitserver.domain.userpolicy.dto.response; import com.cmc.zenefitserver.domain.policy.domain.Policy; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/InterestPolicyListResponseDto.java b/src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/response/InterestPolicyListResponseDto.java similarity index 96% rename from src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/InterestPolicyListResponseDto.java rename to src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/response/InterestPolicyListResponseDto.java index 62856e3..22d5692 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/InterestPolicyListResponseDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/response/InterestPolicyListResponseDto.java @@ -1,4 +1,4 @@ -package com.cmc.zenefitserver.domain.userpolicy.dto; +package com.cmc.zenefitserver.domain.userpolicy.dto.response; import com.cmc.zenefitserver.domain.policy.domain.Policy; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/PolicySizeResponseDto.java b/src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/response/PolicySizeResponseDto.java similarity index 89% rename from src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/PolicySizeResponseDto.java rename to src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/response/PolicySizeResponseDto.java index 03274d3..2c3dd09 100644 --- a/src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/PolicySizeResponseDto.java +++ b/src/main/java/com/cmc/zenefitserver/domain/userpolicy/dto/response/PolicySizeResponseDto.java @@ -1,4 +1,4 @@ -package com.cmc.zenefitserver.domain.userpolicy.dto; +package com.cmc.zenefitserver.domain.userpolicy.dto.response; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty;