Merge pull request #10 from AITestingOrg/gmaps-adapter-integration-test

Gmaps adapter integration test

Author: R4il

docker-compose-local.yml

@@ -0,0 +1,114 @@
+version: '3'
+
+services:
+
+  edgeservice:
+    build: ./
+    ports:
+      - "80:8080"
+    depends_on:
+      - discovery-service
+
+  discovery-service:
+    image: springcloud/eureka
+    ports:
+      - "8761:8761"
+
+#  hystrix-dashboard:
+#    image: kbastani/hystrix-dashboard
+#    container_name: hystrix-dashboard
+#    environment:
+#      - SPRING_PROFILES_ACTIVE=docker
+#    ports:
+#      - 6161:6161
+
+#  config-service:
+#    build: config-service
+#    container_name: config-service
+#    environment:
+#      - SPRING_PROFILES_ACTIVE=docker
+#    ports:
+#      - 8888:8888
+
+  mysqlserver:
+    image: mysql:5.7
+    volumes:
+      - mysql-data:/var/lib/mysql:rw
+    restart: always
+    ports:
+      - '3306:3306'
+    environment:
+      MYSQL_USER:
+      MYSQL_PASSWORD:
+      MYSQL_ROOT_PASSWORD: 'root'
+      MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+      MYSQL_DATABASE: 'user_service'
+
+  userservice:
+    image: aista/user-service
+    depends_on:
+      - discovery-service
+      - mysqlserver
+    ports:
+      - '8091:8091'
+
+  mongo:
+    image: 'mongo:3.4.1'
+    container_name: 'mongo'
+    ports:
+      - '27017:27017'
+    volumes:
+      - 'mongo:/data/db'
+
+  rabbitmq:
+    image: rabbitmq:management
+    container_name: 'rabbitmq'
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+
+  tripmanagementcmd:
+    image: aista/trip-management-cmd:local
+    environment:
+      - RABBIT_HOST=rabbitmq
+      - MONGO_HOST=mongo
+    ports:
+      - '8080'
+    depends_on:
+      - discovery-service
+      - rabbitmq
+      - mongo
+
+  tripmanagementquery:
+    image: aista/trip-management-query:local
+    environment:
+      - RABBIT_HOST=rabbitmq
+      - MONGO_HOST=mongo
+    ports:
+      - '8080'
+    depends_on:
+      - rabbitmq
+      - mongo
+      - discovery-service
+
+  gmapsadapter:
+    image: aista/gmaps-adapter:local
+    environment:
+      - EUREKA_SERVER=discovery-service
+    ports:
+      - '8080'
+    depends_on:
+      - discovery-service
+
+  calculationservice:
+    image: aista/calculation-service:local
+    environment:
+      - EUREKA_SERVER=discovery-service
+    ports:
+      - '8080'
+    depends_on:
+      - discovery-service
+
+volumes:
+  mongo:
+  mysql-data:

docker-compose.yml

@@ -2,18 +2,17 @@ version: '3'
 
 services:
 
-  edge-service:
+  edgeservice:
     build: ./
     ports:
-      - "8080:8080"
+      - "80:8080"
     depends_on:
       - discovery-service
 
   discovery-service:
     image: springcloud/eureka
     ports:
       - "8761:8761"
-    container_name: eureka-server
 
 #  hystrix-dashboard:
 #    image: kbastani/hystrix-dashboard
@@ -33,7 +32,6 @@ services:
 
   mysqlserver:
     image: mysql:5.7
-    container_name: mysqlserver
     volumes:
       - mysql-data:/var/lib/mysql:rw
     restart: always
@@ -51,7 +49,6 @@ services:
     depends_on:
       - discovery-service
       - mysqlserver
-    container_name: userservice
     ports:
       - '8080'
 
@@ -70,9 +67,8 @@ services:
       - "5672:5672"
       - "15672:15672"
 
-  trip-management-cmd:
+  tripmanagementcmd:
     image: aista/trip-management-cmd
-    container_name: trip-management-cmd
     environment:
       - RABBIT_HOST=rabbitmq
       - MONGO_HOST=mongo
@@ -83,9 +79,8 @@ services:
       - rabbitmq
       - mongo
 
-  trip-management-query:
+  tripmanagementquery:
     image: aista/trip-management-query
-    container_name: trip-management-query
     environment:
       - RABBIT_HOST=rabbitmq
       - MONGO_HOST=mongo
@@ -94,7 +89,25 @@ services:
     depends_on:
       - rabbitmq
       - mongo
-      - discovery-service 
+      - discovery-service
+
+  gmapsadapter:
+    image: aista/gmaps-adapter
+    environment:
+      - EUREKA_SERVER=discovery-service
+    ports:
+      - '8080'
+    depends_on:
+      - discovery-service
+
+  calculationservice:
+    image: aista/calculation-service
+    environment:
+      - EUREKA_SERVER=discovery-service
+    ports:
+      - '8080'
+    depends_on:
+      - discovery-service
 
 volumes:
   mongo:

readme.md

@@ -1,5 +1,13 @@
 # Edge Service
 The edge service is one of the backing services that serves as the front door for the API. The services utilizes Zuul.
 
-#Performance Metrics API
-Once edge service is UP, you can access the metrics at http://localhost:8080/actuator
+# Running the service:
+After making sure the project assembled properly run:  ```docker-compose up --build```
+
+## Running with locally build images.
+Build the images locally but tag them with version ```:local``` instead of default, for example instead of just building gmaps-adapter as aista/gmaps-adapter tag it aista/gmaps-adapter:local
+Run ```docker-compose -f docker-compose-local.yml up```
+remove the :local from the docker-compose-local.yml file for images that wont be changed locally.
+
+# Performance Metrics API
+Once edge service is UP, you can access the metrics at http://localhost:8080/actuator

src/main/resources/application.yml

@@ -5,12 +5,16 @@ spring:
 spring:
   profiles: development
   application:
-    name: edge-service
+    name: edgeservice
 zuul:
-  ignored-services: '*'
-  ignoredPatterns: /**/api/**
+  prefix: /api
   routes:
-    example-service: /example/**
+    trip-cmd:
+      path: /trip/cmd/**
+      url: http://tripmanagementcmd:8080/api
+    trip-query:
+      path: /trip/query/**
+      url: http://tripmanagementquery:8080/api
 security:
   oauth2:
     resource:
@@ -32,12 +36,16 @@ management:
 spring:
   profiles: docker
   application:
-    name: edge-service
+    name: edgeservice
 zuul:
-  ignored-services: '*'
-  ignoredPatterns: /**/api/**
+  prefix: /api
   routes:
-    example-service: /example/**
+    trip-cmd:
+      path: /trip/cmd/**
+      url: http://tripmanagementcmd:8080/api
+    trip-query:
+      path: /trip/query/**
+      url: http://tripmanagementquery:8080/api
 security:
   oauth2:
     resource:

src/test/java/aist/edge/edgeservice/EdgeServiceIntegrationTests.java

@@ -203,4 +203,23 @@ public void calculationServiceRequestSuccess() {
         assertThat(response.getStatusCodeValue()).isEqualTo(200);
 
     }
+
+    @Test
+    public void gmapsAdapterRequestSuccess() {
+        //given:
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Authorization", "Bearer " + token);
+        headers.add("Content-Type", "application/json");
+
+        String body = "{ \"origin\": \"Weston, FL\", \"destination\": \"Miami, FL\", \"departureTime\": \"15220998650000000\" }";
+        HttpEntity<String> request = new HttpEntity<>(body, headers);
+
+        //when:
+        ResponseEntity<String> response = restTemplate.postForEntity(gmapsAdapterURL + "/api/v1/directions", request,
+                String.class);
+
+        //then:
+        assertThat(response.getStatusCodeValue()).isEqualTo(200);
+
+    }
 }