@ricado/api-client 1.3.0 → 2.0.1

package/lib/Models/RTUPluginModel.js

@@ -58,133 +58,55 @@ var RTUPluginModel = /*#__PURE__*/function (_BaseModel) {
      * The RTU Plugin ID
      * 
      * @type {number}
-     * @private
+     * @public
      */
 
-    _this._id = undefined;
+    _this.id = undefined;
     /**
      * The Plugin Name
      * 
      * @type {string}
-     * @private
+     * @public
      */
 
-    _this._name = undefined;
+    _this.name = undefined;
     /**
      * The Company this RTU Plugin belongs to
      * 
      * @type {string}
-     * @private
+     * @public
      */
 
-    _this._companyId = undefined;
+    _this.companyId = undefined;
     /**
      * Whether the RTU Plugin has been deleted
      * 
      * @type {boolean}
-     * @private
+     * @public
      */
 
-    _this._deleted = undefined;
+    _this.deleted = undefined;
     /**
      * When the RTU Plugin was last updated
      * 
      * @type {Date}
-     * @private
+     * @public
      */
 
-    _this._updateTimestamp = undefined;
+    _this.updateTimestamp = undefined;
     return _this;
   }
   /**
-   * The RTU Plugin ID
+   * Create a new **RTUPluginModel** from a JSON Object or JSON String
    * 
+   * @static
    * @public
-   * @type {number}
+   * @param {Object<string, any>|string} json A JSON Object or JSON String
+   * @return {RTUPluginModel}
    */
 
 
-  _createClass(RTUPluginModel, [{
-    key: "id",
-    get: function get() {
-      return this._id;
-    }
-    /**
-     * The Plugin Name
-     * 
-     * @public
-     * @type {string}
-     */
-
-  }, {
-    key: "name",
-    get: function get() {
-      return this._name;
-    }
-    /**
-     * The Company this RTU Plugin belongs to
-     * 
-     * @public
-     * @type {string}
-     */
-
-  }, {
-    key: "companyId",
-    get: function get() {
-      return this._companyId;
-    }
-    /**
-     * Whether the RTU Plugin has been deleted
-     * 
-     * @public
-     * @type {boolean}
-     */
-
-  }, {
-    key: "deleted",
-    get: function get() {
-      return this._deleted;
-    }
-    /**
-     * When the RTU Plugin was last updated
-     * 
-     * @public
-     * @type {Date}
-     */
-
-  }, {
-    key: "updateTimestamp",
-    get: function get() {
-      return this._updateTimestamp;
-    }
-    /**
-     * Convert this **RTUPluginModel** to a JSON Object
-     * 
-     * @public
-     * @return {Object<string, any>}
-     */
-
-  }, {
-    key: "toJSON",
-    value: function toJSON() {
-      return {
-        id: this._id,
-        name: this._name,
-        companyId: this._companyId,
-        deleted: this._deleted,
-        updateTimestamp: this._updateTimestamp
-      };
-    }
-    /**
-     * Create a new **RTUPluginModel** from a JSON Object or JSON String
-     * 
-     * @static
-     * @public
-     * @param {Object<string, any>|string} json A JSON Object or JSON String
-     * @return {RTUPluginModel}
-     */
-
-  }], [{
+  _createClass(RTUPluginModel, null, [{
     key: "fromJSON",
     value: function fromJSON(json) {
       var model = new RTUPluginModel();
@@ -203,7 +125,7 @@ var RTUPluginModel = /*#__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']));
           }
@@ -213,7 +135,7 @@ var RTUPluginModel = /*#__PURE__*/function (_BaseModel) {
       }
 
       if ('name' in jsonObject) {
-        model._name = function () {
+        model.name = function () {
           if (typeof jsonObject['name'] !== 'string') {
             return String(jsonObject['name']);
           }
@@ -223,7 +145,7 @@ var RTUPluginModel = /*#__PURE__*/function (_BaseModel) {
       }
 
       if ('companyId' in jsonObject) {
-        model._companyId = function () {
+        model.companyId = function () {
           if (typeof jsonObject['companyId'] !== 'string') {
             return String(jsonObject['companyId']);
           }
@@ -233,7 +155,7 @@ var RTUPluginModel = /*#__PURE__*/function (_BaseModel) {
       }
 
       if ('deleted' in jsonObject) {
-        model._deleted = function () {
+        model.deleted = function () {
           if (typeof jsonObject['deleted'] !== 'boolean') {
             return Boolean(jsonObject['deleted']);
           }
@@ -243,7 +165,7 @@ var RTUPluginModel = /*#__PURE__*/function (_BaseModel) {
       }
 
       if ('updateTimestamp' in jsonObject) {
-        model._updateTimestamp = function () {
+        model.updateTimestamp = function () {
           if (typeof jsonObject['updateTimestamp'] !== 'string') {
             return new Date(String(jsonObject['updateTimestamp']));
           }

package/lib/Models/Site/AlarmGroupModel.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 AlarmGroupModel = /*#__PURE__*/function (_BaseSiteModel) {
-  _inherits(AlarmGroupModel, _BaseSiteModel);
+var AlarmGroupModel = /*#__PURE__*/function (_BaseModel) {
+  _inherits(AlarmGroupModel, _BaseModel);
 
   var _super = _createSuper(AlarmGroupModel);
 
@@ -47,9 +47,8 @@ var AlarmGroupModel = /*#__PURE__*/function (_BaseSiteModel) {
    * AlarmGroupModel Constructor
    * 
    * @protected
-   * @param {number} siteId The Site ID associated with this Alarm Group
    */
-  function AlarmGroupModel(siteId) {
+  function AlarmGroupModel() {
     var _this;
 
     _classCallCheck(this, AlarmGroupModel);
@@ -59,199 +58,74 @@ var AlarmGroupModel = /*#__PURE__*/function (_BaseSiteModel) {
      * The Alarm Group ID
      * 
      * @type {string}
-     * @private
+     * @public
      */
 
-    _this._id = undefined;
+    _this.id = undefined;
     /**
      * The RTU this Alarm Group belongs to
      * 
      * @type {?number}
-     * @private
+     * @public
      */
 
-    _this._rtuId = undefined;
+    _this.rtuId = undefined;
     /**
      * The Alarm Group Name
      * 
      * @type {string}
-     * @private
+     * @public
      */
 
-    _this._name = undefined;
+    _this.name = undefined;
     /**
      * The Boolean Point used to Reset this Alarm Group
      * 
      * @type {number}
-     * @private
+     * @public
      */
 
-    _this._resetPoint = undefined;
+    _this.resetPoint = undefined;
     /**
      * An Array of Points and the States to be Written when this Alarm Group is Reset
      * 
      * @type {Array<{point: number, value: boolean}>}
-     * @private
+     * @public
      */
 
-    _this._externalResetPoints = undefined;
+    _this.externalResetPoints = undefined;
     /**
      * Whether the Alarm Group has been deleted
      * 
      * @type {boolean}
-     * @private
+     * @public
      */
 
-    _this._deleted = undefined;
+    _this.deleted = undefined;
     /**
      * When the Alarm Group was last updated
      * 
      * @type {Date}
-     * @private
-     */
-
-    _this._updateTimestamp = undefined;
-    /**
-     * The Site ID associated with this Alarm Group
-     * 
-     * @type {number}
-     * @private
+     * @public
      */
 
-    _this._siteId = siteId;
+    _this.updateTimestamp = undefined;
     return _this;
   }
   /**
-   * The Alarm Group ID
+   * Create a new **AlarmGroupModel** from a JSON Object or JSON String
    * 
+   * @static
    * @public
-   * @type {string}
+   * @param {Object<string, any>|string} json A JSON Object or JSON String
+   * @return {AlarmGroupModel}
    */
 
 
-  _createClass(AlarmGroupModel, [{
-    key: "id",
-    get: function get() {
-      return this._id;
-    }
-    /**
-     * The RTU this Alarm Group belongs to
-     * 
-     * @public
-     * @type {?number}
-     */
-
-  }, {
-    key: "rtuId",
-    get: function get() {
-      return this._rtuId;
-    }
-    /**
-     * The Alarm Group Name
-     * 
-     * @public
-     * @type {string}
-     */
-
-  }, {
-    key: "name",
-    get: function get() {
-      return this._name;
-    }
-    /**
-     * The Boolean Point used to Reset this Alarm Group
-     * 
-     * @public
-     * @type {number}
-     */
-
-  }, {
-    key: "resetPoint",
-    get: function get() {
-      return this._resetPoint;
-    }
-    /**
-     * An Array of Points and the States to be Written when this Alarm Group is Reset
-     * 
-     * @public
-     * @type {Array<{point: number, value: boolean}>}
-     */
-
-  }, {
-    key: "externalResetPoints",
-    get: function get() {
-      return this._externalResetPoints;
-    }
-    /**
-     * Whether the Alarm Group has been deleted
-     * 
-     * @public
-     * @type {boolean}
-     */
-
-  }, {
-    key: "deleted",
-    get: function get() {
-      return this._deleted;
-    }
-    /**
-     * When the Alarm Group was last updated
-     * 
-     * @public
-     * @type {Date}
-     */
-
-  }, {
-    key: "updateTimestamp",
-    get: function get() {
-      return this._updateTimestamp;
-    }
-    /**
-     * The Site ID associated with this Alarm Group
-     * 
-     * @public
-     * @type {number}
-     */
-
-  }, {
-    key: "siteId",
-    get: function get() {
-      return this._siteId;
-    }
-    /**
-     * Convert this **AlarmGroupModel** to a JSON Object
-     * 
-     * @public
-     * @return {Object<string, any>}
-     */
-
-  }, {
-    key: "toJSON",
-    value: function toJSON() {
-      return {
-        id: this._id,
-        rtuId: this._rtuId,
-        name: this._name,
-        resetPoint: this._resetPoint,
-        externalResetPoints: this._externalResetPoints,
-        deleted: this._deleted,
-        updateTimestamp: this._updateTimestamp
-      };
-    }
-    /**
-     * Create a new **AlarmGroupModel** 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 Alarm Group
-     * @return {AlarmGroupModel}
-     */
-
-  }], [{
+  _createClass(AlarmGroupModel, null, [{
     key: "fromJSON",
-    value: function fromJSON(json, siteId) {
-      var model = new AlarmGroupModel(siteId);
+    value: function fromJSON(json) {
+      var model = new AlarmGroupModel();
       /**
        * The JSON Object
        * 
@@ -267,7 +141,7 @@ var AlarmGroupModel = /*#__PURE__*/function (_BaseSiteModel) {
       }
 
       if ('id' in jsonObject) {
-        model._id = function () {
+        model.id = function () {
           if (typeof jsonObject['id'] !== 'string') {
             return String(jsonObject['id']);
           }
@@ -277,7 +151,7 @@ var AlarmGroupModel = /*#__PURE__*/function (_BaseSiteModel) {
       }
 
       if ('rtuId' in jsonObject) {
-        model._rtuId = function () {
+        model.rtuId = function () {
           if (jsonObject['rtuId'] === null) {
             return null;
           }
@@ -291,7 +165,7 @@ var AlarmGroupModel = /*#__PURE__*/function (_BaseSiteModel) {
       }
 
       if ('name' in jsonObject) {
-        model._name = function () {
+        model.name = function () {
           if (typeof jsonObject['name'] !== 'string') {
             return String(jsonObject['name']);
           }
@@ -301,7 +175,7 @@ var AlarmGroupModel = /*#__PURE__*/function (_BaseSiteModel) {
       }
 
       if ('resetPoint' in jsonObject) {
-        model._resetPoint = function () {
+        model.resetPoint = function () {
           if (typeof jsonObject['resetPoint'] !== 'number') {
             return Number.isInteger(Number(jsonObject['resetPoint'])) ? Number(jsonObject['resetPoint']) : Math.floor(Number(jsonObject['resetPoint']));
           }
@@ -311,7 +185,7 @@ var AlarmGroupModel = /*#__PURE__*/function (_BaseSiteModel) {
       }
 
       if ('externalResetPoints' in jsonObject) {
-        model._externalResetPoints = function () {
+        model.externalResetPoints = function () {
           if (Array.isArray(jsonObject['externalResetPoints']) !== true) {
             return [];
           }
@@ -351,7 +225,7 @@ var AlarmGroupModel = /*#__PURE__*/function (_BaseSiteModel) {
       }
 
       if ('deleted' in jsonObject) {
-        model._deleted = function () {
+        model.deleted = function () {
           if (typeof jsonObject['deleted'] !== 'boolean') {
             return Boolean(jsonObject['deleted']);
           }
@@ -361,7 +235,7 @@ var AlarmGroupModel = /*#__PURE__*/function (_BaseSiteModel) {
       }
 
       if ('updateTimestamp' in jsonObject) {
-        model._updateTimestamp = function () {
+        model.updateTimestamp = function () {
           if (typeof jsonObject['updateTimestamp'] !== 'string') {
             return new Date(String(jsonObject['updateTimestamp']));
           }
@@ -375,7 +249,7 @@ var AlarmGroupModel = /*#__PURE__*/function (_BaseSiteModel) {
   }]);
 
   return AlarmGroupModel;
-}(_BaseSiteModel2.default);
+}(_BaseModel2.default);
 
 var _default = AlarmGroupModel;
 exports.default = _default;