Query available drivers (#4)

Added possibility to query for next available driver, and also query for all available drivers. Also, changed the name of the eventbus to be specifically for driver.

Author: R4il

docker-compose-dev.yml

@@ -21,7 +21,7 @@ services:
  - RABBIT_HOST=rabbitmq
  - MONGO_HOST=mongo
  ports:
- - "8080"
+ - '8080'
  depends_on:
  - rabbitmq
  - mongo

docker-compose.yml

@@ -19,7 +19,7 @@ services:
  - RABBIT_HOST=rabbitmq
  - MONGO_HOST=mongo
  ports:
- - "8080"
+ - '8080'
  depends_on:
  - rabbitmq
  - mongo

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

@@ -42,5 +42,23 @@ public ResponseEntity<Driver> getDriver(@PathVariable UUID id) {
  return new ResponseEntity<>(HttpStatus.NOT_FOUND);
  }
 
-}
+ @GetMapping("driver/available")
+ public ResponseEntity<Driver> getAvailableDriver() {
+ logger.info(String.format("Request for an available driver"));
+ List<Driver> availableDrivers = driverRepository.findByAvailable(true);
+ if(availableDrivers.size() > 0) {
+ return new ResponseEntity<>(availableDrivers.get(0), HttpStatus.OK);
+ }
+ return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+ }
 
+ @GetMapping("drivers/allavailable")
+ public ResponseEntity<List<Driver>> getAllAvailableDrivers() {
+ logger.info(String.format("Request for all available drivers"));
+ List<Driver> availableDrivers =driverRepository.findByAvailable(true);
+ if(availableDrivers.size() > 0) {
+ return new ResponseEntity<>(availableDrivers, HttpStatus.OK);
+ }
+ return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+ }
+}

src/main/java/org/aitesting/microservices/driver/query/service/repositories/DriverRepository.java

@@ -3,7 +3,11 @@
 import org.aitesting.microservices.driver.query.domain.models.Driver;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
+import java.util.List;
 import java.util.UUID;
 
 public interface DriverRepository extends MongoRepository<Driver, UUID> {
+
+ public List<Driver> findByAvailable(boolean b);
+
 }

src/main/resources/application.yml

@@ -19,8 +19,8 @@ server:
 amqp:
  events:
  host: ${RABBIT_HOST:localhost}
- exchange-name: eventBus
- queue-name: eventQueue
+ exchange-name: eventBusDriver
+ queue-name: eventQueueDriver
  handlers: org.aitesting.microservices.driver.query.domain.eventhandlers
 
 logging:

src/test/java/org/aitesting/microservices/driverquery/unit/DriverControllerUnitTests.java

@@ -42,4 +42,26 @@ public void getDriver_FindOneIsCalled() {
  //assert
  verify(driverRepository, times(1)).findOne(id1);
  }
+
+ @Test
+ public void getAvailableDriver_FindByAvailableIsCalled() {
+ //arrange
+
+ //act
+ driverController.getAvailableDriver();
+
+ //assert
+ verify(driverRepository, times(1)).findByAvailable(true);
+ }
+
+ @Test
+ public void getAllAvailableDrivers_FindByAvailableIsCalled() {
+ //arrange
+
+ //act
+ driverController.getAllAvailableDrivers();
+
+ //assert
+ verify(driverRepository, times(1)).findByAvailable(true);
+ }
 }