Skip to content

Commit a835e23

Browse files
committed
Fixes #114 - message handlers should not use @transactional
1 parent 1a46672 commit a835e23

File tree

2 files changed

+4
-4
lines changed
  • ftgo-consumer-service/src/main/java/net/chrisrichardson/ftgo/consumerservice/domain
  • ftgo-order-service/src/main/java/net/chrisrichardson/ftgo/orderservice/domain

2 files changed

+4
-4
lines changed

ftgo-consumer-service/src/main/java/net/chrisrichardson/ftgo/consumerservice/domain/ConsumerService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import java.util.Optional;
1111

12-
@Transactional
1312
public class ConsumerService {
1413

1514
@Autowired
@@ -23,6 +22,7 @@ public void validateOrderForConsumer(long consumerId, Money orderTotal) {
2322
consumer.orElseThrow(ConsumerNotFoundException::new).validateOrderByConsumer(orderTotal);
2423
}
2524

25+
@Transactional
2626
public ResultWithEvents<Consumer> create(PersonName name) {
2727
ResultWithEvents<Consumer> rwe = Consumer.create(name);
2828
consumerRepository.save(rwe.result);

ftgo-order-service/src/main/java/net/chrisrichardson/ftgo/orderservice/domain/OrderService.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import static java.util.stream.Collectors.toList;
2727

28-
@Transactional
2928
public class OrderService {
3029

3130
private Logger logger = LoggerFactory.getLogger(getClass());
@@ -66,6 +65,7 @@ public OrderService(SagaInstanceFactory sagaInstanceFactory,
6665
this.meterRegistry = meterRegistry;
6766
}
6867

68+
@Transactional
6969
public Order createOrder(long consumerId, long restaurantId, DeliveryInformation deliveryInformation,
7070
List<MenuItemIdAndQuantity> lineItems) {
7171
Restaurant restaurant = restaurantRepository.findById(restaurantId)
@@ -112,6 +112,7 @@ public void noteReversingAuthorization(Long orderId) {
112112
throw new UnsupportedOperationException();
113113
}
114114

115+
@Transactional
115116
public Order cancel(Long orderId) {
116117
Order order = orderRepository.findById(orderId)
117118
.orElseThrow(() -> new OrderNotFoundException(orderId));
@@ -149,6 +150,7 @@ public void confirmCancelled(long orderId) {
149150
updateOrder(orderId, Order::noteCancelled);
150151
}
151152

153+
@Transactional
152154
public Order reviseOrder(long orderId, OrderRevision orderRevision) {
153155
Order order = orderRepository.findById(orderId).orElseThrow(() -> new OrderNotFoundException(orderId));
154156
ReviseOrderSagaData sagaData = new ReviseOrderSagaData(order.getConsumerId(), orderId, null, orderRevision);
@@ -172,13 +174,11 @@ public void confirmRevision(long orderId, OrderRevision revision) {
172174
updateOrder(orderId, order -> order.confirmRevision(revision));
173175
}
174176

175-
@Transactional(propagation = Propagation.MANDATORY)
176177
public void createMenu(long id, String name, List<MenuItem> menuItems) {
177178
Restaurant restaurant = new Restaurant(id, name, menuItems);
178179
restaurantRepository.save(restaurant);
179180
}
180181

181-
@Transactional(propagation = Propagation.MANDATORY)
182182
public void reviseMenu(long id, List<MenuItem> menuItems) {
183183
restaurantRepository.findById(id).map(restaurant -> {
184184
List<OrderDomainEvent> events = restaurant.reviseMenu(menuItems);

0 commit comments

Comments
 (0)