Fixes #114 - message handlers should not use @transactional

microservices-patterns · Aug 29, 2020 · a835e23 · a835e23
1 parent 1a46672
commit a835e23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...ervice/src/main/java/net/chrisrichardson/ftgo/consumerservice/domain/ConsumerService.java b/...ervice/src/main/java/net/chrisrichardson/ftgo/consumerservice/domain/ConsumerService.java
@@ -9,7 +9,6 @@
 
 import java.util.Optional;
 
-@Transactional
 public class ConsumerService {
 
   @Autowired
@@ -23,6 +22,7 @@ public void validateOrderForConsumer(long consumerId, Money orderTotal) {
     consumer.orElseThrow(ConsumerNotFoundException::new).validateOrderByConsumer(orderTotal);
   }
 
+  @Transactional
   public ResultWithEvents<Consumer> create(PersonName name) {
     ResultWithEvents<Consumer> rwe = Consumer.create(name);
     consumerRepository.save(rwe.result);

diff --git a/...rder-service/src/main/java/net/chrisrichardson/ftgo/orderservice/domain/OrderService.java b/...rder-service/src/main/java/net/chrisrichardson/ftgo/orderservice/domain/OrderService.java
@@ -25,7 +25,6 @@
 
 import static java.util.stream.Collectors.toList;
 
-@Transactional
 public class OrderService {
 
   private Logger logger = LoggerFactory.getLogger(getClass());
@@ -66,6 +65,7 @@ public OrderService(SagaInstanceFactory sagaInstanceFactory,
     this.meterRegistry = meterRegistry;
   }
 
+  @Transactional
   public Order createOrder(long consumerId, long restaurantId, DeliveryInformation deliveryInformation,
                            List<MenuItemIdAndQuantity> lineItems) {
     Restaurant restaurant = restaurantRepository.findById(restaurantId)
@@ -112,6 +112,7 @@ public void noteReversingAuthorization(Long orderId) {
     throw new UnsupportedOperationException();
   }
 
+  @Transactional
   public Order cancel(Long orderId) {
     Order order = orderRepository.findById(orderId)
             .orElseThrow(() -> new OrderNotFoundException(orderId));
@@ -149,6 +150,7 @@ public void confirmCancelled(long orderId) {
     updateOrder(orderId, Order::noteCancelled);
   }
 
+  @Transactional
   public Order reviseOrder(long orderId, OrderRevision orderRevision) {
     Order order = orderRepository.findById(orderId).orElseThrow(() -> new OrderNotFoundException(orderId));
     ReviseOrderSagaData sagaData = new ReviseOrderSagaData(order.getConsumerId(), orderId, null, orderRevision);
@@ -172,13 +174,11 @@ public void confirmRevision(long orderId, OrderRevision revision) {
     updateOrder(orderId, order -> order.confirmRevision(revision));
   }
 
-  @Transactional(propagation = Propagation.MANDATORY)
   public void createMenu(long id, String name, List<MenuItem> menuItems) {
     Restaurant restaurant = new Restaurant(id, name, menuItems);
     restaurantRepository.save(restaurant);
   }
 
-  @Transactional(propagation = Propagation.MANDATORY)
   public void reviseMenu(long id, List<MenuItem> menuItems) {
     restaurantRepository.findById(id).map(restaurant -> {
       List<OrderDomainEvent> events = restaurant.reviseMenu(menuItems);