@spytecgps/nova-orm 1.1.7 → 1.1.9
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.
|
@@ -24,11 +24,14 @@ export const getUserAlertNotificationsConfig = async (novaDataSource, params, lo
|
|
|
24
24
|
const result = clientAlertConfigurations.map(config => {
|
|
25
25
|
const notificationsConfig = existingUserAlertNotificationConfigs.find(existingConfig => existingConfig.clientAlertConfigurationId === config.id);
|
|
26
26
|
if (notificationsConfig) {
|
|
27
|
+
logger.trace({ userNotificationId: notificationsConfig.id }, 'Existing notification override found');
|
|
27
28
|
return notificationsConfig;
|
|
28
29
|
}
|
|
29
30
|
const userRecipient = missingConfigsRecipients.find(recipient => recipient.clientAlertConfigurationId === config.id &&
|
|
30
|
-
binaryBufferToUuidString(recipient.userId) == params.filters.userId
|
|
31
|
+
binaryBufferToUuidString(recipient.userId) == params.filters.userId &&
|
|
32
|
+
recipient.isEnabled);
|
|
31
33
|
if (userRecipient) {
|
|
34
|
+
logger.trace({ userRecipientId: userRecipient.id }, 'Existing notification configured specific for the user');
|
|
32
35
|
return {
|
|
33
36
|
id: null,
|
|
34
37
|
clientAlertConfigurationId: config.id,
|
|
@@ -40,8 +43,10 @@ export const getUserAlertNotificationsConfig = async (novaDataSource, params, lo
|
|
|
40
43
|
};
|
|
41
44
|
}
|
|
42
45
|
const roleRecipient = missingConfigsRecipients.find(recipient => recipient.clientAlertConfigurationId === config.id &&
|
|
43
|
-
userRoles.find(role => role.securityRoleId === recipient.roleId)
|
|
46
|
+
userRoles.find(role => role.securityRoleId === recipient.roleId) &&
|
|
47
|
+
recipient.isEnabled);
|
|
44
48
|
if (roleRecipient) {
|
|
49
|
+
logger.trace({ roleRecipientId: roleRecipient.id }, 'Existing notification configured specific for the user role');
|
|
45
50
|
return {
|
|
46
51
|
id: null,
|
|
47
52
|
clientAlertConfigurationId: config.id,
|
|
@@ -54,8 +59,10 @@ export const getUserAlertNotificationsConfig = async (novaDataSource, params, lo
|
|
|
54
59
|
}
|
|
55
60
|
const allUsersRecipient = missingConfigsRecipients.find(recipient => recipient.clientAlertConfigurationId === config.id &&
|
|
56
61
|
recipient.userId == null &&
|
|
57
|
-
recipient.roleId == null
|
|
62
|
+
recipient.roleId == null &&
|
|
63
|
+
recipient.isEnabled);
|
|
58
64
|
if (allUsersRecipient) {
|
|
65
|
+
logger.trace({ allUsersRecipientId: allUsersRecipient.id }, 'Existing notification configured specific for all users');
|
|
59
66
|
return {
|
|
60
67
|
id: null,
|
|
61
68
|
clientAlertConfigurationId: config.id,
|
|
@@ -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,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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"}
|