@spytecgps/nova-orm 1.1.8 → 1.2.1
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/index.js +1 -1
- package/dist/novaDataSource.d.ts +8 -1
- package/dist/novaDataSource.js +28 -0
- package/dist/novaDataSource.js.map +1 -1
- package/dist/repositories/clientAlertConfiguration/getClientAlertConfigurations.js +1 -1
- package/dist/repositories/clientAlertConfiguration/getClientAlertConfigurations.js.map +1 -1
- package/dist/repositories/userConfigurations/getUserAlertNotificationsConfig.js +6 -3
- package/dist/repositories/userConfigurations/getUserAlertNotificationsConfig.js.map +1 -1
- package/package.json +2 -3
package/dist/novaDataSource.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DataSource, EntityTarget, LoggerOptions, ObjectLiteral, QueryRunner, ReplicationMode, Repository, SelectQueryBuilder } from 'typeorm';
|
|
1
|
+
import { DataSource, EntityTarget, LoggerOptions, ObjectLiteral, QueryBuilder, QueryRunner, ReplicationMode, Repository, SelectQueryBuilder } from 'typeorm';
|
|
2
2
|
import { BaseSelectQueryParams } from './types/common';
|
|
3
3
|
import { Logger } from './types/logger';
|
|
4
4
|
export type queryBuilderHandler<T> = (novaDataSource: NovaDataSource, queryRunner?: QueryRunner) => Promise<T>;
|
|
@@ -32,9 +32,15 @@ export interface NovaDataSourceConfig {
|
|
|
32
32
|
*/
|
|
33
33
|
logging?: LoggerOptions;
|
|
34
34
|
}
|
|
35
|
+
interface SafeQuery3Options {
|
|
36
|
+
tag?: string;
|
|
37
|
+
replicationMode?: ReplicationMode;
|
|
38
|
+
}
|
|
39
|
+
export type SafeQuery3Callback<T> = (queryBuilder: (q: QueryBuilder<T>) => any) => Promise<T>;
|
|
35
40
|
export declare class NovaDataSource {
|
|
36
41
|
protected readonly dataSource: DataSource;
|
|
37
42
|
protected readonly logger: Logger;
|
|
43
|
+
safeQuery3<T extends ObjectLiteral, R>(target: EntityTarget<T>, alias: string, callback: (q: QueryBuilder<T>) => Promise<R>, { replicationMode, tag }?: SafeQuery3Options): Promise<R>;
|
|
38
44
|
constructor(config: NovaDataSourceConfig, logger: Logger, replicaConfig?: NovaDataSourceConfig);
|
|
39
45
|
/**
|
|
40
46
|
* Performs connection to the database.
|
|
@@ -72,3 +78,4 @@ export declare class NovaDataSource {
|
|
|
72
78
|
safeQuery<T>(queryBuilderHandler: queryBuilderHandler<T>, tag?: string, queryRunner?: QueryRunner): Promise<T>;
|
|
73
79
|
safeQuery2<T>(queryBuilderHandler: queryBuilderHandler<T>, tag?: string, queryRunner?: QueryRunner): Promise<T>;
|
|
74
80
|
}
|
|
81
|
+
export {};
|
package/dist/novaDataSource.js
CHANGED
|
@@ -5,6 +5,34 @@ import { QueryLogger } from './utils/queryLogger';
|
|
|
5
5
|
export class NovaDataSource {
|
|
6
6
|
dataSource;
|
|
7
7
|
logger;
|
|
8
|
+
async safeQuery3(target, alias,
|
|
9
|
+
// eslint-disable-next-line no-unused-vars
|
|
10
|
+
callback, { replicationMode = 'slave', tag } = {}) {
|
|
11
|
+
let queryRunner;
|
|
12
|
+
try {
|
|
13
|
+
if (!this.dataSource.isInitialized) {
|
|
14
|
+
this.logger.info('nova-orm new connection');
|
|
15
|
+
await this.connect();
|
|
16
|
+
}
|
|
17
|
+
else {
|
|
18
|
+
this.logger.info('nova-orm reusing connection');
|
|
19
|
+
}
|
|
20
|
+
queryRunner = this.dataSource.createQueryRunner(replicationMode);
|
|
21
|
+
// const queryBuilder = this.getRepository(target).createQueryBuilder()
|
|
22
|
+
const queryBuilder = this.dataSource.createQueryBuilder(target, alias, queryRunner);
|
|
23
|
+
const result = await callback(queryBuilder);
|
|
24
|
+
return result;
|
|
25
|
+
}
|
|
26
|
+
catch (error) {
|
|
27
|
+
this.logger.error({ error }, tag ? tag + ' ' : '' + 'Error while executing query');
|
|
28
|
+
throw error;
|
|
29
|
+
}
|
|
30
|
+
finally {
|
|
31
|
+
if (queryRunner) {
|
|
32
|
+
await queryRunner.release();
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
8
36
|
constructor(config, logger, replicaConfig) {
|
|
9
37
|
this.logger = logger;
|
|
10
38
|
const entities = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"novaDataSource.js","sourceRoot":"","sources":["../src/novaDataSource.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,
|
|
1
|
+
{"version":3,"file":"novaDataSource.js","sourceRoot":"","sources":["../src/novaDataSource.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ export const getClientAlertConfigurations = async (novaDataSource, params, logge
|
|
|
35
35
|
queryBuilder = queryBuilder.leftJoinAndSelect('clientAlertConfiguration.internalRecipients', 'internalRecipients');
|
|
36
36
|
}
|
|
37
37
|
if (params.projectionOptions?.withExternalRecipients) {
|
|
38
|
-
queryBuilder = queryBuilder.leftJoinAndSelect('clientAlertConfiguration.externalRecipients', 'externalRecipients');
|
|
38
|
+
queryBuilder = queryBuilder.leftJoinAndSelect('clientAlertConfiguration.externalRecipients', 'externalRecipients', 'externalRecipients.clientId = clientAlertConfiguration.clientId');
|
|
39
39
|
}
|
|
40
40
|
const clientAlertConfigurations = await queryBuilder.getMany();
|
|
41
41
|
return clientAlertConfigurations;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientAlertConfigurations.js","sourceRoot":"","sources":["../../../src/repositories/clientAlertConfiguration/getClientAlertConfigurations.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAA;AAKzD,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,EAC/C,cAA8B,EAC9B,MAA0C,EAC1C,MAAc,EACuB,EAAE;IACvC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;QAC5B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,gGAAgG,CACjG,CAAA;QACD,OAAO,EAAE,CAAA;KACV;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EACH,UAA0B,EAC1B,WAAyB,EACY,EAAE;QACvC,MAAM,mCAAmC,GAAG,UAAU,CAAC,aAAa,CAAC,wBAAwB,CAAC,CAAA;QAE9F,IAAI,YAAY,GAAG,mCAAmC;aACnD,kBAAkB,CAAC,0BAA0B,CAAC;aAC9C,KAAK,CAAC,+CAA+C,EAAE;YACtD,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;SAClC,CAAC,CAAA;QAEJ,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE;YAC9B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAClC,qDAAqD,EACrD;gBACE,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW;aACxC,CACF,CAAA;SACF;QAED,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE;YACrC,YAAY,GAAG,YAAY,CAAC,QAAQ,CAClC,qDAAqD,EACrD;gBACE,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU;aACtC,CACF,CAAA;SACF;QAED,IAAI,MAAM,CAAC,OAAO,CAAC,mBAAmB,EAAE;YACtC,YAAY,GAAG,YAAY,CAAC,QAAQ,CAClC,0DAA0D,EAC1D;gBACE,mBAAmB,EAAE,MAAM,CAAC,OAAO,CAAC,mBAAmB;aACxD,CACF,CAAA;SACF;QAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,sBAAsB,EAAE;YACpD,YAAY,GAAG,YAAY,CAAC,iBAAiB,CAC3C,6CAA6C,EAC7C,oBAAoB,CACrB,CAAA;SACF;QAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,sBAAsB,EAAE;YACpD,YAAY,GAAG,YAAY,CAAC,iBAAiB,CAC3C,6CAA6C,EAC7C,oBAAoB,
|
|
1
|
+
{"version":3,"file":"getClientAlertConfigurations.js","sourceRoot":"","sources":["../../../src/repositories/clientAlertConfiguration/getClientAlertConfigurations.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAA;AAKzD,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,EAC/C,cAA8B,EAC9B,MAA0C,EAC1C,MAAc,EACuB,EAAE;IACvC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;QAC5B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,gGAAgG,CACjG,CAAA;QACD,OAAO,EAAE,CAAA;KACV;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EACH,UAA0B,EAC1B,WAAyB,EACY,EAAE;QACvC,MAAM,mCAAmC,GAAG,UAAU,CAAC,aAAa,CAAC,wBAAwB,CAAC,CAAA;QAE9F,IAAI,YAAY,GAAG,mCAAmC;aACnD,kBAAkB,CAAC,0BAA0B,CAAC;aAC9C,KAAK,CAAC,+CAA+C,EAAE;YACtD,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;SAClC,CAAC,CAAA;QAEJ,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE;YAC9B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAClC,qDAAqD,EACrD;gBACE,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW;aACxC,CACF,CAAA;SACF;QAED,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE;YACrC,YAAY,GAAG,YAAY,CAAC,QAAQ,CAClC,qDAAqD,EACrD;gBACE,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU;aACtC,CACF,CAAA;SACF;QAED,IAAI,MAAM,CAAC,OAAO,CAAC,mBAAmB,EAAE;YACtC,YAAY,GAAG,YAAY,CAAC,QAAQ,CAClC,0DAA0D,EAC1D;gBACE,mBAAmB,EAAE,MAAM,CAAC,OAAO,CAAC,mBAAmB;aACxD,CACF,CAAA;SACF;QAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,sBAAsB,EAAE;YACpD,YAAY,GAAG,YAAY,CAAC,iBAAiB,CAC3C,6CAA6C,EAC7C,oBAAoB,CACrB,CAAA;SACF;QAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,sBAAsB,EAAE;YACpD,YAAY,GAAG,YAAY,CAAC,iBAAiB,CAC3C,6CAA6C,EAC7C,oBAAoB,EACpB,iEAAiE,CAClE,CAAA;SACF;QAED,MAAM,yBAAyB,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAA;QAE9D,OAAO,yBAAyB,CAAA;IAClC,CAAC,EACD,kEAAkE,EAClE,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -28,7 +28,8 @@ export const getUserAlertNotificationsConfig = async (novaDataSource, params, lo
|
|
|
28
28
|
return notificationsConfig;
|
|
29
29
|
}
|
|
30
30
|
const userRecipient = missingConfigsRecipients.find(recipient => recipient.clientAlertConfigurationId === config.id &&
|
|
31
|
-
binaryBufferToUuidString(recipient.userId) == params.filters.userId
|
|
31
|
+
binaryBufferToUuidString(recipient.userId) == params.filters.userId &&
|
|
32
|
+
recipient.isEnabled);
|
|
32
33
|
if (userRecipient) {
|
|
33
34
|
logger.trace({ userRecipientId: userRecipient.id }, 'Existing notification configured specific for the user');
|
|
34
35
|
return {
|
|
@@ -42,7 +43,8 @@ export const getUserAlertNotificationsConfig = async (novaDataSource, params, lo
|
|
|
42
43
|
};
|
|
43
44
|
}
|
|
44
45
|
const roleRecipient = missingConfigsRecipients.find(recipient => recipient.clientAlertConfigurationId === config.id &&
|
|
45
|
-
userRoles.find(role => role.securityRoleId === recipient.roleId)
|
|
46
|
+
userRoles.find(role => role.securityRoleId === recipient.roleId) &&
|
|
47
|
+
recipient.isEnabled);
|
|
46
48
|
if (roleRecipient) {
|
|
47
49
|
logger.trace({ roleRecipientId: roleRecipient.id }, 'Existing notification configured specific for the user role');
|
|
48
50
|
return {
|
|
@@ -57,7 +59,8 @@ export const getUserAlertNotificationsConfig = async (novaDataSource, params, lo
|
|
|
57
59
|
}
|
|
58
60
|
const allUsersRecipient = missingConfigsRecipients.find(recipient => recipient.clientAlertConfigurationId === config.id &&
|
|
59
61
|
recipient.userId == null &&
|
|
60
|
-
recipient.roleId == null
|
|
62
|
+
recipient.roleId == null &&
|
|
63
|
+
recipient.isEnabled);
|
|
61
64
|
if (allUsersRecipient) {
|
|
62
65
|
logger.trace({ allUsersRecipientId: allUsersRecipient.id }, 'Existing notification configured specific for all users');
|
|
63
66
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUserAlertNotificationsConfig.js","sourceRoot":"","sources":["../../../src/repositories/userConfigurations/getUserAlertNotificationsConfig.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,wBAAwB,EACxB,oBAAoB,EACpB,IAAI,EACJ,4BAA4B,EAC5B,gBAAgB,GACjB,MAAM,gBAAgB,CAAA;AAIvB,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAE5F,MAAM,CAAC,MAAM,+BAA+B,GAAG,KAAK,EAClD,cAA8B,EAC9B,MAA6C,EAC7C,MAAc,EAC2B,EAAE;IAC3C,4BAA4B;IAC5B,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;QAC5B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,6FAA6F,CAC9F,CAAA;QACD,OAAO,EAAE,CAAA;KACV;IAED,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IAE5E,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,gGAAgG,CACjG,CAAA;QACD,OAAO,EAAE,CAAA;KACV;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EACH,UAA0B,EAC1B,WAAyB,EACgB,EAAE;QAC3C,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,kBAAkB,EAAE,WAAW,CAAC,CAAA;QAEjF,MAAM,yBAAyB,GAAG,MAAM,mCAAmC,CACzE,UAAU,EACV,kBAAkB,EAClB,SAAS,EACT,WAAW,CACZ,CAAA;QAED,MAAM,oCAAoC,GAAG,yBAAyB,EAAE,MAAM;YAC5E,CAAC,CAAC,MAAM,uCAAuC,CAC3C,UAAU,EACV,kBAAkB,EAClB,yBAAyB,EACzB,WAAW,CACZ;YACH,CAAC,CAAC,EAAE,CAAA;QAEN,MAAM,cAAc,GAAG,yBAAyB,CAAC,MAAM,CACrD,MAAM,CAAC,EAAE,CACP,CAAC,oCAAoC,EAAE,IAAI,CACzC,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,0BAA0B,KAAK,MAAM,CAAC,EAAE,CAC1E,CACJ,CAAA;QAED,MAAM,wBAAwB,GAAG,MAAM,0BAA0B,CAC/D,UAAU,EACV,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EACxC,WAAW,CACZ,CAAA;QAED,MAAM,MAAM,GAAG,yBAAyB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YACpD,MAAM,mBAAmB,GAAG,oCAAoC,CAAC,IAAI,CACnE,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,0BAA0B,KAAK,MAAM,CAAC,EAAE,CAC1E,CAAA;YAED,IAAI,mBAAmB,EAAE;gBACvB,MAAM,CAAC,KAAK,CACV,EAAE,kBAAkB,EAAE,mBAAmB,CAAC,EAAE,EAAE,EAC9C,sCAAsC,CACvC,CAAA;gBACD,OAAO,mBAAmB,CAAA;aAC3B;YAED,MAAM,aAAa,GAAG,wBAAwB,CAAC,IAAI,CACjD,SAAS,CAAC,EAAE,CACV,SAAS,CAAC,0BAA0B,KAAK,MAAM,CAAC,EAAE;gBAClD,wBAAwB,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"getUserAlertNotificationsConfig.js","sourceRoot":"","sources":["../../../src/repositories/userConfigurations/getUserAlertNotificationsConfig.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@spytecgps/nova-orm",
|
|
3
|
-
"version": "1.1
|
|
3
|
+
"version": "1.2.1",
|
|
4
4
|
"description": "ORM with PlanetScale",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -26,8 +26,7 @@
|
|
|
26
26
|
"ts-node": "^10.9.1",
|
|
27
27
|
"typescript": "^4.9.5",
|
|
28
28
|
"webpack": "^5.72.0",
|
|
29
|
-
"webpack-cli": "^4.9.2"
|
|
30
|
-
"yarn": "^1.22.19"
|
|
29
|
+
"webpack-cli": "^4.9.2"
|
|
31
30
|
},
|
|
32
31
|
"dependencies": {
|
|
33
32
|
"dayjs": "^1.11.11",
|