@zohoim/client-sdk 1.0.0-poc91 → 1.0.0-poc92

package/es/application/services/sessions/SessionService.js

@@ -8,6 +8,10 @@ export default class SessionService extends ISessionRepository {
     this.sessionRepository = sessionRepository;
   }
 
+  async pickupSession(request) {
+    return this.sessionRepository.pickupSession(request);
+  }
+
   async updateAssignee(request) {
     return this.sessionRepository.updateAssignee(request);
   }
@@ -38,6 +42,7 @@ export default class SessionService extends ISessionRepository {
 
   toJSON() {
     return {
+      pickupSession: this.pickupSession.bind(this),
       updateAssignee: this.updateAssignee.bind(this),
       getSessions: this.getSessions.bind(this),
       getSession: this.getSession.bind(this),

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

@@ -4,4 +4,5 @@ export { default as getSessionRequest } from "./getSessionRequest";
 export { default as getSessionAttachmentsRequest } from "./getSessionAttachmentsRequest";
 export { default as getSessionLastMessagesRequest } from "./getSessionLastMessagesRequest";
 export { default as markSessionAsReadRequest } from "./markSessionAsReadRequest";
-export { default as updateSessionStatusRequest } from "./updateSessionStatusRequest";
+export { default as updateSessionStatusRequest } from "./updateSessionStatusRequest";
+export { default as pickupSessionRequest } from "./pickupSessionRequest";

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

@@ -0,0 +1,9 @@
+import RequestBuilder from "../RequestBuilder";
+
+function pickupSessionRequest() {
+  return new RequestBuilder().withParams({
+    sessionId: null
+  }).build();
+}
+
+export default pickupSessionRequest;

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

@@ -10,6 +10,7 @@ function updateSessionStatusRequest() {
     ...params
   }).withBody({
     status: null,
+    agentId: null,
     ...body
   }).build();
 }

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

@@ -21,14 +21,14 @@ export default class Actor {
     return type === ActorType.BOT;
   }
 
-  static isEnduser(type) {
-    return type === ActorType.ENDUSER;
-  }
-
   static isSystemMessage(type) {
     return type === ActorType.SYSTEM;
   }
 
+  static isEndUser(type) {
+    return type === ActorType.ENDUSER;
+  }
+
   toJSON() {
     return { ...this.data
     };

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

@@ -1,6 +1,6 @@
 import { validateSchema } from "../../../core/utils";
-import { ActionSchema } from "../../schema";
 import { ActionType } from "../../enum";
+import { ActionSchema } from "../../schema";
 export default class Action {
   constructor() {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -12,8 +12,9 @@ export default class Action {
     };
   }
 
-  static isTransferAction(action) {
-    return action === ActionType.TRANSFER;
+  static isTransferAction() {
+    let action = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    return action && action.type === ActionType.TRANSFER;
   }
 
   toJSON() {

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

@@ -2,6 +2,13 @@ import { validateSchema } from "../../../core/utils";
 import { Actor } from "../Actor";
 import { InfoSchema } from "../../schema/message";
 import { InfoAction } from "../../enum";
+import InfoTarget from "./InfoTarget";
+
+function adaptTargets() {
+  let targets = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return targets.map(target => new InfoTarget(target).toJSON());
+}
+
 export default class Info {
   constructor() {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -10,20 +17,23 @@ export default class Info {
       actor: new Actor(validatedData.actor).toJSON(),
       action: validatedData.action,
       sessionStatus: validatedData.sessionStatus,
-      targets: validatedData.targets
+      targets: adaptTargets(validatedData.targets)
     };
   }
 
-  static isChatTransfer(action) {
-    return action === InfoAction.CHAT_TRANSFER;
+  static isEndSessionMessage() {
+    let info = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    return info && info.action === InfoAction.END_SESSION;
   }
 
-  static isAutoAssign(action) {
-    return action === InfoAction.CHAT_AUTO_ASSIGN;
+  static isAutoAssignMessage() {
+    let info = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    return info && info.action === InfoAction.CHAT_AUTO_ASSIGN;
   }
 
-  static isEndSession(action) {
-    return action === InfoAction.END_SESSION;
+  static isTransferMessage() {
+    let info = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    return info && info.action === InfoAction.CHAT_TRANSFER;
   }
 
   toJSON() {

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

@@ -0,0 +1,22 @@
+import { validateSchema } from "../../../core/utils";
+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);
+    this.data = {
+      id: validatedData.id,
+      name: validatedData.name || null,
+      photoURL: validatedData.photoURL || null,
+      email: validatedData.email || null,
+      isReplyAllowed: validatedData.isReplyAllowed,
+      type: validatedData.type
+    };
+  }
+
+  toJSON() {
+    return { ...this.data
+    };
+  }
+
+}

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

@@ -99,6 +99,10 @@ export default class Message {
     return status === MessageStatus.FAILED;
   }
 
+  static isAutoSent(systemMsgType) {
+    return !!systemMsgType;
+  }
+
   static getMetaValue() {
     let meta = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     let key = arguments.length > 1 ? arguments[1] : undefined;

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

@@ -3,4 +3,5 @@ export { default as Info } from "./Info";
 export { default as Action } from "./Action";
 export { default as ExternalInfo } from "./ExternalInfo";
 export { default as Location } from "./Location";
-export { default as MessageWithSession } from "./MessageWithSession";
+export { default as MessageWithSession } from "./MessageWithSession";
+export { default as InfoTarget } from "./InfoTarget";

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

@@ -64,6 +64,10 @@ export default class Session {
     return replyStatus === SessionReplyStatus.ENDUSER_OFFLINE;
   }
 
+  static isCreated(sessionStatus) {
+    return sessionStatus === SessionStatus.CREATED;
+  }
+
   static isAssignedToOtherService(replyStatus) {
     return replyStatus === SessionReplyStatus.ASSIGNED_TO_OTHER_SERVICE;
   }

package/es/domain/enum/attachment/AttachmentStatus.js

@@ -1,5 +1,7 @@
 const AttachmentStatus = {
   VALID: 'VALID',
-  INVALID: 'INVALID'
+  // NO I18N
+  INVALID: 'INVALID' // NO I18N
+
 };
 export default AttachmentStatus;

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

@@ -0,0 +1,11 @@
+const InfoTargetType = {
+  AGENT: 'AGENT',
+  // NO I18N
+  BOT: 'BOT',
+  // NO I18N
+  END_USER: 'END_USER',
+  // NO I18N
+  SESSION: 'SESSION' // NO I18N
+
+};
+export default InfoTargetType;

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

@@ -7,4 +7,5 @@ import ExternalInfoAction from "./ExternalInfoAction";
 import InfoSessionStatus from "./InfoSessionStatus";
 import InfoAction from "./InfoAction";
 import ActionSubType from "./ActionSubType";
-export { MessageTypes, MessageStatus, MessageDirection, MessageContentType, ActionType, ActionSubType, ExternalInfoAction, InfoSessionStatus, InfoAction };
+import InfoTargetType from "./InfoTargetType";
+export { MessageTypes, MessageStatus, MessageDirection, MessageContentType, ActionType, ActionSubType, ExternalInfoAction, InfoSessionStatus, InfoAction, InfoTargetType };

package/es/domain/interfaces/repositories/sessions/ISessionRepository.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-unused-vars */
 import { ModuleNames } from "../../../../core/constants";
 import BaseAPI from "../../../../infrastructure/api/BaseAPI";
-import { updateSessionAssigneeRequest, getSessionsRequest, getSessionRequest, getSessionAttachmentsRequest, getSessionLastMessagesRequest, markSessionAsReadRequest, updateSessionStatusRequest } from "../../../dto";
+import { updateSessionAssigneeRequest, getSessionsRequest, getSessionRequest, getSessionAttachmentsRequest, getSessionLastMessagesRequest, markSessionAsReadRequest, updateSessionStatusRequest, pickupSessionRequest } from "../../../dto";
 export default class ISessionRepository extends BaseAPI {
   constructor() {
     super({
@@ -9,6 +9,11 @@ export default class ISessionRepository extends BaseAPI {
     });
   }
 
+  pickupSession() {
+    let request = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : pickupSessionRequest();
+    throw new Error('Method not implemented.');
+  }
+
   updateAssignee() {
     let request = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : updateSessionAssigneeRequest();
     throw new Error('Method not implemented.');

package/es/domain/schema/message/InfoTargetSchema.js

@@ -0,0 +1,35 @@
+import { InfoTargetType } from "../../enum";
+const InfoTargetSchema = {
+  id: {
+    type: 'string',
+    // NO I18N
+    required: true
+  },
+  email: {
+    type: 'string',
+    // NO I18N
+    required: false
+  },
+  photoURL: {
+    type: 'string',
+    // NO I18N
+    required: false
+  },
+  name: {
+    type: 'string',
+    // NO I18N
+    required: false
+  },
+  isReplyAllowed: {
+    type: 'boolean',
+    // NO I18N
+    required: false
+  },
+  type: {
+    type: 'string',
+    // NO I18N
+    required: true,
+    enum: Object.values(InfoTargetType)
+  }
+};
+export default InfoTargetSchema;

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

@@ -4,4 +4,5 @@ import ExternalInfoSchema from "./ExternalInfoSchema";
 import InfoSchema from "./InfoSchema";
 import LocationSchema from "./LocationSchema";
 import MessageWithSessionSchema from "./MessageWithSessionSchema";
-export { MessageSchema, ActionSchema, ExternalInfoSchema, InfoSchema, LocationSchema, MessageWithSessionSchema };
+import InfoTargetSchema from "./InfoTargetSchema";
+export { MessageSchema, ActionSchema, ExternalInfoSchema, InfoSchema, LocationSchema, MessageWithSessionSchema, InfoTargetSchema };

package/es/infrastructure/api/BaseAPI.js

@@ -69,6 +69,10 @@ export default class BaseAPI {
   }
 
   isMethodOverridden(customAPI, methodName) {
+    if (!customAPI) {
+      return false;
+    }
+
     const customPrototype = Object.getPrototypeOf(customAPI);
     return typeof customAPI[methodName] === 'function' && // Method is defined directly on custom prototype
     Object.prototype.hasOwnProperty.call(customPrototype, methodName);

package/es/infrastructure/api/registry/bots/botAPIRegistry.js

@@ -8,7 +8,8 @@ function getBots() {
 }
 
 function getBot() {
-  return createAPIRegistry(constructBotEndPoint('/:botId'), HTTP_METHODS.GET, getBotRequest());
+  return createAPIRegistry(constructBotEndPoint('/:botId'), // NO I18N
+  HTTP_METHODS.GET, getBotRequest());
 }
 
 export default {

package/es/infrastructure/api/registry/sessions/sessionAPIRegistry.js

@@ -1,11 +1,16 @@
 import { HTTP_METHODS } from "../../../../core/constants";
-import { updateSessionAssigneeRequest, getSessionAttachmentsRequest, getSessionLastMessagesRequest, getSessionRequest, getSessionsRequest, markSessionAsReadRequest, updateSessionStatusRequest } from "../../../../domain/dto";
+import { updateSessionAssigneeRequest, getSessionAttachmentsRequest, getSessionLastMessagesRequest, getSessionRequest, getSessionsRequest, markSessionAsReadRequest, updateSessionStatusRequest, pickupSessionRequest } from "../../../../domain/dto";
 import createAPIRegistry from "../createAPIRegistry";
 import constructSessionEndPoint from "./constructSessionEndPoint";
 const SINGLE_SESSION_URL = '/:sessionId';
 const SESSION_ATTACHMENTS_URL = `${SINGLE_SESSION_URL}/attachments`;
 const SESSION_LAST_MESSAGE = '/lastMessages';
 const MARK_AS_READ = `${SINGLE_SESSION_URL}/markAsRead`;
+const PICKUP_SESSION = `${SINGLE_SESSION_URL}/pickup`;
+
+function pickupSession() {
+  return createAPIRegistry(constructSessionEndPoint(PICKUP_SESSION), HTTP_METHODS.POST, pickupSessionRequest());
+}
 
 function updateAssignee() {
   return createAPIRegistry(constructSessionEndPoint(SINGLE_SESSION_URL), HTTP_METHODS.PATCH, updateSessionAssigneeRequest());
@@ -42,5 +47,6 @@ export default {
   getSessionAttachments,
   getSessionLastMessages,
   markSessionAsRead,
-  updateSessionStatus
+  updateSessionStatus,
+  pickupSession
 };

package/es/infrastructure/api/sessions/SessionAPI.js

@@ -1,6 +1,16 @@
-import { updateSessionAssigneeRequest, getSessionsRequest, getSessionRequest, getSessionAttachmentsRequest, getSessionLastMessagesRequest, markSessionAsReadRequest, updateSessionStatusRequest } from "../../../domain/dto";
+import { updateSessionAssigneeRequest, getSessionsRequest, getSessionRequest, getSessionAttachmentsRequest, getSessionLastMessagesRequest, markSessionAsReadRequest, updateSessionStatusRequest, pickupSessionRequest } from "../../../domain/dto";
 import { ISessionRepository } from "../../../domain/interfaces/repositories";
 export default class SessionAPI extends ISessionRepository {
+  async pickupSession() {
+    let request = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : pickupSessionRequest();
+    const operation = 'pickupSession';
+    const httpRequest = await this.request({
+      request,
+      operation
+    });
+    return httpRequest;
+  }
+
   async updateAssignee() {
     let request = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : updateSessionAssigneeRequest();
     const operation = 'updateAssignee';

package/es/infrastructure/repositories/sessions/SessionRepository.js

@@ -36,6 +36,13 @@ export default class SessionRepository extends ISessionRepository {
     });
   }
 
+  async pickupSession(request) {
+    return this.invokeAPI({
+      operation: 'pickupSession',
+      request
+    });
+  }
+
   async updateAssignee(request) {
     return this.invokeAPI({
       operation: 'updateAssignee',
@@ -92,6 +99,7 @@ export default class SessionRepository extends ISessionRepository {
 
   toJSON() {
     return {
+      pickupSession: this.pickupSession.bind(this),
       updateAssignee: this.updateAssignee.bind(this),
       getSessions: this.getSessions.bind(this),
       getSession: this.getSession.bind(this),

package/package.json

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