Skip to content

Commit

Permalink
Merge pull request #261 from nhnacademy-be4-My-Books/fix/log
Browse files Browse the repository at this point in the history
error: log를 찍어봤습니다
  • Loading branch information
hyeonjaez authored Mar 27, 2024
2 parents 77ad326 + cce838d commit aa6ec65
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 3 deletions.
2 changes: 2 additions & 0 deletions src/main/java/store/mybooks/front/cart/domain/CartDetail.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;

/**
* packageName : store.mybooks.front.cart.domain <br/>
Expand All @@ -18,6 +19,7 @@
@Getter
@NoArgsConstructor
@AllArgsConstructor
@ToString
public class CartDetail {
private Long bookId;
private int cartDetailAmount;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
Expand Down Expand Up @@ -30,6 +31,7 @@
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/carts")
@Slf4j
public class CartItemController {

private final CartItemService cartItemService;
Expand All @@ -48,7 +50,10 @@ public class CartItemController {
public ResponseEntity<List<CartDetail>> moveDataMysqlToRedis(
@RequestHeader(name = HeaderProperties.USER_ID) Long userId,
@RequestBody CartUserRedisKeyNameRequest cartUserRedisKeyNameRequest) {
log.debug("moveDataMysqlToRedis controller 들어왔습니다.");
List<CartDetail> cartDetailList = cartItemService.registerMysqlToRedis(userId, cartUserRedisKeyNameRequest);
log.debug("registerMysqlToRedis service 빠져나왔습니다.");
log.debug("cartDetailList는 {}", cartDetailList);
return ResponseEntity
.status(HttpStatus.CREATED)
.body(cartDetailList);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import store.mybooks.resource.book.entity.Book;
import store.mybooks.resource.cart.entity.Cart;

Expand All @@ -30,6 +31,7 @@
@NoArgsConstructor
@Getter
@Entity
@ToString
@Table(name = "cart_detail")
public class CartItem {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down Expand Up @@ -36,6 +37,7 @@
@Service
@Transactional
@RequiredArgsConstructor
@Slf4j
public class CartItemService {
private final CartItemRepository cartItemRepository;
private final RedisTemplate<String, CartDetail> redisTemplate;
Expand All @@ -61,17 +63,24 @@ public void registerRedisToMysql(String userEmail, List<CartDetail> cartDetailLi
}

public List<CartDetail> registerMysqlToRedis(Long userId, CartUserRedisKeyNameRequest cartUserRedisKeyNameRequest) {
log.debug("registerMysqlToRedis 메서드에 들어왔습니다");
User user = userRepository.findById(userId)
.orElseThrow(() -> new UserNotExistException(userId));
log.debug("user가 있나 봅니다.");
Optional<Cart> optionalCart = cartRepository.findCartByUserId(user.getId());
if (optionalCart.isEmpty()) {
log.debug("cart가 비어있습니다.");
return new ArrayList<>();
}
log.debug("cart가 있나봅니다.");
Cart userCart = optionalCart.get();
List<CartItem> cartItemList = cartItemRepository.findCartItemsByCart_Id(userCart.getId());
log.debug("cartItemList 입니다: {}", cartItemList);
if (cartItemList.isEmpty()) {
log.debug("cartItemList 가 비어있습니다.");
return new ArrayList<>();
}
log.debug("cartItemList 입니다 : {}", cartItemList);
redisTemplate.delete(cartUserRedisKeyNameRequest.getCartKey());
List<CartDetail> cartDetailList = new ArrayList<>();

Expand All @@ -91,6 +100,8 @@ public List<CartDetail> registerMysqlToRedis(Long userId, CartUserRedisKeyNameRe
cartUserRedisKeyNameRequest.getCartKey(), cartDetail
);
}
log.debug("최종 입니다");
log.debug("cartDetailList 입니다 {}", cartDetailList);
stringRedisTemplate.expire(getExpiredKey(cartUserRedisKeyNameRequest.getCartKey()), 179, TimeUnit.MINUTES);
redisTemplate.expire(cartUserRedisKeyNameRequest.getCartKey(), 180, TimeUnit.MINUTES);

Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/application-prod1.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ my-books.redis.database=22
## mysql
database.mysql.url=9053ef8fd6e04a87aab73321a565c1b2
# Log Levels
logging.level.root=INFO
logging.level.root=debug
# Logging file
logging.file.name=/home/administrator/log/resource.log
logging.file.path=/home/administrator/log
logging.file.name=/home/administrator/log/hi/resource.log
logging.file.path=/home/administrator/log/hi

0 comments on commit aa6ec65

Please sign in to comment.