Merge remote-tracking branch 'origin/master'

build.gradle

@@ -60,6 +60,7 @@ dependencies {
     compile('org.springframework.boot:spring-boot-starter-data-jpa')
     compile('org.springframework.boot:spring-boot-starter-web')
     compile('org.springframework.boot:spring-boot-starter-security')
+    compile('org.springframework.boot:spring-boot-starter-amqp')
     compile('com.fasterxml.jackson.module:jackson-module-kotlin')
     compile('org.springframework.cloud:spring-cloud-starter-openfeign')
     compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")

src/main/kotlin/com/s63d/ertripservice/clients/VehicleClient.kt

@@ -14,4 +14,5 @@ interface VehicleClient {
 
     @GetMapping("{license}")
     fun getById(@PathVariable license: String, @RequestHeader(HttpHeaders.AUTHORIZATION) auth: String) : SimpleVehicle?
+
 }

src/main/kotlin/com/s63d/ertripservice/config/SecurityConfig.kt

@@ -25,7 +25,7 @@ class SecurityConfig(private val userDetailsService: UserDetailsService) : WebSe
                 .authorizeRequests()
                 .antMatchers("/v2/api-docs","/swagger-resources","/swagger-resources/**", "/swagger-ui.html", "/webjars/**").permitAll()
                 .antMatchers("/actuator/**").permitAll()
-                .antMatchers(HttpMethod.POST,"/api/trips").permitAll()
+                .antMatchers(HttpMethod.POST,"/api/trips", "/api/trips/**/finished").permitAll()
                 .anyRequest().authenticated()
                 .and()
                 .addFilterAfter(JwtAuthorizationFilter(authenticationManager(), userDetailsService), BasicAuthenticationFilter::class.java)

src/main/kotlin/com/s63d/ertripservice/controllers/TripController.kt

@@ -14,4 +14,8 @@ class TripController(private val tripService: TripService) {
     @GetMapping
     fun getTripsForVehicle(@RequestParam vehicleId: String, principal: Principal) = tripService.byVehicleId(vehicleId)
 
+    @PostMapping
+    @RequestMapping("{id}/finished")
+    fun finishTrip(@PathVariable id: Long) =  tripService.finishTrip(id)
+
 }

src/main/kotlin/com/s63d/ertripservice/domain/intern/InternTrip.kt

@@ -0,0 +1,13 @@
+package com.s63d.ertripservice.domain.intern
+
+import com.s63d.ertripservice.domain.db.Trip
+import com.s63d.ertripservice.domain.db.toPolyline
+import com.s63d.ertripservice.domain.rest.SimpleVehicle
+
+data class InternTrip(val id: Long, val polyline: String, val vehicleWeight: Int) {
+
+    private constructor() : this(0, "", 0)
+
+    constructor(trip:Trip, vehicle: SimpleVehicle) : this(trip.id, trip.locations.toPolyline(), vehicle.weight)
+
+}

src/main/kotlin/com/s63d/ertripservice/domain/rest/SimpleVehicle.kt

@@ -3,4 +3,4 @@ package com.s63d.ertripservice.domain.rest
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-class SimpleVehicle(val carTrackerId: String? = null)
+class SimpleVehicle(val carTrackerId: String? = null, val weight: Int)

src/main/kotlin/com/s63d/ertripservice/services/TripService.kt

@@ -3,28 +3,35 @@ package com.s63d.ertripservice.services
 import com.s63d.ertripservice.clients.VehicleClient
 import com.s63d.ertripservice.domain.db.CarTracker
 import com.s63d.ertripservice.domain.db.Trip
+import com.s63d.ertripservice.domain.intern.InternTrip
 import com.s63d.ertripservice.domain.rest.TripResponse
 import com.s63d.ertripservice.repositories.TripRepository
+import org.springframework.amqp.rabbit.core.RabbitTemplate
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
 import org.springframework.stereotype.Service
 
 @Service
-class TripService(private val tripRepository: TripRepository, private val vehicleClient: VehicleClient) {
+class TripService(private val tripRepository: TripRepository, private val vehicleClient: VehicleClient, private val rabbitTemplate: RabbitTemplate) {
 
     fun createNew(carTrackerId: String) : Trip {
         val trip = Trip(CarTracker(carTrackerId))
-        //println(trip.carTracker.carTrackerId)
         return tripRepository.save(trip).also(::println)
     }
 
     fun byCarTracker(trackerId: String?, pageable: Pageable = Pageable.unpaged()) = tripRepository.findByCarTrackerId(trackerId, pageable).map { TripResponse(it) }
 
-    // fun byId(id: Long) = TripResponse(tripRepository.findById(id).orElseThrow { Exception("Invalid trip id") }) // TODO response status
 
     val user1 = " eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJnb29zamVAaG90bWFpbC5jb20iLCJ1c2VyUm9sZSI6ImJhc2ljIiwidXNlcklkIjoxfQ.QPLlsebqlIdn6FQIMThrIQcNtk7qygStwyUcaxETXHQ"
     fun byVehicleId(id: String, pageable: Pageable = Pageable.unpaged()): Page<TripResponse> {
         val carTrackerId = vehicleClient.getById(id, user1)?.carTrackerId
         return byCarTracker(carTrackerId, pageable)
     }
+
+    fun finishTrip(id: Long) {
+        val trip = tripRepository.findById(id).orElseThrow { Exception("Trip '$id' not found") }
+        val vehicle = vehicleClient.getById(trip.carTracker.carTrackerId, user1) ?: throw Exception("Car not found with car tracker ${trip.carTracker.carTrackerId}")
+        val internTrip = InternTrip(trip, vehicle)
+        rabbitTemplate.convertAndSend("AT", "trip", internTrip)
+    }
 }

src/main/resources/application.yml

@@ -1,3 +1,4 @@
+
 spring:
     datasource:
         url: jdbc:mysql://localhost:3309/trip-db
@@ -10,6 +11,8 @@ spring:
         show-sql: true
     main:
       banner-mode: "off"
+    rabbitmq:
+      host: ersols.online
 urls:
   account-service: "localhost:8081"
   vehicle-service: "localhost:8080"