@ricado/api-client 1.4.1 → 2.0.0

package/lib/Models/Site/TemporaryObjectModel.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _BaseSiteModel2 = _interopRequireDefault(require("../../Models/Site/BaseSiteModel"));
+var _BaseModel2 = _interopRequireDefault(require("../../Models/BaseModel"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -36,10 +36,10 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
  * 
  * @class
  * @hideconstructor
- * @extends BaseSiteModel
+ * @extends BaseModel
  */
-var TemporaryObjectModel = /*#__PURE__*/function (_BaseSiteModel) {
-  _inherits(TemporaryObjectModel, _BaseSiteModel);
+var TemporaryObjectModel = /*#__PURE__*/function (_BaseModel) {
+  _inherits(TemporaryObjectModel, _BaseModel);
 
   var _super = _createSuper(TemporaryObjectModel);
 
@@ -47,9 +47,8 @@ var TemporaryObjectModel = /*#__PURE__*/function (_BaseSiteModel) {
    * TemporaryObjectModel Constructor
    * 
    * @protected
-   * @param {number} siteId The Site ID associated with this Temporary Object
    */
-  function TemporaryObjectModel(siteId) {
+  function TemporaryObjectModel() {
     var _this;
 
     _classCallCheck(this, TemporaryObjectModel);
@@ -59,178 +58,66 @@ var TemporaryObjectModel = /*#__PURE__*/function (_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
-     */
-
-    _this._updateTimestamp = undefined;
-    /**
-     * The Site ID associated with this Temporary Object
-     * 
-     * @type {number}
-     * @private
+     * @public
      */
 
-    _this._siteId = siteId;
+    _this.updateTimestamp = undefined;
     return _this;
   }
   /**
-   * The Temporary Object ID
+   * Create a new **TemporaryObjectModel** from a JSON Object or JSON String
    * 
+   * @static
    * @public
-   * @type {string}
+   * @param {Object<string, any>|string} json A JSON Object or JSON String
+   * @return {TemporaryObjectModel}
    */
 
 
-  _createClass(TemporaryObjectModel, [{
-    key: "id",
-    get: function get() {
-      return this._id;
-    }
-    /**
-     * The Temporary Object Key Index
-     * 
-     * @public
-     * @type {string}
-     */
-
-  }, {
-    key: "keyIndex",
-    get: function get() {
-      return this._keyIndex;
-    }
-    /**
-     * The Temporary Object Type
-     * 
-     * @public
-     * @type {string}
-     */
-
-  }, {
-    key: "type",
-    get: function get() {
-      return this._type;
-    }
-    /**
-     * The Temporary Object Definition
-     * 
-     * @public
-     * @type {Object}
-     */
-
-  }, {
-    key: "definition",
-    get: function get() {
-      return this._definition;
-    }
-    /**
-     * Whether the Temporary Object has been deleted
-     * 
-     * @public
-     * @type {boolean}
-     */
-
-  }, {
-    key: "deleted",
-    get: function get() {
-      return this._deleted;
-    }
-    /**
-     * When the Temporary Object was last updated
-     * 
-     * @public
-     * @type {Date}
-     */
-
-  }, {
-    key: "updateTimestamp",
-    get: function get() {
-      return this._updateTimestamp;
-    }
-    /**
-     * The Site ID associated with this Temporary Object
-     * 
-     * @public
-     * @type {number}
-     */
-
-  }, {
-    key: "siteId",
-    get: function get() {
-      return this._siteId;
-    }
-    /**
-     * Convert this **TemporaryObjectModel** to a JSON Object
-     * 
-     * @public
-     * @return {Object<string, any>}
-     */
-
-  }, {
-    key: "toJSON",
-    value: function toJSON() {
-      return {
-        id: this._id,
-        keyIndex: this._keyIndex,
-        type: this._type,
-        definition: this._definition,
-        deleted: this._deleted,
-        updateTimestamp: this._updateTimestamp
-      };
-    }
-    /**
-     * Create a new **TemporaryObjectModel** from a JSON Object or JSON String
-     * 
-     * @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}
-     */
-
-  }], [{
+  _createClass(TemporaryObjectModel, null, [{
     key: "fromJSON",
-    value: function fromJSON(json, siteId) {
-      var model = new TemporaryObjectModel(siteId);
+    value: function fromJSON(json) {
+      var model = new TemporaryObjectModel();
       /**
        * The JSON Object
        * 
@@ -246,7 +133,7 @@ var TemporaryObjectModel = /*#__PURE__*/function (_BaseSiteModel) {
       }
 
       if ('id' in jsonObject) {
-        model._id = function () {
+        model.id = function () {
           if (typeof jsonObject['id'] !== 'string') {
             return String(jsonObject['id']);
           }
@@ -256,7 +143,7 @@ var TemporaryObjectModel = /*#__PURE__*/function (_BaseSiteModel) {
       }
 
       if ('keyIndex' in jsonObject) {
-        model._keyIndex = function () {
+        model.keyIndex = function () {
           if (typeof jsonObject['keyIndex'] !== 'string') {
             return String(jsonObject['keyIndex']);
           }
@@ -266,7 +153,7 @@ var TemporaryObjectModel = /*#__PURE__*/function (_BaseSiteModel) {
       }
 
       if ('type' in jsonObject) {
-        model._type = function () {
+        model.type = function () {
           if (typeof jsonObject['type'] !== 'string') {
             return String(jsonObject['type']);
           }
@@ -276,7 +163,7 @@ var TemporaryObjectModel = /*#__PURE__*/function (_BaseSiteModel) {
       }
 
       if ('definition' in jsonObject) {
-        model._definition = function () {
+        model.definition = function () {
           if (_typeof(jsonObject['definition']) !== 'object') {
             return Object(jsonObject['definition']);
           }
@@ -286,7 +173,7 @@ var TemporaryObjectModel = /*#__PURE__*/function (_BaseSiteModel) {
       }
 
       if ('deleted' in jsonObject) {
-        model._deleted = function () {
+        model.deleted = function () {
           if (typeof jsonObject['deleted'] !== 'boolean') {
             return Boolean(jsonObject['deleted']);
           }
@@ -296,7 +183,7 @@ var TemporaryObjectModel = /*#__PURE__*/function (_BaseSiteModel) {
       }
 
       if ('updateTimestamp' in jsonObject) {
-        model._updateTimestamp = function () {
+        model.updateTimestamp = function () {
           if (typeof jsonObject['updateTimestamp'] !== 'string') {
             return new Date(String(jsonObject['updateTimestamp']));
           }
@@ -310,7 +197,7 @@ var TemporaryObjectModel = /*#__PURE__*/function (_BaseSiteModel) {
   }]);
 
   return TemporaryObjectModel;
-}(_BaseSiteModel2.default);
+}(_BaseModel2.default);
 
 var _default = TemporaryObjectModel;
 exports.default = _default;

package/lib/Models/Site/index.js

@@ -9,8 +9,6 @@ var _AlarmGroupModel = _interopRequireDefault(require("./AlarmGroupModel"));
 
 var _AlarmModel = _interopRequireDefault(require("./AlarmModel"));
 
-var _BaseSiteModel = _interopRequireDefault(require("./BaseSiteModel"));
-
 var _DefinitionModel = _interopRequireDefault(require("./DefinitionModel"));
 
 var _PermanentObjectDataModel = _interopRequireDefault(require("./PermanentObjectDataModel"));
@@ -35,7 +33,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var Site = {
   AlarmGroupModel: _AlarmGroupModel.default,
   AlarmModel: _AlarmModel.default,
-  BaseSiteModel: _BaseSiteModel.default,
   DefinitionModel: _DefinitionModel.default,
   PermanentObjectDataModel: _PermanentObjectDataModel.default,
   PermanentObjectModel: _PermanentObjectModel.default,

package/lib/Models/SiteModel.js

@@ -58,154 +58,63 @@ var SiteModel = /*#__PURE__*/function (_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;
+    _this.updateTimestamp = undefined;
     return _this;
   }
   /**
-   * The Site ID
+   * Create a new **SiteModel** from a JSON Object or JSON String
    * 
+   * @static
    * @public
-   * @type {number}
+   * @param {Object<string, any>|string} json A JSON Object or JSON String
+   * @return {SiteModel}
    */
 
 
-  _createClass(SiteModel, [{
-    key: "id",
-    get: function get() {
-      return this._id;
-    }
-    /**
-     * The Site Name
-     * 
-     * @public
-     * @type {string}
-     */
-
-  }, {
-    key: "name",
-    get: function get() {
-      return this._name;
-    }
-    /**
-     * The Company this Site belongs to
-     * 
-     * @public
-     * @type {string}
-     */
-
-  }, {
-    key: "companyId",
-    get: function get() {
-      return this._companyId;
-    }
-    /**
-     * Whether the Site is Enabled
-     * 
-     * @public
-     * @type {boolean}
-     */
-
-  }, {
-    key: "enabled",
-    get: function get() {
-      return this._enabled;
-    }
-    /**
-     * Whether the Site has been deleted
-     * 
-     * @public
-     * @type {boolean}
-     */
-
-  }, {
-    key: "deleted",
-    get: function get() {
-      return this._deleted;
-    }
-    /**
-     * When the Site was last updated
-     * 
-     * @public
-     * @type {Date}
-     */
-
-  }, {
-    key: "updateTimestamp",
-    get: function get() {
-      return this._updateTimestamp;
-    }
-    /**
-     * Convert this **SiteModel** to a JSON Object
-     * 
-     * @public
-     * @return {Object<string, any>}
-     */
-
-  }, {
-    key: "toJSON",
-    value: function toJSON() {
-      return {
-        id: this._id,
-        name: this._name,
-        companyId: this._companyId,
-        enabled: this._enabled,
-        deleted: this._deleted,
-        updateTimestamp: this._updateTimestamp
-      };
-    }
-    /**
-     * Create a new **SiteModel** from a JSON Object or JSON String
-     * 
-     * @static
-     * @public
-     * @param {Object<string, any>|string} json A JSON Object or JSON String
-     * @return {SiteModel}
-     */
-
-  }], [{
+  _createClass(SiteModel, null, [{
     key: "fromJSON",
     value: function fromJSON(json) {
       var model = new SiteModel();
@@ -224,7 +133,7 @@ var SiteModel = /*#__PURE__*/function (_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']));
           }
@@ -234,7 +143,7 @@ var SiteModel = /*#__PURE__*/function (_BaseModel) {
       }
 
       if ('name' in jsonObject) {
-        model._name = function () {
+        model.name = function () {
           if (typeof jsonObject['name'] !== 'string') {
             return String(jsonObject['name']);
           }
@@ -244,7 +153,7 @@ var SiteModel = /*#__PURE__*/function (_BaseModel) {
       }
 
       if ('companyId' in jsonObject) {
-        model._companyId = function () {
+        model.companyId = function () {
           if (typeof jsonObject['companyId'] !== 'string') {
             return String(jsonObject['companyId']);
           }
@@ -254,7 +163,7 @@ var SiteModel = /*#__PURE__*/function (_BaseModel) {
       }
 
       if ('enabled' in jsonObject) {
-        model._enabled = function () {
+        model.enabled = function () {
           if (typeof jsonObject['enabled'] !== 'boolean') {
             return Boolean(jsonObject['enabled']);
           }
@@ -264,7 +173,7 @@ var SiteModel = /*#__PURE__*/function (_BaseModel) {
       }
 
       if ('deleted' in jsonObject) {
-        model._deleted = function () {
+        model.deleted = function () {
           if (typeof jsonObject['deleted'] !== 'boolean') {
             return Boolean(jsonObject['deleted']);
           }
@@ -274,7 +183,7 @@ var SiteModel = /*#__PURE__*/function (_BaseModel) {
       }
 
       if ('updateTimestamp' in jsonObject) {
-        model._updateTimestamp = function () {
+        model.updateTimestamp = function () {
           if (typeof jsonObject['updateTimestamp'] !== 'string') {
             return new Date(String(jsonObject['updateTimestamp']));
           }