refactorred models, updated the integration tests and added tests.yaml

teetangh · teetangh · commit 328bfdd083e0 · 2024-01-11T13:47:26.000+05:30
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -0,0 +1,53 @@
+name: Tests
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  schedule:
+    - cron: "0 */6 * * *"
+
+jobs:
+  run_tests:
+    name: Run Tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java-version: ["8", "11", "17"]
+    steps:
+      - name: Update repositories
+        run: |
+          sudo apt update || echo "apt-update failed" # && apt -y upgrade
+
+      - name: Checkout ${{ github.event.repository.name }}
+        uses: actions/checkout@v4
+
+      - name: Set up JDK ${{ matrix.java-version }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java-version }}
+          distribution: "adopt"
+
+      - name: Replace secrets in application.properties
+        run: |
+          sed -i "s#DB_CONN_STR#${{ vars.DB_CONN_STR }}#g" src/main/resources/application.properties
+          sed -i "s#DB_USERNAME#${{ vars.DB_USERNAME }}#g" src/main/resources/application.properties
+          sed -i "s#DB_PASSWORD#${{ secrets.DB_PASSWORD }}#g" src/main/resources/application.properties
+
+          # Print the updated file for verification
+          cat ./src/main/resources/application.properties
+
+      - name: Run Maven Tests
+        id: run
+        run: |
+            mvn test "-Dtest=org.couchbase.quickstart.springdata.controllers.*Test"
+
+      - name: Report Status
+        if: always()
+        uses: ravsamhq/notify-slack-action@v1
+        with:
+          status: ${{ job.status }}
+          notify_when: "failure"
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/pom.xml b/pom.xml
@@ -28,6 +28,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>5.3.10</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot</artifactId>
diff --git a/src/main/java/org/couchbase/quickstart/springboot/models/Airline.java b/src/main/java/org/couchbase/quickstart/springboot/models/Airline.java
@@ -8,12 +8,8 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 
-@Getter
-@Setter
 @AllArgsConstructor
 @NoArgsConstructor
 @Data
diff --git a/src/main/java/org/couchbase/quickstart/springboot/models/Airport.java b/src/main/java/org/couchbase/quickstart/springboot/models/Airport.java
@@ -7,12 +7,8 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 
-@Getter
-@Setter
 @AllArgsConstructor
 @NoArgsConstructor
 @Data
@@ -48,8 +44,6 @@ public class Airport {
     @Valid
     private Geo geo;
 
-    @Getter
-    @Setter
     @AllArgsConstructor
     @NoArgsConstructor
     @Data
diff --git a/src/main/java/org/couchbase/quickstart/springboot/models/Route.java b/src/main/java/org/couchbase/quickstart/springboot/models/Route.java
@@ -51,8 +51,6 @@ public class Route {
     @NotNull(message = "Distance is mandatory")
     private double distance;
 
-    @Getter
-    @Setter
     @AllArgsConstructor
     @NoArgsConstructor
     @Data
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,5 +1,5 @@
-spring.couchbase.bootstrap-hosts=#######
+spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER
 spring.couchbase.bucket.name=travel-sample
-spring.couchbase.bucket.user=kaustav
-spring.couchbase.bucket.password=#######
-spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER
+spring.couchbase.bootstrap-hosts=DB_CONN_STR
+spring.couchbase.bucket.user=DB_USERNAME
+spring.couchbase.bucket.password=DB_PASSWORD
diff --git a/src/test/java/org/couchbase/quickstart/springboot/controllers/AirlineIntegrationTest.java b/src/test/java/org/couchbase/quickstart/springboot/controllers/AirlineIntegrationTest.java
@@ -6,6 +6,7 @@
 import java.util.Map;
 
 import org.couchbase.quickstart.springboot.models.Airline;
+import org.couchbase.quickstart.springboot.services.AirlineService;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -14,10 +15,17 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.dao.DataRetrievalFailureException;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.ResourceAccessException;
 
+import com.couchbase.client.core.error.DocumentNotFoundException;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class AirlineIntegrationTest {
 
@@ -27,24 +35,41 @@ class AirlineIntegrationTest {
         @Autowired
         private TestRestTemplate restTemplate;
 
+        @Autowired
+        private AirlineService airlineService;
+
+        private void deleteAirline(String airlineId, String cleanupTiming) {
+                try {
+                        if (airlineService.getAirlineById(airlineId) != null) {
+                                restTemplate.delete("/api/v1/airline/" + airlineId);
+                        }
+                } catch (DocumentNotFoundException | DataRetrievalFailureException | ResourceAccessException e) {
+                        log.warn("Document " + airlineId + " not present " + cleanupTiming);
+                } catch (Exception e) {
+                        log.error("Error deleting test data", e.getMessage());
+                }
+        }
+
+        private void deleteTestAirlineData(String cleanupTiming) {
+                deleteAirline("airline_create", cleanupTiming);
+                deleteAirline("airline_update", cleanupTiming);
+                deleteAirline("airline_delete", cleanupTiming);
+        }
+
         @BeforeEach
         void setUp() {
-                restTemplate.delete("http://localhost:" + port + "/api/v1/airline/airline_create");
-                restTemplate.delete("http://localhost:" + port + "/api/v1/airline/airline_update");
-                restTemplate.delete("http://localhost:" + port + "/api/v1/airline/airline_delete");
+                deleteTestAirlineData("prior to test");
         }
 
         @AfterEach
         void tearDown() {
-                restTemplate.delete("http://localhost:" + port + "/api/v1/airline/airline_create");
-                restTemplate.delete("http://localhost:" + port + "/api/v1/airline/airline_update");
-                restTemplate.delete("http://localhost:" + port + "/api/v1/airline/airline_delete");
+                deleteTestAirlineData("after test");
         }
 
         @Test
         void testGetAirline() {
                 ResponseEntity<Airline> response = restTemplate
-                                .getForEntity("http://localhost:" + port + "/api/v1/airline/airline_10", Airline.class);
+                                .getForEntity("/api/v1/airline/airline_10", Airline.class);
                 assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
                 Airline airline = response.getBody();
                 assert airline != null;
@@ -64,7 +89,7 @@ void testCreateAirline() {
                                 .country("United States")
                                 .build();
                 ResponseEntity<Airline> response = restTemplate.postForEntity(
-                                "http://localhost:" + port + "/api/v1/airline/" + airline.getId(), airline,
+                                "/api/v1/airline/" + airline.getId(), airline,
                                 Airline.class);
                 assertThat(response.getStatusCode()).isEqualTo(HttpStatus.CREATED);
                 Airline createdAirline = response.getBody();
@@ -84,11 +109,11 @@ void testUpdateAirline() {
                                 .callsign("TEST")
                                 .country("United States")
                                 .build();
-                restTemplate.postForEntity("http://localhost:" + port + "/api/v1/airline/" + airline.getId(), airline,
+                restTemplate.postForEntity("/api/v1/airline/" + airline.getId(), airline,
                                 Airline.class);
-                restTemplate.put("http://localhost:" + port + "/api/v1/airline/" + airline.getId(), airline);
+                restTemplate.put("/api/v1/airline/" + airline.getId(), airline);
                 ResponseEntity<Airline> response = restTemplate
-                                .getForEntity("http://localhost:" + port + "/api/v1/airline/" + airline.getId(),
+                                .getForEntity("/api/v1/airline/" + airline.getId(),
                                                 Airline.class);
 
                 assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
@@ -110,11 +135,11 @@ void testDeleteAirline() {
                                 .callsign("TEST")
                                 .country("United States")
                                 .build();
-                restTemplate.postForEntity("http://localhost:" + port + "/api/v1/airline/" + airline.getId(), airline,
+                restTemplate.postForEntity("/api/v1/airline/" + airline.getId(), airline,
                                 Airline.class);
-                restTemplate.delete("http://localhost:" + port + "/api/v1/airline/" + airlineIdToDelete);
+                restTemplate.delete("/api/v1/airline/" + airlineIdToDelete);
                 ResponseEntity<Airline> response = restTemplate
-                                .getForEntity("http://localhost:" + port + "/api/v1/airline/" + airlineIdToDelete,
+                                .getForEntity("/api/v1/airline/" + airlineIdToDelete,
                                                 Airline.class);
                 assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
         }
@@ -124,7 +149,7 @@ void testListAirlines() {
                 int limit = 10;
                 int offset = 0;
                 ResponseEntity<List<Airline>> response = restTemplate.exchange(
-                                "http://localhost:" + port + "/api/v1/airline/list?limit=" + limit + "&offset="
+                                "/api/v1/airline/list?limit=" + limit + "&offset="
                                                 + offset,
                                 HttpMethod.GET, null, new ParameterizedTypeReference<List<Airline>>() {
                                 });
@@ -151,7 +176,7 @@ void testListAirlinesByCountry() {
                 int limit = 10;
                 int offset = 0;
                 ResponseEntity<List<Airline>> response = restTemplate.exchange(
-                                "http://localhost:" + port + "/api/v1/airline/country/" + country + "?limit=" + limit
+                                "/api/v1/airline/country/" + country + "?limit=" + limit
                                                 + "&offset=" + offset,
                                 HttpMethod.GET, null, new ParameterizedTypeReference<List<Airline>>() {
                                 });
@@ -173,7 +198,7 @@ void testListAirlinesByCountry() {
 
                 country = "France";
                 ResponseEntity<List<Airline>> response2 = restTemplate.exchange(
-                                "http://localhost:" + port + "/api/v1/airline/country/" + country + "?limit=" + limit
+                                "/api/v1/airline/country/" + country + "?limit=" + limit
                                                 + "&offset=" + offset,
                                 HttpMethod.GET, null, new ParameterizedTypeReference<List<Airline>>() {
                                 });
@@ -225,7 +250,7 @@ void testListAirlinesByDestinationAirport() {
                         List<Airline> expectedAirlines = entry.getValue();
 
                         ResponseEntity<List<Airline>> response = restTemplate.exchange(
-                                        "http://localhost:" + port + "/api/v1/airline/destination/" + destinationAirport
+                                        "/api/v1/airline/destination/" + destinationAirport
                                                         + "?limit=" + limit + "&offset=" + offset,
                                         HttpMethod.GET, null, new ParameterizedTypeReference<List<Airline>>() {
                                         });
diff --git a/src/test/java/org/couchbase/quickstart/springboot/controllers/AirportIntegrationTest.java b/src/test/java/org/couchbase/quickstart/springboot/controllers/AirportIntegrationTest.java
diff --git a/src/test/java/org/couchbase/quickstart/springboot/controllers/RouteIntegrationTest.java b/src/test/java/org/couchbase/quickstart/springboot/controllers/RouteIntegrationTest.java
