diff --git a/src/main/java/com/example/demo/creditcard/CreditCardController.java b/src/main/java/com/example/demo/creditcard/CreditCardController.java index 3b99556..f328e6b 100644 --- a/src/main/java/com/example/demo/creditcard/CreditCardController.java +++ b/src/main/java/com/example/demo/creditcard/CreditCardController.java @@ -51,10 +51,11 @@ public Response findOne(@PathVariable("id") Long cardId) { try { CreditCardInfo findCard = creditCardService.findOne(cardId); + SavedCardRes resDto = SavedCardRes.toDto(findCard); response.setCode(200); response.setResponse("success"); response.setMessage("카드 조회에 성공하였습니다."); - response.setData(findCard); + response.setData(resDto); } catch (Exception e) { response.setCode(500); response.setResponse("failed"); @@ -66,15 +67,17 @@ public Response findOne(@PathVariable("id") Long cardId) { } @PostMapping("/update/{id}") - public Response update(@PathVariable("id") Long cardId, @RequestBody CreditCardInfo creditCardInfo) { + public Response update(@PathVariable("id") Long cardId, @RequestBody CreditCardInfoDto dto) { Response response = new Response(); try { - creditCardService.update(cardId, creditCardInfo); + CreditCardInfo creditCardInfo = CreditCardInfoDto.toEntity(dto); + CreditCardInfo update = creditCardService.update(cardId, creditCardInfo); + CreditCardInfoDto creditCardInfoDto = CreditCardInfoDto.toDto(update); response.setCode(200); response.setResponse("success"); response.setMessage("카드 수정에 성공하였습니다."); - response.setData(creditCardInfo); + response.setData(creditCardInfoDto); } catch (Exception e) { response.setCode(500); response.setResponse("failed"); diff --git a/src/main/java/com/example/demo/creditcard/CreditCardService.java b/src/main/java/com/example/demo/creditcard/CreditCardService.java index ef5c687..32b7bfe 100644 --- a/src/main/java/com/example/demo/creditcard/CreditCardService.java +++ b/src/main/java/com/example/demo/creditcard/CreditCardService.java @@ -37,10 +37,10 @@ public CreditCardInfo findOne(Long id) { } @Transactional - public void update(Long id, CreditCardInfo creditCardInfo) { + public CreditCardInfo update(Long id, CreditCardInfo creditCardInfo) { CreditCardInfo findCreditCard = creditCardRepository.findById(id).orElseThrow(EntityNotFoundException::new); - findCreditCard.updateCreditCard(creditCardInfo); + return findCreditCard; } @Transactional diff --git a/src/main/java/com/example/demo/creditcard/request/CreditCardInfoDto.java b/src/main/java/com/example/demo/creditcard/request/CreditCardInfoDto.java index b9ee285..74292d9 100644 --- a/src/main/java/com/example/demo/creditcard/request/CreditCardInfoDto.java +++ b/src/main/java/com/example/demo/creditcard/request/CreditCardInfoDto.java @@ -24,9 +24,7 @@ public class CreditCardInfoDto { private int expireMonth; private LocalDate birth; private String simplePassword; - private User user; - private List customOrders = new ArrayList<>(); - private List orders = new ArrayList<>(); + private String email; /** * 신용카드 등록을 위한 dto to entity @@ -44,12 +42,21 @@ public static CreditCardInfo toEntity(CreditCardInfoDto dto) { .expireMonth(dto.getExpireMonth()) .birth(dto.getBirth()) .simplePassword(dto.getSimplePassword()) - .user(dto.getUser()) - .customOrders(dto.getCustomOrders()) - .orders(dto.getOrders()) .build(); } + public static CreditCardInfoDto toDto(CreditCardInfo entity) { + return CreditCardInfoDto.builder() + .cardNickname(entity.getCardNickname()) + .creditCardBank(entity.getCreditCardBank()) + .cardNum(entity.getCardNum()) + .expireYear(entity.getExpireYear()) + .expireMonth(entity.getExpireMonth()) + .birth(entity.getBirth()) + .simplePassword(entity.getSimplePassword()) + .email(entity.getUser().getEmail()) + .build(); + } public void updateCreditCard(CreditCardInfoDto creditCardInfo) {