From 0355bc2e74b5263312f77045817ed73d26d54155 Mon Sep 17 00:00:00 2001 From: SoMin Date: Tue, 12 Mar 2024 14:49:45 +0900 Subject: [PATCH 1/2] =?UTF-8?q?docs=20:=20author=20=EC=B6=94=EA=B0=80=20(?= =?UTF-8?q?=EC=9D=B4=EC=86=8C=EB=AF=BC)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OrderProductController.java | 13 ------------- .../orderProduct/dto/PaymentInfoDTO.java | 4 ++++ .../orderProduct/entity/OrderProduct.java | 3 +++ .../orders/controller/OrderController.java | 5 +++-- .../hyundai/domain/orders/dto/OrderInfo.java | 4 ++++ .../domain/orders/dto/OrderSaveDTO.java | 4 ++++ .../domain/orders/dto/OrdersRequestDTO.java | 3 +++ .../hyundai/domain/orders/entity/Orders.java | 4 ++++ .../domain/orders/service/OrderService.java | 4 ++++ .../payment/controller/PaymentController.java | 5 ++++- .../payment/entity/enums/IamportApiURL.java | 4 ++++ .../payment/entity/enums/PayStatus.java | 3 +++ .../payment/service/PaymentServiceImpl.java | 3 +++ .../domain/payment/service/RefundService.java | 4 ++++ .../payment/service/RefundServiceImpl.java | 4 ++++ .../product/controller/ProductController.java | 3 +++ .../product/dto/IngredientExpansion.java | 4 ++++ .../dto/request/ProductRequestDTO.java | 4 ++++ .../product/dto/request/SearchRequestDTO.java | 3 +++ .../dto/response/ProductResponseDTO.java | 4 ++++ .../response/ProductWithCountResponseDTO.java | 6 ++++-- .../dto/response/RecommendProducts.java | 4 ++++ .../domain/product/entity/Product.java | 19 ++++--------------- .../repository/ProductSearchRepository.java | 5 +++++ .../product/service/ProductService.java | 4 ++++ .../product/service/ProductServiceImpl.java | 9 +++++++-- .../controller/RecommendationController.java | 3 +++ .../dto/request/MainRequestDTO.java | 4 ++++ .../dto/response/MainRecommendProducts.java | 4 ++++ .../service/RecommendationService.java | 3 +++ .../service/RecommendationServiceImpl.java | 7 +++++-- .../global/config/ElasticSearchConfig.java | 4 ++++ .../hyundai/global/config/RedisConfig.java | 4 ++++ 33 files changed, 124 insertions(+), 37 deletions(-) delete mode 100644 src/main/java/com/hyundai/domain/orderProduct/controller/OrderProductController.java diff --git a/src/main/java/com/hyundai/domain/orderProduct/controller/OrderProductController.java b/src/main/java/com/hyundai/domain/orderProduct/controller/OrderProductController.java deleted file mode 100644 index 7c8dfda..0000000 --- a/src/main/java/com/hyundai/domain/orderProduct/controller/OrderProductController.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hyundai.domain.orderProduct.controller; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class OrderProductController { - @GetMapping("/confirm/payment") // 결제 성공 페이지로 이동 - public String confirmPayment() { - // todo : user 정보 가져오기 - return "payment/paymentSuccess"; - } -} diff --git a/src/main/java/com/hyundai/domain/orderProduct/dto/PaymentInfoDTO.java b/src/main/java/com/hyundai/domain/orderProduct/dto/PaymentInfoDTO.java index dc40e17..85b490b 100644 --- a/src/main/java/com/hyundai/domain/orderProduct/dto/PaymentInfoDTO.java +++ b/src/main/java/com/hyundai/domain/orderProduct/dto/PaymentInfoDTO.java @@ -3,6 +3,10 @@ import lombok.Builder; import lombok.Getter; +/** + * author : 이소민 + */ + @Getter public class PaymentInfoDTO { private String quotaInfo; diff --git a/src/main/java/com/hyundai/domain/orderProduct/entity/OrderProduct.java b/src/main/java/com/hyundai/domain/orderProduct/entity/OrderProduct.java index 646fee3..d41789c 100644 --- a/src/main/java/com/hyundai/domain/orderProduct/entity/OrderProduct.java +++ b/src/main/java/com/hyundai/domain/orderProduct/entity/OrderProduct.java @@ -3,6 +3,9 @@ import lombok.Builder; import lombok.Getter; +/** + * author : 이소민 + */ @Getter public class OrderProduct { private Long orderProductId; diff --git a/src/main/java/com/hyundai/domain/orders/controller/OrderController.java b/src/main/java/com/hyundai/domain/orders/controller/OrderController.java index 504ba87..6a1265c 100644 --- a/src/main/java/com/hyundai/domain/orders/controller/OrderController.java +++ b/src/main/java/com/hyundai/domain/orders/controller/OrderController.java @@ -15,14 +15,15 @@ import java.util.List; import java.util.stream.Collectors; +/** + * author : 이소민 + */ @Slf4j @RequestMapping("/order") @RestController @RequiredArgsConstructor public class OrderController { private final OrderService orderService; - // todo memberinfo -> 주소 가져오기 - // 주문 상품 여러개를 주문하는 경우 // xxx 예시: http://localhost:8080/member/order?products=%5B1%2C2%2C3%5D // xxx: %5B 는 [ 를 의미 diff --git a/src/main/java/com/hyundai/domain/orders/dto/OrderInfo.java b/src/main/java/com/hyundai/domain/orders/dto/OrderInfo.java index eb8d1c0..6d6e79e 100644 --- a/src/main/java/com/hyundai/domain/orders/dto/OrderInfo.java +++ b/src/main/java/com/hyundai/domain/orders/dto/OrderInfo.java @@ -3,6 +3,10 @@ import lombok.Getter; import lombok.NoArgsConstructor; +/** + * author : 이소민 + */ + @Getter @NoArgsConstructor public class OrderInfo { diff --git a/src/main/java/com/hyundai/domain/orders/dto/OrderSaveDTO.java b/src/main/java/com/hyundai/domain/orders/dto/OrderSaveDTO.java index 578d843..0ce4a92 100644 --- a/src/main/java/com/hyundai/domain/orders/dto/OrderSaveDTO.java +++ b/src/main/java/com/hyundai/domain/orders/dto/OrderSaveDTO.java @@ -4,6 +4,10 @@ import lombok.NoArgsConstructor; import lombok.Setter; +/** + * author : 이소민 + */ + @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/hyundai/domain/orders/dto/OrdersRequestDTO.java b/src/main/java/com/hyundai/domain/orders/dto/OrdersRequestDTO.java index 202e12f..fec5cf7 100644 --- a/src/main/java/com/hyundai/domain/orders/dto/OrdersRequestDTO.java +++ b/src/main/java/com/hyundai/domain/orders/dto/OrdersRequestDTO.java @@ -6,6 +6,9 @@ import java.util.List; +/** + * author : 이소민 + */ @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/hyundai/domain/orders/entity/Orders.java b/src/main/java/com/hyundai/domain/orders/entity/Orders.java index 5cb4312..f7a120a 100644 --- a/src/main/java/com/hyundai/domain/orders/entity/Orders.java +++ b/src/main/java/com/hyundai/domain/orders/entity/Orders.java @@ -6,6 +6,10 @@ import java.time.LocalDateTime; +/** + * author : 이소민 + */ + @Getter @Setter public class Orders { diff --git a/src/main/java/com/hyundai/domain/orders/service/OrderService.java b/src/main/java/com/hyundai/domain/orders/service/OrderService.java index 39286e2..b07fb55 100644 --- a/src/main/java/com/hyundai/domain/orders/service/OrderService.java +++ b/src/main/java/com/hyundai/domain/orders/service/OrderService.java @@ -9,6 +9,10 @@ import java.util.List; +/** + * author : 이소민 + */ + @Service @Transactional @RequiredArgsConstructor diff --git a/src/main/java/com/hyundai/domain/payment/controller/PaymentController.java b/src/main/java/com/hyundai/domain/payment/controller/PaymentController.java index 3ddeab5..5bb6160 100644 --- a/src/main/java/com/hyundai/domain/payment/controller/PaymentController.java +++ b/src/main/java/com/hyundai/domain/payment/controller/PaymentController.java @@ -23,6 +23,10 @@ import javax.annotation.PostConstruct; import java.io.IOException; +/** + * author : 이소민 + */ + @Slf4j @RestController @RequiredArgsConstructor @@ -44,7 +48,6 @@ public void init() { this.iamportClient = new IamportClient(apiKey, secretKey); } - // todo 쿠폰, 포인트 추가 // 요청으로 받은 주문 상품들을 저장 @PostMapping("/payment") public ResponseEntity paymentComplete(@RequestBody OrdersRequestDTO ordersRequestDTO) throws IOException { diff --git a/src/main/java/com/hyundai/domain/payment/entity/enums/IamportApiURL.java b/src/main/java/com/hyundai/domain/payment/entity/enums/IamportApiURL.java index 12f895a..07560d7 100644 --- a/src/main/java/com/hyundai/domain/payment/entity/enums/IamportApiURL.java +++ b/src/main/java/com/hyundai/domain/payment/entity/enums/IamportApiURL.java @@ -1,5 +1,9 @@ package com.hyundai.domain.payment.entity.enums; +/** + * author : 이소민 + */ + public enum IamportApiURL { GET_TOKEN_URL("https://api.iamport.kr/users/getToken"), CANCEL_URL("https://api.iamport.kr/payments/cancel"); diff --git a/src/main/java/com/hyundai/domain/payment/entity/enums/PayStatus.java b/src/main/java/com/hyundai/domain/payment/entity/enums/PayStatus.java index 6f68be5..41aeeee 100644 --- a/src/main/java/com/hyundai/domain/payment/entity/enums/PayStatus.java +++ b/src/main/java/com/hyundai/domain/payment/entity/enums/PayStatus.java @@ -1,5 +1,8 @@ package com.hyundai.domain.payment.entity.enums; +/** + * author : 이소민 + */ public enum PayStatus { SUCCESS("결제완료"), REFUND("환불완료"), diff --git a/src/main/java/com/hyundai/domain/payment/service/PaymentServiceImpl.java b/src/main/java/com/hyundai/domain/payment/service/PaymentServiceImpl.java index 202b509..0a3aa5c 100644 --- a/src/main/java/com/hyundai/domain/payment/service/PaymentServiceImpl.java +++ b/src/main/java/com/hyundai/domain/payment/service/PaymentServiceImpl.java @@ -19,6 +19,9 @@ import java.util.List; +/** + * author : 이소민 + */ @RequiredArgsConstructor @Service diff --git a/src/main/java/com/hyundai/domain/payment/service/RefundService.java b/src/main/java/com/hyundai/domain/payment/service/RefundService.java index ef114dc..7e60da1 100644 --- a/src/main/java/com/hyundai/domain/payment/service/RefundService.java +++ b/src/main/java/com/hyundai/domain/payment/service/RefundService.java @@ -2,6 +2,10 @@ import java.io.IOException; +/** + * author : 이소민 + */ + public interface RefundService { public void refundRequest(String access_token, String merchant_uid, String reason) throws IOException; public String getToken(String apiKey, String secretKey) throws Exception; diff --git a/src/main/java/com/hyundai/domain/payment/service/RefundServiceImpl.java b/src/main/java/com/hyundai/domain/payment/service/RefundServiceImpl.java index 1b86380..ebb4590 100644 --- a/src/main/java/com/hyundai/domain/payment/service/RefundServiceImpl.java +++ b/src/main/java/com/hyundai/domain/payment/service/RefundServiceImpl.java @@ -13,6 +13,10 @@ import java.net.URL; import java.util.Map; +/** + * author : 이소민 + */ + @Transactional @Slf4j @RequiredArgsConstructor diff --git a/src/main/java/com/hyundai/domain/product/controller/ProductController.java b/src/main/java/com/hyundai/domain/product/controller/ProductController.java index 1965184..7e95913 100644 --- a/src/main/java/com/hyundai/domain/product/controller/ProductController.java +++ b/src/main/java/com/hyundai/domain/product/controller/ProductController.java @@ -17,6 +17,9 @@ import java.io.IOException; import java.util.List; +/** + * author : 이소민 + */ @Slf4j @RestController diff --git a/src/main/java/com/hyundai/domain/product/dto/IngredientExpansion.java b/src/main/java/com/hyundai/domain/product/dto/IngredientExpansion.java index c7dfc0f..c0cccc8 100644 --- a/src/main/java/com/hyundai/domain/product/dto/IngredientExpansion.java +++ b/src/main/java/com/hyundai/domain/product/dto/IngredientExpansion.java @@ -4,6 +4,10 @@ import java.util.List; import java.util.Map; +/** + * author : 이소민 + */ + public class IngredientExpansion { private static final Map> ingredientExpansions = new HashMap<>(); diff --git a/src/main/java/com/hyundai/domain/product/dto/request/ProductRequestDTO.java b/src/main/java/com/hyundai/domain/product/dto/request/ProductRequestDTO.java index cb4b74e..db60294 100644 --- a/src/main/java/com/hyundai/domain/product/dto/request/ProductRequestDTO.java +++ b/src/main/java/com/hyundai/domain/product/dto/request/ProductRequestDTO.java @@ -4,6 +4,10 @@ import lombok.NoArgsConstructor; import lombok.Setter; +/** + * author : 이소민 + */ + @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/hyundai/domain/product/dto/request/SearchRequestDTO.java b/src/main/java/com/hyundai/domain/product/dto/request/SearchRequestDTO.java index 8a93382..a3aa5a4 100644 --- a/src/main/java/com/hyundai/domain/product/dto/request/SearchRequestDTO.java +++ b/src/main/java/com/hyundai/domain/product/dto/request/SearchRequestDTO.java @@ -6,6 +6,9 @@ import java.util.List; +/** + * author : 이소민 + */ @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/hyundai/domain/product/dto/response/ProductResponseDTO.java b/src/main/java/com/hyundai/domain/product/dto/response/ProductResponseDTO.java index 659acf5..b590e9a 100644 --- a/src/main/java/com/hyundai/domain/product/dto/response/ProductResponseDTO.java +++ b/src/main/java/com/hyundai/domain/product/dto/response/ProductResponseDTO.java @@ -10,6 +10,10 @@ import java.util.List; import java.util.stream.Collectors; +/** + * author : 이소민 + */ + @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/hyundai/domain/product/dto/response/ProductWithCountResponseDTO.java b/src/main/java/com/hyundai/domain/product/dto/response/ProductWithCountResponseDTO.java index 31cf54a..4c861fa 100644 --- a/src/main/java/com/hyundai/domain/product/dto/response/ProductWithCountResponseDTO.java +++ b/src/main/java/com/hyundai/domain/product/dto/response/ProductWithCountResponseDTO.java @@ -1,7 +1,6 @@ package com.hyundai.domain.product.dto.response; -import lombok.Builder; -import lombok.Getter; +import lombok.*; import java.util.List; @@ -13,6 +12,9 @@ */ @Getter @Builder +@Setter +@NoArgsConstructor +@AllArgsConstructor public class ProductWithCountResponseDTO { private int total; private List productResponseDTOList; diff --git a/src/main/java/com/hyundai/domain/product/dto/response/RecommendProducts.java b/src/main/java/com/hyundai/domain/product/dto/response/RecommendProducts.java index 5fe0e81..7df43e9 100644 --- a/src/main/java/com/hyundai/domain/product/dto/response/RecommendProducts.java +++ b/src/main/java/com/hyundai/domain/product/dto/response/RecommendProducts.java @@ -5,6 +5,10 @@ import lombok.NoArgsConstructor; import lombok.Setter; +/** + * author : 이소민 + */ + @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/hyundai/domain/product/entity/Product.java b/src/main/java/com/hyundai/domain/product/entity/Product.java index 62331e1..1872431 100644 --- a/src/main/java/com/hyundai/domain/product/entity/Product.java +++ b/src/main/java/com/hyundai/domain/product/entity/Product.java @@ -1,6 +1,5 @@ package com.hyundai.domain.product.entity; -import com.hyundai.domain.product.dto.request.ProductRequestDTO; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -10,6 +9,10 @@ import java.time.LocalDateTime; +/** + * author : 이소민 + */ + @Getter @Setter @AllArgsConstructor @@ -33,18 +36,4 @@ public class Product { private LocalDateTime createdAt; private LocalDateTime modifiedAt; private LocalDateTime deletedAt; - - /*public Product(ProductRequestDTO productRequestDTO) { - this.productName = productRequestDTO.getProductName(); - this.productSubName = productRequestDTO.getProductSubName(); - this.price = productRequestDTO.getPrice(); - this.productType = productRequestDTO.getProductType(); - this.stock = productRequestDTO.getStock(); - this.discountRate = productRequestDTO.getDiscountRate(); - this.amount = productRequestDTO.getAmount(); - this.calorie = productRequestDTO.getCalorie(); - this.storage = productRequestDTO.getProductStorage(); - this.productDetail = productRequestDTO.getProductDetail(); - this.thumbnailImageUrl = productRequestDTO.getThumbnailImageUrl(); - }*/ } \ No newline at end of file diff --git a/src/main/java/com/hyundai/domain/product/repository/ProductSearchRepository.java b/src/main/java/com/hyundai/domain/product/repository/ProductSearchRepository.java index e7afc84..2dad657 100644 --- a/src/main/java/com/hyundai/domain/product/repository/ProductSearchRepository.java +++ b/src/main/java/com/hyundai/domain/product/repository/ProductSearchRepository.java @@ -17,6 +17,11 @@ import java.util.*; + +/** + * author : 이소민 + */ + public interface ProductSearchRepository extends ElasticsearchRepository { default List search(SearchRequestDTO searchRequestDTO, ElasticsearchOperations elasticsearchOperations) { BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); diff --git a/src/main/java/com/hyundai/domain/product/service/ProductService.java b/src/main/java/com/hyundai/domain/product/service/ProductService.java index a5cb296..fd02d20 100644 --- a/src/main/java/com/hyundai/domain/product/service/ProductService.java +++ b/src/main/java/com/hyundai/domain/product/service/ProductService.java @@ -11,6 +11,10 @@ import java.io.IOException; import java.util.List; +/** + * author : 이소민 + */ + public interface ProductService { ProductWithCountResponseDTO getProducts(ProductCriteria productCriteria, String memberId); ProductResponseDTO getProductDetail(Long productId); diff --git a/src/main/java/com/hyundai/domain/product/service/ProductServiceImpl.java b/src/main/java/com/hyundai/domain/product/service/ProductServiceImpl.java index 33c9c03..5e5bd07 100644 --- a/src/main/java/com/hyundai/domain/product/service/ProductServiceImpl.java +++ b/src/main/java/com/hyundai/domain/product/service/ProductServiceImpl.java @@ -11,6 +11,7 @@ import com.hyundai.global.mapper.ProductMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.cache.annotation.Cacheable; import org.springframework.data.elasticsearch.core.ElasticsearchTemplate; import org.springframework.http.*; import org.springframework.http.converter.StringHttpMessageConverter; @@ -32,6 +33,10 @@ import static com.hyundai.domain.product.dto.response.ProductResponseDTO.listOf; +/** + * author : 이소민 + */ + @Slf4j @Service @RequiredArgsConstructor @@ -44,7 +49,7 @@ public class ProductServiceImpl implements ProductService{ @Transactional(readOnly = true) // product나 product_like가 바뀌면 캐시 삭제 해줘야 함 // (product가 바뀌면 allEntries = true, product_like가 바뀌면 해당 key(memberId) 캐시 삭제) -// @Cacheable(cacheNames = "ProductResponseDTOs", key = "#memberId != null ? #memberId : 'anonymous'") + @Cacheable(cacheNames = "ProductResponseDTOs", key = "#memberId != null ? #memberId : 'anonymous'") public ProductWithCountResponseDTO getProducts(ProductCriteria productCriteria, String memberId) { Map params = new HashMap<>(); params.put("memberId", memberId); @@ -151,7 +156,7 @@ public List getImageSearchProducts(MultipartFile image) throw RestTemplate restTemplate = new RestTemplate(); restTemplate.getMessageConverters().add(0, new StringHttpMessageConverter(StandardCharsets.UTF_8)); - String fastApiUrl = "http://3.37.206.197:8000/ai/image-search"; + String fastApiUrl = "http://localhost:8000/ai/image-search"; HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.MULTIPART_FORM_DATA); diff --git a/src/main/java/com/hyundai/domain/recommendation/controller/RecommendationController.java b/src/main/java/com/hyundai/domain/recommendation/controller/RecommendationController.java index 40cde39..8203882 100644 --- a/src/main/java/com/hyundai/domain/recommendation/controller/RecommendationController.java +++ b/src/main/java/com/hyundai/domain/recommendation/controller/RecommendationController.java @@ -23,6 +23,9 @@ import java.nio.charset.StandardCharsets; import java.util.List; +/** + * author : 이소민 + */ @RestController @RequestMapping("/recommendation") diff --git a/src/main/java/com/hyundai/domain/recommendation/dto/request/MainRequestDTO.java b/src/main/java/com/hyundai/domain/recommendation/dto/request/MainRequestDTO.java index ad78f95..998fa4d 100644 --- a/src/main/java/com/hyundai/domain/recommendation/dto/request/MainRequestDTO.java +++ b/src/main/java/com/hyundai/domain/recommendation/dto/request/MainRequestDTO.java @@ -4,6 +4,10 @@ import lombok.NoArgsConstructor; import lombok.Setter; +/** + * author : 이소민 + */ + @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/hyundai/domain/recommendation/dto/response/MainRecommendProducts.java b/src/main/java/com/hyundai/domain/recommendation/dto/response/MainRecommendProducts.java index b4496d7..5b81ec6 100644 --- a/src/main/java/com/hyundai/domain/recommendation/dto/response/MainRecommendProducts.java +++ b/src/main/java/com/hyundai/domain/recommendation/dto/response/MainRecommendProducts.java @@ -8,6 +8,10 @@ import java.util.List; +/** + * author : 이소민 + */ + @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/hyundai/domain/recommendation/service/RecommendationService.java b/src/main/java/com/hyundai/domain/recommendation/service/RecommendationService.java index c83f867..d63d5a6 100644 --- a/src/main/java/com/hyundai/domain/recommendation/service/RecommendationService.java +++ b/src/main/java/com/hyundai/domain/recommendation/service/RecommendationService.java @@ -6,6 +6,9 @@ import java.util.List; +/** + * author : 이소민 + */ public interface RecommendationService { List getRecommendWines(Long productId); diff --git a/src/main/java/com/hyundai/domain/recommendation/service/RecommendationServiceImpl.java b/src/main/java/com/hyundai/domain/recommendation/service/RecommendationServiceImpl.java index d184186..01f243a 100644 --- a/src/main/java/com/hyundai/domain/recommendation/service/RecommendationServiceImpl.java +++ b/src/main/java/com/hyundai/domain/recommendation/service/RecommendationServiceImpl.java @@ -24,6 +24,10 @@ import java.util.Calendar; import java.util.List; +/** + * author : 이소민 + */ + @Slf4j @Service @RequiredArgsConstructor @@ -34,7 +38,6 @@ public class RecommendationServiceImpl implements RecommendationService { @Override @Transactional(readOnly = true) public List getRecommendWines(Long productId) { - // todo productid 검증 return productMapper.findRecommendWines(productId); } @@ -64,7 +67,7 @@ public List getMainRecommendProducts(String memberId) thr RestTemplate restTemplate = new RestTemplate(); restTemplate.getMessageConverters().add(0, new StringHttpMessageConverter(StandardCharsets.UTF_8)); - String fastApiUrl = "http://3.37.206.197:8000/ai/age-gender-recommendation"; + String fastApiUrl = "http://localhost:8000/ai/age-gender-recommendation"; HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); diff --git a/src/main/java/com/hyundai/global/config/ElasticSearchConfig.java b/src/main/java/com/hyundai/global/config/ElasticSearchConfig.java index 1c978e0..63a3590 100644 --- a/src/main/java/com/hyundai/global/config/ElasticSearchConfig.java +++ b/src/main/java/com/hyundai/global/config/ElasticSearchConfig.java @@ -12,6 +12,10 @@ import java.net.InetAddress; +/** + * author : 이소민 + */ + @Configuration @EnableElasticsearchRepositories(basePackages = "com.hyundai.domain.product.repository") public class ElasticSearchConfig { diff --git a/src/main/java/com/hyundai/global/config/RedisConfig.java b/src/main/java/com/hyundai/global/config/RedisConfig.java index 381be23..6acdd0f 100644 --- a/src/main/java/com/hyundai/global/config/RedisConfig.java +++ b/src/main/java/com/hyundai/global/config/RedisConfig.java @@ -20,6 +20,10 @@ import java.time.Duration; +/** + * author : 이소민 + */ + @EnableCaching @Configuration @RequiredArgsConstructor From d939a48f0e2947a7d68ba388d748e62fce18f073 Mon Sep 17 00:00:00 2001 From: SoMin Date: Tue, 12 Mar 2024 14:54:25 +0900 Subject: [PATCH 2/2] =?UTF-8?q?docs=20:=20author=20=EC=B6=94=EA=B0=80=20(?= =?UTF-8?q?=EC=9D=B4=EC=86=8C=EB=AF=BC)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hyundai/domain/product/service/ProductServiceImpl.java | 5 ++--- .../recommendation/service/RecommendationServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/hyundai/domain/product/service/ProductServiceImpl.java b/src/main/java/com/hyundai/domain/product/service/ProductServiceImpl.java index 5e5bd07..af9106c 100644 --- a/src/main/java/com/hyundai/domain/product/service/ProductServiceImpl.java +++ b/src/main/java/com/hyundai/domain/product/service/ProductServiceImpl.java @@ -11,7 +11,6 @@ import com.hyundai.global.mapper.ProductMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.cache.annotation.Cacheable; import org.springframework.data.elasticsearch.core.ElasticsearchTemplate; import org.springframework.http.*; import org.springframework.http.converter.StringHttpMessageConverter; @@ -49,7 +48,7 @@ public class ProductServiceImpl implements ProductService{ @Transactional(readOnly = true) // product나 product_like가 바뀌면 캐시 삭제 해줘야 함 // (product가 바뀌면 allEntries = true, product_like가 바뀌면 해당 key(memberId) 캐시 삭제) - @Cacheable(cacheNames = "ProductResponseDTOs", key = "#memberId != null ? #memberId : 'anonymous'") + // @Cacheable(cacheNames = "ProductResponseDTOs", key = "#memberId != null ? #memberId : 'anonymous'") public ProductWithCountResponseDTO getProducts(ProductCriteria productCriteria, String memberId) { Map params = new HashMap<>(); params.put("memberId", memberId); @@ -156,7 +155,7 @@ public List getImageSearchProducts(MultipartFile image) throw RestTemplate restTemplate = new RestTemplate(); restTemplate.getMessageConverters().add(0, new StringHttpMessageConverter(StandardCharsets.UTF_8)); - String fastApiUrl = "http://localhost:8000/ai/image-search"; + String fastApiUrl = "http://3.37.206.197:8000/ai/image-search"; HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.MULTIPART_FORM_DATA); diff --git a/src/main/java/com/hyundai/domain/recommendation/service/RecommendationServiceImpl.java b/src/main/java/com/hyundai/domain/recommendation/service/RecommendationServiceImpl.java index 01f243a..fa3bcdd 100644 --- a/src/main/java/com/hyundai/domain/recommendation/service/RecommendationServiceImpl.java +++ b/src/main/java/com/hyundai/domain/recommendation/service/RecommendationServiceImpl.java @@ -67,7 +67,7 @@ public List getMainRecommendProducts(String memberId) thr RestTemplate restTemplate = new RestTemplate(); restTemplate.getMessageConverters().add(0, new StringHttpMessageConverter(StandardCharsets.UTF_8)); - String fastApiUrl = "http://localhost:8000/ai/age-gender-recommendation"; + String fastApiUrl = "http://3.37.206.197:8000/ai/age-gender-recommendation"; HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON);