@zetra/citrineos-data 1.8.3-fork.61 → 1.8.3-fork.62

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.
@@ -14,15 +14,6 @@
14
14
  "minLength": 3,
15
15
  "maxLength": 3
16
16
  },
17
- "pricePerKwh": {
18
- "type": "number"
19
- },
20
- "pricePerMin": {
21
- "type": "number"
22
- },
23
- "pricePerSession": {
24
- "type": "number"
25
- },
26
17
  "paymentFee": {
27
18
  "type": "number"
28
19
  },
@@ -99,8 +99,10 @@ export declare class Cdr extends Model {
99
99
  lastUpdated: Date;
100
100
  tenantId: number;
101
101
  tenant?: Tenant;
102
- tenantPartnerId: number;
103
- tenantPartner?: TenantPartner;
102
+ toTenantPartnerId?: number | null;
103
+ fromTenantPartnerId?: number | null;
104
+ toTenantPartner?: TenantPartner;
105
+ fromTenantPartner?: TenantPartner;
104
106
  roamingPartnerId?: number | null;
105
107
  roamingPartner?: RoamingPartner;
106
108
  static setDefaultTenant(instance: Cdr): void;
@@ -159,13 +159,22 @@ __decorate([
159
159
  ], Cdr.prototype, "tenant", void 0);
160
160
  __decorate([
161
161
  ForeignKey(() => TenantPartner),
162
- Column({ type: DataType.INTEGER, allowNull: false, onUpdate: 'CASCADE', onDelete: 'RESTRICT' }),
163
- __metadata("design:type", Number)
164
- ], Cdr.prototype, "tenantPartnerId", void 0);
162
+ Column({ type: DataType.INTEGER, allowNull: true, onUpdate: 'CASCADE', onDelete: 'RESTRICT' }),
163
+ __metadata("design:type", Object)
164
+ ], Cdr.prototype, "toTenantPartnerId", void 0);
165
+ __decorate([
166
+ ForeignKey(() => TenantPartner),
167
+ Column({ type: DataType.INTEGER, allowNull: true, onUpdate: 'CASCADE', onDelete: 'RESTRICT' }),
168
+ __metadata("design:type", Object)
169
+ ], Cdr.prototype, "fromTenantPartnerId", void 0);
170
+ __decorate([
171
+ BelongsTo(() => TenantPartner, { foreignKey: 'toTenantPartnerId', as: 'toTenantPartner' }),
172
+ __metadata("design:type", TenantPartner)
173
+ ], Cdr.prototype, "toTenantPartner", void 0);
165
174
  __decorate([
166
- BelongsTo(() => TenantPartner),
175
+ BelongsTo(() => TenantPartner, { foreignKey: 'fromTenantPartnerId', as: 'fromTenantPartner' }),
167
176
  __metadata("design:type", TenantPartner)
168
- ], Cdr.prototype, "tenantPartner", void 0);
177
+ ], Cdr.prototype, "fromTenantPartner", void 0);
169
178
  __decorate([
170
179
  ForeignKey(() => RoamingPartner),
171
180
  Column({ type: DataType.INTEGER, allowNull: true, onUpdate: 'CASCADE', onDelete: 'SET NULL' }),
@@ -1 +1 @@
1
- {"version":3,"file":"Cdrs.js","sourceRoot":"","sources":["../../../../../src/layers/sequelize/model/Cdrs/Cdrs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Cdrs.js","sourceRoot":"","sources":["../../../../../src/layers/sequelize/model/Cdrs/Cdrs.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { ConnectorDto, TariffDto, TenantDto } from '@zetra/citrineos-base';
1
+ import type { TariffDto, TenantDto } from '@zetra/citrineos-base';
2
2
  import type { CreationOptional } from 'sequelize';
3
3
  import { Model } from 'sequelize-typescript';
4
4
  import { RoamingPartner } from '../RoamingPartner.js';
@@ -6,13 +6,7 @@ import { TenantPartner } from '../TenantPartner.js';
6
6
  export declare class Tariff extends Model implements TariffDto {
7
7
  static readonly MODEL_NAME: string;
8
8
  ocpiTariffId?: string | null;
9
- stationId: string;
10
- connectorId?: number | null;
11
- connector?: ConnectorDto | null;
12
9
  currency: string;
13
- pricePerKwh: number;
14
- pricePerMin?: number | null;
15
- pricePerSession?: number | null;
16
10
  authorizationAmount?: number | null;
17
11
  paymentFee?: number | null;
18
12
  taxRate?: number | null;
@@ -35,9 +29,6 @@ export declare class Tariff extends Model implements TariffDto {
35
29
  export interface TariffData {
36
30
  id: number;
37
31
  currency: string;
38
- pricePerKwh: number;
39
- pricePerMin?: number | null;
40
- pricePerSession?: number | null;
41
32
  taxRate?: number | null;
42
33
  authorizationAmount?: number | null;
43
34
  paymentFee?: number | null;
@@ -13,7 +13,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
13
13
  var Tariff_1;
14
14
  import { DEFAULT_TENANT_ID, OCPP2_0_1_Namespace } from '@zetra/citrineos-base';
15
15
  import { BeforeCreate, BeforeUpdate, BelongsTo, Column, DataType, ForeignKey, Model, Table, } from 'sequelize-typescript';
16
- import { Connector } from '../Location/index.js';
17
16
  import { Tenant } from '../Tenant.js';
18
17
  import { RoamingPartner } from '../RoamingPartner.js';
19
18
  import { TenantPartner } from '../TenantPartner.js';
@@ -24,9 +23,6 @@ let Tariff = class Tariff extends Model {
24
23
  return {
25
24
  id: this.id,
26
25
  currency: this.currency,
27
- pricePerKwh: this.pricePerKwh,
28
- pricePerMin: this.pricePerMin,
29
- pricePerSession: this.pricePerSession,
30
26
  taxRate: this.taxRate,
31
27
  authorizationAmount: this.authorizationAmount,
32
28
  paymentFee: this.paymentFee,
@@ -54,22 +50,6 @@ __decorate([
54
50
  }),
55
51
  __metadata("design:type", Object)
56
52
  ], Tariff.prototype, "ocpiTariffId", void 0);
57
- __decorate([
58
- Column({
59
- type: DataType.STRING,
60
- unique: true,
61
- }),
62
- __metadata("design:type", String)
63
- ], Tariff.prototype, "stationId", void 0);
64
- __decorate([
65
- ForeignKey(() => Connector),
66
- Column(DataType.INTEGER),
67
- __metadata("design:type", Object)
68
- ], Tariff.prototype, "connectorId", void 0);
69
- __decorate([
70
- BelongsTo(() => Connector),
71
- __metadata("design:type", Object)
72
- ], Tariff.prototype, "connector", void 0);
73
53
  __decorate([
74
54
  Column({
75
55
  type: DataType.CHAR(3),
@@ -77,43 +57,6 @@ __decorate([
77
57
  }),
78
58
  __metadata("design:type", String)
79
59
  ], Tariff.prototype, "currency", void 0);
80
- __decorate([
81
- Column({
82
- type: DataType.DECIMAL,
83
- allowNull: false,
84
- validate: {
85
- min: 0,
86
- },
87
- get() {
88
- return parseFloat(this.getDataValue('pricePerKwh'));
89
- },
90
- }),
91
- __metadata("design:type", Number)
92
- ], Tariff.prototype, "pricePerKwh", void 0);
93
- __decorate([
94
- Column({
95
- type: DataType.DECIMAL,
96
- validate: {
97
- min: 0,
98
- },
99
- get() {
100
- return parseFloat(this.getDataValue('pricePerMin'));
101
- },
102
- }),
103
- __metadata("design:type", Object)
104
- ], Tariff.prototype, "pricePerMin", void 0);
105
- __decorate([
106
- Column({
107
- type: DataType.DECIMAL,
108
- validate: {
109
- min: 0,
110
- },
111
- get() {
112
- return parseFloat(this.getDataValue('pricePerSession'));
113
- },
114
- }),
115
- __metadata("design:type", Object)
116
- ], Tariff.prototype, "pricePerSession", void 0);
117
60
  __decorate([
118
61
  Column({
119
62
  type: DataType.DECIMAL,
@@ -1 +1 @@
1
- {"version":3,"file":"Tariffs.js","sourceRoot":"","sources":["../../../../../src/layers/sequelize/model/Tariff/Tariffs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Tariffs.js","sourceRoot":"","sources":["../../../../../src/layers/sequelize/model/Tariff/Tariffs.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zetra/citrineos-data",
3
- "version": "1.8.3-fork.61",
3
+ "version": "1.8.3-fork.62",
4
4
  "description": "The OCPP data module which includes all persistence layer implementation.",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -24,7 +24,7 @@
24
24
  "typescript": "^5.8.2"
25
25
  },
26
26
  "dependencies": {
27
- "@zetra/citrineos-base": "1.8.3-fork.61",
27
+ "@zetra/citrineos-base": "1.8.3-fork.62",
28
28
  "@types/sequelize": "4.28.20",
29
29
  "pg": "8.11.3",
30
30
  "pg-hstore": "2.3.4",