Merge pull request #77 from NashTech-Labs/feature/unit-test-for-order…

…-service

readme file added and code coverage completed.

order-service/README.md

@@ -31,6 +31,11 @@ curl --location 'http://localhost:9090/orders/create' \
 ```
 curl --location 'http://localhost:9090/orders/1652'
 ```
+
+## Saga Orchestration
+Saga orchestration is a design pattern in distributed systems where car-demo process is broken down into a series of smaller, independent transactions (sagas) that can be orchestrated to ensure consistency and reliability across the entire process.
+
+![saga.png](..%2Fdocumentation%2Fsaga.png)
 ## Contributing
 
 Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.

order-service/pom.xml

@@ -193,7 +193,7 @@
                 <sonar.organization>nashtech</sonar.organization>
                 <sonar.host.url>https://sonarcloud.io</sonar.host.url>
                 <sonarConfig>b47aeba29df2889126c736ee7012a5a490edc34a</sonarConfig> <!-- NOSONAR -->
-                <sonar.login>${sonarConfig}</sonar.login> <!-- NOSONAR -->
+                <sonar.token>${sonarConfig}</sonar.token> <!-- NOSONAR -->
                 <sonar.jacoco.reportPath>target/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
                 <sonar.coverage.exclusions>
                     **/*config*/**,

order-service/src/main/java/com.nashtech.order/OrderApplication.java → order-service/src/main/java/com/nashtech/order/OrderApplication.java

@@ -1,7 +1,7 @@
 package com.nashtech.order;
 
-import com.nashtech.order.commands.CreateOrderCommandInterceptor;
-import com.nashtech.order.exception.handler.OrderServiceEventsErrorHandler;
+import com.nashtech.order.commands.handler.CreateOrderCommandInterceptor;
+import com.nashtech.order.exception.OrderServiceEventsErrorHandler;
 import org.axonframework.commandhandling.CommandBus;
 import org.axonframework.config.EventProcessingConfigurer;
 import org.springframework.beans.factory.annotation.Autowired;

order-service/src/main/java/com.nashtech.order/aggregate/OrderAggregate.java → order-service/src/main/java/com/nashtech/order/aggregate/OrderAggregate.java

@@ -20,13 +20,12 @@ public class OrderAggregate {
 
     @AggregateIdentifier
     private String orderId;
-    private String productId;
-    private String userId;
-    private String paymentId;
-    private String shipmentId;
-    private OrderStatus orderStatus;
-
-    private String reasonToRejectedOrder;
+    String productId;
+    String userId;
+    String paymentId;
+    String shipmentId;
+    OrderStatus orderStatus;
+    String reasonToRejectedOrder;
 
     public OrderAggregate() {
     }

order-service/src/main/java/com.nashtech.order/commands/ApproveOrderCommand.java → order-service/src/main/java/com/nashtech/order/commands/ApproveOrderCommand.java

@@ -2,11 +2,11 @@
 
 import com.nashtech.common.utils.OrderStatus;
 import lombok.Builder;
-import lombok.Value;
+import lombok.Getter;
 import org.axonframework.modelling.command.TargetAggregateIdentifier;
 
-@Value
 @Builder
+@Getter
 public class ApproveOrderCommand {
     @TargetAggregateIdentifier
     String orderId;

order-service/src/main/java/com.nashtech.order/commands/CreateOrderCommand.java → order-service/src/main/java/com/nashtech/order/commands/CreateOrderCommand.java

@@ -1,11 +1,11 @@
 package com.nashtech.order.commands;
 
 import lombok.Builder;
-import lombok.Value;
+import lombok.Getter;
 import org.axonframework.modelling.command.TargetAggregateIdentifier;
 
-@Value
 @Builder
+@Getter
 public class CreateOrderCommand {
     @TargetAggregateIdentifier
     String orderId;

order-service/src/main/java/com.nashtech.order/commands/RejectOrderCommand.java → order-service/src/main/java/com/nashtech/order/commands/RejectOrderCommand.java

@@ -2,22 +2,20 @@
 
 import com.nashtech.common.utils.OrderStatus;
 import lombok.Builder;
-import lombok.Value;
+import lombok.Getter;
 import org.axonframework.modelling.command.TargetAggregateIdentifier;
 
 import java.util.Date;
 
-@Value
 @Builder
+@Getter
 public class RejectOrderCommand {
     @TargetAggregateIdentifier
     String orderId;
     String userId;
     String productId;
     String paymentId;
     String shipmentId;
-    Date timestamp = new Date();
     String reasonToFailed;
-    String errorMessage;
     OrderStatus orderStatus;
 }

order-service/src/main/java/com.nashtech.order/commands/CreateOrderCommandInterceptor.java → order-service/src/main/java/com/nashtech/order/commands/handler/CreateOrderCommandInterceptor.java

@@ -1,5 +1,6 @@
-package com.nashtech.order.commands;
+package com.nashtech.order.commands.handler;
 
+import com.nashtech.order.commands.CreateOrderCommand;
 import com.nashtech.order.repository.OrderLookupRepository;
 import com.nashtech.order.repository.entity.OrderLookupEntity;
 import lombok.extern.slf4j.Slf4j;

order-service/src/main/java/com.nashtech.order/events/OrderApprovedEvent.java → order-service/src/main/java/com/nashtech/order/events/OrderApprovedEvent.java

@@ -2,9 +2,9 @@
 
 import com.nashtech.common.utils.OrderStatus;
 import lombok.Builder;
-import lombok.Value;
+import lombok.Getter;
 
-@Value
+@Getter
 @Builder
 public class OrderApprovedEvent {
     String orderId;

order-service/src/main/java/com.nashtech.order/events/OrderCancelledEvent.java → order-service/src/main/java/com/nashtech/order/events/OrderCancelledEvent.java

@@ -2,10 +2,10 @@
 
 import com.nashtech.common.utils.OrderStatus;
 import lombok.Builder;
-import lombok.Value;
+import lombok.Getter;
 
-@Value
 @Builder
+@Getter
 public class OrderCancelledEvent {
     String orderId;
     String productId;

order-service/src/main/java/com.nashtech.order/events/OrderCreatedEvent.java → order-service/src/main/java/com/nashtech/order/events/OrderCreatedEvent.java

@@ -2,9 +2,9 @@
 
 import com.nashtech.common.utils.OrderStatus;
 import lombok.Builder;
-import lombok.Value;
+import lombok.Getter;
 
-@Value
+@Getter
 @Builder
 public class OrderCreatedEvent {
     String orderId;

order-service/src/main/java/com.nashtech.order/exception/CompensateOrder.java → order-service/src/main/java/com/nashtech/order/exception/CompensateOrder.java

@@ -1,10 +1,12 @@
 package com.nashtech.order.exception;
 
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
-@Data
 @NoArgsConstructor
+@Setter
+@Getter
 public class CompensateOrder {
     private String orderId;
     private String userId;

order-service/src/main/java/com.nashtech.order/exception/ErrorMessage.java → order-service/src/main/java/com/nashtech/order/exception/ErrorMessage.java

@@ -1,14 +1,14 @@
 package com.nashtech.order.exception;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
+import lombok.Getter;
 
 import java.util.Date;
 
-@Data
 @AllArgsConstructor
+@Getter
 public class ErrorMessage {
-    private final Date timestamp;
-    private final String message;
+    private Date timestamp;
+    private String message;
 
 }

order-service/src/main/java/com.nashtech.order/exception/handler/OrderServiceErrorHandler.java → order-service/src/main/java/com/nashtech/order/exception/OrderServiceErrorHandler.java

@@ -1,4 +1,4 @@
-package com.nashtech.order.exception.handler;
+package com.nashtech.order.exception;
 
 import com.nashtech.order.exception.ErrorMessage;
 import org.springframework.http.HttpHeaders;

order-service/src/main/java/com.nashtech.order/exception/handler/OrderServiceEventsErrorHandler.java → order-service/src/main/java/com/nashtech/order/exception/OrderServiceEventsErrorHandler.java

@@ -1,4 +1,4 @@
-package com.nashtech.order.exception.handler;
+package com.nashtech.order.exception;
 
 import lombok.extern.slf4j.Slf4j;
 import org.axonframework.eventhandling.EventMessage;

order-service/src/main/java/com.nashtech.order/handler/OrderEventsHandler.java → order-service/src/main/java/com/nashtech/order/handler/OrderEventsHandler.java

@@ -37,6 +37,7 @@ public void on(OrderCreatedEvent event) {
 
         FailedOrderEntity failedOrder = new FailedOrderEntity();
         failedOrder.setOrderId(event.getOrderId());
+        failedOrder.setTimestamp(new Date());
         failedOrderRepository.save(failedOrder);
     }
 

order-service/src/main/java/com.nashtech.order/query/FindOrderQuery.java → order-service/src/main/java/com/nashtech/order/query/FindOrderQuery.java

@@ -1,12 +1,10 @@
 package com.nashtech.order.query;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @AllArgsConstructor
 @NoArgsConstructor
-@Data
 public class FindOrderQuery {
     String orderId;
 }

order-service/src/main/java/com.nashtech.order/query/FindOrdersByUserQuery.java → order-service/src/main/java/com/nashtech/order/query/FindOrdersByUserQuery.java

@@ -1,12 +1,10 @@
 package com.nashtech.order.query;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.Getter;
 
 @AllArgsConstructor
-@NoArgsConstructor
-@Data
+@Getter
 public class FindOrdersByUserQuery {
     String userId;
 }

order-service/src/main/java/com.nashtech.order/query/OrderQueriesHandler.java → order-service/src/main/java/com/nashtech/order/query/handler/OrderQueriesHandler.java

@@ -1,9 +1,11 @@
-package com.nashtech.order.query;
+package com.nashtech.order.query.handler;
 
+import com.nashtech.order.query.FindOrdersByUserQuery;
 import com.nashtech.order.repository.OrderRepository;
 import com.nashtech.order.repository.entity.OrderEntity;
 import org.axonframework.queryhandling.QueryHandler;
 import org.springframework.stereotype.Component;
+
 import java.util.List;
 
 @Component

order-service/src/main/java/com.nashtech.order/repository/entity/FailedOrderEntity.java → order-service/src/main/java/com/nashtech/order/repository/entity/FailedOrderEntity.java

@@ -3,12 +3,12 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import java.util.Date;
 
-@Data
+@Setter
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity(name = "failed_orders")
@@ -19,7 +19,7 @@ public class FailedOrderEntity {
     private String productId;
     private String paymentId;
     private String shipmentId;
-    private Date timestamp = new Date();
+    private Date timestamp;
     private String reasonToFailed;
     private String orderStatus;
 }

order-service/src/main/java/com.nashtech.order/repository/entity/OrderEntity.java → order-service/src/main/java/com/nashtech/order/repository/entity/OrderEntity.java

@@ -20,6 +20,6 @@ public class OrderEntity {
     private String productId;
     private String paymentId;
     private String shipmentId;
-    private Date timestamp = new Date();
+    private Date timestamp;
     private String orderStatus;
 }

order-service/src/main/java/com.nashtech.order/repository/entity/OrderLookupEntity.java → order-service/src/main/java/com/nashtech/order/repository/entity/OrderLookupEntity.java

@@ -3,13 +3,11 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
 
 
-@Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity

order-service/src/main/java/com.nashtech.order/restapi/OrdersCommandController.java → order-service/src/main/java/com/nashtech/order/restapi/OrdersCommandController.java

@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
 import javax.validation.Valid;
 import java.util.List;
 import java.util.UUID;
@@ -46,13 +47,6 @@ public OrderSummary createOrder(@Valid @RequestBody OrderCreateRequest orderRequ
                 .quantity(orderRequest.getQuantity()).orderId(orderId)
                 .build();
 
-/*        try (SubscriptionQueryResult<OrderSummary, OrderSummary> queryResult = queryGateway.subscriptionQuery(
-                new FindOrderQuery(orderId), ResponseTypes.instanceOf(OrderSummary.class),
-                ResponseTypes.instanceOf(OrderSummary.class))) {
-            commandGateway.send(createOrderCommand);
-            return queryResult.updates().blockFirst();
-        }*/
-
         commandGateway.send(createOrderCommand);
         return OrderSummary.builder()
                 .orderId(orderId)

order-service/src/main/java/com.nashtech.order/restapi/request/OrderCreateRequest.java → order-service/src/main/java/com/nashtech/order/restapi/request/OrderCreateRequest.java

@@ -2,13 +2,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 
-@Data
+@Getter
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor

order-service/src/main/java/com.nashtech.order/restapi/response/OrderSummary.java → order-service/src/main/java/com/nashtech/order/restapi/response/OrderSummary.java

@@ -1,10 +1,14 @@
 package com.nashtech.order.restapi.response;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
-@Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
 public class OrderSummary {
     private String orderId;
     private String orderStatus;