@zetra/citrineos-data 1.8.3-fork.19-prerelease.6 → 1.8.3-fork.20
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.
- package/dist/layers/sequelize/repository/Base.js +15 -3
- package/dist/layers/sequelize/repository/Base.js.map +1 -1
- package/dist/layers/sequelize/repository/BaseJunction.d.ts +0 -1
- package/dist/layers/sequelize/repository/BaseJunction.js +82 -41
- package/dist/layers/sequelize/repository/BaseJunction.js.map +1 -1
- package/package.json +2 -2
|
@@ -42,13 +42,25 @@ export class SequelizeRepository extends CrudRepository {
|
|
|
42
42
|
return maxValue + 1;
|
|
43
43
|
}
|
|
44
44
|
async existsByKey(tenantId, key, namespace = this.namespace) {
|
|
45
|
-
|
|
45
|
+
const pk = this.s.models[namespace].primaryKeyAttribute;
|
|
46
|
+
return await this.s.models[namespace]
|
|
47
|
+
.findOne({ where: { [pk]: key, tenantId } })
|
|
48
|
+
.then((row) => row !== null);
|
|
46
49
|
}
|
|
47
50
|
async existByQuery(tenantId, query, namespace = this.namespace) {
|
|
48
|
-
|
|
51
|
+
const q = query;
|
|
52
|
+
const mergedQuery = {
|
|
53
|
+
...q,
|
|
54
|
+
where: { ...(q.where ?? {}), tenantId },
|
|
55
|
+
};
|
|
56
|
+
return await this.s.models[namespace].findAll(mergedQuery).then((row) => row.length);
|
|
49
57
|
}
|
|
50
58
|
async findAndCount(tenantId, options, namespace = this.namespace) {
|
|
51
|
-
|
|
59
|
+
const merged = {
|
|
60
|
+
...options,
|
|
61
|
+
where: { ...(options.where ?? {}), tenantId },
|
|
62
|
+
};
|
|
63
|
+
return this.s.models[namespace].findAndCountAll(merged);
|
|
52
64
|
}
|
|
53
65
|
async _create(tenantId, value, _namespace = this.namespace) {
|
|
54
66
|
return await value.save();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Base.js","sourceRoot":"","sources":["../../../../src/layers/sequelize/repository/Base.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Base.js","sourceRoot":"","sources":["../../../../src/layers/sequelize/repository/Base.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,6 @@ export declare abstract class SequelizeTenantJunctionRepository<T extends Model<
|
|
|
14
14
|
private _injectJunctionInclude;
|
|
15
15
|
readByKey(tenantId: number, key: string | number, namespace?: string): Promise<T | undefined>;
|
|
16
16
|
readAllByQuery(tenantId: number, query: object, namespace?: string): Promise<T[]>;
|
|
17
|
-
readAllBySqlString(tenantId: number, sqlString: string, _namespace?: string): Promise<object[]>;
|
|
18
17
|
readNextValue(tenantId: number, columnName: string, query?: object, startValue?: number, namespace?: string): Promise<number>;
|
|
19
18
|
existsByKey(tenantId: number, key: string, namespace?: string): Promise<boolean>;
|
|
20
19
|
existByQuery(tenantId: number, query: object, namespace?: string): Promise<number>;
|
|
@@ -41,13 +41,10 @@ export class SequelizeTenantJunctionRepository extends CrudRepository {
|
|
|
41
41
|
}
|
|
42
42
|
async readByKey(tenantId, key, namespace = this.namespace) {
|
|
43
43
|
const row = (await this._model(namespace).findByPk(key));
|
|
44
|
-
console.log('!!! row !!', row);
|
|
45
44
|
if (!row)
|
|
46
45
|
return undefined;
|
|
47
46
|
const fk = this.getJunctionForeignKey();
|
|
48
|
-
console.log('!!! fk !!', fk);
|
|
49
47
|
const junctionRow = await this._junctionModel().findOne({ where: { [fk]: key, tenantId } });
|
|
50
|
-
console.log('!!! junctionRow !!', junctionRow);
|
|
51
48
|
return junctionRow ? row : undefined;
|
|
52
49
|
}
|
|
53
50
|
async readAllByQuery(tenantId, query, namespace = this.namespace) {
|
|
@@ -55,9 +52,15 @@ export class SequelizeTenantJunctionRepository extends CrudRepository {
|
|
|
55
52
|
.findAll(this._injectJunctionInclude(query, tenantId))
|
|
56
53
|
.then((rows) => rows);
|
|
57
54
|
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
55
|
+
// TODO: add this back in when we have a use case for it
|
|
56
|
+
// This was removed because it was not used and it was not clear how to use it with the new junction model.
|
|
57
|
+
// async readAllBySqlString(
|
|
58
|
+
// tenantId: number,
|
|
59
|
+
// sqlString: string,
|
|
60
|
+
// _namespace: string = this.namespace,
|
|
61
|
+
// ): Promise<object[]> {
|
|
62
|
+
// return await this.s.query(`${sqlString}`, { type: QueryTypes.SELECT });
|
|
63
|
+
// }
|
|
61
64
|
async readNextValue(tenantId, columnName, query, startValue, namespace = this.namespace) {
|
|
62
65
|
const options = query ? query : undefined;
|
|
63
66
|
const maxValue = await this._model(namespace).max(columnName, options);
|
|
@@ -76,48 +79,83 @@ export class SequelizeTenantJunctionRepository extends CrudRepository {
|
|
|
76
79
|
}
|
|
77
80
|
async existByQuery(tenantId, query, namespace = this.namespace) {
|
|
78
81
|
return await this._model(namespace)
|
|
79
|
-
.findAll(query)
|
|
82
|
+
.findAll(this._injectJunctionInclude(query, tenantId))
|
|
80
83
|
.then((rows) => rows.length);
|
|
81
84
|
}
|
|
82
85
|
async findAndCount(tenantId, options, namespace = this.namespace) {
|
|
83
|
-
return this._model(namespace).findAndCountAll(options);
|
|
86
|
+
return this._model(namespace).findAndCountAll(this._injectJunctionInclude(options, tenantId));
|
|
84
87
|
}
|
|
85
88
|
async _create(tenantId, value, _namespace = this.namespace) {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
89
|
+
return this.s.transaction(async (transaction) => {
|
|
90
|
+
const saved = await value.save({ transaction });
|
|
91
|
+
const pk = this._model(_namespace).primaryKeyAttribute;
|
|
92
|
+
const fk = this.getJunctionForeignKey();
|
|
93
|
+
await this._junctionModel().create({ [fk]: saved.get(pk), tenantId }, { transaction });
|
|
94
|
+
return saved;
|
|
95
|
+
});
|
|
92
96
|
}
|
|
93
97
|
async _bulkCreate(tenantId, values, namespace = this.namespace) {
|
|
94
|
-
return
|
|
98
|
+
return this.s.transaction(async (transaction) => {
|
|
99
|
+
const saved = (await this._model(namespace).bulkCreate(values, {
|
|
100
|
+
transaction,
|
|
101
|
+
}));
|
|
102
|
+
const pk = this._model(namespace).primaryKeyAttribute;
|
|
103
|
+
const fk = this.getJunctionForeignKey();
|
|
104
|
+
await this._junctionModel().bulkCreate(saved.map((row) => ({ [fk]: row.get(pk), tenantId })), { transaction });
|
|
105
|
+
return saved;
|
|
106
|
+
});
|
|
95
107
|
}
|
|
96
108
|
async _createByKey(tenantId, value, key, namespace = this.namespace) {
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
109
|
+
return this.s.transaction(async (transaction) => {
|
|
110
|
+
const model = this._model(namespace);
|
|
111
|
+
const primaryKey = model.primaryKeyAttribute;
|
|
112
|
+
value.setDataValue(primaryKey, key);
|
|
113
|
+
const saved = (await model.create(value.toJSON(), { transaction }));
|
|
114
|
+
const fk = this.getJunctionForeignKey();
|
|
115
|
+
await this._junctionModel().create({ [fk]: key, tenantId }, { transaction });
|
|
116
|
+
return saved;
|
|
117
|
+
});
|
|
101
118
|
}
|
|
102
119
|
async _readOrCreateByQuery(tenantId, query, namespace = this.namespace) {
|
|
103
|
-
return
|
|
104
|
-
.
|
|
105
|
-
|
|
120
|
+
return this.s.transaction(async (transaction) => {
|
|
121
|
+
const model = this._model(namespace);
|
|
122
|
+
const pk = model.primaryKeyAttribute;
|
|
123
|
+
const fk = this.getJunctionForeignKey();
|
|
124
|
+
const [row, created] = (await model.findOrCreate({
|
|
125
|
+
...query,
|
|
126
|
+
transaction,
|
|
127
|
+
}));
|
|
128
|
+
const rowKey = row.get(pk);
|
|
129
|
+
const [, junctionCreated] = await this._junctionModel().findOrCreate({
|
|
130
|
+
where: { [fk]: rowKey, tenantId },
|
|
131
|
+
defaults: { [fk]: rowKey, tenantId },
|
|
132
|
+
transaction,
|
|
133
|
+
});
|
|
134
|
+
return [row, junctionCreated];
|
|
135
|
+
});
|
|
106
136
|
}
|
|
107
137
|
async _updateByKey(tenantId, value, key, namespace = this.namespace) {
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
138
|
+
return this.s.transaction(async (transaction) => {
|
|
139
|
+
const fk = this.getJunctionForeignKey();
|
|
140
|
+
const junctionRow = await this._junctionModel().findOne({
|
|
141
|
+
where: { [fk]: key, tenantId },
|
|
142
|
+
transaction,
|
|
143
|
+
});
|
|
144
|
+
if (!junctionRow)
|
|
145
|
+
return undefined;
|
|
146
|
+
const sharedCount = await this._junctionModel().count({ where: { [fk]: key }, transaction });
|
|
147
|
+
if (sharedCount > 1) {
|
|
148
|
+
throw new Error(`Cannot mutate Authorization ${key}: it is shared by ${sharedCount} tenants`);
|
|
149
|
+
}
|
|
150
|
+
const model = this._model(namespace);
|
|
151
|
+
const pk = model.primaryKeyAttribute;
|
|
152
|
+
const { tenantId: _ignored, ...safeValue } = value;
|
|
153
|
+
const row = await model.findOne({ where: { [pk]: key }, transaction });
|
|
154
|
+
if (!row)
|
|
155
|
+
return undefined;
|
|
156
|
+
await row.update(safeValue, { transaction });
|
|
157
|
+
return row.reload({ transaction });
|
|
158
|
+
});
|
|
121
159
|
}
|
|
122
160
|
async _updateAllByQuery(tenantId, value, query, namespace = this.namespace) {
|
|
123
161
|
const model = this._model(namespace);
|
|
@@ -138,19 +176,22 @@ export class SequelizeTenantJunctionRepository extends CrudRepository {
|
|
|
138
176
|
});
|
|
139
177
|
if (!junctionRow)
|
|
140
178
|
return undefined;
|
|
141
|
-
await junctionRow.destroy({ transaction });
|
|
142
179
|
const model = this._model(namespace);
|
|
143
180
|
const entryToDelete = (await model.findByPk(key, { transaction }));
|
|
144
|
-
if (entryToDelete)
|
|
181
|
+
if (!entryToDelete)
|
|
182
|
+
return undefined;
|
|
183
|
+
await junctionRow.destroy({ transaction });
|
|
184
|
+
const remainingCount = await this._junctionModel().count({
|
|
185
|
+
where: { [fk]: key },
|
|
186
|
+
transaction,
|
|
187
|
+
});
|
|
188
|
+
if (remainingCount === 0) {
|
|
145
189
|
await model.destroy({
|
|
146
190
|
where: { [model.primaryKeyAttribute]: key },
|
|
147
191
|
transaction,
|
|
148
192
|
});
|
|
149
|
-
return entryToDelete;
|
|
150
|
-
}
|
|
151
|
-
else {
|
|
152
|
-
return undefined;
|
|
153
193
|
}
|
|
194
|
+
return entryToDelete;
|
|
154
195
|
});
|
|
155
196
|
}
|
|
156
197
|
async _deleteAllByQuery(tenantId, query, namespace = this.namespace) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseJunction.js","sourceRoot":"","sources":["../../../../src/layers/sequelize/repository/BaseJunction.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;AAEtC,OAAO,EAAwB,cAAc,EAAE,MAAM,iBAAiB,CAAC;AASvE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAgD,MAAM,sBAAsB,CAAC;AACpF,OAAO,EAAgB,MAAM,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAEtD,MAAM,OAAgB,iCAEpB,SAAQ,cAAiB;IACf,CAAC,CAAY;IACb,SAAS,CAAS;IAClB,MAAM,CAAkB;IAElC,YACE,MAAuB,EACvB,SAAiB,EACjB,MAAwB,EACxB,iBAA6B;QAE7B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,CAAC,GAAG,iBAAiB,IAAI,wBAAwB,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACnF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM;YAClB,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YACtD,CAAC,CAAC,IAAI,MAAM,CAAU,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;IAKO,MAAM,CAAsB,SAAiB;QACnD,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAuC,CAAC;IACxE,CAAC;IAEO,cAAc;QACpB,OAAO,IAAI,CAAC,gBAAgB,EAA4C,CAAC;IAC3E,CAAC;IAEO,sBAAsB,CAAC,KAAa,EAAE,QAAgB;QAC5D,MAAM,QAAQ,GAAI,KAAa,CAAC,OAAO,IAAI,EAAE,CAAC;QAC9C,OAAO;YACL,GAAG,KAAK;YACR,OAAO,EAAE;gBACP,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACpD;oBACE,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE;oBAC9B,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,EAAE,QAAQ,EAAE;oBACnB,UAAU,EAAE,EAAE;iBACf;aACF;SACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,SAAS,CACb,QAAgB,EAChB,GAAoB,EACpB,YAAoB,IAAI,CAAC,SAAS;QAElC,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAa,CAAC;QACrE,
|
|
1
|
+
{"version":3,"file":"BaseJunction.js","sourceRoot":"","sources":["../../../../src/layers/sequelize/repository/BaseJunction.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.
|
|
3
|
+
"version": "1.8.3-fork.20",
|
|
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.
|
|
27
|
+
"@zetra/citrineos-base": "1.8.3-fork.20",
|
|
28
28
|
"@types/sequelize": "4.28.20",
|
|
29
29
|
"pg": "8.11.3",
|
|
30
30
|
"pg-hstore": "2.3.4",
|