Fix errors when no response

MadKudu · Dec 11, 2019 · 03cb361 · 03cb361
2 parents 162fd7a + a25a91f
commit 03cb361
Show file tree

Hide file tree

Showing 10 changed files with 442 additions and 130 deletions.
diff --git a/lib/account.ts b/lib/account.ts
@@ -0,0 +1,37 @@
+import EloquaClient from './client';
+import Field from './field';
+
+export default class Contact {
+  client: EloquaClient;
+  fields: any;
+  lists: any;
+
+  constructor (client: EloquaClient) {
+    this.client = client;
+    this.fields = new Field(this.client, 'account');
+  }
+
+  get (id: number, options?: any) {
+    return this.client._request({
+      method: 'GET',
+      url: `/api/REST/1.0/data/account/${id}`,
+      params: options
+    });
+  }
+
+  getAll (options?: any) {
+    return this.client._request({
+      method: 'GET',
+      url: '/api/REST/1.0/data/accounts',
+      params: options
+    });
+  }
+
+  update (id: number, data: any) {
+    return this.client._request({
+      data,
+      method: 'PUT',
+      url: `/api/REST/1.0/data/account/${id}`
+    });
+  }
+}
diff --git a/lib/bulk.ts b/lib/bulk.ts
@@ -11,14 +11,14 @@ export default class List {
     this.client = client;
   }
 
-  createExport(name: string, fields: any, filter: string) {
+  createExport(objectName: string, exportName: string, fields: any, filter: string) {
     return this.client._request({
       method: 'POST',
-      url: '/api/bulk/2.0/activities/exports',
+      url: `/api/bulk/2.0/${objectName}/exports`,
       data: {
-        name,
         fields,
         filter,
+        name: exportName,
         areSystemTimestampsInUTC: true
       }
     });
@@ -58,25 +58,25 @@ export default class List {
     });
   }
 
-  async completeExport(name: string, fields: any, filter: string) {
-    const bulkExport = await this.createExport(name, fields, filter);
+  async completeExport(objectName: string, exportName: string, fields: any, filter: string) {
+    const bulkExport = await this.createExport(objectName, exportName, fields, filter);
     const sync = await this.createSync(bulkExport.uri);
     const syncUri = sync.uri;
     const results = await this.pollSync(syncUri);
     const { status } = results;
     return { syncUri, status };
   }
 
-  async runExport(name: string, fields: any, filter: string) {
-    const { status, syncUri } = await this.completeExport(name, fields, filter);
+  async runExport(objectName: string, exportName: string, fields: any, filter: string) {
+    const { status, syncUri } = await this.completeExport(objectName, exportName, fields, filter);
     if (status === 'success') {
       return this.getSyncData(syncUri);
     }
     return;
   }
 
-  async getExportStream(name: string, fields: any, filter: string) {
-    const { status, syncUri } = await this.completeExport(name, fields, filter);
+  async getExportStream(objectName: string, exportName: string, fields: any, filter: string) {
+    const { status, syncUri } = await this.completeExport(objectName, exportName, fields, filter);
     if (status === 'success') {
       return new Stream(this.client, syncUri);
     }

diff --git a/lib/client.ts b/lib/client.ts
@@ -3,6 +3,7 @@ import Debug from 'debug';
 import * as EventEmitter from 'events';
 import * as _ from 'lodash';
 import Bulk from './bulk';
+import Account from './account';
 import Contact from './contact';
 import EloquaError from './errors';
 
@@ -29,6 +30,7 @@ export default class EloquaClient extends EventEmitter {
   loginUrl: string;
   baseUrl: string;
   apiCalls: number;
+  accounts: any;
   contacts: any;
   bulk: any;
 
@@ -47,6 +49,7 @@ export default class EloquaClient extends EventEmitter {
       this.apiCalls += 1;
     });
 
+    this.accounts = new Account(this);
     this.contacts = new Contact(this);
     this.bulk = new Bulk(this);
   }

diff --git a/lib/contact.ts b/lib/contact.ts
@@ -1,4 +1,4 @@
-import Field from './contact_field';
+import Field from './field';
 import List from './contact_list';
 import Segment from './contact_segment';
 import EloquaClient from './client';
@@ -11,7 +11,7 @@ export default class Contact {
 
   constructor (client: EloquaClient) {
     this.client = client;
-    this.fields = new Field(this.client);
+    this.fields = new Field(this.client, 'contact');
     this.lists = new List(this.client);
     this.segments = new Segment(this.client);
   }

diff --git a/lib/contact_field.ts → lib/field.ts b/lib/contact_field.ts → lib/field.ts
@@ -2,23 +2,25 @@ import EloquaClient from './client';
 
 export default class Properties {
   client: EloquaClient;
+  objectName: string;
 
-  constructor (client: EloquaClient) {
+  constructor (client: EloquaClient, objectName: string) {
     this.client = client;
+    this.objectName = objectName;
   }
 
   getAll (options?: any) {
     return this.client._request({
       method: 'GET',
-      url: '/api/REST/1.0/assets/contact/fields',
+      url: `/api/REST/1.0/assets/${this.objectName}/fields`,
       params: options
     });
   }
 
   get (id: number, options?: any) {
     return this.client._request({
       method: 'GET',
-      url: `/api/REST/1.0/assets/contact/field/${id}`,
+      url: `/api/REST/1.0/assets/${this.objectName}/field/${id}`,
       params: options
     });
   }
@@ -27,22 +29,22 @@ export default class Properties {
     return this.client._request({
       data,
       method: 'POST',
-      url: '/api/REST/1.0/assets/contact/field'
+      url: `/api/REST/1.0/assets/${this.objectName}/field`
     });
   }
 
   update (id: number, data: any) {
     return this.client._request({
       data,
       method: 'PUT',
-      url: `/api/REST/1.0/assets/contact/field/${id}`
+      url: `/api/REST/1.0/assets/${this.objectName}/field/${id}`
     });
   }
 
   delete (id: number) {
     return this.client._request({
       method: 'DELETE',
-      url: `/api/REST/1.0/assets/contact/field/${id}`
+      url: `/api/REST/1.0/assets/${this.objectName}/field/${id}`
     });
   }
 }