Merge pull request #15 from fleetbase/dev-v0.1.2

v0.1.2

addon/models/contact.js

@@ -7,10 +7,8 @@ export default class ContactModel extends Model {
     @attr('string') public_id;
     @attr('string') company_uuid;
     @attr('string') photo_uuid;
-    @attr('string') place_uuid;
 
     /** @relationships */
-    @belongsTo('place') place;
     @belongsTo('file') photo;
 
     /** @attributes */
@@ -19,8 +17,6 @@ export default class ContactModel extends Model {
     @attr('string') email;
     @attr('string') phone;
     @attr('string') type;
-    @attr('string') customer_type;
-    @attr('string') facilitator_type;
     @attr('string', {
         defaultValue: 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/no-avatar.png',
     })

addon/models/driver.js

@@ -17,6 +17,7 @@ export default class DriverModel extends Model {
     @attr('string') vehicle_uuid;
     @attr('string') vendor_uuid;
     @attr('string') current_job_uuid;
+    @attr('string') photo_uuid;
     @attr('string') vehicle_id;
     @attr('string') vendor_id;
     @attr('string') current_job_id;
@@ -174,20 +175,17 @@ export default class DriverModel extends Model {
     /** @methods */
     loadVehicle() {
         const owner = getOwner(this);
-        const store = owner.lookup(`service:store`);
+        const store = owner.lookup('service:store');
 
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             if (isRelationMissing(this, 'vehicle')) {
                 return store
                     .findRecord('vehicle', this.vehicle_uuid)
                     .then((vehicle) => {
                         this.vehicle = vehicle;
-
                         resolve(vehicle);
                     })
-                    .catch(() => {
-                        resolve(null);
-                    });
+                    .catch(reject);
             }
 
             resolve(this.vehicle);
@@ -198,18 +196,15 @@ export default class DriverModel extends Model {
         const owner = getOwner(this);
         const store = owner.lookup(`service:store`);
 
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             if (isRelationMissing(this, 'vendor')) {
                 return store
                     .findRecord('vendor', this.vendor_uuid)
                     .then((vendor) => {
                         this.vendor = vendor;
-
                         resolve(vendor);
                     })
-                    .catch(() => {
-                        resolve(null);
-                    });
+                    .catch(reject);
             }
 
             resolve(this.vendor);

addon/models/fuel-report.js

@@ -1,28 +1,34 @@
 import Model, { attr, belongsTo } from '@ember-data/model';
 import { computed } from '@ember/object';
+import { getOwner } from '@ember/application';
 import { format as formatDate, isValid as isValidDate, formatDistanceToNow } from 'date-fns';
+import isRelationMissing from '@fleetbase/ember-core/utils/is-relation-missing';
 
 export default class FuelReportModel extends Model {
     /** @ids */
     @attr('string') public_id;
     @attr('string') company_uuid;
     @attr('string') driver_uuid;
     @attr('string') vehicle_uuid;
+    @attr('string') reported_by_uuid;
 
     /** @relationships */
     @belongsTo('driver') driver;
     @belongsTo('vehicle') vehicle;
+    @belongsTo('user') reporter;
 
     /** @attributes */
+    @attr('string') reporter_name;
     @attr('string') driver_name;
     @attr('string') vehicle_name;
+    @attr('string') report;
     @attr('string') odometer;
     @attr('string') amount;
     @attr('string') currency;
     @attr('string') volume;
     @attr('string', { defaultValue: 'L' }) metric_unit;
-    @attr('string') type;
     @attr('point') location;
+    @attr('raw') meta;
 
     /** @dates */
     @attr('date') deleted_at;
@@ -71,4 +77,43 @@ export default class FuelReportModel extends Model {
         }
         return formatDate(this.created_at, 'PP');
     }
+
+    /** @methods */
+    loadVehicle() {
+        const owner = getOwner(this);
+        const store = owner.lookup('service:store');
+
+        return new Promise((resolve, reject) => {
+            if (isRelationMissing(this, 'vehicle')) {
+                return store
+                    .findRecord('vehicle', this.vehicle_uuid)
+                    .then((vehicle) => {
+                        this.vehicle = vehicle;
+                        resolve(vehicle);
+                    })
+                    .catch(reject);
+            }
+
+            resolve(this.vehicle);
+        });
+    }
+
+    loadDriver() {
+        const owner = getOwner(this);
+        const store = owner.lookup('service:store');
+
+        return new Promise((resolve, reject) => {
+            if (isRelationMissing(this, 'driver')) {
+                return store
+                    .findRecord('driver', this.driver_uuid)
+                    .then((driver) => {
+                        this.driver = driver;
+                        resolve(driver);
+                    })
+                    .catch(reject);
+            }
+
+            resolve(this.driver);
+        });
+    }
 }

addon/models/issue.js

@@ -1,6 +1,8 @@
 import Model, { attr, belongsTo } from '@ember-data/model';
 import { computed } from '@ember/object';
+import { getOwner } from '@ember/application';
 import { format as formatDate, isValid as isValidDate, formatDistanceToNow } from 'date-fns';
+import isRelationMissing from '@fleetbase/ember-core/utils/is-relation-missing';
 
 export default class IssueModel extends Model {
     /** @ids */
@@ -9,21 +11,28 @@ export default class IssueModel extends Model {
     @attr('string') company_uuid;
     @attr('string') reported_by_uuid;
     @attr('string') assigned_to_uuid;
+    @attr('string') driver_uuid;
     @attr('string') vehicle_uuid;
 
     /** @relationships */
     @belongsTo('user') reporter;
     @belongsTo('user') assignee;
     @belongsTo('vehicle') vehicle;
+    @belongsTo('driver') driver;
 
     /** @attributes */
-    @attr('string') odometer;
-    @attr('string') latitude;
-    @attr('string') longitude;
+    @attr('string') driver_name;
+    @attr('string') vehicle_name;
+    @attr('string') assignee_name;
+    @attr('string') reporter_name;
     @attr('string') type;
+    @attr('string') category;
     @attr('string') report;
     @attr('string') priority;
     @attr('string') status;
+    @attr('point') location;
+    @attr('raw') tags;
+    @attr('raw') meta;
 
     /** @dates */
     @attr('date') deleted_at;
@@ -72,4 +81,43 @@ export default class IssueModel extends Model {
         }
         return formatDate(this.created_at, 'PP');
     }
+
+    /** @methods */
+    loadVehicle() {
+        const owner = getOwner(this);
+        const store = owner.lookup('service:store');
+
+        return new Promise((resolve, reject) => {
+            if (isRelationMissing(this, 'vehicle')) {
+                return store
+                    .findRecord('vehicle', this.vehicle_uuid)
+                    .then((vehicle) => {
+                        this.vehicle = vehicle;
+                        resolve(vehicle);
+                    })
+                    .catch(reject);
+            }
+
+            resolve(this.vehicle);
+        });
+    }
+
+    loadDriver() {
+        const owner = getOwner(this);
+        const store = owner.lookup('service:store');
+
+        return new Promise((resolve, reject) => {
+            if (isRelationMissing(this, 'driver')) {
+                return store
+                    .findRecord('driver', this.driver_uuid)
+                    .then((driver) => {
+                        this.driver = driver;
+                        resolve(driver);
+                    })
+                    .catch(reject);
+            }
+
+            resolve(this.driver);
+        });
+    }
 }

addon/models/vendor.js

@@ -1,7 +1,8 @@
 import Model, { attr, belongsTo } from '@ember-data/model';
-import { computed } from '@ember/object';
+import { computed, get } from '@ember/object';
 import { notEmpty } from '@ember/object/computed';
 import { format as formatDate, isValid as isValidDate, formatDistanceToNow } from 'date-fns';
+import config from 'ember-get-config';
 
 export default class VendorModel extends Model {
     /** @ids */
@@ -21,7 +22,10 @@ export default class VendorModel extends Model {
     @attr('string') name;
     @attr('string') email;
     @attr('string') website_url;
-    @attr('string') logo_url;
+    @attr('string', {
+        defaultValue: get(config, 'defaultValues.vendorImage'),
+    })
+    logo_url;
     @attr('string') phone;
     @attr('string') address;
     @attr('string') address_street;

addon/serializers/fleet.js

@@ -11,13 +11,14 @@ export default class FleetSerializer extends ApplicationSerializer.extend(Embedd
         return {
             vendor: { embedded: 'always' },
             parent_fleet: { embedded: 'always' },
+            subfleets: { embedded: 'always' },
             service_area: { embedded: 'always' },
             zone: { embedded: 'always' },
             drivers: { embedded: 'always' },
             vehicles: { embedded: 'always' },
         };
     }
-    
+
     serializeBelongsTo(snapshot, json, relationship) {
         let key = relationship.key;
 

addon/serializers/fuel-report.js

@@ -11,6 +11,24 @@ export default class FuelReportSerializer extends ApplicationSerializer.extend(E
         return {
             driver: { embedded: 'always' },
             vehicle: { embedded: 'always' },
+            reporter: { embedded: 'always' },
         };
     }
+
+    /**
+     * Customize serializer so that any attributes that are instances of Models or objects
+     * that are to accept and ID get serialized into the id only
+     *
+     * @param {Snapshot} snapshot
+     * @param {Object} options
+     * @return {Object} json
+     */
+    serialize() {
+        const json = super.serialize(...arguments);
+
+        // remove automatically set `reporter_uuid`
+        delete json.reporter_uuid;
+
+        return json;
+    }
 }

addon/serializers/issue.js

@@ -1,4 +1,38 @@
 import ApplicationSerializer from '@fleetbase/ember-core/serializers/application';
 import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
 
-export default class IssueSerializer extends ApplicationSerializer.extend(EmbeddedRecordsMixin) {}
+export default class IssueSerializer extends ApplicationSerializer.extend(EmbeddedRecordsMixin) {
+    /**
+     * Embedded relationship attributes
+     *
+     * @var {Object}
+     */
+    get attrs() {
+        return {
+            driver: { embedded: 'always' },
+            vehicle: { embedded: 'always' },
+            reporter: { embedded: 'always' },
+            assignee: { embedded: 'always' },
+        };
+    }
+
+    /**
+     * Customize serializer so that any attributes that are instances of Models or objects
+     * that are to accept and ID get serialized into the id only
+     *
+     * @param {Snapshot} snapshot
+     * @param {Object} options
+     * @return {Object} json
+     */
+    serialize() {
+        const json = super.serialize(...arguments);
+
+        // remove automatically set `reporter_uuid`
+        delete json.reporter_uuid;
+
+        // remove automatically set `assignee_uuid`
+        delete json.assignee_uuid;
+
+        return json;
+    }
+}

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-data",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "description": "Fleetbase Fleet-Ops based models, serializers, transforms, adapters and GeoJson utility functions.",
     "keywords": [
         "fleetbase-data",
@@ -42,7 +42,7 @@
         "@ember/optional-features": "^2.0.0",
         "@ember/test-helpers": "^2.8.1",
         "@embroider/test-setup": "^1.8.3",
-        "@fleetbase/ember-core": "^0.0.8",
+        "@fleetbase/ember-core": "^0.1.6",
         "@glimmer/component": "^1.1.2",
         "@glimmer/tracking": "^1.1.2",
         "babel-eslint": "^10.1.0",