bkper 2.0.1 → 2.1.1

package/lib/index.d.ts

@@ -21,7 +21,6 @@
 export declare class Account {
     
     
-    
     /**
      * Gets the account internal id.
      */
@@ -158,7 +157,7 @@ export declare class Account {
     /**
      * Get the [[Groups]] of this account.
      */
-    getGroups(): Promise<Set<Group>>;
+    getGroups(): Promise<Group[]>;
     /**
      * Sets the groups of the Account.
      *
@@ -681,6 +680,10 @@ export declare class Book {
      * Gets all [[Groups]] of this Book
      */
     getGroups(): Promise<Group[]>;
+    /**
+     * Get the [[Groups]] of a given account.
+     */
+    getGroupsByAccount(accountIdOrName: string): Promise<Group[]>;
     /**
      * Get Book transactions based on a query.
      *

package/lib/model/Account.js

@@ -30,9 +30,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Account = void 0;
 const AccountService = __importStar(require("../service/account-service"));
+const GroupService = __importStar(require("../service/group-service"));
 const Group_1 = require("./Group");
 const utils_1 = require("../utils");
 const Amount_1 = require("./Amount");
+const Utils = __importStar(require("../utils"));
 /**
  *
  * This class defines an [Account](https://en.wikipedia.org/wiki/Account_(bookkeeping)) of a [[Book]].
@@ -251,16 +253,12 @@ class Account {
      */
     getGroups() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.groups) {
-                this.groups = new Set();
-                if (this.wrapped.groups != null) {
-                    for (const groupId of this.wrapped.groups) {
-                        let group = yield this.book.getGroup(groupId);
-                        this.groups.add(group);
-                    }
-                }
+            let groups = yield GroupService.getGroupsByAccountId(this.book.getId(), this.getId());
+            let groupsObj = Utils.wrapObjects(new Group_1.Group(), groups);
+            for (const group of groupsObj) {
+                group.book = this.book;
             }
-            return this.groups;
+            return groupsObj;
         });
     }
     /**
@@ -293,13 +291,7 @@ class Account {
                 groupObject = yield this.book.getGroup(group);
             }
             if (groupObject) {
-                this.wrapped.groups.push(groupObject.getId());
-            }
-            if (!this.groups) {
-                this.groups = new Set();
-            }
-            if (groupObject) {
-                this.groups.add(groupObject);
+                this.wrapped.groups.push(groupObject.wrapped);
             }
             return this;
         });

package/lib/model/Book.js

@@ -525,6 +525,19 @@ class Book {
             return groupsObj;
         });
     }
+    /**
+     * Get the [[Groups]] of a given account.
+     */
+    getGroupsByAccount(accountIdOrName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let groups = yield GroupService.getGroupsByAccountId(this.getId(), accountIdOrName);
+            let groupsObj = Utils.wrapObjects(new Group_1.Group(), groups);
+            for (const group of groupsObj) {
+                group.book = this;
+            }
+            return groupsObj;
+        });
+    }
     /**
      * Get Book transactions based on a query.
      *

package/lib/service/HttpApiRequest.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpBooksApiV4Request = exports.HttpBooksApiV2Request = exports.HttpApiRequest = void 0;
+exports.HttpBooksApiV5Request = exports.HttpBooksApiV2Request = exports.HttpApiRequest = void 0;
 const local_auth_service_1 = require("../auth/local-auth-service");
 const gaxios_1 = require("gaxios");
 const https_1 = __importDefault(require("https"));
@@ -83,6 +83,7 @@ class HttpApiRequest {
                     body: this.payload,
                     agent: httpsAgent,
                     retryConfig: {
+                        httpMethodsToRetry: ['GET', 'PUT', 'POST', 'PATCH', 'HEAD', 'OPTIONS', 'DELETE'],
                         statusCodesToRetry: [[100, 199], [429, 429], [500, 599]],
                         retry: process.env.NODE_ENV == utils_1.NODE_ENV_DEV ? 0 : 6,
                         onRetryAttempt: (err) => { console.log(`${err.message} - Retrying... `); },
@@ -93,10 +94,10 @@ class HttpApiRequest {
             catch (e) {
                 let error = e.response.data;
                 if (error.error) {
-                    throw `[${error.error.message}] calling url ${url}`;
+                    throw error.error.message;
                 }
                 else {
-                    throw `[${e.message}] calling url ${url}`;
+                    throw e.message;
                 }
             }
         });
@@ -121,10 +122,10 @@ class HttpBooksApiV2Request extends HttpApiRequest {
     }
 }
 exports.HttpBooksApiV2Request = HttpBooksApiV2Request;
-class HttpBooksApiV4Request extends HttpApiRequest {
+class HttpBooksApiV5Request extends HttpApiRequest {
     constructor(service) {
-        super(`v4/books/${service}`);
+        super(`v5/books/${service}`);
     }
 }
-exports.HttpBooksApiV4Request = HttpBooksApiV4Request;
+exports.HttpBooksApiV5Request = HttpBooksApiV5Request;
 //# sourceMappingURL=HttpApiRequest.js.map

package/lib/service/account-service.js

@@ -14,7 +14,7 @@ const HttpApiRequest_1 = require("./HttpApiRequest");
 function createAccount(bookId, account) {
     return __awaiter(this, void 0, void 0, function* () {
         var payload = JSON.stringify(account);
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/accounts`).setMethod('POST').setPayload(payload).fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/accounts`).setMethod('POST').setPayload(payload).fetch();
         return response.data;
     });
 }
@@ -22,14 +22,14 @@ exports.createAccount = createAccount;
 function updateAccount(bookId, account) {
     return __awaiter(this, void 0, void 0, function* () {
         var payload = JSON.stringify(account);
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/accounts`).setMethod('PUT').setPayload(payload).fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/accounts`).setMethod('PUT').setPayload(payload).fetch();
         return response.data;
     });
 }
 exports.updateAccount = updateAccount;
 function deleteAccount(bookId, account) {
     return __awaiter(this, void 0, void 0, function* () {
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/accounts/${account.id}`).setMethod('DELETE').fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/accounts/${account.id}`).setMethod('DELETE').fetch();
         return response.data;
     });
 }
@@ -40,7 +40,7 @@ function createAccounts(bookId, accounts) {
             items: accounts
         };
         var accountSaveBatchJSON = JSON.stringify(accountList);
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/accounts/batch`).setMethod('POST').setPayload(accountSaveBatchJSON).fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/accounts/batch`).setMethod('POST').setPayload(accountSaveBatchJSON).fetch();
         var accountsPlain = yield response.data;
         if (accountsPlain.items == null) {
             return [];
@@ -52,7 +52,7 @@ exports.createAccounts = createAccounts;
 function getAccount(bookId, idOrName) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/accounts/${encodeURIComponent(idOrName)}`).setMethod('GET').fetch();
+            var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/accounts/${encodeURIComponent(idOrName)}`).setMethod('GET').fetch();
             return response.data;
         }
         catch (error) {

package/lib/service/app-service.js

@@ -14,7 +14,7 @@ const HttpApiRequest_1 = require("./HttpApiRequest");
 function createApp(app) {
     return __awaiter(this, void 0, void 0, function* () {
         var payload = JSON.stringify(app);
-        var response = yield new HttpApiRequest_1.HttpApiRequest(`v3/apps`).setMethod('POST').setPayload(payload).fetch();
+        var response = yield new HttpApiRequest_1.HttpApiRequest(`v5/apps`).setMethod('POST').setPayload(payload).fetch();
         return response.data;
     });
 }
@@ -22,7 +22,7 @@ exports.createApp = createApp;
 function updateApp(app) {
     return __awaiter(this, void 0, void 0, function* () {
         var payload = JSON.stringify(app);
-        var response = yield new HttpApiRequest_1.HttpApiRequest(`v3/apps`).setMethod('PUT').setPayload(payload).fetch();
+        var response = yield new HttpApiRequest_1.HttpApiRequest(`v5/apps`).setMethod('PUT').setPayload(payload).fetch();
         return response.data;
     });
 }
@@ -30,7 +30,7 @@ exports.updateApp = updateApp;
 function patchApp(app) {
     return __awaiter(this, void 0, void 0, function* () {
         var payload = JSON.stringify(app);
-        var response = yield new HttpApiRequest_1.HttpApiRequest(`v3/apps`).setMethod('PATCH').setPayload(payload).fetch();
+        var response = yield new HttpApiRequest_1.HttpApiRequest(`v5/apps`).setMethod('PATCH').setPayload(payload).fetch();
         return response.data;
     });
 }

package/lib/service/balances-service.js

@@ -13,7 +13,7 @@ exports.getBalances = void 0;
 const HttpApiRequest_1 = require("./HttpApiRequest");
 function getBalances(bookId, query) {
     return __awaiter(this, void 0, void 0, function* () {
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/balances`).addParam('query', query).addParam('time', Date.now()).fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/balances`).addParam('query', query).addParam('time', Date.now()).fetch();
         return response.data;
     });
 }

package/lib/service/book-service.js

@@ -16,7 +16,7 @@ function loadBook(bookId) {
         if (bookId == null) {
             throw new Error("Book id null!");
         }
-        let response = yield new HttpApiRequest_1.HttpBooksApiV4Request(bookId).fetch();
+        let response = yield new HttpApiRequest_1.HttpBooksApiV5Request(bookId).fetch();
         return response.data;
     });
 }
@@ -24,14 +24,14 @@ exports.loadBook = loadBook;
 function updateBook(bookId, book) {
     return __awaiter(this, void 0, void 0, function* () {
         var payload = JSON.stringify(book);
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}`).setMethod('PUT').setPayload(payload).fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}`).setMethod('PUT').setPayload(payload).fetch();
         return response.data;
     });
 }
 exports.updateBook = updateBook;
 function audit(bookId) {
     return __awaiter(this, void 0, void 0, function* () {
-        new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/audit`).setMethod('PATCH').fetch();
+        new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/audit`).setMethod('PATCH').fetch();
     });
 }
 exports.audit = audit;

package/lib/service/file-service.js

@@ -14,14 +14,14 @@ const HttpApiRequest_1 = require("./HttpApiRequest");
 function createFile(bookId, file) {
     return __awaiter(this, void 0, void 0, function* () {
         var payload = JSON.stringify(file);
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/files`).setMethod('POST').setPayload(payload).fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/files`).setMethod('POST').setPayload(payload).fetch();
         return response.data;
     });
 }
 exports.createFile = createFile;
 function getFile(bookId, id) {
     return __awaiter(this, void 0, void 0, function* () {
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/files/${id}`).setMethod('GET').fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/files/${id}`).setMethod('GET').fetch();
         return response.data;
     });
 }

package/lib/service/group-service.js

@@ -9,12 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAccounts = exports.getGroup = exports.getGroups = exports.createGroups = exports.deleteGroup = exports.updateGroup = exports.createGroup = void 0;
+exports.getAccounts = exports.getGroup = exports.getGroups = exports.getGroupsByAccountId = exports.createGroups = exports.deleteGroup = exports.updateGroup = exports.createGroup = void 0;
 const HttpApiRequest_1 = require("./HttpApiRequest");
 function createGroup(bookId, group) {
     return __awaiter(this, void 0, void 0, function* () {
         var payload = JSON.stringify(group);
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/groups`).setMethod('POST').setPayload(payload).fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/groups`).setMethod('POST').setPayload(payload).fetch();
         return response.data;
     });
 }
@@ -22,14 +22,14 @@ exports.createGroup = createGroup;
 function updateGroup(bookId, group) {
     return __awaiter(this, void 0, void 0, function* () {
         var payload = JSON.stringify(group);
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/groups`).setMethod('PUT').setPayload(payload).fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/groups`).setMethod('PUT').setPayload(payload).fetch();
         return response.data;
     });
 }
 exports.updateGroup = updateGroup;
 function deleteGroup(bookId, group) {
     return __awaiter(this, void 0, void 0, function* () {
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/groups/${group.id}`).setMethod('DELETE').fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/groups/${group.id}`).setMethod('DELETE').fetch();
         return response.data;
     });
 }
@@ -40,7 +40,7 @@ function createGroups(bookId, groups) {
             items: groups
         };
         var groupsBatchJSON = JSON.stringify(groupList);
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/groups/batch`).setMethod('POST').setPayload(groupsBatchJSON).fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/groups/batch`).setMethod('POST').setPayload(groupsBatchJSON).fetch();
         if (response == null) {
             return [];
         }
@@ -52,9 +52,20 @@ function createGroups(bookId, groups) {
     });
 }
 exports.createGroups = createGroups;
+function getGroupsByAccountId(bookId, accountId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/accounts/${accountId}/groups`).setMethod('GET').fetch();
+        var groupsPlain = response.data;
+        if (groupsPlain.items == null) {
+            return [];
+        }
+        return groupsPlain.items;
+    });
+}
+exports.getGroupsByAccountId = getGroupsByAccountId;
 function getGroups(bookId) {
     return __awaiter(this, void 0, void 0, function* () {
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/groups`).setMethod('GET').fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/groups`).setMethod('GET').fetch();
         var groupsPlain = response.data;
         if (groupsPlain.items == null) {
             return [];
@@ -66,7 +77,7 @@ exports.getGroups = getGroups;
 function getGroup(bookId, idOrName) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/groups/${encodeURIComponent(idOrName)}`).setMethod('GET').fetch();
+            var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/groups/${encodeURIComponent(idOrName)}`).setMethod('GET').fetch();
             return response.data;
         }
         catch (error) {
@@ -77,7 +88,7 @@ function getGroup(bookId, idOrName) {
 exports.getGroup = getGroup;
 function getAccounts(bookId, idOrName) {
     return __awaiter(this, void 0, void 0, function* () {
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/groups/${encodeURIComponent(idOrName)}/accounts`).setMethod('GET').fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/groups/${encodeURIComponent(idOrName)}/accounts`).setMethod('GET').fetch();
         var accountsPlain = response.data;
         if (accountsPlain.items == null) {
             return [];

package/lib/service/transaction-service.js

@@ -14,7 +14,7 @@ const HttpApiRequest_1 = require("./HttpApiRequest");
 function createTransaction(bookId, transaction) {
     return __awaiter(this, void 0, void 0, function* () {
         var payload = JSON.stringify(transaction);
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/transactions`).setMethod('POST').setPayload(payload).fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/transactions`).setMethod('POST').setPayload(payload).fetch();
         return response.data;
     });
 }
@@ -25,7 +25,7 @@ function createTransactionsBatch(bookId, transactions) {
             items: transactions
         };
         var payload = JSON.stringify(transactionList);
-        let response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/transactions/batch`)
+        let response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/transactions/batch`)
             .setMethod('POST')
             .setPayload(payload)
             .fetch();
@@ -37,7 +37,7 @@ exports.createTransactionsBatch = createTransactionsBatch;
 function updateTransaction(bookId, transaction) {
     return __awaiter(this, void 0, void 0, function* () {
         var payload = JSON.stringify(transaction);
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/transactions`).setMethod('PUT').setPayload(payload).fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/transactions`).setMethod('PUT').setPayload(payload).fetch();
         return response.data;
     });
 }
@@ -45,7 +45,7 @@ exports.updateTransaction = updateTransaction;
 function postTransaction(bookId, transaction) {
     return __awaiter(this, void 0, void 0, function* () {
         var payload = JSON.stringify(transaction);
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/transactions/post`).setMethod('PATCH').setPayload(payload).fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/transactions/post`).setMethod('PATCH').setPayload(payload).fetch();
         return response.data;
     });
 }
@@ -53,7 +53,7 @@ exports.postTransaction = postTransaction;
 function checkTransaction(bookId, transaction) {
     return __awaiter(this, void 0, void 0, function* () {
         var payload = JSON.stringify(transaction);
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/transactions/check`).setMethod('PATCH').setPayload(payload).fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/transactions/check`).setMethod('PATCH').setPayload(payload).fetch();
         return response.data;
     });
 }
@@ -61,7 +61,7 @@ exports.checkTransaction = checkTransaction;
 function uncheckTransaction(bookId, transaction) {
     return __awaiter(this, void 0, void 0, function* () {
         var payload = JSON.stringify(transaction);
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/transactions/uncheck`).setMethod('PATCH').setPayload(payload).fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/transactions/uncheck`).setMethod('PATCH').setPayload(payload).fetch();
         return response.data;
     });
 }
@@ -69,7 +69,7 @@ exports.uncheckTransaction = uncheckTransaction;
 function removeTransaction(bookId, transaction) {
     return __awaiter(this, void 0, void 0, function* () {
         var payload = JSON.stringify(transaction);
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/transactions/remove`).setMethod('PATCH').setPayload(payload).fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/transactions/remove`).setMethod('PATCH').setPayload(payload).fetch();
         return response.data;
     });
 }
@@ -77,14 +77,14 @@ exports.removeTransaction = removeTransaction;
 function restoreTransaction(bookId, transaction) {
     return __awaiter(this, void 0, void 0, function* () {
         var payload = JSON.stringify(transaction);
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/transactions/restore`).setMethod('PATCH').setPayload(payload).fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/transactions/restore`).setMethod('PATCH').setPayload(payload).fetch();
         return response.data;
     });
 }
 exports.restoreTransaction = restoreTransaction;
 function getTransaction(bookId, id) {
     return __awaiter(this, void 0, void 0, function* () {
-        var response = yield new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/transactions/${id}`).setMethod('GET').fetch();
+        var response = yield new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/transactions/${id}`).setMethod('GET').fetch();
         return response.data;
     });
 }
@@ -94,7 +94,7 @@ function searchTransactions(bookId, query, limit, cursor) {
         if (query == null) {
             query = "";
         }
-        var request = new HttpApiRequest_1.HttpBooksApiV4Request(`${bookId}/transactions`);
+        var request = new HttpApiRequest_1.HttpBooksApiV5Request(`${bookId}/transactions`);
         request.addParam('query', query);
         request.addParam('limit', limit);
         if (cursor != null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkper",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "description": "Node.js client for Bkper REST API",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -46,7 +46,7 @@
     "open": "^7.3.1"
   },
   "devDependencies": {
-    "@bkper/bkper-api-types": "^4.0.3",
+    "@bkper/bkper-api-types": "^5.0.0",
     "@microsoft/api-extractor": "^7.12.1",
     "@types/big.js": "^6.0.2",
     "@types/chai": "^4.2.14",