@or-sdk/hitl 0.34.68 → 0.34.69-beta.3622.0

package/src/api/SessionEvents.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import URI from 'urijs';
 
 import { DEFAULT_OMIT_FIELDS } from '../constants';
@@ -32,7 +31,9 @@ export class SessionEvents extends HITLBase {
     options: GetSessionEventsOptions
   ): Promise<GetSessionEventsResponse> {
     const route = this.getBaseUrl(options);
-    const params = _.omit(options, DEFAULT_OMIT_FIELDS);
+    const params = Object.fromEntries(
+      Object.entries(options).filter(([key]) => !DEFAULT_OMIT_FIELDS.includes(key))
+    );
 
     return this.request({
       method: 'GET',
@@ -51,7 +52,9 @@ export class SessionEvents extends HITLBase {
   ): Promise<GetBulkSessionsEventsResponse> {
     const baseUrl = this.getBaseUrl(options);
     const route = new URI(baseUrl).segment(this.GET_BULK_EVENTS_URL).href();
-    const params = _.omit(options, DEFAULT_OMIT_FIELDS);
+    const params = Object.fromEntries(
+      Object.entries(options).filter(([key]) => !DEFAULT_OMIT_FIELDS.includes(key))
+    );
 
     return this.request({
       method: 'GET',
@@ -66,17 +69,15 @@ export class SessionEvents extends HITLBase {
    * @param options
    */
   public static addEvents(
-    options: AddEventsOptions
+    { sessionId, events, ...options }: AddEventsOptions
   ): Promise<AddEventsResponse> {
     const route = this.getBaseUrl(options);
-    const params = _.pick(options, ['sessionId']);
-    const data = _.pick(options, ['events']);
 
     return this.request({
       method: 'POST',
       route,
-      params,
-      data,
+      params: { sessionId },
+      data: { events },
       ...this.getBaseSettings(options),
     });
   }
@@ -86,17 +87,19 @@ export class SessionEvents extends HITLBase {
    * @param options
    */
   public static async getNewEventsCount(
-    options: GetNewEventsCountOptions
+    // TODO: add userId to GetNewEventsCountOptions
+    { userId, ...options }: GetNewEventsCountOptions & { userId: string; }
   ): Promise<GetNewEventsCountResponse> {
     const baseUrl = this.getBaseUrl(options);
     const route = new URI(baseUrl).segment(this.GET_EVENTS_COUNT_URL).href();
-    const params = _.pick(options, ['userId']);
-    const data = _.omit(options, ['userId', ...DEFAULT_OMIT_FIELDS]);
+    const data = Object.fromEntries(
+      Object.entries(options).filter(([key]) => !DEFAULT_OMIT_FIELDS.includes(key))
+    );
 
     return this.request({
       method: 'POST',
       route,
-      params,
+      params: { userId },
       data,
       ...this.getBaseSettings(options),
     });
@@ -107,17 +110,19 @@ export class SessionEvents extends HITLBase {
    * @param options
    */
   public static async saveReadEventByUserId(
-    options: SaveLastReadEventOptions
+    // TODO: add userId to SaveLastReadEventOptions
+    { userId, ...options }: SaveLastReadEventOptions & { userId: string; }
   ): Promise<void> {
     const baseUrl = this.getBaseUrl(options);
     const route = new URI(baseUrl).segment(this.SAVE_READ_EVENT_URL).href();
-    const params = _.pick(options, ['userId']);
-    const data = _.omit(options, ['userId', ...DEFAULT_OMIT_FIELDS]);
+    const data = Object.fromEntries(
+      Object.entries(options).filter(([key]) => !DEFAULT_OMIT_FIELDS.includes(key))
+    );
 
     return this.request({
       method: 'POST',
       route,
-      params,
+      params: { userId },
       data,
       ...this.getBaseSettings(options),
     });

package/src/api/SessionRelations.ts

@@ -1,5 +1,3 @@
-import _ from 'lodash';
-
 import { DEFAULT_OMIT_FIELDS } from '../constants';
 import {
   GetSessionRelationsOptions,
@@ -22,7 +20,9 @@ export class SessionRelations extends HITLBase {
     options: GetSessionRelationsOptions
   ): Promise<GetSessionRelationsResponse> {
     const route = this.getBaseUrl(options);
-    const params = _.omit(options, DEFAULT_OMIT_FIELDS);
+    const params = Object.fromEntries(
+      Object.entries(options).filter(([key]) => !DEFAULT_OMIT_FIELDS.includes(key))
+    );
 
     return this.request({
       method: 'GET',
@@ -37,9 +37,13 @@ export class SessionRelations extends HITLBase {
    * @param options
    */
 
-  public static createSessionRelations(options: CreateSessionRelationsOptions): Promise<CreateSessionRelationsResponse> {
+  public static createSessionRelations(
+    options: CreateSessionRelationsOptions,
+  ): Promise<CreateSessionRelationsResponse> {
     const route = this.getBaseUrl(options);
-    const data = _.omit(options, DEFAULT_OMIT_FIELDS);
+    const data = Object.fromEntries(
+      Object.entries(options).filter(([key]) => !DEFAULT_OMIT_FIELDS.includes(key))
+    );
 
     return this.request({
       method: 'POST',
@@ -57,7 +61,9 @@ export class SessionRelations extends HITLBase {
     options: DeleteSessionRelationsOptions
   ) {
     const route = this.getBaseUrl(options);
-    const data = _.omit(options, DEFAULT_OMIT_FIELDS);
+    const data = Object.fromEntries(
+      Object.entries(options).filter(([key]) => !DEFAULT_OMIT_FIELDS.includes(key))
+    );
 
     return this.request({
       method: 'DELETE',

package/src/api/Sessions.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import URI from 'urijs';
 
 import { DEFAULT_OMIT_FIELDS } from '../constants';
@@ -32,16 +31,16 @@ import { HITLBase } from './HITLBase';
 export class Sessions extends HITLBase {
   protected static MODULE_URL = 'sessions';
 
-  protected static SEARCH_URL = 'search';
-  protected static SEARCH_WITH_CONTACTS_URL = 'search-with-contacts';
-  protected static GET_TRIGGERS_URL = 'helpers/triggers';
-  protected static GET_QUEUE_SESSION_URL = 'helpers/queue';
+  protected static SEARCH_URL = 'search' as const;
+  protected static SEARCH_WITH_CONTACTS_URL = 'search-with-contacts' as const;
+  protected static GET_TRIGGERS_URL = 'helpers/triggers' as const;
+  protected static GET_QUEUE_SESSION_URL = 'helpers/queue' as const;
 
-  protected static CLAIM_URL = 'claim';
-  protected static TRANSFER_TO_BOT_URL = 'transfer-to-bot';
-  protected static START_CONVERSATION_URL = 'start-conversation';
-  protected static CLOSE_URL = 'close';
-  protected static REOPEN_URL = 'reopen';
+  protected static CLAIM_URL = 'claim' as const;
+  protected static TRANSFER_TO_BOT_URL = 'transfer-to-bot' as const;
+  protected static START_CONVERSATION_URL = 'start-conversation' as const;
+  protected static CLOSE_URL = 'close' as const;
+  protected static REOPEN_URL = 'reopen' as const;
 
   /**
    * @description Get HitL Sessions
@@ -51,7 +50,9 @@ export class Sessions extends HITLBase {
     options: GetSessionsOptions = {}
   ): Promise<GetSessionsResponse> {
     const route = this.getBaseUrl(options);
-    const params = _.omit(options, DEFAULT_OMIT_FIELDS);
+    const params = Object.fromEntries(
+      Object.entries(options).filter(([key]) => !DEFAULT_OMIT_FIELDS.includes(key))
+    );
 
     return this.request({
       method: 'GET',
@@ -66,16 +67,18 @@ export class Sessions extends HITLBase {
    * @param options
    */
   public static async getSessionById(
-    options: GetSessionByIdOptions
+    { agentId, projection, ...options }: GetSessionByIdOptions
   ): Promise<Session> {
     const baseUrl = this.getBaseUrl(options);
     const route = new URI(baseUrl).segment(options.sessionId).href();
-    const params = _.pick(options, ['agentId', 'projection']);
 
     return this.request({
       method: 'GET',
       route,
-      params,
+      params: {
+        agentId,
+        projection,
+      },
       ...this.getBaseSettings(options),
     });
   }
@@ -85,17 +88,18 @@ export class Sessions extends HITLBase {
    * @param options
    */
   public static async searchSessions(
-    options: SearchSessionsOptions = {}
+    { agentId, ...options }: SearchSessionsOptions = {}
   ): Promise<SearchSessionsResponse> {
     const baseUrl = this.getBaseUrl(options);
     const route = new URI(baseUrl).segment(this.SEARCH_URL).href();
-    const params = _.pick(options, ['agentId']);
-    const data = _.omit(options, ['agentId', ...DEFAULT_OMIT_FIELDS]);
+    const data = Object.fromEntries(
+      Object.entries(options).filter(([key]) => !DEFAULT_OMIT_FIELDS.includes(key))
+    );
 
     return this.request({
       method: 'POST',
       route,
-      params,
+      params: { agentId },
       data,
       ...this.getBaseSettings(options),
     });
@@ -106,20 +110,21 @@ export class Sessions extends HITLBase {
    * @param options
    */
   public static async searchSessionsWithContacts(
-    options: SearchSessionsWithContactsOptions = {}
+    { agentId, ...options }: SearchSessionsWithContactsOptions = {}
   ): Promise<SearchSessionsWithContactsResponse> {
     const baseUrl = this.getBaseUrl(options);
     const route = new URI(baseUrl)
       .segment(this.SEARCH_WITH_CONTACTS_URL)
       .href();
 
-    const params = _.pick(options, ['agentId']);
-    const data = _.omit(options, ['agentId', ...DEFAULT_OMIT_FIELDS]);
+    const data = Object.fromEntries(
+      Object.entries(options).filter(([key]) => !DEFAULT_OMIT_FIELDS.includes(key))
+    );
 
     return this.request({
       method: 'POST',
       route,
-      params,
+      params: { agentId },
       data,
       ...this.getBaseSettings(options),
     });
@@ -130,16 +135,18 @@ export class Sessions extends HITLBase {
    * @param options
    */
   public static async getQueueSession(
-    options: GetQueueSessionOptions
+    { agentId, ruleTags, ...options }: GetQueueSessionOptions
   ): Promise<GetQueueSessionResponse> {
     const baseUrl = this.getBaseUrl(options);
     const route = new URI(baseUrl).segment(this.GET_QUEUE_SESSION_URL).href();
-    const params = _.pick(options, ['agentId', 'ruleTags']);
 
     return this.request({
       method: 'GET',
       route,
-      params,
+      params: {
+        agentId,
+        ruleTags,
+      },
       ...this.getBaseSettings(options),
     });
   }
@@ -169,7 +176,7 @@ export class Sessions extends HITLBase {
    * @param options
    */
   public static async claimSessionByAgent(
-    options: ClaimSessionByAgentOptions
+    { claimBy, params, ...options }: ClaimSessionByAgentOptions
   ): Promise<Session> {
     const baseUrl = this.getBaseUrl(options);
     const route = new URI(baseUrl)
@@ -177,14 +184,11 @@ export class Sessions extends HITLBase {
       .segment(this.CLAIM_URL)
       .href();
 
-    const params = _.pick(options, ['claimBy']);
-    const data = _.pick(options, ['params']);
-
     return this.request({
       method: 'POST',
       route,
-      params,
-      data,
+      params: { claimBy },
+      data: { params },
       ...this.getBaseSettings(options),
     });
   }
@@ -196,7 +200,7 @@ export class Sessions extends HITLBase {
    * @param options
    */
   public static async transferToBot(
-    options: TransferToBotOptions
+    { agentId, params, ...options }: TransferToBotOptions
   ): Promise<Session> {
     const baseUrl = this.getBaseUrl(options);
     const route = new URI(baseUrl)
@@ -204,14 +208,11 @@ export class Sessions extends HITLBase {
       .segment(this.TRANSFER_TO_BOT_URL)
       .href();
 
-    const params = _.pick(options, ['agentId']);
-    const data = _.pick(options, ['params']);
-
     return this.request({
       method: 'POST',
       route,
-      params,
-      data,
+      params: { agentId },
+      data: { params },
       ...this.getBaseSettings(options),
     });
   }
@@ -221,19 +222,19 @@ export class Sessions extends HITLBase {
    * @param options
    */
   public static async startConversation(
-    options: StartConversationOptions
+    { contactId, triggerId, params, ...options }: StartConversationOptions
   ): Promise<Session> {
     const baseUrl = this.getBaseUrl(options);
     const route = new URI(baseUrl).segment(this.START_CONVERSATION_URL).href();
 
-    const params = _.pick(options, ['contactId', 'triggerId']);
-    const data = _.pick(options, ['params']);
-
     return this.request({
       method: 'POST',
       route,
-      params,
-      data,
+      params: {
+        contactId,
+        triggerId,
+      },
+      data: { params },
       ...this.getBaseSettings(options),
     });
   }
@@ -243,16 +244,19 @@ export class Sessions extends HITLBase {
    * @param options
    */
   public static async updateSession(
-    options: UpdateSessionOptions
+    { tags, contactId, meta, ...options }: UpdateSessionOptions
   ): Promise<Session> {
     const baseUrl = this.getBaseUrl(options);
     const route = new URI(baseUrl).segment(options.sessionId).href();
 
-    const data = _.pick(options, ['tags', 'contactId', 'meta']);
     return this.request({
       method: 'PUT',
       route,
-      data,
+      data: {
+        tags,
+        contactId,
+        meta,
+      },
       ...this.getBaseSettings(options),
     });
   }
@@ -262,14 +266,13 @@ export class Sessions extends HITLBase {
    * @param options
    */
   public static async createSessions(
-    options: CreateSessionsOptions
+    { sessions, ...options }: CreateSessionsOptions
   ): Promise<CreateSessionsResponse> {
     const route = this.getBaseUrl(options);
-    const data = _.pick(options, ['sessions']);
     return this.request({
       method: 'POST',
       route,
-      data,
+      data: { sessions },
       ...this.getBaseSettings(options),
     });
   }
@@ -332,15 +335,11 @@ export class Sessions extends HITLBase {
 
   // TODO delete method with typo
   public static async buldDeleteSessions(
-    options: BulkDeleteSessionsOptions
+    { sessionIds, ...options }: BulkDeleteSessionsOptions
   ) {
-    const route = this.getBaseUrl(options);
-    const params = _.pick(options, ['sessionIds']);
-    return this.request({
-      method: 'DELETE',
-      route,
-      params,
-      ...this.getBaseSettings(options),
+    return this.bulkDeleteSessions({
+      sessionIds,
+      ...options,
     });
   }
 
@@ -349,14 +348,13 @@ export class Sessions extends HITLBase {
    * @param options
    */
   public static async bulkDeleteSessions(
-    options: BulkDeleteSessionsOptions
+    { sessionIds, ...options }: BulkDeleteSessionsOptions
   ) {
     const route = this.getBaseUrl(options);
-    const params = _.pick(options, ['sessionIds']);
     return this.request({
       method: 'DELETE',
       route,
-      params,
+      params: { sessionIds },
       ...this.getBaseSettings(options),
     });
   }

package/src/api/Settings.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import URI from 'urijs';
 
 import { DEFAULT_OMIT_FIELDS } from '../constants';
@@ -24,11 +23,13 @@ export class Settings extends HITLBase {
    * @param options
    */
   public static async getSettings(
-    options: GetSettingsOptions = {}
+    { ignoreRuleTags = false, ...options }: GetSettingsOptions = {}
   ): Promise<GetSettingsResponse> {
     const route = this.getBaseUrl(options);
-    const params = _.omit(options, [...DEFAULT_OMIT_FIELDS, 'accountId', 'ignoreRuleTags']);
-    const customHeaders = { [this.IGNORE_RULE_TAGS_HEADER]: `${_.get(options, ['ignoreRuleTags']) || false}` };
+    const params = Object.fromEntries(
+      Object.entries(options).filter(([key]) => ![...DEFAULT_OMIT_FIELDS, 'accountId'].includes(key))
+    );
+    const customHeaders = { [this.IGNORE_RULE_TAGS_HEADER]: `${ignoreRuleTags}` };
 
     return this.request({
       route,
@@ -47,7 +48,9 @@ export class Settings extends HITLBase {
   ): Promise<SettingsType> {
     const baseUrl = this.getBaseUrl(options);
     const route = new URI(baseUrl).segment(this.CONTACT_BOOK_INFO_URL).href();
-    const params = _.omit(options, [...DEFAULT_OMIT_FIELDS, 'accountId']);
+    const params = Object.fromEntries(
+      Object.entries(options).filter(([key]) => ![...DEFAULT_OMIT_FIELDS, 'accountId'].includes(key))
+    );
 
     return this.request({
       route,
@@ -61,20 +64,18 @@ export class Settings extends HITLBase {
    * @param options
    */
   public static async updateSettings(
-    options: UpdateSettingsOptions
+    { isCommon, data, settings, ...options }: UpdateSettingsOptions
   ): Promise<UpdateSettingsResponse> {
     const route = this.getBaseUrl(options);
-    const params = _.pick(options, ['isCommon']);
-    const data = {
-      data: options.data,
-      settings: options.settings,
-    };
 
     return this.request({
       route,
       method: 'PUT',
-      params,
-      data,
+      params: { isCommon },
+      data: {
+        data,
+        settings,
+      },
       ...this.getBaseSettings(options),
     });
   }
@@ -88,7 +89,9 @@ export class Settings extends HITLBase {
     options: DeleteSettingOptions
   ): Promise<GetSettingsResponse> {
     const route = this.getBaseUrl(options);
-    const params = _.omit(options, DEFAULT_OMIT_FIELDS);
+    const params = Object.fromEntries(
+      Object.entries(options).filter(([key]) => !DEFAULT_OMIT_FIELDS.includes(key))
+    );
 
     return this.request({
       route,

package/src/api/Tasks.ts

@@ -1,5 +1,3 @@
-import _ from 'lodash';
-
 import { RunTaskOptions } from '../types/tasks';
 
 import { HITLBase } from './HITLBase';
@@ -11,17 +9,15 @@ export class Tasks extends HITLBase {
    * @param options
    */
   public static async runTask(
-    options: RunTaskOptions
+    { task, data, ...options }: RunTaskOptions
   ): Promise<void> {
     const route = this.getBaseUrl(options);
-    const params = _.pick(options, ['task']);
-    const data = _.pick(options, ['data']);
 
     return this.request({
       method: 'POST',
       route,
-      params,
-      data,
+      params: { task },
+      data: { data },
       ...this.getBaseSettings(options),
     });
   }

package/src/constants.ts

@@ -1,5 +1,4 @@
-export const SERVICE_KEY = 'hitl-api';
-export const EKS_SERVICE_KEY = 'hitl-eks-api';
+export const SERVICE_KEY = 'hitl-api' as const;
+export const EKS_SERVICE_KEY = 'hitl-eks-api' as const;
 export const HITL_API_SERVICE_KEY = SERVICE_KEY;
 export const DEFAULT_OMIT_FIELDS = ['version', 'timeout'];
-