@golemio/energetics 1.2.12-dev.1217912522 → 1.2.12-dev.1219005045

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5,4 +5,6 @@ import { AbstractTransformation } from "@golemio/core/dist/helpers/transformatio
5
5
  export declare class AveMeasurementTransformation extends AbstractTransformation<IMeasurementOption & IAveApiDeviceDataDto, IMeasurementDto> {
6
6
  name: string;
7
7
  protected transformInternal: (data: IMeasurementOption & IAveApiDeviceDataDto) => IMeasurementDto;
8
+ private formatAddress;
9
+ private getValue;
8
10
  }
@@ -12,6 +12,7 @@ const luxon_1 = require("@golemio/core/dist/shared/luxon");
12
12
  const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
13
13
  const CommodityProviderEnum_1 = require("../datasources/helpers/CommodityProviderEnum");
14
14
  const PpasAveApiHelper_1 = require("../datasources/ppas-ave-api/helpers/PpasAveApiHelper");
15
+ const MeasurementVariableEnum_1 = require("../../../schema-definitions/datasources/helpers/MeasurementVariableEnum");
15
16
  let AveMeasurementTransformation = exports.AveMeasurementTransformation = class AveMeasurementTransformation extends AbstractTransformation_1.AbstractTransformation {
16
17
  constructor() {
17
18
  super(...arguments);
@@ -20,16 +21,28 @@ let AveMeasurementTransformation = exports.AveMeasurementTransformation = class
20
21
  return {
21
22
  source: CommodityProviderEnum_1.CommodityProvider.PpasInternetAveApi,
22
23
  measurement_category: data.Name,
23
- addr: data.Addr,
24
+ addr: this.formatAddress(data.Addr, data.Var),
24
25
  meter: data.Meter,
25
- timestamp: luxon_1.DateTime.fromISO(data.Timestamp, {
26
+ timestamp: luxon_1.DateTime.fromISO(data.StandardTime, {
26
27
  zone: PpasAveApiHelper_1.PpasAveApiHelper.API_DATE_TZ,
27
28
  }).toJSDate(),
28
29
  variable: data.Var,
29
30
  type: data.Type,
30
- value: data.ConvertDifference,
31
+ value: this.getValue(data, data.Var),
31
32
  };
32
33
  };
34
+ this.formatAddress = (address, variable) => {
35
+ return address + "/" + variable;
36
+ };
37
+ this.getValue = (data, variable) => {
38
+ switch (variable) {
39
+ case MeasurementVariableEnum_1.MeasurementVariable.Core:
40
+ default:
41
+ return data.OperatingAmount;
42
+ case MeasurementVariableEnum_1.MeasurementVariable.Core2:
43
+ return data.ConvertDifference;
44
+ }
45
+ };
33
46
  }
34
47
  };
35
48
  exports.AveMeasurementTransformation = AveMeasurementTransformation = __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"AveMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAGA,6GAA0G;AAC1G,2DAA2D;AAC3D,iEAAgE;AAChE,wFAAiF;AACjF,2FAAwF;AAGjF,IAAM,4BAA4B,0CAAlC,MAAM,4BAA6B,SAAQ,+CAGjD;IAHM;;QAII,SAAI,GAAG,8BAA8B,CAAC;QAEnC,sBAAiB,GAAG,CAAC,IAA+C,EAAmB,EAAE;YAC/F,OAAO;gBACH,MAAM,EAAE,yCAAiB,CAAC,kBAAkB;gBAC5C,oBAAoB,EAAE,IAAI,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,gBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE;oBACxC,IAAI,EAAE,mCAAgB,CAAC,WAAW;iBACrC,CAAC,CAAC,QAAQ,EAAE;gBACb,QAAQ,EAAE,IAAI,CAAC,GAAG;gBAClB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,iBAAiB;aAChC,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;uCApBY,4BAA4B;IADxC,IAAA,qBAAU,GAAE;GACA,4BAA4B,CAoBxC"}
1
+ {"version":3,"file":"AveMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/AveMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAGA,6GAA0G;AAC1G,2DAA2D;AAC3D,iEAAgE;AAChE,wFAAiF;AACjF,2FAAwF;AACxF,qHAAuF;AAGhF,IAAM,4BAA4B,0CAAlC,MAAM,4BAA6B,SAAQ,+CAGjD;IAHM;;QAII,SAAI,GAAG,8BAA8B,CAAC;QAEnC,sBAAiB,GAAG,CAAC,IAA+C,EAAmB,EAAE;YAC/F,OAAO;gBACH,MAAM,EAAE,yCAAiB,CAAC,kBAAkB;gBAC5C,oBAAoB,EAAE,IAAI,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAA0B,CAAC;gBACpE,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,gBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE;oBAC3C,IAAI,EAAE,mCAAgB,CAAC,WAAW;iBACrC,CAAC,CAAC,QAAQ,EAAE;gBACb,QAAQ,EAAE,IAAI,CAAC,GAAG;gBAClB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,GAA0B,CAAC;aAC9D,CAAC;QACN,CAAC,CAAC;QAEM,kBAAa,GAAG,CAAC,OAAe,EAAE,QAA6B,EAAU,EAAE;YAC/E,OAAO,OAAO,GAAG,GAAG,GAAG,QAAQ,CAAC;QACpC,CAAC,CAAC;QAEM,aAAQ,GAAG,CAAC,IAA0B,EAAE,QAA6B,EAAU,EAAE;YACrF,QAAQ,QAAQ,EAAE;gBACd,KAAK,6CAAmB,CAAC,IAAI,CAAC;gBAC9B;oBACI,OAAO,IAAI,CAAC,eAAe,CAAC;gBAChC,KAAK,6CAAmB,CAAC,KAAK;oBAC1B,OAAO,IAAI,CAAC,iBAAiB,CAAC;aACrC;QACL,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;uCAlCY,4BAA4B;IADxC,IAAA,qBAAU,GAAE;GACA,4BAA4B,CAkCxC"}
@@ -1 +1 @@
1
- {"version":3,"file":"CemMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAGA,6GAA0G;AAC1G,iEAAgE;AAChE,wFAAiF;AACjF,2CAAqD;AAG9C,IAAM,4BAA4B,0CAAlC,MAAM,4BAA6B,SAAQ,+CAGjD;IAHM;;QAII,SAAI,GAAG,8BAA8B,CAAC;QAEnC,sBAAiB,GAAG,CAC1B,IAA4E,EAC7D,EAAE;YACjB,OAAO;gBACH,MAAM,EAAE,yCAAiB,CAAC,gBAAgB;gBAC1C,oBAAoB,EAAE,IAAI,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC;gBACjE,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;gBACnC,QAAQ,EAAE,IAAI,CAAC,GAAG;gBAClB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;aACpB,CAAC;QACN,CAAC,CAAC;QAEM,kBAAa,GAAG,CAAC,OAAe,EAAE,aAAqB,EAAE,QAAgB,EAAU,EAAE;YACzF,IAAI,aAAa,KAAK,gCAAsB,CAAC,WAAW,CAAC,YAAY,EAAE;gBACnE,OAAO,IAAI,KAAK,CAAC,CAAC,eAAe;aACpC;iBAAM,IAAI,aAAa,KAAK,gCAAsB,CAAC,WAAW,CAAC,WAAW,EAAE;gBACzE,OAAO,IAAI,KAAK,CAAC,CAAC,cAAc;aACnC;YAED,OAAO,OAAO,GAAG,GAAG,GAAG,QAAQ,CAAC;QACpC,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;uCA9BY,4BAA4B;IADxC,IAAA,qBAAU,GAAE;GACA,4BAA4B,CA8BxC"}
1
+ {"version":3,"file":"CemMeasurementTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/commodity-providers/transformations/CemMeasurementTransformation.ts"],"names":[],"mappings":";;;;;;;;;AAGA,6GAA0G;AAC1G,iEAAgE;AAChE,wFAAiF;AACjF,2CAAqD;AAI9C,IAAM,4BAA4B,0CAAlC,MAAM,4BAA6B,SAAQ,+CAGjD;IAHM;;QAII,SAAI,GAAG,8BAA8B,CAAC;QAEnC,sBAAiB,GAAG,CAC1B,IAA4E,EAC7D,EAAE;YACjB,OAAO;gBACH,MAAM,EAAE,yCAAiB,CAAC,gBAAgB;gBAC1C,oBAAoB,EAAE,IAAI,CAAC,IAAI;gBAC/B,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAA0B,CAAC;gBACxF,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;gBACnC,QAAQ,EAAE,IAAI,CAAC,GAAG;gBAClB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;aACpB,CAAC;QACN,CAAC,CAAC;QAEM,kBAAa,GAAG,CAAC,OAAe,EAAE,aAAqB,EAAE,QAA6B,EAAU,EAAE;YACtG,IAAI,aAAa,KAAK,gCAAsB,CAAC,WAAW,CAAC,YAAY,EAAE;gBACnE,OAAO,IAAI,KAAK,CAAC,CAAC,eAAe;aACpC;iBAAM,IAAI,aAAa,KAAK,gCAAsB,CAAC,WAAW,CAAC,WAAW,EAAE;gBACzE,OAAO,IAAI,KAAK,CAAC,CAAC,cAAc;aACnC;YAED,OAAO,OAAO,GAAG,GAAG,GAAG,QAAQ,CAAC;QACpC,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;uCA9BY,4BAA4B;IADxC,IAAA,qBAAU,GAAE;GACA,4BAA4B,CA8BxC"}
@@ -20,6 +20,8 @@ export declare class FetchPpasMeasurementsTask extends AbstractFetchMeasurements
20
20
  constructor(config: ISimpleConfig, logger: ILogger, dataSourceFactory: ICommodityProviderDataSourceFactory, measurementTransformation: AveMeasurementTransformation, measurementRepository: MeasurementRepository, meterSettingsRepository: StaticMeterSettingsRepository);
21
21
  execute(data: IPpasMeasurementsParams): Promise<void>;
22
22
  private getProviderConfig;
23
+ /** Splits the measurement options into individual options (multiple variables) */
24
+ private splitOptionsByVars;
23
25
  private generateMeasurements;
24
26
  private getDataFromDataSource;
25
27
  }
@@ -70,10 +70,13 @@ let FetchPpasMeasurementsTask = exports.FetchPpasMeasurementsTask = class FetchP
70
70
  execute(data) {
71
71
  var _a, e_1, _b, _c;
72
72
  return __awaiter(this, void 0, void 0, function* () {
73
- const measurementOptions = yield this.meterSettingsRepository.getData(data.providerType, StaticDataResourceTypeEnum_1.StaticDataResourceType.MeasurementOptions);
73
+ let measurementOptions = yield this.meterSettingsRepository.getData(data.providerType, StaticDataResourceTypeEnum_1.StaticDataResourceType.MeasurementOptions);
74
74
  if (!measurementOptions) {
75
75
  throw new golemio_errors_1.GeneralError("Measurement options not found", this.constructor.name);
76
76
  }
77
+ else {
78
+ measurementOptions = this.splitOptionsByVars(measurementOptions);
79
+ }
77
80
  const { baseUrl, config } = this.getProviderConfig(data);
78
81
  const aveApiHelper = new PpasAveApiHelper_1.PpasAveApiHelper(baseUrl, config);
79
82
  const sessionId = yield aveApiHelper.createSession();
@@ -81,8 +84,8 @@ let FetchPpasMeasurementsTask = exports.FetchPpasMeasurementsTask = class FetchP
81
84
  const places = yield this.getDataFromDataSource("Places", sessionId);
82
85
  let consumptionData = [];
83
86
  for (const place of places) {
84
- const options = measurementOptions.find((item) => item.MeterSerialNumber === place.DeviceSerialNumber && item.Meter === place.Eic);
85
- if (!options) {
87
+ const options = measurementOptions.filter((item) => item.MeterSerialNumber === place.DeviceSerialNumber && item.Meter === place.Eic);
88
+ if (options.length === 0) {
86
89
  continue;
87
90
  }
88
91
  this.logger.info(`Fetching data for device ${place.DeviceSerialNumber}`);
@@ -92,8 +95,10 @@ let FetchPpasMeasurementsTask = exports.FetchPpasMeasurementsTask = class FetchP
92
95
  _c = measurementChunkGenerator_1_1.value;
93
96
  _d = false;
94
97
  const measurements = _c;
95
- const consumptionBatch = measurements.map((item) => this.measurementTransformation.transformElement(Object.assign(Object.assign({}, item), options)));
96
- consumptionData = consumptionData.concat(consumptionBatch);
98
+ for (const option of options) {
99
+ const consumptionBatch = measurements.map((item) => this.measurementTransformation.transformElement(Object.assign(Object.assign({}, item), option)));
100
+ consumptionData = consumptionData.concat(consumptionBatch);
101
+ }
97
102
  }
98
103
  }
99
104
  catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -117,6 +122,15 @@ let FetchPpasMeasurementsTask = exports.FetchPpasMeasurementsTask = class FetchP
117
122
  config: this.config.getValue(`module.energetics.commodityProviders.${data.providerType}`),
118
123
  };
119
124
  }
125
+ /** Splits the measurement options into individual options (multiple variables) */
126
+ splitOptionsByVars(options) {
127
+ let result = [];
128
+ for (const option of options) {
129
+ const vars = option.Var.split("|");
130
+ result = result.concat(vars.map((v) => (Object.assign(Object.assign({}, option), { Var: v }))));
131
+ }
132
+ return result;
133
+ }
120
134
  generateMeasurements(data, sessionId) {
121
135
  return __asyncGenerator(this, arguments, function* generateMeasurements_1() {
122
136
  const dateFrom = luxon_1.DateTime.fromISO(data.dateFrom).startOf("day");
@@ -130,7 +144,7 @@ let FetchPpasMeasurementsTask = exports.FetchPpasMeasurementsTask = class FetchP
130
144
  dateFrom: start.toISODate(),
131
145
  dateTo: end.toISODate(),
132
146
  isoDate: "1",
133
- dataType: "2", // fill all measurement values (we need the ConvertDifference value)
147
+ dataType: "2", // fill all measurement values (we need the OperatingAmount and ConvertDifference values)
134
148
  }));
135
149
  }
136
150
  });
@@ -1 +1 @@
1
- {"version":3,"file":"FetchPpasMeasurementsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FetchPpasMeasurementsTask.js","sourceRoot":"","sources":["../../../../../src/integration-engine/commodity-providers/workers/tasks/FetchPpasMeasurementsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2FAAsG;AAKtG,8FAAyH;AAEzH,yEAAwF;AACxF,oFAAmG;AACnG,oGAAmH;AACnH,qGAAoH;AAIpH,yHAAwF;AAIxF,wEAAqE;AACrE,6EAAwE;AACxE,2DAAqE;AACrE,iEAAwE;AAExE,6EAAoF;AACpF,mFAAgF;AAGzE,IAAM,yBAAyB,uCAA/B,MAAM,yBAA0B,SAAQ,6DAAsD;IAKjG,YACoC,MAA6B,EACnC,MAAuB,EAEjD,iBAA8D,EAE9D,yBAA+D,EACX,qBAAsD,EAC9C,uBAA8D;QAE1H,KAAK,EAAE,CAAC;QATgC,WAAM,GAAN,MAAM,CAAe;QAC3B,WAAM,GAAN,MAAM,CAAS;QAEzC,sBAAiB,GAAjB,iBAAiB,CAAqC;QAEtD,8BAAyB,GAAzB,yBAAyB,CAA8B;QACD,0BAAqB,GAArB,qBAAqB,CAAuB;QACtC,4BAAuB,GAAvB,uBAAuB,CAA+B;QAZ9G,cAAS,GAAG,uBAAuB,CAAC;QACpC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAC1B,WAAM,GAAG,yDAAgC,CAAC;IAa1D,CAAC;IAEY,OAAO,CAAC,IAA6B;;;YAC9C,IAAI,kBAAkB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAC/D,IAAI,CAAC,YAAY,EACjB,mDAAsB,CAAC,kBAAkB,CAC5C,CAAC;YACF,IAAI,CAAC,kBAAkB,EAAE;gBACrB,MAAM,IAAI,6BAAY,CAAC,+BAA+B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aAClF;iBAAM;gBACH,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;aACpE;YAED,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACzD,MAAM,YAAY,GAAG,IAAI,mCAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC3D,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,aAAa,EAAE,CAAC;YAErD,IAAI;gBACA,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAkB,QAAQ,EAAE,SAAS,CAAC,CAAC;gBACtF,IAAI,eAAe,GAAsB,EAAE,CAAC;gBAE5C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;oBACxB,MAAM,OAAO,GAAG,kBAAkB,CAAC,MAAM,CACrC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,KAAK,KAAK,CAAC,kBAAkB,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,GAAG,CAC5F,CAAC;oBAEF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;wBACtB,SAAS;qBACZ;oBAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,KAAK,CAAC,kBAAkB,EAAE,CAAC,CAAC;oBACzE,MAAM,yBAAyB,GAAG,IAAI,CAAC,oBAAoB,iCAAM,IAAI,KAAE,OAAO,EAAE,KAAK,CAAC,EAAE,KAAI,SAAS,CAAC,CAAC;;wBAEvG,KAAiC,eAAA,6CAAA,cAAA,yBAAyB,CAAA,CAAA,+BAAA,qIAAE;4BAA3B,yCAAyB;4BAAzB,WAAyB;4BAA/C,MAAM,YAAY,KAAA,CAAA;4BACzB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;gCAC1B,MAAM,gBAAgB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC/C,IAAI,CAAC,yBAAyB,CAAC,gBAAgB,iCACxC,IAAI,GACJ,MAAM,EACX,CACL,CAAC;gCAEF,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;6BAC9D;yBACJ;;;;;;;;;iBACJ;gBAED,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;aACnD;oBAAS;gBACN,MAAM,YAAY,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;aAClD;;KACJ;IAEO,iBAAiB,CAAC,IAA6B;QACnD,OAAO;YACH,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,2DAA2D,CAAW;YACpG,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,wCAAwC,IAAI,CAAC,YAAY,EAAE,CAAe;SAC1G,CAAC;IACN,CAAC;IAED,kFAAkF;IAC1E,kBAAkB,CAAC,OAA6B;QACpD,IAAI,MAAM,GAAyB,EAAE,CAAC;QAEtC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC1B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCAAM,MAAM,KAAE,GAAG,EAAE,CAAC,IAAG,CAAC,CAAC,CAAC;SACpE;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAEc,oBAAoB,CAC/B,IAAmD,EACnD,SAAiB;;YAEjB,MAAM,QAAQ,GAAG,gBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAChE,MAAM,MAAM,GAAG,gBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5D,MAAM,SAAS,GAAG,gBAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;YAEhF,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAC9B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC5C,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAExC,oBAAM,IAAI,CAAC,qBAAqB,CAAuB,YAAY,EAAE,SAAS,EAAE;oBAC5E,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,QAAQ,EAAE,KAAK,CAAC,SAAS,EAAE;oBAC3B,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;oBACvB,OAAO,EAAE,GAAG;oBACZ,QAAQ,EAAE,GAAG,EAAE,yFAAyF;iBAC3G,CAAC,CAAA,CAAC;aACN;QACL,CAAC;KAAA;IAEO,qBAAqB,CACzB,eAA2D,EAC3D,SAAiB,EACjB,MAAgC;QAEhC,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,CACnD,yCAAiB,CAAC,kBAAkB,EACpC,mCAAgB,CAAC,YAAY,CAAC,eAAe,CAAC,EAC9C,SAAS,EACT,MAAM,CACT,CAAC;QAEF,OAAO,UAAU,CAAC,MAAM,EAAkB,CAAC;IAC/C,CAAC;CACJ,CAAA;oCA5HY,yBAAyB;IADrC,IAAA,qBAAU,GAAE;IAOJ,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,YAAY,CAAC,CAAA;IAC9B,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;IACxB,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,kCAAkC,CAAC,CAAA;IAE/D,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,4BAA4B,CAAC,CAAA;IAEzD,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,qBAAqB,CAAC,CAAA;IAClD,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,6BAA6B,CAAC,CAAA;6DAFxB,2DAA4B;QACsB,6CAAqB;QACb,6DAA6B;GAbrH,yBAAyB,CA4HrC"}
@@ -6,10 +6,11 @@ exports.aveApiDeviceDataJsonSchema = {
6
6
  items: {
7
7
  type: "object",
8
8
  properties: {
9
- Timestamp: { type: "string" },
9
+ StandardTime: { type: "string" },
10
+ OperatingAmount: { type: "number" },
10
11
  ConvertDifference: { type: "number" },
11
12
  },
12
- required: ["Timestamp", "ConvertDifference"],
13
+ required: ["StandardTime", "OperatingAmount", "ConvertDifference"],
13
14
  },
14
15
  };
15
16
  //# sourceMappingURL=AveApiDeviceDataJsonSchema.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"AveApiDeviceDataJsonSchema.js","sourceRoot":"","sources":["../../../../src/schema-definitions/datasources/commodity-providers/AveApiDeviceDataJsonSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,0BAA0B,GAA2C;IAC9E,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC7B,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SACxC;QACD,QAAQ,EAAE,CAAC,WAAW,EAAE,mBAAmB,CAAC;KAC/C;CACJ,CAAC"}
1
+ {"version":3,"file":"AveApiDeviceDataJsonSchema.js","sourceRoot":"","sources":["../../../../src/schema-definitions/datasources/commodity-providers/AveApiDeviceDataJsonSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,0BAA0B,GAA2C;IAC9E,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAChC,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACnC,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SACxC;QACD,QAAQ,EAAE,CAAC,cAAc,EAAE,iBAAiB,EAAE,mBAAmB,CAAC;KACrE;CACJ,CAAC"}
@@ -1,4 +1,5 @@
1
1
  export interface IAveApiDeviceDataDto {
2
- Timestamp: string;
2
+ StandardTime: string;
3
+ OperatingAmount: number;
3
4
  ConvertDifference: number;
4
5
  }
@@ -0,0 +1,4 @@
1
+ export declare enum MeasurementVariable {
2
+ Core = "core",
3
+ Core2 = "core2"
4
+ }
@@ -0,0 +1,9 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.MeasurementVariable = void 0;
4
+ var MeasurementVariable;
5
+ (function (MeasurementVariable) {
6
+ MeasurementVariable["Core"] = "core";
7
+ MeasurementVariable["Core2"] = "core2";
8
+ })(MeasurementVariable || (exports.MeasurementVariable = MeasurementVariable = {}));
9
+ //# sourceMappingURL=MeasurementVariableEnum.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"MeasurementVariableEnum.js","sourceRoot":"","sources":["../../../../src/schema-definitions/datasources/helpers/MeasurementVariableEnum.ts"],"names":[],"mappings":";;;AAAA,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC3B,oCAAa,CAAA;IACb,sCAAe,CAAA;AACnB,CAAC,EAHW,mBAAmB,mCAAnB,mBAAmB,QAG9B"}
@@ -1,3 +1,4 @@
1
+ import { MeasurementVariable } from "../helpers/MeasurementVariableEnum";
1
2
  export interface IStaticMeterSettings {
2
3
  [providerOptionKey: string]: {
3
4
  MeasurementOptions: IMeasurementOption[];
@@ -9,5 +10,5 @@ export interface IMeasurementOption {
9
10
  Addr: string;
10
11
  Meter: string;
11
12
  Type: string;
12
- Var: string;
13
+ Var: MeasurementVariable | string;
13
14
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@golemio/energetics",
3
- "version": "1.2.12-dev.1217912522",
3
+ "version": "1.2.12-dev.1219005045",
4
4
  "description": "Golemio Energetics Module",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",