Fix bus test, somehow it has OpenHandles still, need to debug

Author: StefanWallin

packages/simulator/__tests__/unit/bus.js

@@ -1,32 +1,38 @@
-const Bus = require('../../lib/vehicles/bus')
+const moment = require('moment')
 const { Subject } = require('rxjs')
+
+const Bus = require('../../lib/vehicles/bus')
+
 const range = (length) => Array.from({ length }).map((_, i) => i)
-const moment = require('moment')
+
 describe('A bus', () => {
   const arjeplog = { lon: 17.886855, lat: 66.041054 }
   const ljusdal = { lon: 14.44681991219, lat: 61.59465992477 }
-  let bus
 
-  it('should be able to pickup multiple bookings and queue the all except the first', () => {
+  it('should be able to pickup multiple bookings and queue the all except the first',  (done) => {
     const stops = new Subject()
-    bus = new Bus({ id: 1, position: arjeplog, stops })
+    const bus = new Bus({ id: 1, position: arjeplog, stops })
 
     range(10).map((i) =>
       stops.next({
-        pickup: ljusdal,
-        destination: arjeplog,
+        position: i % 2 === 0 ? ljusdal : arjeplog,
+        stopName: i % 2 === 0 ? 'ljusdal' : 'arjeplog',
         departureTime: moment('2021-04-20 00:00:00')
           .add(i, 'minutes')
           .format('HH:mm:ss'),
       })
     )
 
     const queue = bus.queue
-    console.log(bus.queue.map((e) => e.pickup.departureTime))
     expect(queue.length).toBe(8)
-    expect(queue[0].pickup).toEqual(ljusdal)
-    expect(queue[0].departureTime).toBe('00:00:00')
-    expect(queue[0].arrivalTime).toBe('00:00:00')
-    expect(queue[0].status).toBe('queued')
+    expect(queue[0].pickup.position).toEqual(arjeplog)
+    expect(queue[0].pickup.stopName).toBe('arjeplog')
+    expect(queue[0].pickup.departureTime).toBe('00:01:00')
+    expect(queue[0].destination.position).toEqual(ljusdal)
+    expect(queue[0].destination.stopName).toBe('ljusdal')
+    expect(queue[0].destination.departureTime).toBe('00:02:00')
+    expect(queue[0].status).toBe('Queued')
+    bus.unsubscribe()
+    done()
   })
 })

packages/simulator/lib/vehicles/bus.js

@@ -1,8 +1,7 @@
+const { pairwise, map } = require('rxjs/operators')
+
 const Booking = require('../models/booking')
 const Vehicle = require('./vehicle')
-const { pairwise, map } = require('rxjs/operators')
-const moment = require('moment')
-const { virtualTime } = require('../virtualTime')
 
 // TODO: create this somewhere else as real fleet
 const lanstrafiken = {
@@ -33,9 +32,27 @@ class Bus extends Vehicle {
     this.vehicleType = 'bus'
     this.heading = heading
     this.kommun = kommun
-    this.startPosition = startPosition
+    this.startPosition = startPosition || position
     this.capacity = 50 // TODO: fill this from the workshop poll
     this.co2PerKmKg = 1.3 // NOTE: From a quick google. Needs to be verified.
+    this.stopsSubscription = stops
+      .pipe(
+        pairwise(),
+        map(([pickup, destination]) => {
+          this.handleBooking(
+            new Booking({
+              // pickup and destination contains both position and arrival and departure time
+              pickup,
+              destination,
+            })
+          )
+        })
+      )
+      .subscribe(() => {})
+  }
+
+  unsubscribe() {
+    this.stopsSubscription.unsubscribe()
   }
 
   async handleBooking(booking) {