Merge pull request #3 from AITestingOrg/update-delete-functionalities

Update delete functionalities

Author: schan2023

Dockerfile

@@ -2,7 +2,8 @@ FROM frolvlad/alpine-oraclejdk8:slim
 VOLUME /tmp
 ADD build/libs/driver-query-0.0.1.jar app.jar
 ENV JAVA_OPTS=""
+ENV MONGO_HOST="mongo"
 ENV MONGO_PORT="27017"
 ENV RABBIT_HOST="rabbitmq"
 EXPOSE 8080
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar" ]
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar" ]

build.gradle

@@ -61,6 +61,7 @@ dependencies {
 testCompile('org.springframework.boot:spring-boot-starter-test')
 testCompile('org.codehaus.groovy:groovy-all:2.4.6')
 testCompile("org.springframework.cloud:spring-cloud-starter-contract-verifier:${verifierVersion}")
+testCompile("org.springframework.cloud:spring-cloud-contract-spec:${verifierVersion}")
 testCompile("org.springframework.boot:spring-boot-starter-test:${springBootVersion}")
 }
 
@@ -70,6 +71,12 @@ dependencyManagement {
 }
 }
 
+contracts {
+baseClassMappings {
+baseClassMapping(".*driverquery.*", "org.aitesting.microservices.driverquery.provider.DriverQueryContractBase")
+}
+}
+
 checkstyle {
 toolVersion = "8.7"
 configFile = new File(rootDir, "checkstyle.xml")
@@ -93,6 +100,13 @@ jacocoTestReport {
 }
 
 jacocoTestCoverageVerification {
+afterEvaluate {
+classDirectories = files(classDirectories.files.collect {
+fileTree(dir: "${project.buildDir}/classes/main",
+exclude: ['**/controllers/DriverControllerExceptionHandler*',
+ '**/DriverQueryApplication*'])
+})
+}
 violationRules {
 rule {
 limit {

docker-compose-dev.yml

@@ -15,7 +15,7 @@ services:
  - "5672:5672"
  - "15672:15672"
  driver-cmd:
- image: aista/tdriver-cmd
+ image: ../driver-cmd/
  container_name: 'driver-cmd'
  environment:
  - RABBIT_HOST=rabbitmq

docker-compose.yml

@@ -3,19 +3,17 @@ services:
 
  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"
  driver-cmd:
- image: aista/driver-cmd
+ build: aista/driver-cmd/
  container_name: 'driver-cmd'
  environment:
  - RABBIT_HOST=rabbitmq
@@ -39,4 +37,4 @@ services:
  - driver-cmd
 
 volumes:
- mongo:
+ mongo:

libs/driver-common-1.0.jar

@@ -1,5 +1,6 @@
 package org.aitesting.microservices.driver.query.domain.eventhandlers;
 
+import org.aitesting.microservices.driver.common.events.DriverAvailabilityChangedEvent;
 import org.aitesting.microservices.driver.common.events.DriverCreatedEvent;
 import org.aitesting.microservices.driver.common.events.DriverDeletedEvent;
 import org.aitesting.microservices.driver.query.domain.models.Driver;
@@ -30,8 +31,17 @@ public void on(DriverCreatedEvent event) {
 
  @EventHandler
  public void on(DriverDeletedEvent event) {
- LOG.trace("Deleting driver: {}", event.getId());
+ LOG.info("Deleting driver: {}", event.getId());
  driverRepository.delete(event.getId());
  LOG.info("Driver deleted: {}", event.getId());
  }
+
+ @EventHandler
+ public void on(DriverAvailabilityChangedEvent event) {
+ LOG.info("Updating driver availability: {}", event.getId());
+ Driver driver = driverRepository.findOne(event.getId());
+ driver.setAvailable(event.isAvailable());
+ driverRepository.save(driver);
+ LOG.info("Driver availability updated: {}", event.getId());
+ }
 }

src/main/java/org/aitesting/microservices/driver/query/domain/eventhandlers/DriverEventHandler.java

@@ -81,4 +81,8 @@ public double getRating() {
  public int getNumberOfRatings() {
  return numberOfRatings;
  }
+
+ public void setAvailable(boolean available) {
+ this.available = available;
+ }
 }

src/main/java/org/aitesting/microservices/driver/query/domain/models/Driver.java

@@ -30,10 +30,16 @@ public ResponseEntity<List<Driver>> getDrivers() {
  return new ResponseEntity<>(driverRepository.findAll(), HttpStatus.OK);
  }
 
- @GetMapping("drivers/{id}")
+ @GetMapping("driver/{id}")
  public ResponseEntity<Driver> getDriver(@PathVariable UUID id) {
  logger.info(String.format("Request for a driver with id: %s", id));
- return new ResponseEntity<>(driverRepository.findOne(id), HttpStatus.OK);
+ Driver driver = driverRepository.findOne(id);
+ if(driver != null) {
+ logger.info(String.format("Found driver by ID: %s", id));
+ return new ResponseEntity<>(driver, HttpStatus.OK);
+ }
+ logger.info(String.format("No drivers found by ID: %s", id));
+ return new ResponseEntity<>(HttpStatus.NOT_FOUND);
  }
 
 }

src/main/java/org/aitesting/microservices/driver/query/service/controllers/DriverController.java

@@ -1,16 +1,18 @@
 package org.aitesting.microservices.driverquery;
 
+import org.aitesting.microservices.driver.query.DriverQueryApplication;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Profile;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@Profile("test")
+@SpringBootTest(classes = DriverQueryApplication.class)
 public class DriverQueryApplicationTests {
 
-@Test
-public void contextLoads() {
-}
-
+ @Test
+ public void contextLoads() {
+ }
 }

src/test/java/org/aitesting/microservices/driverquery/DriverQueryApplicationTests.java

@@ -0,0 +1,22 @@
+package org.aitesting.microservices.driverquery.configurations;
+
+import java.util.UUID;
+
+public class TestConstants {
+ public static final UUID id1 = UUID.fromString("1f13bafe-9236-4edf-ac47-bf2f1d3caec6");
+ public static final String fname1 = "Jason";
+ public static final String lname1 = "Blossoms";
+ public static final String address1 = "1457 Maple Street";
+ public static final String email1 = "jasonblossoms@email.com";
+ public static final String phone1 = "5437685380";
+ public static final String license1 = "124D-FEW-CVD-F342";
+
+ public static final UUID id2 = UUID.fromString("1f13bafe-9236-4edf-ac47-bf2f1d3caec6");
+ public static final String fname2 = "Veronica";
+ public static final String lname2 = "Lodge";
+ public static final String address2 = "1345 Eastwood";
+ public static final String email2 = "vlodge@email.com";
+ public static final String phone2 = "4642785563";
+ public static final String license2 = "134D-FE5E-CV34D-F3442";
+
+}