misc changes

build-and-test-all.sh

@@ -56,6 +56,7 @@ if [ -z "$ASSEMBLE_ONLY" ] ; then
 
   # Component tests need to use the per-service database schema
 
+
   SPRING_DATASOURCE_URL=jdbc:mysql://${DOCKER_HOST_IP?}/ftgoorderservice ./gradlew :ftgo-order-service:cleanComponentTest :ftgo-order-service:componentTest
 
   # Reset the DB/messages

docker-compose.yml

@@ -10,7 +10,7 @@ services:
     image: eventuateio/eventuateio-local-kafka:0.20.1.RELEASE
     ports:
       - 9092:9092
-    links:
+    depends_on:
       - zookeeper
     environment:
       - ADVERTISED_HOST_NAME=${DOCKER_HOST_IP}

dynamodblocal-init/create-dynamodb-tables.sh

@@ -1,5 +1,7 @@
 #! /bin/bash -e
 
+echo Initializing DynamoDB at endpoint ${AWS_DYNAMODB_ENDPOINT_URL}
+
 if aws dynamodb --region us-west-1 --endpoint-url ${AWS_DYNAMODB_ENDPOINT_URL?} describe-table --table-name ftgo-order-history ; then
     echo table exists
 else

eventuate-tram-spring-cloud-contract-support/build.gradle

@@ -19,6 +19,12 @@ dependencyManagement {
 }
 
 dependencies {
-    compile 'org.springframework.cloud:spring-cloud-starter-contract-verifier'
     compile "io.eventuate.tram.core:eventuate-tram-messaging:$eventuateTramVersion"
+    compile "io.eventuate.tram.core:eventuate-tram-commands:$eventuateTramVersion"
+    compile "io.eventuate.tram.core:eventuate-tram-events:$eventuateTramVersion"
+
+    compile 'org.springframework.cloud:spring-cloud-starter-contract-verifier'
+    compile "org.springframework.cloud:spring-cloud-starter-contract-stub-runner"
+
+    compile "io.eventuate.util:eventuate-util-test:$eventuateUtilVersion"
 }

ftgo-api-gateway-graphql/src/schema.js

@@ -23,12 +23,7 @@ const typeDefs = gql`
     consumerId : Int,
     consumer: Consumer
     restaurant: Restaurant
-
     deliveryInfo : DeliveryInfo
-    
-    # restaurant status
-    # payment status
-
   }
 
   type Restaurant {

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

@@ -5,9 +5,11 @@
 import net.chrisrichardson.ftgo.common.Money;
 import net.chrisrichardson.ftgo.common.PersonName;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Optional;
 
+@Transactional
 public class ConsumerService {
 
   @Autowired

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

@@ -13,11 +13,13 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
 @EnableJpaRepositories
 @EnableAutoConfiguration
 @Import({SagaParticipantConfiguration.class, TramEventsPublisherConfiguration.class, CommonConfiguration.class})
+@EnableTransactionManagement
 @ComponentScan
 public class ConsumerServiceConfiguration {
 

ftgo-order-service/src/integration-test/java/net/chrisrichardson/ftgo/orderservice/domain/RestaurantJpaTest.java

@@ -0,0 +1,47 @@
+package net.chrisrichardson.ftgo.orderservice.domain;
+
+import net.chrisrichardson.ftgo.orderservice.api.events.OrderState;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import static net.chrisrichardson.ftgo.orderservice.OrderDetailsMother.CONSUMER_ID;
+import static net.chrisrichardson.ftgo.orderservice.OrderDetailsMother.chickenVindalooLineItems;
+import static net.chrisrichardson.ftgo.orderservice.RestaurantMother.AJANTA_ID;
+import static net.chrisrichardson.ftgo.orderservice.RestaurantMother.AJANTA_RESTAURANT_MENU_ITEMS;
+import static net.chrisrichardson.ftgo.orderservice.RestaurantMother.AJANTA_RESTAURANT_NAME;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = OrderJpaTestConfiguration.class)
+public class RestaurantJpaTest {
+
+  @Autowired
+  private RestaurantRepository restaurantRepository;
+
+  @Autowired
+  private TransactionTemplate transactionTemplate;
+
+  @Test
+  public void shouldSaveRestaurant() {
+
+    transactionTemplate.execute((ts) -> {
+      Restaurant restaurant = new Restaurant(AJANTA_ID, AJANTA_RESTAURANT_NAME, AJANTA_RESTAURANT_MENU_ITEMS);
+      restaurantRepository.save(restaurant);
+      return null;
+    });
+    transactionTemplate.execute((ts) -> {
+      Restaurant restaurant = new Restaurant(AJANTA_ID, AJANTA_RESTAURANT_NAME, AJANTA_RESTAURANT_MENU_ITEMS);
+      restaurantRepository.save(restaurant);
+      return null;
+    });
+
+
+
+  }
+
+}

ftgo-order-service/src/integration-test/resources/application.properties

@@ -1,8 +1,12 @@
 spring.application.name=ftgo-order-service
 
+logging.level.root=INFO
 logging.level.org.hibernate.SQL=DEBUG
 logging.level.org.springframework.cloud.contract=DEBUG
 logging.level.io.eventuate=DEBUG
+#logging.level.org.springframework.orm.jpa.JpaTransactionManager=TRACE
+
 spring.jpa.generate-ddl=true
+
 stubrunner.stream.enabled=false
-stubrunner.integration.enabled=false
+stubrunner.integration.enabled=false

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

@@ -15,6 +15,7 @@
 import net.chrisrichardson.ftgo.restaurantservice.events.RestaurantMenu;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -158,11 +159,13 @@ public void confirmRevision(long orderId, OrderRevision revision) {
     updateOrder(orderId, order -> order.confirmRevision(revision));
   }
 
+  @Transactional(propagation = Propagation.MANDATORY)
   public void createMenu(long id, String name, RestaurantMenu menu) {
     Restaurant restaurant = new Restaurant(id, name, menu.getMenuItems());
     restaurantRepository.save(restaurant);
   }
 
+  @Transactional(propagation = Propagation.MANDATORY)
   public void reviseMenu(long id, RestaurantMenu revisedMenu) {
     restaurantRepository.findById(id).map(restaurant -> {
       List<OrderDomainEvent> events = restaurant.reviseMenu(revisedMenu);

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

@@ -23,6 +23,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import java.util.Optional;
 

ftgo-order-service/src/main/java/net/chrisrichardson/ftgo/orderservice/messaging/OrderEventConsumer.java

@@ -7,6 +7,8 @@
 import net.chrisrichardson.ftgo.restaurantservice.events.RestaurantCreated;
 import net.chrisrichardson.ftgo.restaurantservice.events.RestaurantMenu;
 import net.chrisrichardson.ftgo.restaurantservice.events.RestaurantMenuRevised;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 
 public class OrderEventConsumer {

ftgo-order-service/src/test/resources/application.properties

@@ -5,4 +5,4 @@ logging.level.org.springframework.cloud.contract=DEBUG
 logging.level.io.eventuate=DEBUG
 spring.jpa.generate-ddl=true
 stubrunner.stream.enabled=false
-stubrunner.integration.enabled=false
+stubrunner.integration.enabled=false

ftgo-restaurant-service/src/main/java/net/chrisrichardson/ftgo/restaurantservice/domain/RestaurantServiceDomainConfiguration.java

@@ -7,9 +7,11 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
 @EnableJpaRepositories
+@EnableTransactionManagement
 @EntityScan
 @Import({TramEventsPublisherConfiguration.class, CommonConfiguration.class})
 public class RestaurantServiceDomainConfiguration {

mysql-cli.sh

@@ -4,4 +4,4 @@ docker run $* \
    --name mysqlterm --rm \
    -e MYSQL_PORT_3306_TCP_ADDR=$DOCKER_HOST_IP -e MYSQL_PORT_3306_TCP_PORT=3306 -e MYSQL_ENV_MYSQL_ROOT_PASSWORD=rootpassword \
    mysql:5.7.13  \
-   sh -c 'exec mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -p"$MYSQL_ENV_MYSQL_ROOT_PASSWORD" -o eventuate'
+   sh -c 'exec mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -p"$MYSQL_ENV_MYSQL_ROOT_PASSWORD" '