Merge remote-tracking branch 'origin/develop' into feature/site

api/status.js

@@ -16,6 +16,17 @@ export const IN_PROGRESS = 'progress';
 export const DELIVERED = 'delivered';
 export const DONE = 'done';
 export const CANCELED = 'canceled';
+export const CANCELED_TECHNICAL = 'canceled_technical';
+export const CANCELED_REQUESTED_CUSTOMER = 'canceled_requested_customer';
+export const CANCELED_CUSTOMER_OVERLOAD = 'canceled_customer_overload';
+export const CANCELED_CUSTOMER_MISSING = 'canceled_customer_missing';
+export const CANCELED_STATUSES = [
+  CANCELED,
+  CANCELED_TECHNICAL,
+  CANCELED_REQUESTED_CUSTOMER,
+  CANCELED_CUSTOMER_OVERLOAD,
+  CANCELED_CUSTOMER_MISSING,
+];
 
 export const isDeclined = status => status.startsWith(DECLINED);
 

pages/_ride_id.vue

@@ -151,7 +151,7 @@ export default {
     try {
       const rideAPI = $api
         .rides('id,departure(label,location(coordinates)),arrival(label,location(coordinates)),'
-          + 'driver(id,name),car(id,model(label)),position,status');
+          + 'driver(id,name),car(id,model(label)),position,status,token');
 
       const { data: ride } = await rideAPI.getRide(rideId, token);
       const { data: { position, date } } = await rideAPI.getDriverPosition(rideId, token);

plugins/socket.js

@@ -1,23 +1,31 @@
 import Vue from 'vue';
 import VueSocketio from 'vue-socket.io-extended';
 import io from 'socket.io-client';
+import { CANCELED_STATUSES, DELIVERED } from '../api/status';
 
 
-export default function ({ env, store, query }, inject) {
+export default function ({ env, store }, inject) {
   const ioInstance = io(env.apiUrl, { autoConnect: false });
   Vue.use(VueSocketio, ioInstance, { store });
   inject('io', ioInstance);
   ioInstance.on('connect', () => {
-    const { token = null } = query;
-    ioInstance.emit('roomJoinRide', { id: store.getters['ride/rideId'], token });
+    ioInstance.emit(
+      'roomJoinRide',
+      { id: store.getters['ride/ride'].id, token: store.getters['ride/ride'].token },
+    );
   });
-  const autoConnect = (rideId) => {
-    if (rideId) {
+  ioInstance.on('rideUpdate', (ride) => {
+    if (ride && (ride.status === DELIVERED || CANCELED_STATUSES.indexOf(ride.status) !== -1)) {
+      ioInstance.close();
+    }
+  });
+  const autoConnect = (ride) => {
+    if (ride && ride.id && ride.status !== DELIVERED && CANCELED_STATUSES.indexOf(ride.status) === -1) {
       ioInstance.open();
     } else {
       ioInstance.close();
     }
   };
-  autoConnect(store.getters['ride/rideId']);
-  store.watch((state, getters) => getters['ride/rideId'], autoConnect);
+  autoConnect(store.getters['ride/ride']);
+  store.watch((state, getters) => getters['ride/ride'], autoConnect);
 }