@or-sdk/contacts 3.5.5-beta.2129.0 → 3.5.5-beta.2131.0

package/src/api/contactApi.ts

@@ -2,7 +2,6 @@ import { v4 } from 'uuid';
 
 import {
   BatchProcessResponseDto,
-  BatchProcessStatus,
   ContactParamsDto,
   ContactRequestDto,
   ContactResponseDto,
@@ -19,22 +18,22 @@ import {
   UpdateContactDto,
 } from '@onereach/types-contacts-api';
 import { CalApiParams, List } from '@or-sdk/base';
-import { BaseApi } from './baseApi';
 import BatchProcessApi from './batchProcessApi';
 import { getObjectSizeInBytes, chunkArrByMaxSize, debouncePromise } from '../utils';
 import { InitCreateBatchResponse, CreateContactsBatchResults } from '../types';
 import ContactBookApi from './contactBookApi';
-import { REQUEST_PAYLOAD_MAX_BYTES, FAILED_REQUEST_REPEATS, CONTACTS_DELETE_MAX_AMOUNT } from '../constants';
+import { REQUEST_PAYLOAD_MAX_BYTES, CONTACTS_DELETE_MAX_AMOUNT } from '../constants';
 import { ApiError, CreateContactsBatchError } from '../apiError';
 import { DeleteContactsData } from '../types';
+import BaseWithPoling from './baseWithPolingApi';
 
-export default class ContactApi extends BaseApi {
+export default class ContactApi extends BaseWithPoling {
   constructor(
     protected readonly apiCall: <T>(params: CalApiParams) => Promise<T>,
-    private batchProcessApi: BatchProcessApi,
+    protected batchProcessApi: BatchProcessApi,
     private bookServiceApi: ContactBookApi
   ) {
-    super(apiCall);
+    super(apiCall, batchProcessApi);
   }
 
   private readonly apiBasePath = 'contact';
@@ -368,38 +367,4 @@ export default class ContactApi extends BaseApi {
     };
   }
 
-  /**
-   * Pols specific batch process until status of it isn't turned from 'pending to something else.
-   */
-  private async polling(batchId: string, repeats = 0): Promise<BatchProcessResponseDto> {
-    let batchProcess: BatchProcessResponseDto;
-
-    try {
-      batchProcess = await debouncePromise(() => this.batchProcessApi.getBatchProcess(batchId), 1000);
-    } catch (e) {
-      if (
-        repeats < FAILED_REQUEST_REPEATS
-        && 'statusCode' in (e as object)
-        && (e as unknown as ApiError).statusCode === 410
-      ) {
-        return await debouncePromise(() => this.polling(batchId, repeats + 1), 2000);
-      }
-      if (repeats < FAILED_REQUEST_REPEATS) {
-        return this.polling(batchId, repeats + 1);
-      }
-      throw new CreateContactsBatchError((e as unknown as Error).message, batchId);
-    }
-
-    if (batchProcess.status === BatchProcessStatus.failed) {
-      throw new CreateContactsBatchError(
-        'Could not complete batch process',
-        batchId,
-        batchProcess.messages
-      );
-    }
-
-    return batchProcess.status === BatchProcessStatus.pending
-      ? this.polling(batchId)
-      : batchProcess;
-  }
 }

package/src/types.ts

@@ -1,6 +1,8 @@
 import { Token } from '@or-sdk/base';
 import {
   BatchProcessStatus,
+  BulkContactDto,
+  BulkCreateRequestDto,
   ContactBookParamsDto,
   CreateFieldSchemaDto,
   DeleteContactMultiParamsDto,
@@ -39,6 +41,12 @@ export type ContactsConfig = {
    * make many requests, for example for bulk operations.
    */
   withKeepAliveAgents?: boolean;
+
+  /**
+   * If true, the API error details like request url, params and body,
+   * will be outputted to console
+   */
+  withApiErrorLog?: boolean;
 };
 
 export interface ContactBookParams extends AdaptedListParams<ContactBookParamsDto> {
@@ -68,3 +76,11 @@ export type TrackBatchProcessResponse = {
 };
 
 export type CreateFieldSchemaParams = CreateFieldSchemaDto & {presetIds?: string[];};
+
+export type BulkCreateData = Omit<BulkCreateRequestDto, 'batchId' | 'batchGroupId' | 'contacts'>
+& { contacts: OptionalBy<BulkContactDto, 'contactKey'>[]; };
+
+export type BatchBulkCreateData = Omit<BulkCreateRequestDto, 'batchId' | 'batchGroupId'>;
+
+export type CreateBulkResults = {created: Record<string, string>; failed: Record<string, string>;};
+