@spytecgps/nova-orm 1.0.47 → 1.0.49
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/repositories/billing/getChurnStatusByClientId.js +1 -0
- package/dist/repositories/billing/getChurnStatusByClientId.js.map +1 -1
- package/dist/repositories/users/getUserData.js +5 -3
- package/dist/repositories/users/getUserData.js.map +1 -1
- package/dist/types/billing.d.ts +1 -0
- package/package.json +1 -1
|
@@ -19,6 +19,7 @@ export const getChurnStatusByClientId = async (novaDataSource, params, logger) =
|
|
|
19
19
|
'billingSubscriptionBraintree.status as braintreeSubscriptionStatus',
|
|
20
20
|
'billingSubscriptionBraintree.subscriptionId as subscriptionId',
|
|
21
21
|
'billingCustomerBraintree.churnStatus as churnStatus',
|
|
22
|
+
'billingSubscriptionBraintree.nextBillingDate as nextBillingDate',
|
|
22
23
|
])
|
|
23
24
|
.distinct();
|
|
24
25
|
const result = await queryBuilder.getRawMany();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getChurnStatusByClientId.js","sourceRoot":"","sources":["../../../src/repositories/billing/getChurnStatusByClientId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,wBAAwB,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAA;AAKhG,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAC3C,cAA8B,EAC9B,MAAsC,EACtC,MAAc,EAC6B,EAAE;IAC7C,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC9B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,2EAA2E,CAC5E,CAAA;QACD,OAAO,EAAE,CAAA;KACV;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAE/D,EAAE;QACF,MAAM,iBAAiB,GAAG,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QAE3D,MAAM,YAAY,GAAG,iBAAiB;aACnC,kBAAkB,CAAC,SAAS,CAAC;aAC7B,KAAK,CAAC,8BAA8B,EAAE;YACrC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;SAClC,CAAC;aACD,kBAAkB,CACjB,4BAA4B,EAC5B,8BAA8B,EAC9B,sEAAsE,CACvE;aACA,kBAAkB,CACjB,wBAAwB,EACxB,0BAA0B,EAC1B,uEAAuE,CACxE;aACA,OAAO,CACN,+GAA+G,CAChH;aACA,MAAM,CAAC;YACN,oDAAoD;YACpD,oEAAoE;YACpE,+DAA+D;YAC/D,qDAAqD;
|
|
1
|
+
{"version":3,"file":"getChurnStatusByClientId.js","sourceRoot":"","sources":["../../../src/repositories/billing/getChurnStatusByClientId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,wBAAwB,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAA;AAKhG,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAC3C,cAA8B,EAC9B,MAAsC,EACtC,MAAc,EAC6B,EAAE;IAC7C,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC9B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,2EAA2E,CAC5E,CAAA;QACD,OAAO,EAAE,CAAA;KACV;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAE/D,EAAE;QACF,MAAM,iBAAiB,GAAG,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QAE3D,MAAM,YAAY,GAAG,iBAAiB;aACnC,kBAAkB,CAAC,SAAS,CAAC;aAC7B,KAAK,CAAC,8BAA8B,EAAE;YACrC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;SAClC,CAAC;aACD,kBAAkB,CACjB,4BAA4B,EAC5B,8BAA8B,EAC9B,sEAAsE,CACvE;aACA,kBAAkB,CACjB,wBAAwB,EACxB,0BAA0B,EAC1B,uEAAuE,CACxE;aACA,OAAO,CACN,+GAA+G,CAChH;aACA,MAAM,CAAC;YACN,oDAAoD;YACpD,oEAAoE;YACpE,+DAA+D;YAC/D,qDAAqD;YACrD,iEAAiE;SAClE,CAAC;aACD,QAAQ,EAAE,CAAA;QAEb,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,CAAA;QAE9C,OAAO,MAAM,CAAA;IACf,CAAC,EAAE,6CAA6C,CAAC,CAAA;AACnD,CAAC,CAAA"}
|
|
@@ -22,9 +22,10 @@ export const getUsersData = async (novaDataSource, params, logger) => {
|
|
|
22
22
|
from notificationRecipient as NR
|
|
23
23
|
where NR.clientId = C.id
|
|
24
24
|
and NR.userId = U.id
|
|
25
|
-
and
|
|
25
|
+
and NR.notificationType = 2
|
|
26
26
|
and NR.isEnabled = true
|
|
27
|
-
and NR.unsubscribed = false
|
|
27
|
+
and NR.unsubscribed = false
|
|
28
|
+
and (NR.userAlertConfigurationId IS NULL or NR.userAlertConfigurationId = AC.id )) as phoneNumbers
|
|
28
29
|
, ( SELECT CONCAT('[',
|
|
29
30
|
GROUP_CONCAT( distinct case when NR.isUserProfile = true
|
|
30
31
|
then CONCAT('"', U.email, '"') else CONCAT('"', NR.recipient, '"') end SEPARATOR ','),
|
|
@@ -34,7 +35,8 @@ export const getUsersData = async (novaDataSource, params, logger) => {
|
|
|
34
35
|
and NR.userId = U.id
|
|
35
36
|
and NR.notificationType = 1
|
|
36
37
|
and NR.isEnabled = true
|
|
37
|
-
and NR.unsubscribed = false
|
|
38
|
+
and NR.unsubscribed = false
|
|
39
|
+
and (NR.userAlertConfigurationId IS NULL or NR.userAlertConfigurationId = AC.id ) ) as emailAddresses
|
|
38
40
|
FROM device AS D
|
|
39
41
|
JOIN client AS C
|
|
40
42
|
ON D.clientId = C.id
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUserData.js","sourceRoot":"","sources":["../../../src/repositories/users/getUserData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAIrC,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAC/B,cAA8B,EAC9B,MAA0B,EAC1B,MAAc,EACO,EAAE;IACvB,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;QAC1B,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,6DAA6D,CAAC,CAAA;QACtF,OAAO,EAAE,CAAA;KACV;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAAuB,EAAE;QACxF,MAAM,eAAe,GAAG,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;QAEtD,MAAM,KAAK,GAAG
|
|
1
|
+
{"version":3,"file":"getUserData.js","sourceRoot":"","sources":["../../../src/repositories/users/getUserData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAIrC,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAC/B,cAA8B,EAC9B,MAA0B,EAC1B,MAAc,EACO,EAAE;IACvB,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;QAC1B,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,6DAA6D,CAAC,CAAA;QACtF,OAAO,EAAE,CAAA;KACV;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAAuB,EAAE;QACxF,MAAM,eAAe,GAAG,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;QAEtD,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCA2CiB,CAAA;QAE/B,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;QAExE,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACzB,GAAG,IAAI;YACP,MAAM,EAAE,wBAAwB,CAAC,IAAI,CAAC,MAAM,CAAC;YAC7C,OAAO,EAAE,IAAI,CAAC,OAAO,KAAK,CAAC;YAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ,KAAK,CAAC;YAC7B,oBAAoB,EAAE,IAAI,CAAC,qBAAqB,KAAK,CAAC;YACtD,eAAe,EAAE,IAAI,CAAC,eAAe,KAAK,CAAC;YAC3C,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,KAAK,CAAC;YAC/C,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,KAAK,CAAC;YAC7C,eAAe,EAAE,IAAI,CAAC,eAAe,KAAK,CAAC;YAC3C,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE;YACpE,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE;SAC3E,CAAC,CAAC,CAAA;IACL,CAAC,EAAE,+BAA+B,CAAC,CAAA;AACrC,CAAC,CAAA"}
|
package/dist/types/billing.d.ts
CHANGED
|
@@ -116,6 +116,7 @@ export interface BillingSubscriptionChurnStatus {
|
|
|
116
116
|
braintreeSubscriptionStatus: string;
|
|
117
117
|
subscriptionId: string;
|
|
118
118
|
churnStatus?: string | null;
|
|
119
|
+
nextBillingDate?: Date | null;
|
|
119
120
|
}
|
|
120
121
|
export interface UpsertBillingSubscriptionBraintreeParams {
|
|
121
122
|
subscriptionId: string;
|