Feature/added remaining services (#14)

Added missing services to docker-compose and made changes to sql server credentials in tests

Author: Richardj52

docker-compose-local.yml

@@ -45,7 +45,7 @@ services:
       MYSQL_DATABASE: 'user_service'
 
   userservice:
-    build: ../authentication-service/
+    image: aista/user-service
     depends_on:
       - discoveryservice
       - mysqlserver
@@ -60,6 +60,19 @@ services:
     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
+
   rabbitmq:
     image: rabbitmq:management
     container_name: 'rabbitmq'
@@ -68,7 +81,7 @@ services:
       - "15672:15672"
 
   tripmanagementcmd:
-    build: ../trip-management-cmd/
+    image: aista/trip-management-cmd
     environment:
       - RABBIT_HOST=rabbitmq
       - MONGO_HOST=mongo
@@ -80,7 +93,7 @@ services:
       - mongo
 
   tripmanagementquery:
-    build: ../trip-management-query/
+    image: aista/trip-management-query
     environment:
       - RABBIT_HOST=rabbitmq
       - MONGO_HOST=mongo
@@ -92,7 +105,7 @@ services:
       - discoveryservice
 
   gmapsadapter:
-    build: ../gmaps-adapter/
+    image: aista/gmaps-adapter
     environment:
       - EUREKA_SERVER=discoveryservice
     ports:
@@ -101,12 +114,45 @@ services:
       - discoveryservice
 
   calculationservice:
-    build: ../calculation-service/
+    image: aista/calculation-service
+    environment:
+      - EUREKA_SERVER=discoveryservice
+    command: ["go", "run", "main.go"]
+    ports:
+      - '8080'
+    depends_on:
+      - discoveryservice
+
+  passenger:
+    build: ../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:

docker-compose.yml

@@ -60,6 +60,19 @@ services:
     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
+
   rabbitmq:
     image: rabbitmq:management
     container_name: 'rabbitmq'
@@ -102,11 +115,44 @@ services:
 
   calculationservice:
     image: aista/calculation-service
+    environment:
+      - EUREKA_SERVER=discoveryservice
+    command: ["go", "run", "main.go"]
+    ports:
+      - '8080'
+    depends_on:
+      - discoveryservice
+
+  passenger:
+    build: ../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:

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

@@ -46,8 +46,8 @@ public class EdgeServiceIntegrationTests {
             .waitingForService("tripmanagementquery", HealthChecks.toHaveAllPortsOpen())
             .waitingForService("gmapsadapter", HealthChecks.toHaveAllPortsOpen())
             .waitingForService("calculationservice", HealthChecks.toHaveAllPortsOpen())
-            .waitingForService("discovery-service", HealthChecks.toHaveAllPortsOpen())
-            .waitingForService("discovery-service", HealthChecks.toRespondOverHttp(8761,
+            .waitingForService("discoveryservice", HealthChecks.toHaveAllPortsOpen())
+            .waitingForService("discoveryservice", HealthChecks.toRespondOverHttp(8761,
                 (port) -> port.inFormat("http://localhost:8761")))
             .build();
 
@@ -101,7 +101,7 @@ public static void initialize() {
 
     @Before
     public void setUp() throws JSONException {
-        String plainCreds = "eagleeye:thisissecret";
+        String plainCreds = "front-end:front-end";
         byte[] plainCredsBytes = plainCreds.getBytes();
         byte[] base64CredsBytes = Base64.getEncoder().encode(plainCredsBytes);
         String base64Creds = new String(base64CredsBytes);
@@ -111,9 +111,9 @@ public void setUp() throws JSONException {
         headers.add("Content-Type", "application/x-www-form-urlencoded");
 
         MultiValueMap<String, String> parameters = new LinkedMultiValueMap<>();
-        parameters.add("username", "eagleeye");
-        parameters.add("secret", "thisissecret");
-        String body = "grant_type=password&scope=webclient&username=user1&password=password";
+        parameters.add("username", "front-end");
+        parameters.add("secret", "front-end");
+        String body = "grant_type=password&scope=webclient&username=passenger&password=password";
         HttpEntity<String> request = new HttpEntity<>(body, headers);
 
         //when:

src/test/resources/docker-compose.yml

@@ -2,30 +2,13 @@ version: '3'
 
 services:
 
-  discovery-service:
-    image: springcloud/eureka
+  discoveryservice:
+    image: aista/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
-    container_name: mysqlserver
     volumes:
       - mysql-data:/var/lib/mysql:rw
     restart: always
@@ -42,7 +25,7 @@ services:
     image: aista/user-service
     container_name: userservice
     depends_on:
-      - discovery-service
+      - discoveryservice
       - mysqlserver
     ports:
       - '8080'
@@ -70,7 +53,7 @@ services:
     ports:
       - '8080'
     depends_on:
-      - discovery-service
+      - discoveryservice
       - rabbitmq
       - mongo
 
@@ -84,25 +67,26 @@ services:
     depends_on:
       - rabbitmq
       - mongo
-      - discovery-service
+      - discoveryservice
 
   gmapsadapter:
     image: aista/gmaps-adapter
     environment:
-      - EUREKA_SERVER=discovery-service
+      - EUREKA_SERVER=discoveryservice
     ports:
       - '8080'
     depends_on:
-      - discovery-service
+      - discoveryservice
 
   calculationservice:
     image: aista/calculation-service
     environment:
-      - EUREKA_SERVER=discovery-service
+      - EUREKA_SERVER=discoveryservice
+    command: ["go", "run", "main.go"]
     ports:
       - '8080'
     depends_on:
-      - discovery-service
+      - discoveryservice
 
 volumes:
   mongo: