Switching to the new cdc service. Fixing tests.

Author: dartartem

.gitignore

@@ -14,3 +14,4 @@ target
 bin
 node_modules
 dist
+ftgo-api-gateway-graphql/jest_0

build-and-test-all.sh

@@ -53,33 +53,40 @@ if [ -z "$ASSEMBLE_ONLY" ] ; then
 
   ./gradlew $* integrationTest
 
-
   # 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 down -v
+
+  docker-compose up -d dynamodblocal mysql
+
+  ./wait-for-mysql.sh
+
+  echo mysql is started
+
+  initializeDynamoDB
+
   docker-compose up -d
 
 
 else
 
   ./gradlew $* assemble
-  docker-compose up -d --build
 
-fi
+  docker-compose up -d --build dynamodblocal mysql
 
-./wait-for-mysql.sh
+  ./wait-for-mysql.sh
 
-echo mysql is started
+  echo mysql is started
 
-initializeDynamoDB
+  initializeDynamoDB
 
-./wait-for-mysql.sh
+  docker-compose up -d --build
 
-echo mysql is started
+fi
 
 ./wait-for-services.sh
 

docker-compose.yml

@@ -43,7 +43,7 @@ services:
       EVENTUATELOCAL_CDC_BINLOG_CLIENT_ID: 1234567890
       EVENTUATELOCAL_CDC_SOURCE_TABLE_NAME: message
   eventuate-local-cdc-service:
-    image: eventuateio/eventuateio-local-cdc-service:0.17.0.RELEASE
+    image: eventuateio/eventuateio-local-new-cdc-service:0.20.1.RELEASE
     ports:
       - "8098:8080"
     depends_on:

ftgo-order-service/src/component-test/java/net/chrisrichardson/ftgo/orderservice/cucumber/OrderServiceComponentTestStepDefinitions.java

@@ -139,13 +139,14 @@ public void restaurantAcceptsOrder() {
             .when(ConfirmCreateTicket.class).replyWithSuccess()
             .when(CancelCreateTicket.class).replyWithSuccess();
 
-    domainEventPublisher.publish("net.chrisrichardson.ftgo.restaurantservice.domain.Restaurant", RestaurantMother.AJANTA_ID,
-            Collections.singletonList(new RestaurantCreated(RestaurantMother.AJANTA_RESTAURANT_NAME, AJANTA_RESTAURANT_MENU)));
-    
-    eventually(() -> {
-      FtgoTestUtil.assertPresent(restaurantRepository.findById(RestaurantMother.AJANTA_ID));
-    });
+    if (!restaurantRepository.findById(RestaurantMother.AJANTA_ID).isPresent()) {
+      domainEventPublisher.publish("net.chrisrichardson.ftgo.restaurantservice.domain.Restaurant", RestaurantMother.AJANTA_ID,
+              Collections.singletonList(new RestaurantCreated(RestaurantMother.AJANTA_RESTAURANT_NAME, AJANTA_RESTAURANT_MENU)));
 
+      eventually(() -> {
+        FtgoTestUtil.assertPresent(restaurantRepository.findById(RestaurantMother.AJANTA_ID));
+      });
+    }
   }
 
   @When("I place an order for Chicken Vindaloo at Ajanta")

run-end-to-end-tests.sh

@@ -23,14 +23,16 @@ initializeDynamoDB() {
 
 ./gradlew assemble
 
-docker-compose up -d --build
+docker-compose up -d --build dynamodblocal mysql
 
 ./wait-for-mysql.sh
 
 echo mysql is started
 
 initializeDynamoDB
 
+docker-compose up -d --build
+
 date
 
 ./wait-for-services.sh