Merge pull request #33 from fleetbase/dev-v0.1.15

dev-v0.1.15

Author: roncodes

addon/models/order.js

@@ -35,6 +35,7 @@ export default class OrderModel extends Model {
     @belongsTo('transaction', { async: false }) transaction;
     @belongsTo('payload', { async: false }) payload;
     @belongsTo('driver', { async: false, inverse: 'jobs' }) driver_assigned;
+    @belongsTo('vehicle', { async: false }) vehicle_assigned;
     @belongsTo('route', { async: false }) route;
     @belongsTo('purchase-rate', { async: false }) purchase_rate;
     @belongsTo('tracking-number', { async: false }) tracking_number;
@@ -45,6 +46,7 @@ export default class OrderModel extends Model {
 
     /** @aliases */
     @alias('driver_assigned') driver;
+    @alias('vehicle_assigned') vehicle;
 
     /** @attributes */
     @attr('string') tracking;

addon/models/payload.js

@@ -15,8 +15,8 @@ export default class PayloadModel extends Model {
     @belongsTo('place', { async: false }) pickup;
     @belongsTo('place', { async: false }) dropoff;
     @belongsTo('place', { async: false }) return;
-    @hasMany('waypoint') waypoints;
-    @hasMany('entity') entities;
+    @hasMany('waypoint', { async: false }) waypoints;
+    @hasMany('entity', { async: false }) entities;
 
     /** @attributes */
     @attr('string') meta;

addon/models/waypoint.js

@@ -6,13 +6,16 @@ export default class WaypointModel extends PlaceModel {
     /** @relationships */
     @belongsTo('place', { async: false }) place;
     @belongsTo('tracking-number', { async: false }) tracking_number;
+    @belongsTo('customer', { polymorphic: true, async: false }) customer;
 
     /** @attributes */
     @attr('string') public_id;
     @attr('string') _import_id;
     @attr('string') waypoint_uuid;
     @attr('string') waypoint_public_id;
     @attr('string') tracking_number_uuid;
+    @attr('string') customer_uuid;
+    @attr('string') customer_type;
     @attr('string') tracking;
     @attr('string') status;
     @attr('string') status_code;

addon/serializers/order.js

@@ -13,6 +13,7 @@ export default class OrderSerializer extends ApplicationSerializer.extend(Embedd
             order_config: { embedded: 'always' },
             payload: { embedded: 'always' },
             driver_assigned: { embedded: 'always' },
+            vehicle_assigned: { embedded: 'always' },
             facilitator: { embedded: 'always' },
             customer: { embedded: 'always' },
             transaction: { embedded: 'always' },
@@ -78,7 +79,6 @@ export default class OrderSerializer extends ApplicationSerializer.extend(Embedd
 
         // if snapshot already has type filled respect manual input
         const isPolymorphicTypeBlank = isBlank(snapshot.attr(key + '_type'));
-
         if (isPolymorphicTypeBlank) {
             key = this.keyForAttribute ? this.keyForAttribute(key, 'serialize') : key;
 

addon/serializers/waypoint.js

@@ -1,6 +1,7 @@
 import ApplicationSerializer from '@fleetbase/ember-core/serializers/application';
 import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
 import { getProperties, setProperties } from '@ember/object';
+import { isBlank } from '@ember/utils';
 
 export default class WaypointSerializer extends ApplicationSerializer.extend(EmbeddedRecordsMixin) {
     /**
@@ -11,6 +12,7 @@ export default class WaypointSerializer extends ApplicationSerializer.extend(Emb
     get attrs() {
         return {
             place: { embedded: 'always' },
+            customer: { embedded: 'always' },
             tracking_number: { embedded: 'always' },
         };
     }
@@ -55,4 +57,26 @@ export default class WaypointSerializer extends ApplicationSerializer.extend(Emb
 
         return super.normalize(model, hash, prop);
     }
+
+    serializePolymorphicType(snapshot, json, relationship) {
+        let key = relationship.key;
+        let belongsTo = snapshot.belongsTo(key);
+        let type = belongsTo.modelName;
+
+        // if snapshot already has type filled respect manual input
+        const isPolymorphicTypeBlank = isBlank(snapshot.attr(key + '_type'));
+        if (isPolymorphicTypeBlank) {
+            key = this.keyForAttribute ? this.keyForAttribute(key, 'serialize') : key;
+
+            if (!isBlank(belongsTo.attr(`${key}_type`))) {
+                type = belongsTo.attr(`${key}_type`);
+            }
+
+            if (!belongsTo) {
+                json[key + '_type'] = null;
+            } else {
+                json[key + '_type'] = `fleet-ops:${type}`;
+            }
+        }
+    }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fleetbase/fleetops-data",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "Fleetbase Fleet-Ops based models, serializers, transforms, adapters and GeoJson utility functions.",
   "keywords": [
     "fleetbase-data",