@spytecgps/nova-orm 1.0.29 → 1.0.31

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.
Files changed (10) hide show
  1. package/dist/entities/customUserAlertConfiguration.d.ts +1 -0
  2. package/dist/entities/customUserAlertConfiguration.js +5 -0
  3. package/dist/entities/customUserAlertConfiguration.js.map +1 -1
  4. package/dist/index.js +1 -1
  5. package/dist/repositories/userConfigurations/createCustomUserAlertConfiguration.js +4 -4
  6. package/dist/repositories/userConfigurations/createCustomUserAlertConfiguration.js.map +1 -1
  7. package/dist/repositories/userConfigurations/getCustomUserAlertConfiguration.js +5 -2
  8. package/dist/repositories/userConfigurations/getCustomUserAlertConfiguration.js.map +1 -1
  9. package/dist/types/userConfigurations.d.ts +3 -1
  10. package/package.json +1 -1
package/dist/repositories/userConfigurations/createCustomUserAlertConfiguration.js CHANGED
@@ -6,14 +6,13 @@ export const createCustomUserAlertConfiguration = async (novaDataSource, params,
6
6
  !params?.alertTypeId ||
7
7
  !params?.daysOfTheWeek ||
8
8
  !params.startTime ||
9
- !params.endTime ||
10
- !params.imei) {
11
- logger.warn({ params }, 'UserConfigurationsRepository::createDeviceAlertTimeWindows - missing required parameters');
9
+ !params.endTime) {
10
+ logger.warn({ params }, 'UserConfigurationsRepository::createCustomUserAlertConfiguration - missing required parameters');
12
11
  return null;
13
12
  }
14
13
  const userIdBinaryBuffer = uuidStringToBinaryBuffer(params?.userId);
15
14
  if (!userIdBinaryBuffer?.length) {
16
- logger.warn({ params }, 'UserConfigurationsRepository::createDeviceAlertTimeWindows - user id should be a valid UUID');
15
+ logger.warn({ params }, 'UserConfigurationsRepository::createCustomUserAlertConfiguration - user id should be a valid UUID');
17
16
  return null;
18
17
  }
19
18
  return novaDataSource.safeQuery(async (dataSource) => {
@@ -29,6 +28,7 @@ export const createCustomUserAlertConfiguration = async (novaDataSource, params,
29
28
  filter: params?.filter ?? null,
30
29
  imei: params?.imei,
31
30
  label: params?.label ?? null,
31
+ alertConfigurationId: params?.alertConfigurationId ?? null,
32
32
  };
33
33
  return await userConfigurationsRepository.save(newCustomUserAlertConfig);
34
34
  }, 'UserConfigurationsRepository::customUserAlertConfiguration');
package/dist/repositories/userConfigurations/createCustomUserAlertConfiguration.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createCustomUserAlertConfiguration.js","sourceRoot":"","sources":["../../../src/repositories/userConfigurations/createCustomUserAlertConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAA;AAI7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EACrD,cAA8B,EAC9B,MAAgD,EAChD,MAAc,EACyB,EAAE;IACzC,IACE,CAAC,MAAM,EAAE,MAAM;QACf,CAAC,MAAM,EAAE,QAAQ;QACjB,CAAC,MAAM,EAAE,WAAW;QACpB,CAAC,MAAM,EAAE,aAAa;QACtB,CAAC,MAAM,CAAC,SAAS;QACjB,CAAC,MAAM,CAAC,OAAO;QACf,CAAC,MAAM,CAAC,IAAI,EACZ;QACA,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,0FAA0F,CAC3F,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAEnE,IAAI,CAAC,kBAAkB,EAAE,MAAM,EAAE;QAC/B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,6FAA6F,CAC9F,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAE/D,EAAE;QACF,MAAM,4BAA4B,GAAG,UAAU,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAA;QAE3F,MAAM,wBAAwB,GAAiC;YAC7D,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,IAAI;YACtB,WAAW,EAAE,MAAM,EAAE,WAAW;YAChC,QAAQ,EAAE,MAAM,EAAE,QAAQ;YAC1B,MAAM,EAAE,kBAAkB;YAC1B,aAAa,EAAE,MAAM,EAAE,aAAa;YACpC,SAAS,EAAE,MAAM,EAAE,SAAS;YAC5B,OAAO,EAAE,MAAM,EAAE,OAAO;YACxB,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,IAAI;YAC9B,IAAI,EAAE,MAAM,EAAE,IAAI;YAClB,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,IAAI;SAC7B,CAAA;QAED,OAAO,MAAM,4BAA4B,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA;IAC1E,CAAC,EAAE,4DAA4D,CAAC,CAAA;AAClE,CAAC,CAAA"}
1
+ {"version":3,"file":"createCustomUserAlertConfiguration.js","sourceRoot":"","sources":["../../../src/repositories/userConfigurations/createCustomUserAlertConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAA;AAI7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EACrD,cAA8B,EAC9B,MAAgD,EAChD,MAAc,EACyB,EAAE;IACzC,IACE,CAAC,MAAM,EAAE,MAAM;QACf,CAAC,MAAM,EAAE,QAAQ;QACjB,CAAC,MAAM,EAAE,WAAW;QACpB,CAAC,MAAM,EAAE,aAAa;QACtB,CAAC,MAAM,CAAC,SAAS;QACjB,CAAC,MAAM,CAAC,OAAO,EACf;QACA,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,gGAAgG,CACjG,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAEnE,IAAI,CAAC,kBAAkB,EAAE,MAAM,EAAE;QAC/B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,mGAAmG,CACpG,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAE/D,EAAE;QACF,MAAM,4BAA4B,GAAG,UAAU,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAA;QAE3F,MAAM,wBAAwB,GAAiC;YAC7D,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,IAAI;YACtB,WAAW,EAAE,MAAM,EAAE,WAAW;YAChC,QAAQ,EAAE,MAAM,EAAE,QAAQ;YAC1B,MAAM,EAAE,kBAAkB;YAC1B,aAAa,EAAE,MAAM,EAAE,aAAa;YACpC,SAAS,EAAE,MAAM,EAAE,SAAS;YAC5B,OAAO,EAAE,MAAM,EAAE,OAAO;YACxB,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,IAAI;YAC9B,IAAI,EAAE,MAAM,EAAE,IAAI;YAClB,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,IAAI;YAC5B,oBAAoB,EAAE,MAAM,EAAE,oBAAoB,IAAI,IAAI;SAC3D,CAAA;QAED,OAAO,MAAM,4BAA4B,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA;IAC1E,CAAC,EAAE,4DAA4D,CAAC,CAAA;AAClE,CAAC,CAAA"}
package/dist/repositories/userConfigurations/getCustomUserAlertConfiguration.js CHANGED
@@ -22,7 +22,7 @@ export const getCustomUserAlertConfiguration = async (novaDataSource, params, lo
22
22
  });
23
23
  }
24
24
  if (params?.filters?.imei) {
25
- queryBuilder = queryBuilder.andWhere('customUserAlertConfig.imei = :imei', {
25
+ queryBuilder = queryBuilder.andWhere('(customUserAlertConfig.imei IS NULL OR customUserAlertConfig.imei = :imei)', {
26
26
  imei: params.filters.imei,
27
27
  });
28
28
  }
@@ -36,7 +36,10 @@ export const getCustomUserAlertConfiguration = async (novaDataSource, params, lo
36
36
  userId: userIdBinaryBuffer,
37
37
  });
38
38
  }
39
- queryBuilder = queryBuilder.orderBy('customUserAlertConfig.alertTypeId');
39
+ queryBuilder = queryBuilder
40
+ .orderBy('customUserAlertConfig.alertTypeId')
41
+ .limit(params.pagingOptions?.pageSize ?? 100)
42
+ .offset((params.pagingOptions?.pageSize ?? 100) * (params.pagingOptions?.pageIndex ?? 0));
40
43
  const result = await queryBuilder.getMany();
41
44
  return result;
42
45
  }, 'UserConfigurationsRepository::getCustomUserAlertConfiguration');
package/dist/repositories/userConfigurations/getCustomUserAlertConfiguration.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getCustomUserAlertConfiguration.js","sourceRoot":"","sources":["../../../src/repositories/userConfigurations/getCustomUserAlertConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAA;AAI7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,+BAA+B,GAAG,KAAK,EAClD,cAA8B,EAC9B,MAA6C,EAC7C,MAAc,EAC2B,EAAE;IAC3C,0BAA0B;IAC1B,IACE,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI;QACtB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ;QAC1B,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM;QACxB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAC1B;QACA,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,6FAA6F,CAC9F,CAAA;QACD,OAAO,EAAE,CAAA;KACV;IAED,IAAI,kBAAkB,GAAG,IAAI,CAAA;IAC7B,IAAI,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,kBAAkB,GAAG,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;KACvE;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAE/D,EAAE;QACF,MAAM,8BAA8B,GAAG,UAAU,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAA;QAE7F,IAAI,YAAY,GAAG,8BAA8B,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,CAAA;QAE7F,IAAI,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;YAC7B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,gCAAgC,EAAE;gBACrE,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;aAC5B,CAAC,CAAA;SACH;QAED,IAAI,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;YACzB,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,oCAAoC,EAAE;gBACzE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI;aAC1B,CAAC,CAAA;SACH;QAED,IAAI,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;YAC7B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,4CAA4C,EAAE;gBACjF,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;aAClC,CAAC,CAAA;SACH;QAED,IAAI,kBAAkB,EAAE;YACtB,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,wCAAwC,EAAE;gBAC7E,MAAM,EAAE,kBAAkB;aAC3B,CAAC,CAAA;SACH;QAED,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,mCAAmC,CAAC,CAAA;QAExE,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAA;QAE3C,OAAO,MAAM,CAAA;IACf,CAAC,EAAE,+DAA+D,CAAC,CAAA;AACrE,CAAC,CAAA"}
1
+ {"version":3,"file":"getCustomUserAlertConfiguration.js","sourceRoot":"","sources":["../../../src/repositories/userConfigurations/getCustomUserAlertConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAA;AAI7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,+BAA+B,GAAG,KAAK,EAClD,cAA8B,EAC9B,MAA6C,EAC7C,MAAc,EAC2B,EAAE;IAC3C,0BAA0B;IAC1B,IACE,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI;QACtB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ;QAC1B,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM;QACxB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAC1B;QACA,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,6FAA6F,CAC9F,CAAA;QACD,OAAO,EAAE,CAAA;KACV;IAED,IAAI,kBAAkB,GAAG,IAAI,CAAA;IAC7B,IAAI,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,kBAAkB,GAAG,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;KACvE;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAE/D,EAAE;QACF,MAAM,8BAA8B,GAAG,UAAU,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAA;QAE7F,IAAI,YAAY,GAAG,8BAA8B,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,CAAA;QAE7F,IAAI,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;YAC7B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,gCAAgC,EAAE;gBACrE,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;aAC5B,CAAC,CAAA;SACH;QAED,IAAI,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;YACzB,YAAY,GAAG,YAAY,CAAC,QAAQ,CAClC,4EAA4E,EAC5E;gBACE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI;aAC1B,CACF,CAAA;SACF;QAED,IAAI,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;YAC7B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,4CAA4C,EAAE;gBACjF,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;aAClC,CAAC,CAAA;SACH;QAED,IAAI,kBAAkB,EAAE;YACtB,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,wCAAwC,EAAE;gBAC7E,MAAM,EAAE,kBAAkB;aAC3B,CAAC,CAAA;SACH;QAED,YAAY,GAAG,YAAY;aACxB,OAAO,CAAC,mCAAmC,CAAC;aAC5C,KAAK,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,IAAI,GAAG,CAAC;aAC5C,MAAM,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,SAAS,IAAI,CAAC,CAAC,CAAC,CAAA;QAE3F,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAA;QAE3C,OAAO,MAAM,CAAA;IACf,CAAC,EAAE,+DAA+D,CAAC,CAAA;AACrE,CAAC,CAAA"}
package/dist/types/userConfigurations.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { OptionalReportPagination } from './common';
1
2
  export interface GetUserConfigurationsParams {
2
3
  filters: {
3
4
  clientId?: number;
@@ -45,7 +46,7 @@ export interface GetUserAlertConfigurationsParams {
45
46
  includeBeta: boolean;
46
47
  };
47
48
  }
48
- export interface GetCustomUserAlertConfigurationParams {
49
+ export interface GetCustomUserAlertConfigurationParams extends OptionalReportPagination {
49
50
  filters: {
50
51
  configId?: number;
51
52
  imei?: string;
@@ -94,6 +95,7 @@ export interface CreateCustomUserAlertConfigurationParams {
94
95
  daysOfTheWeek: string;
95
96
  startTime: Date;
96
97
  endTime: Date;
98
+ alertConfigurationId?: number;
97
99
  imei?: string;
98
100
  filter?: any;
99
101
  label?: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@spytecgps/nova-orm",
3
- "version": "1.0.29",
3
+ "version": "1.0.31",
4
4
  "description": "ORM with PlanetScale",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",