Merge pull request #542 from szprutamich/master

SDCB-11185 - Usage details new model

Author: marisuch

dist/api/APIResourceAccount.d.ts

@@ -2,7 +2,7 @@ import { API } from '../API';
 import { APIList } from './APIList';
 import { APIResource } from './APIResource';
 import { APIResourceBillingPeriod } from './APIResourceBillingPeriod';
-import { Account, AccountData } from './models/Account';
+import { Account, AccountData, AccountSessionUsage, AccountSessionUsageSummary } from './models/Account';
 import { AccountConcurrencyStatusMap } from './models/AccountConcurrencyStatusMap';
 import { AccountPreferences } from './models/AccountPreference';
 import { AccountService, ServicePaymentStatus } from './models/AccountService';
@@ -32,5 +32,7 @@ export declare class APIResourceAccount extends APIResource<Account, QueryParams
     accountServices(): APIList<AccountService, import("./models/HTTP").CollectionQueryParams, any>;
     accountService(id: number): APIList<AccountService, import("./models/HTTP").CollectionQueryParams, any>;
     services(): APIResource<ServicePaymentStatus, QueryParams, QueryParams>;
+    usageDetails(): APIList<AccountSessionUsage, import("./models/HTTP").CollectionQueryParams, any>;
+    usageDetailsSummary(): APIResource<AccountSessionUsageSummary, QueryParams, QueryParams>;
 }
 export default APIResourceAccount;

dist/api/models/Account.d.ts

@@ -44,6 +44,23 @@ export type AccountUsage = {
     manualConcurrency: number;
     manualUsage: number;
 };
+export type AccountSessionUsage = {
+    createTime: number;
+    duration: number;
+    type: SessionUsageType;
+    userId: number;
+    userName: string;
+};
+export type AccountSessionUsageSummary = {
+    totalTime: number;
+    usage: Record<SessionUsageType, number>;
+};
+export declare enum SessionUsageType {
+    AUTOMATIC = "automatic",
+    MANUAL = "manual",
+    DEDICATED_AUTOMATIC = "dedicated_automatic",
+    DEDICATED_MANUAL = "dedicated_manual"
+}
 export declare enum UtilizationType {
     ALL = "all",
     PUBLIC = "public",

dist/bitbar-cloud-api-client.js

@@ -1,6 +1,6 @@
 {
   "name": "@bitbar/cloud-api-client",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Bitbar Cloud API Client for JavaScript",
   "main": "dist/bitbar-cloud-api-client.min.js",
   "types": "dist/index.d.ts",

dist/bitbar-cloud-api-client.js.map

@@ -158,4 +158,20 @@ describe('APIResourceAccount', () => {
     });
   });
 
+  describe('@usageDetails', () => {
+    it('should initialize proper endpoint path', () => {
+      const call = service.usageDetails();
+      expect(call).toBeInstanceOf(APIList);
+      expect(call.toUrl()).toEqual(`${baseUrl}/usage-details`);
+    });
+  });
+
+  describe('@usageDetailsSummary', () => {
+    it('should initialize proper endpoint path', () => {
+      const call = service.usageDetailsSummary();
+      expect(call).toBeInstanceOf(APIResource);
+      expect(call.toUrl()).toEqual(`${baseUrl}/usage-details-summary`);
+    });
+  });
+
 });

dist/bitbar-cloud-api-client.min.js

@@ -2,7 +2,7 @@ import {API} from '../API';
 import {APIList} from './APIList';
 import {APIResource} from './APIResource';
 import {APIResourceBillingPeriod} from './APIResourceBillingPeriod';
-import {Account, AccountData} from './models/Account';
+import {Account, AccountData, AccountSessionUsage, AccountSessionUsageSummary} from './models/Account';
 import {AccountConcurrencyStatusMap} from './models/AccountConcurrencyStatusMap';
 import {AccountPreferences} from './models/AccountPreference';
 import {AccountService, ServicePaymentStatus} from './models/AccountService';
@@ -94,26 +94,36 @@ export class APIResourceAccount extends APIResource<Account, QueryParams, Accoun
     return new APIResource<AccountServicePayment, BillingPeriodQueryParams, NoData>(this).push('account-services', id, 'billing-period');
   }
 
-  // /account/{accountId}/visual-test/access
+  // /accounts/{accountId}/visual-test/access
   visualTestAccess() {
     return new APIResource<VisualTestAccess, NoQueryParams, VisualTestAccess>(this).push('visual-tests', 'access');
   }
 
-  // /account/{accountId}/account-services
+  // /accounts/{accountId}/account-services
   accountServices() {
     return new APIList<AccountService>(this).push('account-services');
   }
 
-  // /account/{accountId}/account-services/{id}
+  // /accounts/{accountId}/account-services/{id}
   accountService(id: number) {
     return new APIList<AccountService>(this).push('account-services', id);
   }
 
-  // /account/{accountId}/services
+  // /accounts/{accountId}/services
   services() {
     return new APIResource<ServicePaymentStatus>(this).push('services');
   }
 
+  // /accounts/{accountId}/usage-details
+  usageDetails() {
+    return new APIList<AccountSessionUsage>(this).push('usage-details');
+  }
+
+  // /accounts/{accountId}/usage-details-summary
+  usageDetailsSummary() {
+    return new APIResource<AccountSessionUsageSummary>(this).push('usage-details-summary');
+  }
+
 }
 
 export default APIResourceAccount;