@zohoim/client-sdk 1.0.0-replyAreaPoc5 → 1.0.0-replyAreaPoc6

package/es/core/utils/validateSchema.js

@@ -1,10 +1,15 @@
-import { ValidationError } from '../errors'; // function validateSchemaKeys(schema, data) {
-//   Object.keys(schema).forEach((key) => {
-//     if (!(key in data)) {
-//       throw new ValidationError(`Key '${key}' is missing in the data`);
-//     }
-//   });
-// }
+function validateSchemaKeys(_ref) {
+  let {
+    schema = {},
+    data = {},
+    entityName = ''
+  } = _ref;
+  Object.keys(schema).forEach(key => {
+    if (!(key in data)) {
+      console.warn(`${entityName} - Key '${key}' is missing in the data`);
+    }
+  });
+}
 
 function isEmpty(value) {
   if (value === null || value === undefined || value === '') {
@@ -14,44 +19,63 @@ function isEmpty(value) {
   return false;
 }
 
-function validateRequiredCheck(_ref) {
+function validateRequiredCheck(_ref2) {
   let {
     value,
     rules,
-    path
-  } = _ref;
+    path,
+    entityName
+  } = _ref2;
 
   if (rules.required && isEmpty(value)) {
-    throw new ValidationError(rules.message || `${path} is required`);
+    console.warn(`${entityName} - ${path} is required`);
   }
 }
 
-function validateEnumCheck(_ref2) {
+function validateEnumCheck(_ref3) {
   let {
     value,
     rules,
-    path
-  } = _ref2;
+    path,
+    entityName
+  } = _ref3;
 
   if (rules.enum && !rules.enum.includes(value)) {
-    throw new ValidationError(`${path} must be one of: ${rules.enum.join(', ')}`);
+    console.warn(`${entityName} - ${path} must be one of: ${rules.enum.join(', ')}. Received: ${value}`);
   }
 }
 
-export const validateSchema = (schema, data) => {
-  const validate = function (schemaObj, dataObj) {
-    let path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+export const validateSchema = _ref4 => {
+  let {
+    schema,
+    data,
+    entityName = ''
+  } = _ref4;
+
+  const validate = _ref5 => {
+    let {
+      schema: schemaObj,
+      data: dataObj,
+      path = '',
+      entityName
+    } = _ref5;
     // Check if all schema keys exist in data
-    // validateSchemaKeys(schemaObj, dataObj);
-    // Validate each field
-    Object.entries(schemaObj).forEach(_ref3 => {
-      let [field, rules] = _ref3;
+    validateSchemaKeys({
+      schema: schemaObj,
+      data: dataObj,
+      entityName,
+      path
+    }); // Validate each field
+
+    Object.entries(schemaObj).forEach(_ref6 => {
+      let [field, rules] = _ref6;
       const value = dataObj[field];
       const fieldPath = path ? `${path}.${field}` : field;
       validateRequiredCheck({
         value,
         rules,
-        path: fieldPath
+        path: fieldPath,
+        entityName
       });
 
       if (value !== null && value !== undefined) {
@@ -59,16 +83,26 @@ export const validateSchema = (schema, data) => {
         validateEnumCheck({
           value,
           rules,
-          path: fieldPath
+          path: fieldPath,
+          entityName
         }); // Nested object validation
 
         if (rules.type === 'object' && rules.schema) {
-          validate(rules.schema, value, fieldPath);
+          validate({
+            schema: rules.schema,
+            data: value,
+            path: fieldPath,
+            entityName
+          });
         }
       }
     });
     return dataObj;
   };
 
-  return validate(schema, data);
+  return validate({
+    schema,
+    data,
+    entityName
+  });
 };

package/es/domain/dto/messages/initiateSessionRequest.js

@@ -15,6 +15,8 @@ function initiateSessionRequest() {
     language: null,
     parameters: {},
     message: null,
+    headerMessage: null,
+    urlMessage: null,
     ...body
   }).build();
 }

package/es/domain/dto/sessions/getSessionsRequest.js

@@ -19,6 +19,7 @@ function getSessionsRequest() {
     assigneeFilter: null,
     workspaceId: null,
     botIds: null,
+    excludeSyncingChannels: false,
     ...query
   }).build();
 }

package/es/domain/entities/Actor/Actor.js

@@ -4,7 +4,11 @@ import { ActorSchema } from '../../schema';
 export default class Actor {
   constructor() {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const validatedData = validateSchema(ActorSchema, data);
+    const validatedData = validateSchema({
+      schema: ActorSchema,
+      data,
+      entityName: 'Actor'
+    });
     this.data = {
       name: validatedData.name,
       type: validatedData.type,

package/es/domain/entities/Agent/Agent.js

@@ -3,7 +3,11 @@ import { AgentSchema } from '../../schema';
 export default class Agent {
   constructor() {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const validatedData = validateSchema(AgentSchema, data);
+    const validatedData = validateSchema({
+      schema: AgentSchema,
+      data,
+      entityName: 'Agent'
+    });
     this.data = {
       id: validatedData.id,
       firstName: validatedData.firstName,

package/es/domain/entities/Attachment/Attachment.js

@@ -3,7 +3,11 @@ import { AttachmentSchema } from '../../schema';
 export default class Attachment {
   constructor() {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const validatedData = validateSchema(AttachmentSchema, data);
+    const validatedData = validateSchema({
+      schema: AttachmentSchema,
+      data,
+      entityName: 'Attachment'
+    });
     this.data = {
       id: validatedData.id,
       name: validatedData.name,

package/es/domain/entities/Bot/Bot.js

@@ -3,7 +3,11 @@ import { BotSchema } from '../../schema';
 export default class Bot {
   constructor() {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const validatedData = validateSchema(BotSchema, data);
+    const validatedData = validateSchema({
+      schema: BotSchema,
+      data,
+      entityName: 'Bot'
+    });
     this.data = {
       id: validatedData.id,
       botServiceType: validatedData.botServiceType,

package/es/domain/entities/Channel/Channel.js

@@ -3,7 +3,11 @@ import { ChannelSchema } from '../../schema';
 export default class Channel {
   constructor() {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const validatedData = validateSchema(ChannelSchema, data); // Set required properties from schema
+    const validatedData = validateSchema({
+      schema: ChannelSchema,
+      data,
+      entityName: 'Channel'
+    }); // Set required properties from schema
 
     this.id = validatedData.id;
     this.integrationService = validatedData.integrationService;

package/es/domain/entities/Contact/Contact.js

@@ -3,7 +3,11 @@ import { ContactSchema } from '../../schema';
 export default class Contact {
   constructor() {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const validatedData = validateSchema(ContactSchema, data);
+    const validatedData = validateSchema({
+      schema: ContactSchema,
+      data,
+      entityName: 'Contact'
+    });
     this.data = {
       id: validatedData.id,
       name: validatedData.name,

package/es/domain/entities/IntegrationService/IntegrationService.js

@@ -4,7 +4,11 @@ import { IntegrationServiceSchema } from '../../schema';
 export default class IntegrationService {
   constructor() {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const validatedData = validateSchema(IntegrationServiceSchema, data);
+    const validatedData = validateSchema({
+      schema: IntegrationServiceSchema,
+      data,
+      entityName: 'IntegrationService'
+    });
     this.data = {
       label: validatedData.label || '',
       id: validatedData.id || '',

package/es/domain/entities/Message/Action.js

@@ -4,7 +4,11 @@ import { ActionSchema } from '../../schema';
 export default class Action {
   constructor() {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const validatedData = validateSchema(ActionSchema, data);
+    const validatedData = validateSchema({
+      schema: ActionSchema,
+      data,
+      entityName: 'Action'
+    });
     this.data = {
       type: validatedData.type,
       subType: validatedData.subType,

package/es/domain/entities/Message/ExternalInfo.js

@@ -4,7 +4,11 @@ import { ExternalInfoSchema } from '../../schema';
 export default class ExternalInfo {
   constructor() {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const validatedData = validateSchema(ExternalInfoSchema, data);
+    const validatedData = validateSchema({
+      schema: ExternalInfoSchema,
+      data,
+      entityName: 'ExternalInfo'
+    });
     this.data = {
       action: validatedData.action
     };

package/es/domain/entities/Message/Info.js

@@ -12,7 +12,11 @@ function adaptTargets() {
 export default class Info {
   constructor() {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const validatedData = validateSchema(InfoSchema, data);
+    const validatedData = validateSchema({
+      schema: InfoSchema,
+      data,
+      entityName: 'Info'
+    });
     this.data = {
       actor: new Actor(validatedData.actor).toJSON(),
       action: validatedData.action,

package/es/domain/entities/Message/InfoTarget.js

@@ -3,7 +3,11 @@ import { InfoTargetSchema } from '../../schema/message';
 export default class InfoTarget {
   constructor() {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const validatedData = validateSchema(InfoTargetSchema, data);
+    const validatedData = validateSchema({
+      schema: InfoTargetSchema,
+      data,
+      entityName: 'InfoTarget'
+    });
     this.data = {
       id: validatedData.id,
       name: validatedData.name || null,

package/es/domain/entities/Message/Location.js

@@ -3,7 +3,11 @@ import { LocationSchema } from '../../schema';
 export default class Location {
   constructor() {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const validatedData = validateSchema(LocationSchema, data);
+    const validatedData = validateSchema({
+      schema: LocationSchema,
+      data,
+      entityName: 'Location'
+    });
     this.data = {
       latitude: validatedData.latitude,
       longitude: validatedData.longitude

package/es/domain/entities/Message/Message.js

@@ -1,5 +1,5 @@
 import { validateSchema } from '../../../core/utils';
-import { MessageDirection, MessageStatus, MessageTypes, MessageMeta, MetaSystemMessageType } from '../../enum';
+import { MessageDirection, MessageStatus, MessageTypes, MessageMeta, MetaSystemMessageType, MetaMessageSourceType } from '../../enum';
 import { MessageSchema } from '../../schema';
 import { Actor } from '../Actor';
 import { Attachment } from '../Attachment';
@@ -10,7 +10,11 @@ import Location from './Location';
 export default class Message {
   constructor() {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const validatedData = validateSchema(MessageSchema, data);
+    const validatedData = validateSchema({
+      schema: MessageSchema,
+      data,
+      entityName: 'Message'
+    });
     this.data = {
       id: validatedData.id,
       sessionId: validatedData.sessionId,
@@ -121,6 +125,25 @@ export default class Message {
     return messageType === MetaSystemMessageType.UN_SUPPORTED_FILE;
   }
 
+  static getMessageSourceValue(meta) {
+    return Message.getMetaValue(meta, MessageMeta.MESSAGE_SOURCE);
+  }
+
+  static isHistoryMessage(meta) {
+    const messageType = Message.getMessageSourceValue(meta);
+    return messageType === MetaMessageSourceType.HISTORY_MESSAGE;
+  }
+
+  static isHistoryMessageViaMobileWBApp(meta) {
+    const messageType = Message.getMessageSourceValue(meta);
+    return messageType === MetaMessageSourceType.HISTORY_MESSAGE_VIA_MOBILE_WHATSAPP_BUSINESS_APP;
+  }
+
+  static isMessageViaMobileWBApp(meta) {
+    const messageType = Message.getMessageSourceValue(meta);
+    return messageType === MetaMessageSourceType.VIA_MOBILE_WHATSAPP_BUSINESS_APP;
+  }
+
   static isFailed(status) {
     return status === MessageStatus.FAILED;
   }

package/es/domain/entities/Message/MessageWithSession.js

@@ -5,7 +5,11 @@ import Message from './Message';
 export default class MessageWithSession {
   constructor() {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const validatedData = validateSchema(MessageWithSessionSchema, data);
+    const validatedData = validateSchema({
+      schema: MessageWithSessionSchema,
+      data,
+      entityName: 'MessageWithSession'
+    });
     const messageData = new Message(validatedData).toJSON();
     const sessionData = new Session(validatedData.session).toJSON();
     this.data = { ...messageData,

package/es/domain/entities/Session/Session.js

@@ -5,7 +5,11 @@ import { SessionReplyStatus, SessionStatus } from '../../enum';
 export default class Session {
   constructor() {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    const validatedData = validateSchema(SessionSchema, data);
+    const validatedData = validateSchema({
+      schema: SessionSchema,
+      data,
+      entityName: 'Session'
+    });
     this.data = {
       channelId: validatedData.channelId,
       status: validatedData.status,

package/es/domain/enum/message/MessageMeta.js

@@ -1,4 +1,5 @@
 const MessageMeta = {
-  SYSTEM_MESSAGE_TYPE: 'SYSTEM_MESSAGE_TYPE'
+  SYSTEM_MESSAGE_TYPE: 'SYSTEM_MESSAGE_TYPE',
+  MESSAGE_SOURCE: 'MESSAGE_SOURCE'
 };
 export default MessageMeta;

package/es/domain/enum/message/MetaMessageSourceType.js

@@ -0,0 +1,6 @@
+const MetaMessageSourceType = {
+  HISTORY_MESSAGE_VIA_MOBILE_WHATSAPP_BUSINESS_APP: 'HISTORY_MESSAGE_VIA_MOBILE_WHATSAPP_BUSINESS_APP',
+  HISTORY_MESSAGE: 'HISTORY_MESSAGE',
+  VIA_MOBILE_WHATSAPP_BUSINESS_APP: 'VIA_MOBILE_WHATSAPP_BUSINESS_APP'
+};
+export default MetaMessageSourceType;

package/es/domain/enum/message/index.js

@@ -10,4 +10,5 @@ import InfoAction from './InfoAction';
 import ActionSubType from './ActionSubType';
 import InfoTargetType from './InfoTargetType';
 import MetaSystemMessageType from './MetaSystemMessageType';
-export { MessageTypes, MessageStatus, MessageDirection, MessageContentType, MessageMeta, ActionType, ActionSubType, ExternalInfoAction, InfoSessionStatus, InfoAction, InfoTargetType, MetaSystemMessageType };
+import MetaMessageSourceType from './MetaMessageSourceType';
+export { MessageTypes, MessageStatus, MessageDirection, MessageContentType, MessageMeta, ActionType, ActionSubType, ExternalInfoAction, InfoSessionStatus, InfoAction, InfoTargetType, MetaSystemMessageType, MetaMessageSourceType };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohoim/client-sdk",
-  "version": "1.0.0-replyAreaPoc5",
+  "version": "1.0.0-replyAreaPoc6",
   "description": "To have the client sdk for the IM",
   "main": "es/index.js",
   "module": "es/index.js",