@ricado/api-client 1.4.1 → 2.0.0

package/src/Controllers/Packhouse/Site/ShiftHourlyEntryController.js

@@ -29,7 +29,7 @@ class ShiftHourlyEntryController
             RequestHelper.getRequest(`/packhouse/sites/${siteId}/shift-hourly-entries/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return ShiftHourlyEntryModel.fromJSON(result, siteId);
+                    return ShiftHourlyEntryModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class ShiftHourlyEntryController
             RequestHelper.patchRequest(`/packhouse/sites/${siteId}/shift-hourly-entries/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return ShiftHourlyEntryModel.fromJSON(result, siteId);
+                    return ShiftHourlyEntryModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -569,7 +569,7 @@ class ShiftHourlyEntryController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return ShiftHourlyEntryModel.fromJSON(resultItem, siteId);
+                            return ShiftHourlyEntryModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -595,7 +595,7 @@ class ShiftHourlyEntryController
             RequestHelper.postRequest(`/packhouse/sites/${siteId}/shift-hourly-entries`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return ShiftHourlyEntryModel.fromJSON(result, siteId);
+                    return ShiftHourlyEntryModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Packhouse/Site/VarietyController.js

@@ -29,7 +29,7 @@ class VarietyController
             RequestHelper.getRequest(`/packhouse/sites/${siteId}/varieties/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return VarietyModel.fromJSON(result, siteId);
+                    return VarietyModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class VarietyController
             RequestHelper.patchRequest(`/packhouse/sites/${siteId}/varieties/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return VarietyModel.fromJSON(result, siteId);
+                    return VarietyModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -105,7 +105,7 @@ class VarietyController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return VarietyModel.fromJSON(resultItem, siteId);
+                            return VarietyModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -131,7 +131,7 @@ class VarietyController
             RequestHelper.postRequest(`/packhouse/sites/${siteId}/varieties`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return VarietyModel.fromJSON(result, siteId);
+                    return VarietyModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Site/AlarmController.js

@@ -29,7 +29,7 @@ class AlarmController
             RequestHelper.getRequest(`/sites/${siteId}/alarms/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return AlarmModel.fromJSON(result, siteId);
+                    return AlarmModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class AlarmController
             RequestHelper.patchRequest(`/sites/${siteId}/alarms/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return AlarmModel.fromJSON(result, siteId);
+                    return AlarmModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -212,7 +212,7 @@ class AlarmController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return AlarmModel.fromJSON(resultItem, siteId);
+                            return AlarmModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -238,7 +238,7 @@ class AlarmController
             RequestHelper.postRequest(`/sites/${siteId}/alarms`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return AlarmModel.fromJSON(result, siteId);
+                    return AlarmModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Site/AlarmGroupController.js

@@ -29,7 +29,7 @@ class AlarmGroupController
             RequestHelper.getRequest(`/sites/${siteId}/alarm-groups/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return AlarmGroupModel.fromJSON(result, siteId);
+                    return AlarmGroupModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class AlarmGroupController
             RequestHelper.patchRequest(`/sites/${siteId}/alarm-groups/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return AlarmGroupModel.fromJSON(result, siteId);
+                    return AlarmGroupModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -105,7 +105,7 @@ class AlarmGroupController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return AlarmGroupModel.fromJSON(resultItem, siteId);
+                            return AlarmGroupModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -131,7 +131,7 @@ class AlarmGroupController
             RequestHelper.postRequest(`/sites/${siteId}/alarm-groups`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return AlarmGroupModel.fromJSON(result, siteId);
+                    return AlarmGroupModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Site/DefinitionController.js

@@ -29,7 +29,7 @@ class DefinitionController
             RequestHelper.getRequest(`/sites/${siteId}/definitions/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return DefinitionModel.fromJSON(result, siteId);
+                    return DefinitionModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class DefinitionController
             RequestHelper.patchRequest(`/sites/${siteId}/definitions/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return DefinitionModel.fromJSON(result, siteId);
+                    return DefinitionModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -105,7 +105,7 @@ class DefinitionController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return DefinitionModel.fromJSON(resultItem, siteId);
+                            return DefinitionModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -131,7 +131,7 @@ class DefinitionController
             RequestHelper.postRequest(`/sites/${siteId}/definitions`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return DefinitionModel.fromJSON(result, siteId);
+                    return DefinitionModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Site/PermanentObjectController.js

@@ -29,7 +29,7 @@ class PermanentObjectController
             RequestHelper.getRequest(`/sites/${siteId}/permanent-objects/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PermanentObjectModel.fromJSON(result, siteId);
+                    return PermanentObjectModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class PermanentObjectController
             RequestHelper.patchRequest(`/sites/${siteId}/permanent-objects/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PermanentObjectModel.fromJSON(result, siteId);
+                    return PermanentObjectModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -105,7 +105,7 @@ class PermanentObjectController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return PermanentObjectModel.fromJSON(resultItem, siteId);
+                            return PermanentObjectModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -131,7 +131,7 @@ class PermanentObjectController
             RequestHelper.postRequest(`/sites/${siteId}/permanent-objects`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PermanentObjectModel.fromJSON(result, siteId);
+                    return PermanentObjectModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Site/PermanentObjectDataController.js

@@ -29,7 +29,7 @@ class PermanentObjectDataController
             RequestHelper.getRequest(`/sites/${siteId}/permanent-object-data/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PermanentObjectDataModel.fromJSON(result, siteId);
+                    return PermanentObjectDataModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class PermanentObjectDataController
             RequestHelper.patchRequest(`/sites/${siteId}/permanent-object-data/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PermanentObjectDataModel.fromJSON(result, siteId);
+                    return PermanentObjectDataModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -569,7 +569,7 @@ class PermanentObjectDataController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return PermanentObjectDataModel.fromJSON(resultItem, siteId);
+                            return PermanentObjectDataModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -595,7 +595,7 @@ class PermanentObjectDataController
             RequestHelper.postRequest(`/sites/${siteId}/permanent-object-data`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PermanentObjectDataModel.fromJSON(result, siteId);
+                    return PermanentObjectDataModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Site/PointController.js

@@ -348,7 +348,7 @@ class PointController
             RequestHelper.getRequest(`/sites/${siteId}/points/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PointModel.fromJSON(result, siteId);
+                    return PointModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -373,7 +373,7 @@ class PointController
             RequestHelper.patchRequest(`/sites/${siteId}/points/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PointModel.fromJSON(result, siteId);
+                    return PointModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -424,7 +424,7 @@ class PointController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return PointModel.fromJSON(resultItem, siteId);
+                            return PointModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -450,7 +450,7 @@ class PointController
             RequestHelper.postRequest(`/sites/${siteId}/points`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return PointModel.fromJSON(result, siteId);
+                    return PointModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Controllers/Site/TemporaryObjectController.js

@@ -29,7 +29,7 @@ class TemporaryObjectController
             RequestHelper.getRequest(`/sites/${siteId}/temporary-objects/${id}`)
             .then((result) => {
                 let resolveValue = (function(){
-                    return TemporaryObjectModel.fromJSON(result, siteId);
+                    return TemporaryObjectModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -54,7 +54,7 @@ class TemporaryObjectController
             RequestHelper.patchRequest(`/sites/${siteId}/temporary-objects/${id}`, updateData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return TemporaryObjectModel.fromJSON(result, siteId);
+                    return TemporaryObjectModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);
@@ -105,7 +105,7 @@ class TemporaryObjectController
                 
                     return result.map((resultItem) => {
                         return (function(){
-                            return TemporaryObjectModel.fromJSON(resultItem, siteId);
+                            return TemporaryObjectModel.fromJSON(resultItem);
                         }());
                     });
                 }());
@@ -131,7 +131,7 @@ class TemporaryObjectController
             RequestHelper.postRequest(`/sites/${siteId}/temporary-objects`, createData)
             .then((result) => {
                 let resolveValue = (function(){
-                    return TemporaryObjectModel.fromJSON(result, siteId);
+                    return TemporaryObjectModel.fromJSON(result);
                 }());
                 
                 resolve(resolveValue);

package/src/Models/AccountPolicyModel.js

@@ -28,153 +28,57 @@ class AccountPolicyModel extends BaseModel
          * The Account Policy ID
          * 
          * @type {string}
-         * @private
+         * @public
          */
-        this._id = undefined;
+        this.id = undefined;
         
         /**
          * The Policy Name
          * 
          * @type {string}
-         * @private
+         * @public
          */
-        this._name = undefined;
+        this.name = undefined;
         
         /**
          * The Company this Policy belongs to
          * 
          * @type {string}
-         * @private
+         * @public
          */
-        this._companyId = undefined;
+        this.companyId = undefined;
         
         /**
          * The Resources this Policy provides
          * 
          * @type {Array<{id: any, type: string, actions: string[], permission: string}>}
-         * @private
+         * @public
          */
-        this._resources = undefined;
+        this.resources = undefined;
         
         /**
          * The Rules this Policy provides
          * 
          * @type {Object[]}
-         * @private
+         * @public
          */
-        this._rules = undefined;
+        this.rules = undefined;
         
         /**
          * Whether the Account Policy has been deleted
          * 
          * @type {boolean}
-         * @private
+         * @public
          */
-        this._deleted = undefined;
+        this.deleted = undefined;
         
         /**
          * When the Account Policy was last updated
          * 
          * @type {Date}
-         * @private
+         * @public
          */
-        this._updateTimestamp = undefined;
-    }
-
-    /**
-     * The Account Policy ID
-     * 
-     * @public
-     * @type {string}
-     */
-    get id()
-    {
-        return this._id;
-    }
-
-    /**
-     * The Policy Name
-     * 
-     * @public
-     * @type {string}
-     */
-    get name()
-    {
-        return this._name;
-    }
-
-    /**
-     * The Company this Policy belongs to
-     * 
-     * @public
-     * @type {string}
-     */
-    get companyId()
-    {
-        return this._companyId;
-    }
-
-    /**
-     * The Resources this Policy provides
-     * 
-     * @public
-     * @type {Array<{id: any, type: string, actions: string[], permission: string}>}
-     */
-    get resources()
-    {
-        return this._resources;
-    }
-
-    /**
-     * The Rules this Policy provides
-     * 
-     * @public
-     * @type {Object[]}
-     */
-    get rules()
-    {
-        return this._rules;
-    }
-
-    /**
-     * Whether the Account Policy has been deleted
-     * 
-     * @public
-     * @type {boolean}
-     */
-    get deleted()
-    {
-        return this._deleted;
-    }
-
-    /**
-     * When the Account Policy was last updated
-     * 
-     * @public
-     * @type {Date}
-     */
-    get updateTimestamp()
-    {
-        return this._updateTimestamp;
-    }
-
-    /**
-     * Convert this **AccountPolicyModel** to a JSON Object
-     * 
-     * @public
-     * @return {Object<string, any>}
-     */
-    toJSON()
-    {
-        return {
-            id: this._id,
-            name: this._name,
-            companyId: this._companyId,
-            resources: this._resources,
-            rules: this._rules,
-            deleted: this._deleted,
-            updateTimestamp: this._updateTimestamp
-        };
+        this.updateTimestamp = undefined;
     }
 
     /**
@@ -207,7 +111,7 @@ class AccountPolicyModel extends BaseModel
         
         if('id' in jsonObject)
         {
-            model._id = (function(){
+            model.id = (function(){
                 if(typeof jsonObject['id'] !== 'string')
                 {
                     return String(jsonObject['id']);
@@ -219,7 +123,7 @@ class AccountPolicyModel extends BaseModel
         
         if('name' in jsonObject)
         {
-            model._name = (function(){
+            model.name = (function(){
                 if(typeof jsonObject['name'] !== 'string')
                 {
                     return String(jsonObject['name']);
@@ -231,7 +135,7 @@ class AccountPolicyModel extends BaseModel
         
         if('companyId' in jsonObject)
         {
-            model._companyId = (function(){
+            model.companyId = (function(){
                 if(typeof jsonObject['companyId'] !== 'string')
                 {
                     return String(jsonObject['companyId']);
@@ -243,7 +147,7 @@ class AccountPolicyModel extends BaseModel
         
         if('resources' in jsonObject)
         {
-            model._resources = (function(){
+            model.resources = (function(){
                 if(Array.isArray(jsonObject['resources']) !== true)
                 {
                     return [];
@@ -329,7 +233,7 @@ class AccountPolicyModel extends BaseModel
         
         if('rules' in jsonObject)
         {
-            model._rules = (function(){
+            model.rules = (function(){
                 if(Array.isArray(jsonObject['rules']) !== true)
                 {
                     return [];
@@ -350,7 +254,7 @@ class AccountPolicyModel extends BaseModel
         
         if('deleted' in jsonObject)
         {
-            model._deleted = (function(){
+            model.deleted = (function(){
                 if(typeof jsonObject['deleted'] !== 'boolean')
                 {
                     return Boolean(jsonObject['deleted']);
@@ -362,7 +266,7 @@ class AccountPolicyModel extends BaseModel
         
         if('updateTimestamp' in jsonObject)
         {
-            model._updateTimestamp = (function(){
+            model.updateTimestamp = (function(){
                 if(typeof jsonObject['updateTimestamp'] !== 'string')
                 {
                     return new Date(String(jsonObject['updateTimestamp']));