@spytecgps/nova-orm 1.0.7 → 1.0.9

package/dist/repositories/billing/getCanceledImeis.js

@@ -1,5 +1,5 @@
 import { Enums } from '../..';
-import { Billing, BillingSubscriptionBraintree, Client, Device, IccidStatus, ImeiIccidCarrier, } from '../../entities';
+import { Billing, BillingSubscriptionBraintree, Client, CustomerAttribute, Device, IccidStatus, ImeiIccidCarrier, } from '../../entities';
 export const getCanceledImeis = async (novaDataSource, params, logger) => {
     if (!params?.filters?.minCancellationDate ||
         !params?.filters?.maxCancellationDate ||
@@ -17,6 +17,7 @@ export const getCanceledImeis = async (novaDataSource, params, logger) => {
             .innerJoin(ImeiIccidCarrier, 'imeiIccidCarrier', 'imeiIccidCarrier.imei = billing.imei')
             .innerJoin(Device, 'device', 'device.imei = billing.imei')
             .innerJoin(Client, 'client', 'client.id = device.clientId')
+            .leftJoin(CustomerAttribute, 'customerAttribute', 'client.id = customerAttribute.clientId')
             .innerJoin(IccidStatus, 'iccidStatus', 'iccidStatus.iccid = imeiIccidCarrier.iccid')
             .where(`iccidStatus.processing = :processing`, {
             processing: false,
@@ -55,8 +56,8 @@ export const getCanceledImeis = async (novaDataSource, params, logger) => {
             }
         }
         if (params.filters.excludeB2B) {
-            queryBuilder = queryBuilder.andWhere(`client.clientTypeId != :b2bClientTypeId`, {
-                b2bClientTypeId: Enums.HapnClientType.b2b,
+            queryBuilder = queryBuilder.andWhere(`(customerAttribute.enterprise is null OR customerAttribute.enterprise = :enterprise)`, {
+                enterprise: false,
             });
         }
         if (params.filters.excludeTest) {
@@ -77,8 +78,12 @@ export const getCanceledImeis = async (novaDataSource, params, logger) => {
             'billingSubscriptionBraintree.updatedAt as updatedAt',
             'billingSubscriptionBraintree.status as status',
             'imeiIccidCarrier.carrier as carrier',
+            'customerAttribute.enterprise as isEnterpriseCustomer',
         ])
             .getRawMany();
-        return result;
+        return result.map(row => ({
+            ...row,
+            isEnterpriseCustomer: row.isEnterpriseCustomer === 1,
+        }));
     }, 'BillingRepository::getCanceledImeis');
 };

package/dist/repositories/billing/getCanceledImeisMatchingMagentoData.js

@@ -27,7 +27,7 @@ export const getCanceledImeisMatchingMagentoData = async (novaDataSource, params
             }
         }
         const excludeB2bCondition = params.filters.excludeB2B
-            ? `AND client.clientTypeId != ${Enums.HapnClientType.b2b} `
+            ? `AND customerAttribute.enterprise  != true `
             : '';
         const excludeTestCondition = params.filters.excludeTest
             ? `AND client.clientTypeId != ${Enums.HapnClientType.test} `
@@ -42,7 +42,8 @@ export const getCanceledImeisMatchingMagentoData = async (novaDataSource, params
                     billingSubscriptionBraintree.createdAt,
                     billingSubscriptionBraintree.updatedAt,
                     billingSubscriptionBraintree.status,
-                    imeiIccidCarrier.carrier
+                    imeiIccidCarrier.carrier,
+                    customerAttribute.enterprise as isEnterpriseCustomer
                   FROM 
                     billing 
                   INNER JOIN 
@@ -53,6 +54,8 @@ export const getCanceledImeisMatchingMagentoData = async (novaDataSource, params
                     device ON device.imei = billing.imei
                   INNER JOIN 
                     client ON client.id = device.clientId
+                  LEFT JOIN
+                    customerAttribute ON customerAttribute.clientId = client.id
                   INNER JOIN 
                     iccidStatus ON iccidStatus.iccid = imeiIccidCarrier.iccid
                   WHERE 
@@ -95,6 +98,7 @@ export const getCanceledImeisMatchingMagentoData = async (novaDataSource, params
             updatedAt: item.updatedAt,
             status: item.status,
             carrier: item.carrier,
+            isEnterpriseCustomer: item.isEnterpriseCustomer === 1,
         }));
     }, 'BillingRepository::getCanceledImeisMatchingMagentoData');
 };

package/dist/repositories/devicePairings/updateDevicePairing.js

@@ -11,7 +11,10 @@ export const updateDevicePairing = async (novaDataSource, params, logger) => {
         !params?.values?.btmacMain &&
         !params?.values?.btmacSecondary &&
         !params?.values?.connectionType &&
-        !params?.values?.pairingMode) {
+        !params?.values?.pairingMode &&
+        !params?.values?.mainDeviceStatus &&
+        !params?.values?.secondaryDeviceStatus &&
+        !params?.values?.notes) {
         logger.warn({ params }, 'DevicePairingsRepository::updateDevicePairing missing required parameters');
         return false;
     }

package/dist/types/billing.d.ts

@@ -173,6 +173,7 @@ export interface CanceledImeiResult {
     updatedAt: string;
     status: string;
     carrier: string;
+    isEnterpriseCustomer: boolean;
 }
 export interface GetMagentoPlanParams {
     filters: {

package/dist/types/devicePairings.d.ts

@@ -6,6 +6,9 @@ export interface CreateDevicePairingParams {
     btmacSecondary: string;
     pairingMode?: string | null;
     connectionType?: string | null;
+    mainDeviceStatus?: string | null;
+    secondaryDeviceStatus?: string | null;
+    notes?: string | null;
 }
 export interface GetDevicePairingsParams {
     filters: {
@@ -31,6 +34,9 @@ export interface UpdateDevicePairingParams {
         btmacSecondary?: string;
         pairingMode?: string;
         connectionType?: string;
+        mainDeviceStatus?: string | null;
+        secondaryDeviceStatus?: string | null;
+        notes?: string | null;
     };
 }
 export interface DeleteDevicePairingParams {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spytecgps/nova-orm",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "ORM with PlanetScale",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/dist/entities/svrPairingRequest.d.ts

@@ -1,21 +0,0 @@
-export declare class SVRPairingRequest {
-    id: number;
-    mainDeviceName: string;
-    imeiMain: string;
-    btmacMain: string;
-    imeiGhost: string;
-    btmacGhost: string;
-    ghostConfigured: boolean;
-    ghostAlreadyReported: boolean;
-    mainDeviceWithCorrectBBFW: boolean;
-    mainDeviceWithCorrectMCUFW: boolean;
-    ghostDeviceWithCorrectBBFW: boolean;
-    ghostDeviceWithCorrectMCUFW: boolean;
-    mainDevicePairCommandsQueued: boolean;
-    mainDevicePairCommandsConfirmed: boolean;
-    readyToPair: boolean;
-    installationOK: boolean;
-    installationFailed: boolean;
-    pairingLost: boolean;
-    notes: string;
-}

package/dist/entities/svrPairingRequest.js

@@ -1,174 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
-import { BoolToNumberTransformer } from '../utils/boolToNumberTransformer';
-let SVRPairingRequest = class SVRPairingRequest {
-    id;
-    mainDeviceName;
-    imeiMain;
-    btmacMain;
-    imeiGhost;
-    btmacGhost;
-    ghostConfigured;
-    ghostAlreadyReported;
-    mainDeviceWithCorrectBBFW;
-    mainDeviceWithCorrectMCUFW;
-    ghostDeviceWithCorrectBBFW;
-    ghostDeviceWithCorrectMCUFW;
-    mainDevicePairCommandsQueued;
-    mainDevicePairCommandsConfirmed;
-    readyToPair;
-    installationOK;
-    installationFailed;
-    pairingLost;
-    notes;
-};
-__decorate([
-    PrimaryGeneratedColumn({ type: 'int', name: 'id' }),
-    __metadata("design:type", Number)
-], SVRPairingRequest.prototype, "id", void 0);
-__decorate([
-    Column('varchar', { name: 'mainDeviceName', length: 30 }),
-    __metadata("design:type", String)
-], SVRPairingRequest.prototype, "mainDeviceName", void 0);
-__decorate([
-    Column('varchar', { name: 'imeiMain', length: 15 }),
-    __metadata("design:type", String)
-], SVRPairingRequest.prototype, "imeiMain", void 0);
-__decorate([
-    Column('varchar', { name: 'btmacMain', length: 20 }),
-    __metadata("design:type", String)
-], SVRPairingRequest.prototype, "btmacMain", void 0);
-__decorate([
-    Column('varchar', { name: 'imeiGhost', length: 15 }),
-    __metadata("design:type", String)
-], SVRPairingRequest.prototype, "imeiGhost", void 0);
-__decorate([
-    Column('varchar', { name: 'btmacGhost', length: 20 }),
-    __metadata("design:type", String)
-], SVRPairingRequest.prototype, "btmacGhost", void 0);
-__decorate([
-    Column('tinyint', {
-        name: 'ghostConfigured',
-        width: 1,
-        default: 0,
-        transformer: new BoolToNumberTransformer(),
-    }),
-    __metadata("design:type", Boolean)
-], SVRPairingRequest.prototype, "ghostConfigured", void 0);
-__decorate([
-    Column('tinyint', {
-        name: 'ghostAlreadyReported',
-        width: 1,
-        default: 0,
-        transformer: new BoolToNumberTransformer(),
-    }),
-    __metadata("design:type", Boolean)
-], SVRPairingRequest.prototype, "ghostAlreadyReported", void 0);
-__decorate([
-    Column('tinyint', {
-        name: 'mainDeviceWithCorrectBBFW',
-        width: 1,
-        default: 0,
-        transformer: new BoolToNumberTransformer(),
-    }),
-    __metadata("design:type", Boolean)
-], SVRPairingRequest.prototype, "mainDeviceWithCorrectBBFW", void 0);
-__decorate([
-    Column('tinyint', {
-        name: 'mainDeviceWithCorrectMCUFW',
-        width: 1,
-        default: 0,
-        transformer: new BoolToNumberTransformer(),
-    }),
-    __metadata("design:type", Boolean)
-], SVRPairingRequest.prototype, "mainDeviceWithCorrectMCUFW", void 0);
-__decorate([
-    Column('tinyint', {
-        name: 'ghostDeviceWithCorrectBBFW',
-        width: 1,
-        default: 0,
-        transformer: new BoolToNumberTransformer(),
-    }),
-    __metadata("design:type", Boolean)
-], SVRPairingRequest.prototype, "ghostDeviceWithCorrectBBFW", void 0);
-__decorate([
-    Column('tinyint', {
-        name: 'ghostDeviceWithCorrectMCUFW',
-        width: 1,
-        default: 0,
-        transformer: new BoolToNumberTransformer(),
-    }),
-    __metadata("design:type", Boolean)
-], SVRPairingRequest.prototype, "ghostDeviceWithCorrectMCUFW", void 0);
-__decorate([
-    Column('tinyint', {
-        name: 'mainDevicePairCommandsQueued',
-        width: 1,
-        default: 0,
-        transformer: new BoolToNumberTransformer(),
-    }),
-    __metadata("design:type", Boolean)
-], SVRPairingRequest.prototype, "mainDevicePairCommandsQueued", void 0);
-__decorate([
-    Column('tinyint', {
-        name: 'mainDevicePairCommandsConfirmed',
-        width: 1,
-        default: 0,
-        transformer: new BoolToNumberTransformer(),
-    }),
-    __metadata("design:type", Boolean)
-], SVRPairingRequest.prototype, "mainDevicePairCommandsConfirmed", void 0);
-__decorate([
-    Column('tinyint', {
-        name: 'readyToPair',
-        width: 1,
-        default: 0,
-        transformer: new BoolToNumberTransformer(),
-    }),
-    __metadata("design:type", Boolean)
-], SVRPairingRequest.prototype, "readyToPair", void 0);
-__decorate([
-    Column('tinyint', {
-        name: 'installationOK',
-        width: 1,
-        default: 0,
-        transformer: new BoolToNumberTransformer(),
-    }),
-    __metadata("design:type", Boolean)
-], SVRPairingRequest.prototype, "installationOK", void 0);
-__decorate([
-    Column('tinyint', {
-        name: 'installationFailed',
-        width: 1,
-        default: 0,
-        transformer: new BoolToNumberTransformer(),
-    }),
-    __metadata("design:type", Boolean)
-], SVRPairingRequest.prototype, "installationFailed", void 0);
-__decorate([
-    Column('tinyint', {
-        name: 'pairingLost',
-        width: 1,
-        default: 0,
-        transformer: new BoolToNumberTransformer(),
-    }),
-    __metadata("design:type", Boolean)
-], SVRPairingRequest.prototype, "pairingLost", void 0);
-__decorate([
-    Column('varchar', { name: 'notes', nullable: true, length: 1000 }),
-    __metadata("design:type", String)
-], SVRPairingRequest.prototype, "notes", void 0);
-SVRPairingRequest = __decorate([
-    Index('ixSVRPairingRequestImeiGhost', ['imeiGhost'], {}),
-    Index('ixSVRPairingRequestImeiMain', ['imeiMain'], {}),
-    Entity('svrPairingRequest', { schema: 'nova' })
-], SVRPairingRequest);
-export { SVRPairingRequest };