diff --git a/module-api/src/main/java/com/kernel360/commoncode/controller/CommonCodeController.java b/module-api/src/main/java/com/kernel360/commoncode/controller/CommonCodeController.java index f4108a61..41d260c9 100644 --- a/module-api/src/main/java/com/kernel360/commoncode/controller/CommonCodeController.java +++ b/module-api/src/main/java/com/kernel360/commoncode/controller/CommonCodeController.java @@ -20,8 +20,12 @@ public class CommonCodeController { private final CommonCodeService commonCodeService; + + // @GetMapping("/{codeName}") public ResponseEntity>> getCommonCode (@PathVariable String codeName){ + + // List codes = commonCodeService.getCodes(codeName); return ApiResponse.toResponseEntity(GET_COMMON_CODE_SUCCESS, codes); diff --git a/module-api/src/main/java/com/kernel360/commoncode/service/CommonCodeService.java b/module-api/src/main/java/com/kernel360/commoncode/service/CommonCodeService.java index f0f7584e..d08db7ff 100644 --- a/module-api/src/main/java/com/kernel360/commoncode/service/CommonCodeService.java +++ b/module-api/src/main/java/com/kernel360/commoncode/service/CommonCodeService.java @@ -17,12 +17,14 @@ public class CommonCodeService { public List getCodes(String codeName) { + // return commonCodeRepository.findAllByUpperNameAndIsUsed(codeName,true) .stream() .map(CommonCodeDto::from) .toList(); } + // public List getCodesMapper(String codeName) { return commonCodeMapper.findAllByUpperNameAndIsUsed(codeName,true) diff --git a/module-api/src/main/java/com/kernel360/global/Interceptor/AcceptInterceptor.java b/module-api/src/main/java/com/kernel360/global/Interceptor/AcceptInterceptor.java index 358dc91e..60032124 100644 --- a/module-api/src/main/java/com/kernel360/global/Interceptor/AcceptInterceptor.java +++ b/module-api/src/main/java/com/kernel360/global/Interceptor/AcceptInterceptor.java @@ -25,6 +25,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons boolean result = true; String requestToken = request.getHeader("Authorization"); + // if (requestToken == null || requestToken.isEmpty()) { throw new BusinessException(AcceptInterceptorErrorCode.DOSE_NOT_EXIST_REQUEST_TOKEN); } if (!validRequestToken(requestToken)) { throw new BusinessException(AcceptInterceptorErrorCode.FAILED_VALID_REQUEST_TOKEN); } diff --git a/module-api/src/main/java/com/kernel360/main/controller/MainContoller.java b/module-api/src/main/java/com/kernel360/main/controller/MainContoller.java index b98e5c98..9d64b836 100644 --- a/module-api/src/main/java/com/kernel360/main/controller/MainContoller.java +++ b/module-api/src/main/java/com/kernel360/main/controller/MainContoller.java @@ -18,17 +18,22 @@ @RestController @RequestMapping @RequiredArgsConstructor + +// public class MainContoller { private final ProductService productService; private final MainService mainService; + // @GetMapping("/banner") ResponseEntity> getBanner() { return ApiResponse.toResponseEntity(BannerBusinessCode.GET_BANNER_DATA_SUCCESS, mainService.getBanner()); } + @GetMapping("/recommend-products") + // ResponseEntity>> getRecommendProducts(Pageable pageable) { Page recommendProductList = productService.getRecommendProductList(pageable); @@ -37,6 +42,8 @@ ResponseEntity>> getRecommendProducts(Pag } @GetMapping("/products/rank") + + // ResponseEntity>> getProducts( @RequestParam(name = "sortType", defaultValue = "viewCnt-order") Sort sortType, Pageable pageable) { Page productDtos = sortType.sort(productService, pageable); diff --git a/module-api/src/main/java/com/kernel360/main/controller/Sort.java b/module-api/src/main/java/com/kernel360/main/controller/Sort.java index d81635e5..54f852e9 100644 --- a/module-api/src/main/java/com/kernel360/main/controller/Sort.java +++ b/module-api/src/main/java/com/kernel360/main/controller/Sort.java @@ -6,6 +6,7 @@ import org.springframework.data.domain.Pageable; +// public enum Sort { VIEW_COUNT_PRODUCT_ORDER("viewCnt-order") { diff --git a/module-api/src/main/java/com/kernel360/member/config/AuditConfig.java b/module-api/src/main/java/com/kernel360/member/config/AuditConfig.java index 802402cf..54048c6d 100644 --- a/module-api/src/main/java/com/kernel360/member/config/AuditConfig.java +++ b/module-api/src/main/java/com/kernel360/member/config/AuditConfig.java @@ -8,6 +8,7 @@ import java.util.Optional; +// @Configuration public class AuditConfig implements AuditorAware { @Override diff --git a/module-api/src/main/java/com/kernel360/member/dto/MemberDto.java b/module-api/src/main/java/com/kernel360/member/dto/MemberDto.java index a580385f..005dbed3 100644 --- a/module-api/src/main/java/com/kernel360/member/dto/MemberDto.java +++ b/module-api/src/main/java/com/kernel360/member/dto/MemberDto.java @@ -9,10 +9,13 @@ /** * DTO for {@link com.kernel360.member.entity.Member} */ + + public record MemberDto(Long memberNo, String id, String email, String password, + // String gender, String age, LocalDate createdAt, diff --git a/module-api/src/main/java/com/kernel360/member/dto/MemberInfo.java b/module-api/src/main/java/com/kernel360/member/dto/MemberInfo.java index 12a71ff9..a4549313 100644 --- a/module-api/src/main/java/com/kernel360/member/dto/MemberInfo.java +++ b/module-api/src/main/java/com/kernel360/member/dto/MemberInfo.java @@ -16,6 +16,8 @@ static MemberInfo of( return new MemberInfo(id, email, gender, age); } + + // public Member toEntity() { return Member.of( this.id, diff --git a/module-api/src/main/java/com/kernel360/member/service/MemberService.java b/module-api/src/main/java/com/kernel360/member/service/MemberService.java index 0246d7eb..64fa298e 100644 --- a/module-api/src/main/java/com/kernel360/member/service/MemberService.java +++ b/module-api/src/main/java/com/kernel360/member/service/MemberService.java @@ -59,6 +59,7 @@ protected Member getNewJoinMemberEntity(MemberDto requestDto) { int ageOrdinal; try { + // enum으로 받으면 다음과 같은 작업을 할 필요가 없음 . genderOrdinal = Gender.valueOf(requestDto.gender()).ordinal(); ageOrdinal = Age.valueOf(requestDto.age()).ordinal(); } catch (Exception e) { @@ -124,6 +125,8 @@ public boolean idDuplicationCheck(String id) { @Transactional(readOnly = true) public boolean emailDuplicationCheck(String email) { + + // Member member = memberRepository.findOneByEmail(email); return member != null; @@ -188,6 +191,7 @@ public Map getCarInfo(String token) { Member member = memberRepository.findOneById(id); CarInfoDto carInfoDto = CarInfoDto.from(member.getCarInfo()); + // return Map.of( "car_info", carInfoDto, "segment_options", commonCodeService.getCodes("segment"), @@ -200,6 +204,7 @@ public Map getCarInfo(String token) { @Transactional public void saveWashInfo(WashInfoDto washInfoDto, String token) { + // String id = JWT.ownerId(token); Member member = memberRepository.findOneById(id); WashInfo washInfo = WashInfo.of(washInfoDto.washNo(), washInfoDto.washCount(), washInfoDto.monthlyExpense(), washInfoDto.interest()); diff --git a/module-api/src/main/java/com/kernel360/mypage/controller/MyPageController.java b/module-api/src/main/java/com/kernel360/mypage/controller/MyPageController.java index 3c71df8f..aad8869a 100644 --- a/module-api/src/main/java/com/kernel360/mypage/controller/MyPageController.java +++ b/module-api/src/main/java/com/kernel360/mypage/controller/MyPageController.java @@ -15,10 +15,13 @@ @Slf4j @RestController +// @RequestMapping("/mypage") @RequiredArgsConstructor public class MyPageController { private final MemberService memberService; + + // private final ProductService productService; @GetMapping("/member") @@ -45,6 +48,7 @@ ResponseEntity> memberDelete(@RequestHeader("Authorization") S @PostMapping("/member") + // ResponseEntity> validatePassword(@RequestBody String password, @RequestHeader("Authorization") String authToken) { memberService.changePassword(password, authToken); diff --git a/module-api/src/main/java/com/kernel360/product/controller/ProductController.java b/module-api/src/main/java/com/kernel360/product/controller/ProductController.java index e830fcf8..b972531d 100644 --- a/module-api/src/main/java/com/kernel360/product/controller/ProductController.java +++ b/module-api/src/main/java/com/kernel360/product/controller/ProductController.java @@ -19,6 +19,7 @@ public class ProductController { private final ProductService productService; + // @GetMapping("/products") ResponseEntity>> findProductList(){ final List productDtoList = productService.getProductList(); diff --git a/module-domain/src/main/java/com/kernel360/auth/entity/Auth.java b/module-domain/src/main/java/com/kernel360/auth/entity/Auth.java index ecaceb3a..17d20aff 100644 --- a/module-domain/src/main/java/com/kernel360/auth/entity/Auth.java +++ b/module-domain/src/main/java/com/kernel360/auth/entity/Auth.java @@ -16,6 +16,8 @@ public class Auth extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "auth_id_gen") @SequenceGenerator(name = "auth_id_gen", sequenceName = "auth_auth_no_seq") + + // @Column(name = "auth_no", nullable = false) private Long authNo; diff --git a/module-domain/src/main/java/com/kernel360/base/BaseRawEntity.java b/module-domain/src/main/java/com/kernel360/base/BaseRawEntity.java index 0ed81785..d0c4d914 100644 --- a/module-domain/src/main/java/com/kernel360/base/BaseRawEntity.java +++ b/module-domain/src/main/java/com/kernel360/base/BaseRawEntity.java @@ -13,6 +13,7 @@ @Getter @MappedSuperclass +// 중복 @EntityListeners(AuditingEntityListener.class) public class BaseRawEntity { // FIXME :: createdAt 자동 생성시, update 로직 진행중에 null or transient 문제가 발생. 임시방편으로 직접 지정하였으나 이후 수정 필요 diff --git a/module-domain/src/main/java/com/kernel360/member/entity/Member.java b/module-domain/src/main/java/com/kernel360/member/entity/Member.java index 34023841..0e714c5e 100644 --- a/module-domain/src/main/java/com/kernel360/member/entity/Member.java +++ b/module-domain/src/main/java/com/kernel360/member/entity/Member.java @@ -88,6 +88,7 @@ public static Member createJoinMember(String id, String email, String password, /** * joinMember Binding **/ + // private Member(String id, String email, String password, int gender, int age) { this.id = id; this.email = email; diff --git a/module-domain/src/main/java/com/kernel360/product/repository/ProductRepository.java b/module-domain/src/main/java/com/kernel360/product/repository/ProductRepository.java index 349d74e0..e9067758 100644 --- a/module-domain/src/main/java/com/kernel360/product/repository/ProductRepository.java +++ b/module-domain/src/main/java/com/kernel360/product/repository/ProductRepository.java @@ -16,12 +16,13 @@ public interface ProductRepository extends JpaRepository { Page findByProductNameContaining(String keyword, Pageable pageable); + // Page findAllByOrderByViewCountDesc(Pageable pageable); Page findTop5ByOrderByProductNameDesc(Pageable pageable); Page findAllBySafetyStatusEquals(SafetyStatus safetyStatus, Pageable pageable); - +거 Page findAllByOrderByCreatedAtDesc(Pageable pageable); @Query(value = "SELECT p FROM Product p WHERE p.productName = :productName "