@ricado/api-client 1.3.0 → 2.0.1

package/src/Models/Site/TemporaryObjectModel.js

@@ -4,24 +4,23 @@
  * Do Not Edit this File Manually!
  */
 
-import BaseSiteModel from '../../Models/Site/BaseSiteModel';
+import BaseModel from '../../Models/BaseModel';
 
 /**
  * Model Class for a Temporary Object
  * 
  * @class
  * @hideconstructor
- * @extends BaseSiteModel
+ * @extends BaseModel
  */
-class TemporaryObjectModel extends BaseSiteModel
+class TemporaryObjectModel extends BaseModel
 {
     /**
      * TemporaryObjectModel Constructor
      * 
      * @protected
-     * @param {number} siteId The Site ID associated with this Temporary Object
      */
-    constructor(siteId)
+    constructor()
     {
         super();
         
@@ -29,152 +28,49 @@ class TemporaryObjectModel extends BaseSiteModel
          * The Temporary Object ID
          * 
          * @type {string}
-         * @private
+         * @public
          */
-        this._id = undefined;
+        this.id = undefined;
         
         /**
          * The Temporary Object Key Index
          * 
          * @type {string}
-         * @private
+         * @public
          */
-        this._keyIndex = undefined;
+        this.keyIndex = undefined;
         
         /**
          * The Temporary Object Type
          * 
          * @type {string}
-         * @private
+         * @public
          */
-        this._type = undefined;
+        this.type = undefined;
         
         /**
          * The Temporary Object Definition
          * 
          * @type {Object}
-         * @private
+         * @public
          */
-        this._definition = undefined;
+        this.definition = undefined;
         
         /**
          * Whether the Temporary Object has been deleted
          * 
          * @type {boolean}
-         * @private
+         * @public
          */
-        this._deleted = undefined;
+        this.deleted = undefined;
         
         /**
          * When the Temporary Object was last updated
          * 
          * @type {Date}
-         * @private
+         * @public
          */
-        this._updateTimestamp = undefined;
-        
-        /**
-         * The Site ID associated with this Temporary Object
-         * 
-         * @type {number}
-         * @private
-         */
-        this._siteId = siteId;
-    }
-
-    /**
-     * The Temporary Object ID
-     * 
-     * @public
-     * @type {string}
-     */
-    get id()
-    {
-        return this._id;
-    }
-
-    /**
-     * The Temporary Object Key Index
-     * 
-     * @public
-     * @type {string}
-     */
-    get keyIndex()
-    {
-        return this._keyIndex;
-    }
-
-    /**
-     * The Temporary Object Type
-     * 
-     * @public
-     * @type {string}
-     */
-    get type()
-    {
-        return this._type;
-    }
-
-    /**
-     * The Temporary Object Definition
-     * 
-     * @public
-     * @type {Object}
-     */
-    get definition()
-    {
-        return this._definition;
-    }
-
-    /**
-     * Whether the Temporary Object has been deleted
-     * 
-     * @public
-     * @type {boolean}
-     */
-    get deleted()
-    {
-        return this._deleted;
-    }
-
-    /**
-     * When the Temporary Object was last updated
-     * 
-     * @public
-     * @type {Date}
-     */
-    get updateTimestamp()
-    {
-        return this._updateTimestamp;
-    }
-
-    /**
-     * The Site ID associated with this Temporary Object
-     * 
-     * @public
-     * @type {number}
-     */
-    get siteId()
-    {
-        return this._siteId;
-    }
-
-    /**
-     * Convert this **TemporaryObjectModel** to a JSON Object
-     * 
-     * @public
-     * @return {Object<string, any>}
-     */
-    toJSON()
-    {
-        return {
-            id: this._id,
-            keyIndex: this._keyIndex,
-            type: this._type,
-            definition: this._definition,
-            deleted: this._deleted,
-            updateTimestamp: this._updateTimestamp
-        };
+        this.updateTimestamp = undefined;
     }
 
     /**
@@ -183,12 +79,11 @@ class TemporaryObjectModel extends BaseSiteModel
      * @static
      * @public
      * @param {Object<string, any>|string} json A JSON Object or JSON String
-     * @param {number} siteId The Site ID associated with this Temporary Object
      * @return {TemporaryObjectModel}
      */
-    static fromJSON(json, siteId)
+    static fromJSON(json)
     {
-        let model = new TemporaryObjectModel(siteId);
+        let model = new TemporaryObjectModel();
         
         /**
          * The JSON Object
@@ -208,7 +103,7 @@ class TemporaryObjectModel extends BaseSiteModel
         
         if('id' in jsonObject)
         {
-            model._id = (function(){
+            model.id = (function(){
                 if(typeof jsonObject['id'] !== 'string')
                 {
                     return String(jsonObject['id']);
@@ -220,7 +115,7 @@ class TemporaryObjectModel extends BaseSiteModel
         
         if('keyIndex' in jsonObject)
         {
-            model._keyIndex = (function(){
+            model.keyIndex = (function(){
                 if(typeof jsonObject['keyIndex'] !== 'string')
                 {
                     return String(jsonObject['keyIndex']);
@@ -232,7 +127,7 @@ class TemporaryObjectModel extends BaseSiteModel
         
         if('type' in jsonObject)
         {
-            model._type = (function(){
+            model.type = (function(){
                 if(typeof jsonObject['type'] !== 'string')
                 {
                     return String(jsonObject['type']);
@@ -244,7 +139,7 @@ class TemporaryObjectModel extends BaseSiteModel
         
         if('definition' in jsonObject)
         {
-            model._definition = (function(){
+            model.definition = (function(){
                 if(typeof jsonObject['definition'] !== 'object')
                 {
                     return Object(jsonObject['definition']);
@@ -256,7 +151,7 @@ class TemporaryObjectModel extends BaseSiteModel
         
         if('deleted' in jsonObject)
         {
-            model._deleted = (function(){
+            model.deleted = (function(){
                 if(typeof jsonObject['deleted'] !== 'boolean')
                 {
                     return Boolean(jsonObject['deleted']);
@@ -268,7 +163,7 @@ class TemporaryObjectModel extends BaseSiteModel
         
         if('updateTimestamp' in jsonObject)
         {
-            model._updateTimestamp = (function(){
+            model.updateTimestamp = (function(){
                 if(typeof jsonObject['updateTimestamp'] !== 'string')
                 {
                     return new Date(String(jsonObject['updateTimestamp']));

package/src/Models/Site/index.js

@@ -9,7 +9,6 @@
  */
 import AlarmGroupModel from './AlarmGroupModel';
 import AlarmModel from './AlarmModel';
-import BaseSiteModel from './BaseSiteModel';
 import DefinitionModel from './DefinitionModel';
 import PermanentObjectDataModel from './PermanentObjectDataModel';
 import PermanentObjectModel from './PermanentObjectModel';
@@ -19,7 +18,6 @@ import TemporaryObjectModel from './TemporaryObjectModel';
 const Site = {
     AlarmGroupModel,
     AlarmModel,
-    BaseSiteModel,
     DefinitionModel,
     PermanentObjectDataModel,
     PermanentObjectModel,

package/src/Models/SiteModel.js

@@ -28,133 +28,49 @@ class SiteModel extends BaseModel
          * The Site ID
          * 
          * @type {number}
-         * @private
+         * @public
          */
-        this._id = undefined;
+        this.id = undefined;
         
         /**
          * The Site Name
          * 
          * @type {string}
-         * @private
+         * @public
          */
-        this._name = undefined;
+        this.name = undefined;
         
         /**
          * The Company this Site belongs to
          * 
          * @type {string}
-         * @private
+         * @public
          */
-        this._companyId = undefined;
+        this.companyId = undefined;
         
         /**
          * Whether the Site is Enabled
          * 
          * @type {boolean}
-         * @private
+         * @public
          */
-        this._enabled = undefined;
+        this.enabled = undefined;
         
         /**
          * Whether the Site has been deleted
          * 
          * @type {boolean}
-         * @private
+         * @public
          */
-        this._deleted = undefined;
+        this.deleted = undefined;
         
         /**
          * When the Site was last updated
          * 
          * @type {Date}
-         * @private
+         * @public
          */
-        this._updateTimestamp = undefined;
-    }
-
-    /**
-     * The Site ID
-     * 
-     * @public
-     * @type {number}
-     */
-    get id()
-    {
-        return this._id;
-    }
-
-    /**
-     * The Site Name
-     * 
-     * @public
-     * @type {string}
-     */
-    get name()
-    {
-        return this._name;
-    }
-
-    /**
-     * The Company this Site belongs to
-     * 
-     * @public
-     * @type {string}
-     */
-    get companyId()
-    {
-        return this._companyId;
-    }
-
-    /**
-     * Whether the Site is Enabled
-     * 
-     * @public
-     * @type {boolean}
-     */
-    get enabled()
-    {
-        return this._enabled;
-    }
-
-    /**
-     * Whether the Site has been deleted
-     * 
-     * @public
-     * @type {boolean}
-     */
-    get deleted()
-    {
-        return this._deleted;
-    }
-
-    /**
-     * When the Site was last updated
-     * 
-     * @public
-     * @type {Date}
-     */
-    get updateTimestamp()
-    {
-        return this._updateTimestamp;
-    }
-
-    /**
-     * Convert this **SiteModel** to a JSON Object
-     * 
-     * @public
-     * @return {Object<string, any>}
-     */
-    toJSON()
-    {
-        return {
-            id: this._id,
-            name: this._name,
-            companyId: this._companyId,
-            enabled: this._enabled,
-            deleted: this._deleted,
-            updateTimestamp: this._updateTimestamp
-        };
+        this.updateTimestamp = undefined;
     }
 
     /**
@@ -187,7 +103,7 @@ class SiteModel extends BaseModel
         
         if('id' in jsonObject)
         {
-            model._id = (function(){
+            model.id = (function(){
                 if(typeof jsonObject['id'] !== 'number')
                 {
                     return Number.isInteger(Number(jsonObject['id'])) ? Number(jsonObject['id']) : Math.floor(Number(jsonObject['id']));
@@ -199,7 +115,7 @@ class SiteModel extends BaseModel
         
         if('name' in jsonObject)
         {
-            model._name = (function(){
+            model.name = (function(){
                 if(typeof jsonObject['name'] !== 'string')
                 {
                     return String(jsonObject['name']);
@@ -211,7 +127,7 @@ class SiteModel extends BaseModel
         
         if('companyId' in jsonObject)
         {
-            model._companyId = (function(){
+            model.companyId = (function(){
                 if(typeof jsonObject['companyId'] !== 'string')
                 {
                     return String(jsonObject['companyId']);
@@ -223,7 +139,7 @@ class SiteModel extends BaseModel
         
         if('enabled' in jsonObject)
         {
-            model._enabled = (function(){
+            model.enabled = (function(){
                 if(typeof jsonObject['enabled'] !== 'boolean')
                 {
                     return Boolean(jsonObject['enabled']);
@@ -235,7 +151,7 @@ class SiteModel extends BaseModel
         
         if('deleted' in jsonObject)
         {
-            model._deleted = (function(){
+            model.deleted = (function(){
                 if(typeof jsonObject['deleted'] !== 'boolean')
                 {
                     return Boolean(jsonObject['deleted']);
@@ -247,7 +163,7 @@ class SiteModel extends BaseModel
         
         if('updateTimestamp' in jsonObject)
         {
-            model._updateTimestamp = (function(){
+            model.updateTimestamp = (function(){
                 if(typeof jsonObject['updateTimestamp'] !== 'string')
                 {
                     return new Date(String(jsonObject['updateTimestamp']));