modifying edge sevice to add calculation route

Author: richard jimenez

docker-compose.yml

@@ -45,33 +45,33 @@ services:
       MYSQL_DATABASE: 'user_service'
 
   userservice:
-    image: aista/user-service
+    build: ../authentication-service
     depends_on:
       - discoveryservice
       - mysqlserver
     ports:
       - '8080'
 
-  mongo:
-    image: 'mongo:3.4.1'
-    container_name: 'mongo'
-    ports:
-      - '27017:27017'
-    volumes:
-      - 'mongo:/data/db'
+#  mongo:
+#    image: 'mongo:3.4.1'
+#    container_name: 'mongo'
+#    ports:
+#      - '27017:27017'
+#    volumes:
+#      - 'mongo:/data/db'
 
-  postgres:
-    image: postgres
-    restart: always
-    environment:
-      POSTGRES_DB: 'passenger_db'
-      POSTGRES_PASSWORD: "admin"
-      POSTGRES_USER: "admin"
-      PGDATA: ./postgres-data
-    ports:
-      - '5432:5432'
-    volumes:
-      - ./db_volume:/var/lib/postgresql
+#  postgres:
+#    image: postgres
+#    restart: always
+#    environment:
+#      POSTGRES_DB: 'passenger_db'
+#      POSTGRES_PASSWORD: "admin"
+#      POSTGRES_USER: "admin"
+#      PGDATA: ./postgres-data
+#    ports:
+#      - '5432:5432'
+#    volumes:
+#      - ./db_volume:/var/lib/postgresql
 
   rabbitmq:
     image: rabbitmq:management
@@ -80,80 +80,82 @@ services:
       - "5672:5672"
       - "15672:15672"
 
-  tripmanagementcmd:
-    image: aista/trip-management-cmd
-    environment:
-      - RABBIT_HOST=rabbitmq
-      - MONGO_HOST=mongo
-    ports:
-      - '8080'
-    depends_on:
-      - discoveryservice
-      - rabbitmq
-      - mongo
-
-  tripmanagementquery:
-    image: aista/trip-management-query
-    environment:
-      - RABBIT_HOST=rabbitmq
-      - MONGO_HOST=mongo
-    ports:
-      - '8080'
-    depends_on:
-      - rabbitmq
-      - mongo
-      - discoveryservice
-
-  gmapsadapter:
-    image: aista/gmaps-adapter
+#  tripmanagementcmd:
+#    image: aista/trip-management-cmd
+#    environment:
+#      - RABBIT_HOST=rabbitmq
+#      - MONGO_HOST=mongo
+#    ports:
+#      - '8080'
+#    depends_on:
+#      - discoveryservice
+#      - rabbitmq
+#      - mongo
+#
+#  tripmanagementquery:
+#    image: aista/trip-management-query
+#    environment:
+#      - RABBIT_HOST=rabbitmq
+#      - MONGO_HOST=mongo
+#    ports:
+#      - '8080'
+#    depends_on:
+#      - rabbitmq
+#      - mongo
+#      - discoveryservice
+#
+  gmaps-adapter:
+    build: ../gmaps-adapter
     environment:
       - EUREKA_SERVER=discoveryservice
+      - RABBIT_HOST=rabbitmq
     ports:
       - '8080'
     depends_on:
       - discoveryservice
 
-  calculationservice:
-    image: aista/calculation-service
+  calculation-service:
+    build: ../calculation-service
     environment:
       - EUREKA_SERVER=discoveryservice
+      - RABBIT_HOST=rabbitmq
     command: ["go", "run", "main.go"]
     ports:
       - '8080'
     depends_on:
       - discoveryservice
-
-  passenger:
-    image: aista/passenger
-    ports:
-      - '8080'
-    depends_on:
-      - postgres
-      - discoveryservice
-
-  driver-cmd:
-    image: aista/driver-cmd
-    environment:
-      - EUREKA_SERVER=discoveryservice
-    ports:
-      - '8080'
-    depends_on:
-      - rabbitmq
-      - mongo
-      - discoveryservice
-
-  driver-query:
-    image: aista/driver-query
-    container_name: 'driver-query'
-    environment:
-      - RABBIT_HOST=rabbitmq
-      - MONGO_HOST=mongo
-    ports:
-      - "8080"
-    depends_on:
-      - rabbitmq
-      - mongo
-      - discoveryservice
+#
+#  passenger:
+#    image: aista/passenger
+#    ports:
+#      - '8080'
+#    depends_on:
+#      - postgres
+#      - discoveryservice
+#
+#  driver-cmd:
+#    image: aista/driver-cmd
+#    environment:
+#      - EUREKA_SERVER=discoveryservice
+#    ports:
+#      - '8080'
+#    depends_on:
+#      - rabbitmq
+#      - mongo
+#      - discoveryservice
+#
+#  driver-query:
+#    image: aista/driver-query
+#    container_name: 'driver-query'
+#    environment:
+#      - RABBIT_HOST=rabbitmq
+#      - MONGO_HOST=mongo
+#    ports:
+#      - "8080"
+#    depends_on:
+#      - rabbitmq
+#      - mongo
+#      - discoveryservice
 
 volumes:
   mongo:

src/main/resources/application.yml

@@ -9,6 +9,9 @@ spring:
 zuul:
   prefix: /api
   routes:
+    calculationservice:
+      path: /calculationservice/**
+      url: http://calculationservice:8080/api
     trip-cmd:
       path: /trip/cmd/**
       url: http://tripmanagementcmd:8080/api
@@ -44,6 +47,9 @@ spring:
 zuul:
   prefix: /api
   routes:
+    calculationservice:
+      path: /calculationservice/**
+      url: http://calculationservice:8080/api
     trip-cmd:
       path: /trip/cmd/**
       url: http://tripmanagementcmd:8080/api