payment-service update

Author: hoangtien2k3

favourite-service/src/main/resources/application.properties

@@ -13,8 +13,8 @@ spring.datasource.password=12042003
 spring.jpa.show-sql=false
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect
-spring.jpa.properties.hibernate.use_sql_comments=true
-spring.jpa.properties.hibernate.format_sql=true
+spring.jpa.properties.hibernate.use_sql_comments=false
+spring.jpa.properties.hibernate.format_sql=false
 
 # log api for resources
 logging.file.name=src/main/resources/script/prod_log.log

notification-service/src/main/java/com/hoangtien2k3/notificationservice/api/NotificationController.java

@@ -40,9 +40,9 @@ public ResponseEntity<Notification> saveNotification(@RequestBody Notification n
     }
 
     @DeleteMapping("/{id}")
-    public ResponseEntity<Void> deleteNotification(@PathVariable String id) {
+    public ResponseEntity<Boolean> deleteNotification(@PathVariable String id) {
         notificationService.deleteNotificationById(id);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+        return new ResponseEntity<>(true, HttpStatus.OK);
     }
 
 }

notification-service/src/main/java/com/hoangtien2k3/notificationservice/api/PaymentController.java

@@ -0,0 +1,42 @@
+package com.hoangtien2k3.notificationservice.api;
+
+import com.hoangtien2k3.notificationservice.dto.PaymentDto;
+import com.hoangtien2k3.notificationservice.entity.Payment;
+import com.hoangtien2k3.notificationservice.service.PaymentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/payments")
+public class PaymentController {
+
+    private final PaymentService paymentService;
+
+    @Autowired
+    public PaymentController(PaymentService paymentService) {
+        this.paymentService = paymentService;
+    }
+
+    @PostMapping
+    public Mono<Payment> savePayment(@RequestBody PaymentDto paymentDto) {
+        return paymentService.savePayment(paymentDto);
+    }
+
+    @GetMapping("/{paymentId}")
+    public Mono<Payment> getPayment(@PathVariable Integer paymentId) {
+        return paymentService.getPayment(paymentId);
+    }
+
+    @GetMapping
+    public Mono<List<Payment>> getAllPayments() {
+        return paymentService.getAllPayments();
+    }
+
+    @DeleteMapping("/{paymentId}")
+    public Mono<Void> deletePayment(@PathVariable Integer paymentId) {
+        return paymentService.deletePayment(paymentId);
+    }
+}

notification-service/src/main/java/com/hoangtien2k3/notificationservice/constant/KafkaConstant.java

@@ -0,0 +1,18 @@
+package com.hoangtien2k3.notificationservice.constant;
+
+public class KafkaConstant {
+    public static final String PROFILE_ONBOARDING_TOPIC = "profileOnboarding";
+    public static final String PROFILE_ONBOARDED_TOPIC = "profileOnboarded";
+
+    public static final String STATUS_PROFILE_PENDING = "PENDING";
+    public static final String STATUS_PROFILE_ACTIVE = "ACTIVE";
+
+    public static final String STATUS_PAYMENT_CREATING = "CREATING";
+    public static final String STATUS_PAYMENT_REJECTED = "REJECTED";
+    public static final String STATUS_PAYMENT_PROCESSING = "PROCESSING";
+    public static final String STATUS_PAYMENT_SUCCESSFUL = "SUCCESSFUL";
+
+    public static final String PAYMENT_REQUEST_TOPIC = "paymentRequest";
+    public static final String PAYMENT_CREATED_TOPIC = "paymentCreated";
+    public static final String PAYMENT_COMPLETED_TOPIC = "paymentCompleted";
+}

notification-service/src/main/java/com/hoangtien2k3/notificationservice/dto/PaymentDto.java

@@ -0,0 +1,27 @@
+package com.hoangtien2k3.notificationservice.dto;
+
+import com.hoangtien2k3.notificationservice.entity.PaymentStatus;
+import lombok.*;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+@Setter
+@Getter
+@Builder
+public class PaymentDto implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Integer paymentId;
+    private Boolean isPayed;
+    private PaymentStatus paymentStatus;
+
+    private Integer orderId;
+    private Long userId;
+
+}

notification-service/src/main/java/com/hoangtien2k3/notificationservice/entity/Notification.java

@@ -2,16 +2,17 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
 
 import java.time.LocalDateTime;
 
-//@Entity
 @Setter
-@Getter@AllArgsConstructor
+@Getter
+@AllArgsConstructor
 @Document(collection = "notifications")
 public class Notification {
 

notification-service/src/main/java/com/hoangtien2k3/notificationservice/entity/Payment.java

@@ -0,0 +1,26 @@
+package com.hoangtien2k3.notificationservice.entity;
+
+import lombok.*;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Document(collection = "payments")
+public class Payment {
+
+    @Id
+    private String id;
+
+    private Integer paymentId;
+    private Boolean isPayed;
+    private PaymentStatus paymentStatus;
+
+    private Integer orderId;
+    private Long userId;
+
+}
+

notification-service/src/main/java/com/hoangtien2k3/notificationservice/entity/PaymentStatus.java

@@ -0,0 +1,16 @@
+package com.hoangtien2k3.notificationservice.entity;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public enum PaymentStatus {
+
+    NOT_STARTED("not_started"),
+    IN_PROGRESS("in_progress"),
+    COMPLETED("completed");
+
+    private final String status;
+
+}

notification-service/src/main/java/com/hoangtien2k3/notificationservice/event/EventConsumer.java

@@ -1,9 +1,12 @@
 package com.hoangtien2k3.notificationservice.event;
 
 import com.google.gson.Gson;
-import com.hoangtien2k3.notificationservice.config.KafkaConstant;
+import com.hoangtien2k3.notificationservice.constant.KafkaConstant;
 import com.hoangtien2k3.notificationservice.dto.EmailDetails;
+import com.hoangtien2k3.notificationservice.dto.PaymentDto;
 import com.hoangtien2k3.notificationservice.service.EmailService;
+import com.hoangtien2k3.notificationservice.service.NotificationService;
+import com.hoangtien2k3.notificationservice.service.PaymentService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -12,24 +15,44 @@
 import reactor.kafka.receiver.ReceiverRecord;
 
 import java.util.Collections;
+import java.util.function.Consumer;
 
 @Service
 @Slf4j
 public class EventConsumer {
+
     Gson gson = new Gson(); // convert Json -> DTO
 
     @Autowired
     private EmailService emailService;
 
+    @Autowired
+    private PaymentService paymentService;
+
     @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) {
-        KafkaReceiver.create(receiverOptions.subscription(Collections.singleton(KafkaConstant.PROFILE_ONBOARDING_TOPIC)))
+        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) {
+        KafkaReceiver.create(receiverOptions.subscription(Collections.singleton(topic)))
                 .receive()
-                .subscribe(this::sendEmailKafkaOnboarding);
+                .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);
@@ -39,4 +62,18 @@ public void sendEmailKafkaOnboarding(ReceiverRecord<String, String> receiverReco
             eventProducer.send(KafkaConstant.PROFILE_ONBOARDED_TOPIC, gson.toJson(email)).subscribe();
         });
     }
+
+
+    public void paymentOrderKafkaOnboarding(ReceiverRecord<String, String> receiverRecord) {
+        log.info("Profile Onboarding event");
+
+        PaymentDto paymentDto = gson.fromJson(receiverRecord.value(), PaymentDto.class);
+        paymentService.savePayment(paymentDto).subscribe(res -> {
+
+            eventProducer.send(KafkaConstant.PROFILE_ONBOARDED_TOPIC, gson.toJson(paymentDto)).subscribe();
+        });
+
+    }
+
+
 }

notification-service/src/main/java/com/hoangtien2k3/notificationservice/helper/PaymentMappingHelper.java

@@ -0,0 +1,30 @@
+package com.hoangtien2k3.notificationservice.helper;
+
+import com.hoangtien2k3.notificationservice.dto.PaymentDto;
+import com.hoangtien2k3.notificationservice.entity.Payment;
+
+public interface PaymentMappingHelper {
+
+    static PaymentDto map(Payment payment) {
+        if (payment == null) return null;
+        return PaymentDto.builder()
+                .paymentId(payment.getPaymentId())
+                .isPayed(payment.getIsPayed())
+                .paymentStatus(payment.getPaymentStatus())
+                .orderId(payment.getOrderId())
+                .userId(payment.getUserId())
+                .build();
+    }
+
+    static Payment map(PaymentDto paymentDto) {
+        if (paymentDto == null) return null;
+        return Payment.builder()
+                .paymentId(paymentDto.getPaymentId())
+                .isPayed(paymentDto.getIsPayed())
+                .paymentStatus(paymentDto.getPaymentStatus())
+                .orderId(paymentDto.getOrderId())
+                .userId(paymentDto.getUserId())
+                .build();
+    }
+
+}