update

hoangtien2k3 · hoangtien2k3 · commit 3334d6e3677c · 2024-01-10T16:53:07.000+07:00
diff --git a/notification-service/src/main/java/com/hoangtien2k3/notificationservice/constant/AppConstant.java b/notification-service/src/main/java/com/hoangtien2k3/notificationservice/constant/AppConstant.java
@@ -0,0 +1,38 @@
+package com.hoangtien2k3.notificationservice.constant;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public abstract class AppConstant {
+
+    public static final String LOCAL_DATE_FORMAT = "dd-MM-yyyy";
+    public static final String LOCAL_DATE_TIME_FORMAT = "dd-MM-yyyy__HH:mm:ss:SSSSSS";
+    public static final String ZONED_DATE_TIME_FORMAT = "dd-MM-yyyy__HH:mm:ss:SSSSSS";
+    public static final String INSTANT_FORMAT = "dd-MM-yyyy__HH:mm:ss:SSSSSS";
+
+    @NoArgsConstructor(access = AccessLevel.PRIVATE)
+    public abstract static class DiscoveredDomainsApi {
+
+        public static final String USER_SERVICE_HOST = "http://USER-SERVICE/user-service";
+//        public static final String USER_SERVICE_API_URL = "http://USER-SERVICE/user-service/api/users";
+        public static final String USER_SERVICE_API_URL = "http://localhost:8088/api/manager";
+
+        public static final String PRODUCT_SERVICE_HOST = "http://PRODUCT-SERVICE/product-service";
+        public static final String PRODUCT_SERVICE_API_URL = "http://PRODUCT-SERVICE/product-service/api/products";
+
+        public static final String ORDER_SERVICE_HOST = "http://ORDER-SERVICE/order-service";
+        public static final String ORDER_SERVICE_API_URL = "http://ORDER-SERVICE/order-service/api/orders";
+
+        public static final String FAVOURITE_SERVICE_HOST = "http://FAVOURITE-SERVICE/favourite-service";
+        public static final String FAVOURITE_SERVICE_API_URL = "http://FAVOURITE-SERVICE/favourite-service/api/favourites";
+
+        public static final String PAYMENT_SERVICE_HOST = "http://PAYMENT-SERVICE/payment-service";
+        public static final String PAYMENT_SERVICE_API_URL = "http://PAYMENT-SERVICE/payment-service/api/payments";
+
+        public static final String SHIPPING_SERVICE_HOST = "http://SHIPPING-SERVICE/shipping-service";
+        public static final String SHIPPING_SERVICE_API_URL = "http://SHIPPING-SERVICE/shipping-service/api/shippings";
+
+    }
+
+}
diff --git a/notification-service/src/main/java/com/hoangtien2k3/notificationservice/dto/EmailDetails.java b/notification-service/src/main/java/com/hoangtien2k3/notificationservice/dto/EmailDetails.java
@@ -1,12 +1,14 @@
 package com.hoangtien2k3.notificationservice.dto;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@Builder
 public class EmailDetails {
     private String recipient;
     private String msgBody;
diff --git a/notification-service/src/main/java/com/hoangtien2k3/notificationservice/dto/OrderDto.java b/notification-service/src/main/java/com/hoangtien2k3/notificationservice/dto/OrderDto.java
@@ -0,0 +1,50 @@
+package com.hoangtien2k3.notificationservice.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.hoangtien2k3.notificationservice.constant.AppConstant;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+@Builder
+public class OrderDto implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Integer orderId;
+
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonFormat(pattern = AppConstant.LOCAL_DATE_TIME_FORMAT, shape = JsonFormat.Shape.STRING)
+    @DateTimeFormat(pattern = AppConstant.LOCAL_DATE_TIME_FORMAT)
+    private LocalDateTime orderDate;
+
+    private String orderDesc;
+    private Double orderFee;
+    private Integer productId;
+
+//    @JsonProperty("product")
+//    @JsonInclude(JsonInclude.Include.NON_NULL)
+//    private ProductDto productDto;
+//
+//    @JsonProperty("cart")
+//    @JsonInclude(JsonInclude.Include.NON_NULL)
+//    private CartDto cartDto;
+
+}
diff --git a/notification-service/src/main/java/com/hoangtien2k3/notificationservice/event/EventConsumer.java b/notification-service/src/main/java/com/hoangtien2k3/notificationservice/event/EventConsumer.java
@@ -4,6 +4,7 @@
 import com.hoangtien2k3.notificationservice.constant.KafkaConstant;
 import com.hoangtien2k3.notificationservice.dto.EmailDetails;
 import com.hoangtien2k3.notificationservice.dto.PaymentDto;
+import com.hoangtien2k3.notificationservice.entity.PaymentStatus;
 import com.hoangtien2k3.notificationservice.service.EmailService;
 import com.hoangtien2k3.notificationservice.service.NotificationService;
 import com.hoangtien2k3.notificationservice.service.PaymentService;
@@ -14,6 +15,10 @@
 import reactor.kafka.receiver.ReceiverOptions;
 import reactor.kafka.receiver.ReceiverRecord;
 
+import java.sql.Time;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.Collections;
 import java.util.function.Consumer;
 
@@ -32,27 +37,18 @@ public class EventConsumer {
     @Autowired
     private EventProducer eventProducer;
 
-//    public EventConsumer(ReceiverOptions<String, String> receiverOptions) {
-//        KafkaReceiver.create(receiverOptions.subscription(Collections.singleton(KafkaConstant.PROFILE_ONBOARDING_TOPIC)))
-//                .receive()
-//                .subscribe(this::sendEmailKafkaOnboarding);
-//    }
-
-
     public EventConsumer(ReceiverOptions<String, String> receiverOptions) {
         subscribeToTopic(receiverOptions, KafkaConstant.PROFILE_ONBOARDING_TOPIC, this::sendEmailKafkaOnboarding);
         subscribeToTopic(receiverOptions, KafkaConstant.STATUS_PAYMENT_SUCCESSFUL, this::paymentOrderKafkaOnboarding);
-
     }
 
     private void subscribeToTopic(ReceiverOptions<String, String> receiverOptions, String topic, Consumer<ReceiverRecord<String, String>> handler) {
+        log.info("Subscribed to Kafka topic: {}", topic);
         KafkaReceiver.create(receiverOptions.subscription(Collections.singleton(topic)))
                 .receive()
                 .subscribe(handler);
-        log.info("Subscribed to Kafka topic: {}", topic);
     }
 
-
     public void sendEmailKafkaOnboarding(ReceiverRecord<String, String> receiverRecord) {
         log.info("USER-SERVICE Onboarding event send email on notification service.");
         EmailDetails emailDetails = gson.fromJson(receiverRecord.value(), EmailDetails.class);
@@ -63,17 +59,32 @@ public void sendEmailKafkaOnboarding(ReceiverRecord<String, String> receiverReco
         });
     }
 
-
     public void paymentOrderKafkaOnboarding(ReceiverRecord<String, String> receiverRecord) {
-        log.info("Profile Onboarding event");
+        log.info("Payment Onboarding event send notification-service payment.");
 
         PaymentDto paymentDto = gson.fromJson(receiverRecord.value(), PaymentDto.class);
         paymentService.savePayment(paymentDto).subscribe(res -> {
-
             eventProducer.send(KafkaConstant.PROFILE_ONBOARDED_TOPIC, gson.toJson(paymentDto)).subscribe();
         });
 
+        EmailDetails emailDetails = EmailDetails.builder()
+                .recipient("hoangtien2k3dev@gmail.com")
+                .msgBody(msgBody(paymentDto.getIsPayed(), paymentDto.getPaymentStatus()))
+                .subject("Payment Successfully in Order with userId: " + paymentDto.getUserId())
+                .attachment("Please, check the full information in invoice: " + LocalDateTime.now())
+                .build();
+        emailService.sendSimpleMail(emailDetails).subscribe(email -> {
+            eventProducer.send(KafkaConstant.PROFILE_ONBOARDED_TOPIC, gson.toJson(email)).subscribe();
+        });
+
     }
 
+    public String msgBody(Boolean isPayed, PaymentStatus paymentStatus) {
+        return "Payment in order product cart successfully: \n " +
+                " + IsPays: " + isPayed +
+                "\n + PaymentStatus: " + paymentStatus.getStatus() +
+                "\n\nDate: " + LocalDate.now() +
+                "\nTime: " + LocalTime.now();
+    }
 
 }
diff --git a/notification-service/src/main/java/com/hoangtien2k3/notificationservice/service/impl/EmailServiceImpl.java b/notification-service/src/main/java/com/hoangtien2k3/notificationservice/service/impl/EmailServiceImpl.java
@@ -77,7 +77,6 @@ public Mono<String> sendMail(MultipartFile[] files, String to, String[] cc, Stri
         return Mono.fromCallable(() -> {
                     MimeMessage mimeMessage = javaMailSender.createMimeMessage();
                     MimeMessageHelper mimeMessageHelper = new MimeMessageHelper(mimeMessage, true);
-
                     mimeMessageHelper.setFrom(fromEmail);
                     mimeMessageHelper.setTo(to);
                     mimeMessageHelper.setCc(cc);
@@ -91,7 +90,6 @@ public Mono<String> sendMail(MultipartFile[] files, String to, String[] cc, Stri
                     }
 
                     javaMailSender.send(mimeMessage);
-
                     return "Email sent successfully to " + Arrays.toString(cc);
                 })
                 .onErrorResume(Exception.class, ex -> {
diff --git a/order-service/src/main/java/com/hoangtien2k3/orderservice/api/OrderController.java b/order-service/src/main/java/com/hoangtien2k3/orderservice/api/OrderController.java
@@ -140,4 +140,10 @@ public Mono<ResponseEntity<Boolean>> deleteById(@PathVariable("orderId") final S
                 .defaultIfEmpty(ResponseEntity.status(HttpStatus.NOT_FOUND).body(false));
     }
 
+
+    @GetMapping("/existOrderId")
+    public Boolean existsByOrderId(Integer orderId) {
+        return orderService.existsByOrderId(orderId);
+    }
+
 }
diff --git a/order-service/src/main/java/com/hoangtien2k3/orderservice/dto/order/OrderDto.java b/order-service/src/main/java/com/hoangtien2k3/orderservice/dto/order/OrderDto.java
@@ -15,7 +15,6 @@
 import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
 import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
diff --git a/order-service/src/main/java/com/hoangtien2k3/orderservice/service/OrderService.java b/order-service/src/main/java/com/hoangtien2k3/orderservice/service/OrderService.java
@@ -20,4 +20,6 @@ public interface OrderService {
     Mono<OrderDto> update(final Integer orderId, final OrderDto orderDto);
 
     Mono<Void> deleteById(final Integer orderId);
+
+    Boolean existsByOrderId(Integer orderId);
 }
diff --git a/order-service/src/main/java/com/hoangtien2k3/orderservice/service/impl/OrderServiceImpl.java b/order-service/src/main/java/com/hoangtien2k3/orderservice/service/impl/OrderServiceImpl.java
@@ -1,6 +1,7 @@
 package com.hoangtien2k3.orderservice.service.impl;
 
 import com.hoangtien2k3.orderservice.dto.order.OrderDto;
+import com.hoangtien2k3.orderservice.entity.Order;
 import com.hoangtien2k3.orderservice.exception.wrapper.CartNotFoundException;
 import com.hoangtien2k3.orderservice.exception.wrapper.OrderNotFoundException;
 import com.hoangtien2k3.orderservice.helper.OrderMappingHelper;
@@ -19,6 +20,7 @@
 
 import javax.transaction.Transactional;
 import java.util.List;
+import java.util.Optional;
 
 @Transactional
 @Slf4j
@@ -103,6 +105,12 @@ public Mono<OrderDto> findById(Integer orderId) {
                 );
     }
 
+    // check orderId in exist in database.
+    @Override
+    public Boolean existsByOrderId(Integer orderId) {
+         return orderRepository.findById(orderId).isPresent();
+    }
+
     @Override
     public Mono<OrderDto> save(final OrderDto orderDto) {
         log.info("OrderDto, service; save order");
diff --git a/payment-service/src/main/java/com/hoangtien2k3/paymentservice/config/client/ClientConfig.java b/payment-service/src/main/java/com/hoangtien2k3/paymentservice/config/client/ClientConfig.java
@@ -14,10 +14,8 @@ public RestTemplate restTemplateBean() {
         return new RestTemplate();
     }
 
-//    @LoadBalanced
     @Bean
     public WebClient.Builder webClientBuilder() {
         return WebClient.builder();
     }
-
 }
diff --git a/payment-service/src/main/java/com/hoangtien2k3/paymentservice/service/impl/PaymentServiceImpl.java b/payment-service/src/main/java/com/hoangtien2k3/paymentservice/service/impl/PaymentServiceImpl.java
@@ -21,6 +21,7 @@
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Scheduler;
 import reactor.core.scheduler.Schedulers;
 
 import javax.transaction.Transactional;
@@ -109,7 +110,7 @@ public Mono<PaymentDto> findById(Integer paymentId) {
                                             .map(userDto -> {
                                                 paymentDto.setUserDto(modelMapper.map(userDto, UserDto.class));
                                                 return paymentDto;
-                                            })
+                                            }).publishOn(Schedulers.boundedElastic())
                                             .switchIfEmpty(Mono.just(paymentDto));
 
                                 })
@@ -125,7 +126,6 @@ public Mono<OrderDto> getOrderDto(Integer orderId) {
                 .map(orderDto -> modelMapper.map(orderDto, OrderDto.class));
     }
 
-
     @Override
     public Mono<PaymentDto> save(PaymentDto paymentDto) {
         log.info("PaymentDto, service; save order");
diff --git a/src/main/resources/script/prod_log.log.2024-01-09.1.gz b/src/main/resources/script/prod_log.log.2024-01-09.1.gz
diff --git a/src/main/resources/script/stage_log.log.2024-01-09.080469086209582.tmp b/src/main/resources/script/stage_log.log.2024-01-09.080469086209582.tmp
diff --git a/src/main/resources/script/stage_log.log.2024-01-09.080471003069153.tmp b/src/main/resources/script/stage_log.log.2024-01-09.080471003069153.tmp

Original file line number	Diff line number	Diff line change
`@@ -140,4 +140,10 @@ public Mono<ResponseEntity<Boolean>> deleteById(@PathVariable("orderId") final S`
`140`	`140`	`.defaultIfEmpty(ResponseEntity.status(HttpStatus.NOT_FOUND).body(false));`
`141`	`141`	`}`
`142`	`142`
	`143`	`+`
	`144`	`+ @GetMapping("/existOrderId")`
	`145`	`+ public Boolean existsByOrderId(Integer orderId) {`
	`146`	`+ return orderService.existsByOrderId(orderId);`
	`147`	`+ }`
	`148`	`+`
`143`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,6 @@ public interface OrderService {`
`20`	`20`	`Mono<OrderDto> update(final Integer orderId, final OrderDto orderDto);`
`21`	`21`
`22`	`22`	`Mono<Void> deleteById(final Integer orderId);`
	`23`	`+`
	`24`	`+ Boolean existsByOrderId(Integer orderId);`
`23`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,8 @@ public RestTemplate restTemplateBean() {`
`14`	`14`	`return new RestTemplate();`
`15`	`15`	`}`
`16`	`16`
`17`		`-// @LoadBalanced`
`18`	`17`	`@Bean`
`19`	`18`	`public WebClient.Builder webClientBuilder() {`
`20`	`19`	`return WebClient.builder();`
`21`	`20`	`}`
`22`		`-`
`23`	`21`	`}`