Added:

bin/ folder to gitignore
Added environment variables for calculation-service
tripId defined as local variable instead of global for test cases

Author: jusoto

.gitignore

@@ -25,3 +25,6 @@ dist/
 nbdist/
 .nb-gradle/
 \.DS_Store
+
+### Eclipse ###
+bin/

docker-compose-local.yml

@@ -116,7 +116,10 @@ services:
   calculationservice:
     image: aista/calculation-service
     environment:
+      - RABBIT_HOST=rabbitmq
       - EUREKA_SERVER=discoveryservice
+      - MONGO_HOST=mongo
+      - MONGO_PORT=27017
     command: ["go", "run", "main.go"]
     ports:
       - '8080'

docker-compose.yml

@@ -141,8 +141,10 @@ services:
     image: aista/calculation-service
     mem_limit: 512M
     environment:
-      - EUREKA_SERVER=discoveryservice
       - RABBIT_HOST=rabbitmq
+      - EUREKA_SERVER=discoveryservice
+      - MONGO_HOST=mongo
+      - MONGO_PORT=27017
     command: ["go", "run", "main.go"]
     ports:
       - '8080'

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

@@ -121,7 +121,6 @@ public static void initialize() {
     private TestRestTemplate restTemplate = new TestRestTemplate();
 
     private String token;
-    private String tripId;
 
     @Before
     public void setUp() throws JSONException {
@@ -181,11 +180,12 @@ public void tripQueryGETSpecificTripRequestSuccess() throws JSONException, Inter
         HttpEntity<String> request = new HttpEntity<>(body, headers);
         ResponseEntity<String> postResponse = restTemplate.postForEntity(tripCommandURL + "/api/v1/trip", request,
                 String.class);
+        
         assertThat(postResponse.getStatusCodeValue()).isEqualTo(201);
 
         JSONObject json = new JSONObject(postResponse.getBody());
-        tripId = json.getString("id");
-
+        String tripId = json.getString("id");
+        
         Thread.sleep(1000);
 
         // when:

src/test/resources/docker-compose.yml

@@ -101,8 +101,10 @@ services:
     image: aista/calculation-service
     mem_limit: 512M
     environment:
-      - EUREKA_SERVER=discoveryservice
       - RABBIT_HOST=rabbitmq
+      - EUREKA_SERVER=discoveryservice
+      - MONGO_HOST=mongo
+      - MONGO_PORT=27017
     command: ["go", "run", "main.go"]
     ports:
       - '8080'