@spytecgps/nova-orm 1.2.17 → 1.2.19
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/magento2Gps.js +1 -0
- package/dist/entities/magento2Gps.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/repositories/acumatica/getAcumaticaShipmentAmazon.d.ts +5 -0
- package/dist/repositories/acumatica/getAcumaticaShipmentAmazon.js +23 -0
- package/dist/repositories/acumatica/getAcumaticaShipmentAmazon.js.map +1 -0
- package/dist/repositories/acumatica/index.d.ts +9 -2
- package/dist/repositories/acumatica/index.js +14 -0
- package/dist/repositories/acumatica/index.js.map +1 -1
- package/dist/repositories/billing/getCanceledImeis.js +1 -1
- package/dist/repositories/billing/getCanceledImeis.js.map +1 -1
- package/dist/repositories/billing/getCanceledImeisMatchingMagentoData.js +14 -9
- package/dist/repositories/billing/getCanceledImeisMatchingMagentoData.js.map +1 -1
- package/dist/repositories/bleMesh/getBeaconBLEMeshes.js +5 -0
- package/dist/repositories/bleMesh/getBeaconBLEMeshes.js.map +1 -1
- package/dist/types/acumatica.d.ts +5 -0
- package/dist/types/bleMesh.d.ts +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { AcumaticaShipmentAmazon } from '../../entities';
|
|
2
|
+
import { NovaDataSource } from '../../novaDataSource';
|
|
3
|
+
import { GetAcumaticaShipmentAmazonParams } from '../../types/acumatica';
|
|
4
|
+
import { Logger } from '../../types/logger';
|
|
5
|
+
export declare const getAcumaticaShipmentAmazon: (novaDataSource: NovaDataSource, params: GetAcumaticaShipmentAmazonParams, logger: Logger) => Promise<AcumaticaShipmentAmazon[]>;
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { AcumaticaShipmentAmazon } from '../../entities';
|
|
2
|
+
export const getAcumaticaShipmentAmazon = async (novaDataSource, params, logger) => {
|
|
3
|
+
if (!params.filters.shipmentIds?.length) {
|
|
4
|
+
logger.warn({ params }, 'AcumaticaRepository::getAcumaticaShipmentAmazon - missing required parameters');
|
|
5
|
+
return [];
|
|
6
|
+
}
|
|
7
|
+
// Force the query to run on master or slave
|
|
8
|
+
const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
|
|
9
|
+
return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
|
|
10
|
+
const acumaticaOrderShipmentDetailsRepository = dataSource.getRepository(AcumaticaShipmentAmazon);
|
|
11
|
+
const queryBuilder = acumaticaOrderShipmentDetailsRepository
|
|
12
|
+
.createQueryBuilder()
|
|
13
|
+
.where('LOWER(shipmentId) IN (:...shipmentIds)', {
|
|
14
|
+
shipmentIds: params.filters.shipmentIds.map(x => x.toLowerCase()),
|
|
15
|
+
});
|
|
16
|
+
if (queryRunner) {
|
|
17
|
+
queryBuilder.setQueryRunner(queryRunner);
|
|
18
|
+
}
|
|
19
|
+
const result = await queryBuilder.getMany();
|
|
20
|
+
return result;
|
|
21
|
+
}, 'AcumaticaRepository::getAcumaticaShipmentAmazon', dbQueryRunner);
|
|
22
|
+
};
|
|
23
|
+
//# sourceMappingURL=getAcumaticaShipmentAmazon.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getAcumaticaShipmentAmazon.js","sourceRoot":"","sources":["../../../src/repositories/acumatica/getAcumaticaShipmentAmazon.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAKxD,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,EAC7C,cAA8B,EAC9B,MAAwC,EACxC,MAAc,EACsB,EAAE;IACtC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE;QACvC,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,+EAA+E,CAChF,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,EACW,EAAE;QACtC,MAAM,uCAAuC,GAAG,UAAU,CAAC,aAAa,CACtE,uBAAuB,CACxB,CAAA;QAED,MAAM,YAAY,GAAG,uCAAuC;aACzD,kBAAkB,EAAE;aACpB,KAAK,CAAC,wCAAwC,EAAE;YAC/C,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;SAClE,CAAC,CAAA;QAEJ,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAA;QAE3C,OAAO,MAAM,CAAA;IACf,CAAC,EACD,iDAAiD,EACjD,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { AcumaticaImeiIccidData } from '../../entities';
|
|
1
|
+
import { AcumaticaImeiIccidData, AcumaticaShipmentAmazon } from '../../entities';
|
|
2
2
|
import { OrderShipmentInternational } from '../../entities/orderShipmentInternational';
|
|
3
|
-
import { AmazonDeviceShipmentDetails, GetAcumaticaImeiIccidDataParams, GetAcumaticaShipmentDetailsParams, GetLastAmazonDeviceShipmentDetailsParams, GetOrderShipmentInternationalParams } from '../../types/acumatica';
|
|
3
|
+
import { AmazonDeviceShipmentDetails, GetAcumaticaImeiIccidDataParams, GetAcumaticaShipmentAmazonParams, GetAcumaticaShipmentDetailsParams, GetLastAmazonDeviceShipmentDetailsParams, GetOrderShipmentInternationalParams } from '../../types/acumatica';
|
|
4
4
|
import { BaseRepository } from '../baseRepository';
|
|
5
5
|
export declare class AcumaticaRepository extends BaseRepository {
|
|
6
6
|
/**
|
|
@@ -16,6 +16,13 @@ export declare class AcumaticaRepository extends BaseRepository {
|
|
|
16
16
|
* @returns Acumatica IMEI/ICCID data list
|
|
17
17
|
*/
|
|
18
18
|
getAcumaticaImeiIccidData(params: GetAcumaticaImeiIccidDataParams): Promise<AcumaticaImeiIccidData[]>;
|
|
19
|
+
/**
|
|
20
|
+
* Get Acumatica shipment Amazon
|
|
21
|
+
* @param params containing information to get Acumatica shipment Amazon
|
|
22
|
+
* - params.filters.shipmentIds Shipment IDs to filter by. At least one is required.
|
|
23
|
+
* @returns Acumatica shipment Amazon list
|
|
24
|
+
*/
|
|
25
|
+
getAcumaticaShipmentAmazon(params: GetAcumaticaShipmentAmazonParams): Promise<AcumaticaShipmentAmazon[]>;
|
|
19
26
|
/**
|
|
20
27
|
* Get last Acumatica shipment details
|
|
21
28
|
* @param params containing information to get last Acumatica shipment details
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { NovaDataSource } from '../../novaDataSource';
|
|
2
2
|
import { BaseRepository } from '../baseRepository';
|
|
3
3
|
import { getAcumaticaImeiIccidData } from './getAcumaticaImeiIccidData';
|
|
4
|
+
import { getAcumaticaShipmentAmazon } from './getAcumaticaShipmentAmazon';
|
|
4
5
|
import { getAcumaticaShipmentDetails } from './getAcumaticaShipmentDetails';
|
|
5
6
|
import { getLastAcumaticaShipmentDetails } from './getLastAcumaticaShipmentDetails';
|
|
6
7
|
import { getOrderShipmentInternational } from './getOrderShipmentInternational';
|
|
@@ -24,6 +25,19 @@ export class AcumaticaRepository extends BaseRepository {
|
|
|
24
25
|
this.logger.trace(result, 'AcumaticaRepository::getAcumaticaImeiIccidData result');
|
|
25
26
|
return result;
|
|
26
27
|
}
|
|
28
|
+
/**
|
|
29
|
+
* Get Acumatica shipment Amazon
|
|
30
|
+
* @param params containing information to get Acumatica shipment Amazon
|
|
31
|
+
* - params.filters.shipmentIds Shipment IDs to filter by. At least one is required.
|
|
32
|
+
* @returns Acumatica shipment Amazon list
|
|
33
|
+
*/
|
|
34
|
+
async getAcumaticaShipmentAmazon(params) {
|
|
35
|
+
this.logger.trace(params, `AcumaticaRepository::getAcumaticaShipmentAmazon started with params`);
|
|
36
|
+
const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger, this.replicaNovaDataSourceConfig);
|
|
37
|
+
const result = await getAcumaticaShipmentAmazon(novaDataSource, params, this.logger);
|
|
38
|
+
this.logger.trace(result, 'AcumaticaRepository::getAcumaticaShipmentAmazon result');
|
|
39
|
+
return result;
|
|
40
|
+
}
|
|
27
41
|
/**
|
|
28
42
|
* Get last Acumatica shipment details
|
|
29
43
|
* @param params containing information to get last Acumatica shipment details
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/repositories/acumatica/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/repositories/acumatica/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ export const getCanceledImeis = async (novaDataSource, params, logger) => {
|
|
|
33
33
|
.andWhere(`billingSubscriptionBraintree.status = :subscriptionStatus`, {
|
|
34
34
|
subscriptionStatus: 'Canceled',
|
|
35
35
|
})
|
|
36
|
-
.andWhere(`billingSubscriptionBraintree.nextBillingDate < :nextBillingDate`, {
|
|
36
|
+
.andWhere(`billingSubscriptionBraintree.nextBillingDate < Date(:nextBillingDate)`, {
|
|
37
37
|
nextBillingDate: new Date(),
|
|
38
38
|
});
|
|
39
39
|
if (queryRunner) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCanceledImeis.js","sourceRoot":"","sources":["../../../src/repositories/billing/getCanceledImeis.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EACL,OAAO,EACP,4BAA4B,EAC5B,MAAM,EACN,iBAAiB,EACjB,MAAM,EACN,WAAW,EACX,gBAAgB,GACjB,MAAM,gBAAgB,CAAA;AAKvB,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,cAA8B,EAC9B,MAA8B,EAC9B,MAAc,EACiB,EAAE;IACjC,IACE,CAAC,MAAM,EAAE,OAAO,EAAE,mBAAmB;QACrC,CAAC,MAAM,EAAE,OAAO,EAAE,mBAAmB;QACrC,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU;QAC5B,MAAM,EAAE,OAAO,EAAE,UAAU,IAAI,IAAI;QACnC,MAAM,EAAE,OAAO,EAAE,WAAW,IAAI,IAAI,EACpC;QACA,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,mEAAmE,CAAC,CAAA;QAC5F,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,EACM,EAAE;QACjC,MAAM,iBAAiB,GAAG,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QAE3D,IAAI,YAAY,GAAG,iBAAiB;aACjC,kBAAkB,CAAC,SAAS,CAAC;aAC7B,SAAS,CACR,4BAA4B,EAC5B,8BAA8B,EAC9B,sEAAsE,CACvE;aACA,SAAS,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,sCAAsC,CAAC;aACvF,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,4BAA4B,CAAC;aACzD,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,6BAA6B,CAAC;aAC1D,QAAQ,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,wCAAwC,CAAC;aAC1F,SAAS,CAAC,WAAW,EAAE,aAAa,EAAE,4CAA4C,CAAC;aACnF,KAAK,CAAC,sCAAsC,EAAE;YAC7C,UAAU,EAAE,KAAK;SAClB,CAAC;aACD,QAAQ,CAAC,+DAA+D,EAAE;YACzE,mBAAmB,EAAE,MAAM,CAAC,OAAO,CAAC,mBAAmB;SACxD,CAAC;aACD,QAAQ,CAAC,+DAA+D,EAAE;YACzE,mBAAmB,EAAE,MAAM,CAAC,OAAO,CAAC,mBAAmB;SACxD,CAAC;aACD,QAAQ,CAAC,4DAA4D,EAAE;YACtE,kBAAkB,EAAE,UAAU;SAC/B,CAAC;aACD,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"getCanceledImeis.js","sourceRoot":"","sources":["../../../src/repositories/billing/getCanceledImeis.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,16 +65,21 @@ export const getCanceledImeisMatchingMagentoData = async (novaDataSource, params
|
|
|
65
65
|
billingSubscriptionBraintree.updatedAt > ? AND
|
|
66
66
|
billingSubscriptionBraintree.updatedAt < ? AND
|
|
67
67
|
billingSubscriptionBraintree.status = 'Canceled' AND
|
|
68
|
-
billingSubscriptionBraintree.nextBillingDate < ? AND
|
|
68
|
+
billingSubscriptionBraintree.nextBillingDate < Date(?) AND
|
|
69
69
|
client.id NOT IN (128, 686142) AND
|
|
70
|
-
(
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
70
|
+
(
|
|
71
|
+
EXISTS (SELECT 1
|
|
72
|
+
FROM magento2Gps magento2Gps1
|
|
73
|
+
INNER JOIN billingSubscriptionBraintree billingSubscriptionBraintree2
|
|
74
|
+
ON billingSubscriptionBraintree2.subscriptionId = magento2Gps1.btSubscriptionId
|
|
75
|
+
WHERE magento2Gps1.imei = billing.imei
|
|
76
|
+
AND billingSubscriptionBraintree2.subscriptionId = billing.subscriptionId
|
|
77
|
+
AND billingSubscriptionBraintree2.subscriptionStart = (
|
|
78
|
+
SELECT MAX(bsb.subscriptionStart)
|
|
79
|
+
FROM billingSubscriptionBraintree bsb
|
|
80
|
+
WHERE bsb.subscriptionId = magento2Gps1.btSubscriptionId
|
|
81
|
+
)
|
|
82
|
+
)
|
|
78
83
|
OR
|
|
79
84
|
NOT EXISTS (SELECT 1 FROM magento2Gps magento2Gps2 WHERE magento2Gps2.imei = billing.imei)
|
|
80
85
|
OR
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCanceledImeisMatchingMagentoData.js","sourceRoot":"","sources":["../../../src/repositories/billing/getCanceledImeisMatchingMagentoData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAKxC,MAAM,CAAC,MAAM,mCAAmC,GAAG,KAAK,EACtD,cAA8B,EAC9B,MAA8B,EAC9B,MAAc,EACiB,EAAE;IACjC,IACE,CAAC,MAAM,EAAE,OAAO,EAAE,mBAAmB;QACrC,CAAC,MAAM,EAAE,OAAO,EAAE,mBAAmB;QACrC,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU;QAC5B,MAAM,EAAE,OAAO,EAAE,UAAU,IAAI,IAAI;QACnC,MAAM,EAAE,OAAO,EAAE,WAAW,IAAI,IAAI,EACpC;QACA,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,sFAAsF,CACvF,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,EACM,EAAE;QACjC,MAAM,iBAAiB,GAAG,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QAE3D,IAAI,kBAAkB,GAAG,EAAE,CAAA;QAC3B,QAAQ,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE;YACjC,KAAK,SAAS,CAAC,CAAC;gBACd,kBAAkB,GAAG,qCAAqC,CAAA;gBAC1D,MAAK;aACN;YACD,KAAK,QAAQ,CAAC,CAAC;gBACb,kBAAkB,GAAG,2BAA2B,CAAA;gBAChD,MAAK;aACN;YACD,OAAO,CAAC,CAAC;gBACP,kBAAkB,GAAG,8DAA8D,CAAA;gBACnF,MAAK;aACN;SACF;QAED,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU;YACnD,CAAC,CAAC,4CAA4C;YAC9C,CAAC,CAAC,EAAE,CAAA;QAEN,MAAM,oBAAoB,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW;YACrD,CAAC,CAAC,8BAA8B,KAAK,CAAC,cAAc,CAAC,IAAI,GAAG;YAC5D,CAAC,CAAC,EAAE,CAAA;QAEN,MAAM,KAAK,GAAG
|
|
1
|
+
{"version":3,"file":"getCanceledImeisMatchingMagentoData.js","sourceRoot":"","sources":["../../../src/repositories/billing/getCanceledImeisMatchingMagentoData.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,11 @@ export const getBeaconBLEMeshes = async (novaDataSource, params, logger) => {
|
|
|
18
18
|
bleMeshIds: params.filters.bleMeshIds,
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
|
+
if (params?.filters?.bleMacs?.length) {
|
|
22
|
+
queryBuilder = queryBuilder.andWhere('beaconBleMesh.bleMac IN (:...bleMacs)', {
|
|
23
|
+
bleMacs: params.filters.bleMacs,
|
|
24
|
+
});
|
|
25
|
+
}
|
|
21
26
|
if (params?.projectionOptions?.withBLEMeshes) {
|
|
22
27
|
queryBuilder = queryBuilder.leftJoinAndSelect('beaconBleMesh.bleMesh', 'bleMesh');
|
|
23
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBeaconBLEMeshes.js","sourceRoot":"","sources":["../../../src/repositories/bleMesh/getBeaconBLEMeshes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAK9C,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,cAA8B,EAC9B,MAAgC,EAChC,MAAc,EACqB,EAAE;IACrC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC9B,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,mEAAmE,CAAC,CAAA;QAC5F,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EACH,UAA0B,EAC1B,WAAyB,EACU,EAAE;QACrC,MAAM,iBAAiB,GAAG,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,CAAA;QAEjE,IAAI,YAAY,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAA;QAExE,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,oCAAoC,EAAE;YACzE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;SAClC,CAAC,CAAA;QAEF,IAAI,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE;YACvC,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,6CAA6C,EAAE;gBAClF,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU;aACtC,CAAC,CAAA;SACH;QAED,IAAI,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE;YAC5C,YAAY,GAAG,YAAY,CAAC,iBAAiB,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAA;SAClF;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,aAAa,EAAE,QAAQ,IAAI,GAAG,CAAA;QACtD,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,EAAE,SAAS,IAAI,CAAC,CAAA;QAEtD,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAA;QAExE,IAAI,eAAgC,CAAA;QACpC,IAAI,KAAK,GAAW,SAAS,CAAA;QAC7B,IAAI,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE;YAC7C,CAAC;YAAA,CAAC,eAAe,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;SACjE;aAAM;YACL,eAAe,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAA;SAC/C;QAED,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,KAAK,EAAE,CAAA;IAC/C,CAAC,EACD,uCAAuC,CACxC,CAAA;AACH,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"getBeaconBLEMeshes.js","sourceRoot":"","sources":["../../../src/repositories/bleMesh/getBeaconBLEMeshes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAK9C,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,cAA8B,EAC9B,MAAgC,EAChC,MAAc,EACqB,EAAE;IACrC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC9B,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,mEAAmE,CAAC,CAAA;QAC5F,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EACH,UAA0B,EAC1B,WAAyB,EACU,EAAE;QACrC,MAAM,iBAAiB,GAAG,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,CAAA;QAEjE,IAAI,YAAY,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAA;QAExE,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,oCAAoC,EAAE;YACzE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;SAClC,CAAC,CAAA;QAEF,IAAI,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE;YACvC,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,6CAA6C,EAAE;gBAClF,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU;aACtC,CAAC,CAAA;SACH;QAED,IAAI,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE;YACpC,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,uCAAuC,EAAE;gBAC5E,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO;aAChC,CAAC,CAAA;SACH;QAED,IAAI,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE;YAC5C,YAAY,GAAG,YAAY,CAAC,iBAAiB,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAA;SAClF;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,aAAa,EAAE,QAAQ,IAAI,GAAG,CAAA;QACtD,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,EAAE,SAAS,IAAI,CAAC,CAAA;QAEtD,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAA;QAExE,IAAI,eAAgC,CAAA;QACpC,IAAI,KAAK,GAAW,SAAS,CAAA;QAC7B,IAAI,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE;YAC7C,CAAC;YAAA,CAAC,eAAe,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;SACjE;aAAM;YACL,eAAe,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAA;SAC/C;QAED,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,KAAK,EAAE,CAAA;IAC/C,CAAC,EACD,uCAAuC,CACxC,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -12,6 +12,11 @@ export interface GetAcumaticaImeiIccidDataParams extends BaseSelectQueryParams {
|
|
|
12
12
|
sortOrder: 'ASC' | 'DESC';
|
|
13
13
|
};
|
|
14
14
|
}
|
|
15
|
+
export interface GetAcumaticaShipmentAmazonParams extends BaseSelectQueryParams {
|
|
16
|
+
filters: {
|
|
17
|
+
shipmentIds: string[];
|
|
18
|
+
};
|
|
19
|
+
}
|
|
15
20
|
export interface GetLastAmazonDeviceShipmentDetailsParams extends BaseSelectQueryParams {
|
|
16
21
|
filters: {
|
|
17
22
|
clientId: number;
|
package/dist/types/bleMesh.d.ts
CHANGED