@spytecgps/nova-orm 1.2.40 → 1.2.42
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/entities/country.js +1 -0
- package/dist/entities/country.js.map +1 -1
- package/dist/entities/magento2Plan.js +3 -1
- package/dist/entities/magento2Plan.js.map +1 -1
- package/dist/entities/user.js +3 -0
- package/dist/entities/user.js.map +1 -1
- package/dist/entities/userActivationDevice.js +1 -0
- package/dist/entities/userActivationDevice.js.map +1 -1
- package/dist/entities/userSecurityRole.js +1 -0
- package/dist/entities/userSecurityRole.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/repositories/devices/getDeviceWithUsersInfo.js +20 -8
- package/dist/repositories/devices/getDeviceWithUsersInfo.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
// AlertType,
|
|
3
|
+
Billing, Device, ImeiIccidCarrier, LatestPosition, SecurityRole, User, UserActivationDevice,
|
|
4
|
+
// UserAlertConfiguration,
|
|
5
|
+
UserSecurityRole, } from '../../entities';
|
|
2
6
|
export const getDeviceWithUsersInfo = async (novaDataSource, params, logger) => {
|
|
3
7
|
if (!params?.filters?.imei) {
|
|
4
8
|
logger.warn({ params }, 'DevicesRepository::getDeviceWithUsersInfo missing required parameters');
|
|
@@ -14,16 +18,24 @@ export const getDeviceWithUsersInfo = async (novaDataSource, params, logger) =>
|
|
|
14
18
|
.innerJoin(User, 'user', 'device.clientId = user.clientId')
|
|
15
19
|
.innerJoin(UserSecurityRole, 'userSecurityRole', 'user.id = userSecurityRole.userId')
|
|
16
20
|
.innerJoin(SecurityRole, 'securityRole', 'userSecurityRole.securityRoleId = securityRole.id')
|
|
17
|
-
.innerJoin(
|
|
21
|
+
// .innerJoin(
|
|
22
|
+
// UserAlertConfiguration,
|
|
23
|
+
// 'userAlertConfiguration',
|
|
24
|
+
// 'user.id = userAlertConfiguration.userId',
|
|
25
|
+
// )
|
|
18
26
|
.leftJoin(Billing, 'billing', 'device.imei = billing.imei')
|
|
19
|
-
.innerJoin(
|
|
27
|
+
// .innerJoin(
|
|
28
|
+
// AlertType,
|
|
29
|
+
// 'alertType',
|
|
30
|
+
// 'userAlertConfiguration.alertTypeId = alertType.id and alertType.id < 6',
|
|
31
|
+
// )
|
|
20
32
|
.innerJoin(UserActivationDevice, 'userActivationDevice', `device.imei = userActivationDevice.imei and userActivationDevice.id = (
|
|
21
33
|
select userActivationDevice.id from userActivationDevice where userActivationDevice.imei = :imei
|
|
22
34
|
order by userActivationDevice.id desc limit 1)
|
|
23
35
|
`, { imei: params.filters.imei.toLowerCase() })
|
|
24
36
|
.leftJoin(LatestPosition, 'latestPosition', 'device.imei = latestPosition.imei')
|
|
25
37
|
.where('device.imei = :imei', { imei: params.filters.imei.toLowerCase() })
|
|
26
|
-
.orderBy('user.createdAt
|
|
38
|
+
.orderBy('user.createdAt', 'DESC') //userAlertConfiguration.alertTypeId
|
|
27
39
|
.select([
|
|
28
40
|
'user.firstName as firstName',
|
|
29
41
|
'user.lastName as lastName',
|
|
@@ -38,10 +50,10 @@ export const getDeviceWithUsersInfo = async (novaDataSource, params, logger) =>
|
|
|
38
50
|
'device.status as deviceStatus',
|
|
39
51
|
'device.name as deviceName',
|
|
40
52
|
'iccidCarrier.iccid as iccid',
|
|
41
|
-
'alertType.name as alertName',
|
|
42
|
-
'userAlertConfiguration.alertValue as alertValue',
|
|
43
|
-
'userAlertConfiguration.smsNotification as smsNotification',
|
|
44
|
-
'userAlertConfiguration.emailNotification as emailNotification',
|
|
53
|
+
// 'alertType.name as alertName',
|
|
54
|
+
// 'userAlertConfiguration.alertValue as alertValue',
|
|
55
|
+
// 'userAlertConfiguration.smsNotification as smsNotification',
|
|
56
|
+
// 'userAlertConfiguration.emailNotification as emailNotification',
|
|
45
57
|
'userActivationDevice.servicePlan as servicePlan',
|
|
46
58
|
'securityRole.name as roleName',
|
|
47
59
|
'billing.subscriptionId as subscriptionId',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDeviceWithUsersInfo.js","sourceRoot":"","sources":["../../../src/repositories/devices/getDeviceWithUsersInfo.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"getDeviceWithUsersInfo.js","sourceRoot":"","sources":["../../../src/repositories/devices/getDeviceWithUsersInfo.ts"],"names":[],"mappings":"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"}
|