dt-common-device 13.4.7 → 13.4.9

package/dist/Integrations/twilio/twilio.service.d.ts

@@ -1,7 +1,6 @@
 import { ISendSMSRequest } from "./interface/twilioInterface";
 export declare class TwilioService {
-    private readonly connectionRepository;
-    private readonly propertyRepository;
+    private readonly notificationService;
     constructor();
     sendSMS(data: ISendSMSRequest): Promise<any>;
 }

package/dist/Integrations/twilio/twilio.service.js

@@ -76,10 +76,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TwilioService = void 0;
 const typedi_1 = __importStar(require("typedi"));
-const Connection_repository_1 = require("../../entities/connection/Connection.repository");
-const IConnection_1 = require("../../entities/connection/IConnection");
+const Notification_service_1 = require("../../entities/notification/Notification.service");
 const twilio_1 = __importDefault(require("twilio"));
-const Property_repository_1 = require("../../entities/property/Property.repository");
 let TwilioService = (() => {
     let _classDecorators = [(0, typedi_1.Service)()];
     let _classDescriptor;
@@ -87,36 +85,34 @@ let TwilioService = (() => {
     let _classThis;
     var TwilioService = _classThis = class {
         constructor() {
-            this.connectionRepository = typedi_1.default.get(Connection_repository_1.ConnectionRepository);
-            this.propertyRepository = typedi_1.default.get(Property_repository_1.PropertyRepository);
+            this.notificationService = typedi_1.default.get(Notification_service_1.NotificationService);
         }
         // -----------------------------
         // Send SMS
         // -----------------------------
         async sendSMS(data) {
             const { propertyId, message, toNumber } = data;
+            if (!propertyId) {
+                throw new Error("Property ID is required for sending SMS");
+            }
             if (!toNumber) {
                 throw new Error("To number is required for sending SMS");
             }
-            //find fromNumber from the dt_connections table based on the propertyId
-            const response = await this.connectionRepository.queryConnections({
+            const connection = await this.notificationService.queryConnections({
                 propertyId,
-                connectionProvider: IConnection_1.ConnectionProvider.Twilio,
+                connectionProvider: "twilio",
+                isEnable: true,
             });
-            //need connectionId, clientSecret, metaData
-            const { clientId, clientSecret, metaData } = response[0];
-            const fromNumber = metaData?.fromNumber;
-            if (!fromNumber) {
-                throw new Error("From number not found");
+            if (!connection) {
+                throw new Error("Twilio connection not found for this property");
             }
-            //find toNumber and sms_enabled from the property settings table based on the propertyId
-            const _settingsRes = await this.propertyRepository.getPropertyPreferences(propertyId);
-            if (!_settingsRes) {
-                throw new Error("Property settings not found");
+            const { clientId, clientSecret, metaData } = connection;
+            if (!clientId || !clientSecret) {
+                throw new Error("Twilio credentials (clientId, clientSecret) not found");
             }
-            const smsEnabled = _settingsRes?.settings?.notificationPreferences?.smsNotification?.enabled;
-            if (!smsEnabled) {
-                throw new Error("SMS notifications are not enabled for this property");
+            const fromNumber = metaData?.fromNumber;
+            if (!fromNumber || typeof fromNumber !== "string") {
+                throw new Error("From number not found");
             }
             //TODO: Need to do single tone pattern for the client
             const client = (0, twilio_1.default)(clientId, clientSecret);

package/dist/entities/notification/INotification.d.ts

@@ -1,5 +1,14 @@
 export type NotificationChannel = "email" | "sms";
 export type NotificationScope = "platform" | "organization" | "property";
+export interface INotificationQuery {
+    id?: string;
+    clientId?: string;
+    clientSecret?: string;
+    metaData?: Record<string, unknown>;
+    propertyId?: string;
+    connectionProvider?: string;
+    isEnable?: boolean;
+}
 export interface INotificationTemplateResolve {
     propertyId?: string;
     organizationId?: string;

package/dist/entities/notification/Notification.repository.d.ts

@@ -1,4 +1,5 @@
-import { INotificationTemplate, INotificationTemplateResolve } from "./INotification";
+import { INotificationQuery, INotificationTemplate, INotificationTemplateResolve } from "./INotification";
 export declare class NotificationRepository {
+    queryConnections(payload: INotificationQuery): Promise<any>;
     getNotificationTemplate(payload: INotificationTemplateResolve): Promise<INotificationTemplate | null>;
 }

package/dist/entities/notification/Notification.repository.js

@@ -47,6 +47,17 @@ let NotificationRepository = (() => {
     let _classExtraInitializers = [];
     let _classThis;
     var NotificationRepository = _classThis = class {
+        async queryConnections(payload) {
+            if (!payload || Object.keys(payload).length === 0) {
+                return null;
+            }
+            const normalizedPayload = { ...payload };
+            const response = await (0, http_utils_1.getNotificationServiceAxiosInstance)().post(`/connections/query`, normalizedPayload);
+            if (!response.data?.success || !response.data?.data?.length) {
+                return null;
+            }
+            return response.data.data;
+        }
         async getNotificationTemplate(payload) {
             if (!payload.propertyId ||
                 !payload.organizationId ||
@@ -55,7 +66,8 @@ let NotificationRepository = (() => {
                 throw new Error("Property ID, Organization ID, Event Name, and Channel are required in payload");
             }
             const response = await (0, http_utils_1.getNotificationServiceAxiosInstance)().post(`/notification-templates/resolve`, payload);
-            return response.data.data;
+            console.log("NotificationTemplate response:", response.data);
+            return response.data;
         }
     };
     __setFunctionName(_classThis, "NotificationRepository");

package/dist/entities/notification/Notification.service.d.ts

@@ -1,6 +1,7 @@
-import { INotificationTemplate, INotificationTemplateResolve } from "./INotification";
+import { INotificationQuery, INotificationTemplate, INotificationTemplateResolve } from "./INotification";
 export declare class NotificationService {
     private readonly notificationRepository;
     constructor();
+    queryConnections(payload: INotificationQuery): Promise<any>;
     getNotificationTemplate(payload: INotificationTemplateResolve): Promise<INotificationTemplate | null>;
 }

package/dist/entities/notification/Notification.service.js

@@ -83,6 +83,9 @@ let NotificationService = (() => {
         constructor() {
             this.notificationRepository = typedi_1.default.get(Notification_repository_1.NotificationRepository);
         }
+        async queryConnections(payload) {
+            return await this.notificationRepository.queryConnections(payload);
+        }
         async getNotificationTemplate(payload) {
             if (!payload.propertyId ||
                 !payload.organizationId ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dt-common-device",
-  "version": "13.4.7",
+  "version": "13.4.9",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [