taxtank-core 0.21.4 → 0.21.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/taxtank-core.umd.js +22 -14
- package/bundles/taxtank-core.umd.js.map +1 -1
- package/esm2015/lib/services/http/bank/bank-connection/bank-connection.service.js +12 -10
- package/esm2015/lib/services/http/bank/basiq/basiq.service.js +5 -6
- package/esm2015/lib/services/http/chart-accounts/chart-accounts.service.js +8 -1
- package/fesm2015/taxtank-core.js +22 -14
- package/fesm2015/taxtank-core.js.map +1 -1
- package/package.json +1 -1
|
@@ -28,15 +28,17 @@ export class BankConnectionService extends RestService {
|
|
|
28
28
|
const connection = plainToClass(BankConnection, bankConnectionBase);
|
|
29
29
|
// We use this endpoint for create and reconnect bank connections because of basiq logic.
|
|
30
30
|
// So we try to replace bank connection in cache for reconnection case.
|
|
31
|
-
if (
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
31
|
+
if (this.cache) {
|
|
32
|
+
if (bankConnection.id) {
|
|
33
|
+
const tempCache = cloneDeep(this.cache);
|
|
34
|
+
replace(tempCache, connection);
|
|
35
|
+
this.cache = tempCache;
|
|
36
|
+
this.cacheSubject.next(this.cache);
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
this.cache.push(connection);
|
|
40
|
+
this.cacheSubject.next(cloneDeep(this.cache));
|
|
41
|
+
}
|
|
40
42
|
}
|
|
41
43
|
return plainToClass(BankConnection, connection);
|
|
42
44
|
}));
|
|
@@ -65,4 +67,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
|
|
|
65
67
|
providedIn: 'root'
|
|
66
68
|
}]
|
|
67
69
|
}] });
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFuay1jb25uZWN0aW9uLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvc2VydmljZXMvaHR0cC9iYW5rL2JhbmstY29ubmVjdGlvbi9iYW5rLWNvbm5lY3Rpb24uc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNDLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVyQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDakQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ3pFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN0RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSw4Q0FBOEMsQ0FBQztBQUVoRixPQUFPLFNBQVMsTUFBTSxrQkFBa0IsQ0FBQztBQUN6QyxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFdEQsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sdURBQXVELENBQUM7O0FBRXBHOzs7R0FHRztBQUlILE1BQU0sT0FBTyxxQkFBc0IsU0FBUSxXQUErQztJQUgxRjs7UUFJRSxlQUFVLEdBQUcsY0FBYyxDQUFDO1FBQzVCLFFBQUcsR0FBVyxrQkFBa0IsQ0FBQztLQWlEbEM7SUEvQ0MsWUFBWTtRQUNWLElBQUksQ0FBQyx5QkFBeUIsRUFBRSxDQUFDO1FBQ2pDLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO0lBQzdCLENBQUM7SUFFRCxHQUFHLENBQUMsY0FBOEI7UUFDaEMsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxJQUFJLElBQUksQ0FBQyxHQUFHLEVBQUUsRUFBRSxjQUFjLENBQUM7YUFDM0UsSUFBSSxDQUNILEdBQUcsQ0FBQyxDQUFDLGtCQUFzQyxFQUFFLEVBQUU7WUFDN0MsTUFBTSxVQUFVLEdBQW1CLFlBQVksQ0FBQyxjQUFjLEVBQUUsa0JBQWtCLENBQUMsQ0FBQztZQUVwRix5RkFBeUY7WUFDekYsdUVBQXVFO1lBQ3ZFLElBQUksSUFBSSxDQUFDLEtBQUssRUFBRTtnQkFDZCxJQUFJLGNBQWMsQ0FBQyxFQUFFLEVBQUU7b0JBQ3JCLE1BQU0sU0FBUyxHQUFxQixTQUFTLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO29CQUMxRCxPQUFPLENBQUMsU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUFDO29CQUUvQixJQUFJLENBQUMsS0FBSyxHQUFHLFNBQVMsQ0FBQztvQkFDdkIsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO2lCQUNwQztxQkFBTTtvQkFDTCxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQTtvQkFDM0IsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO2lCQUMvQzthQUNGO1lBRUQsT0FBTyxZQUFZLENBQUMsY0FBYyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBQ2xELENBQUMsQ0FBQyxDQUNILENBQUM7SUFDTixDQUFDO0lBRUQseUJBQXlCO1FBQ3ZCLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFO1lBQ25GLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUNwQixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRDs7T0FFRztJQUNILG1CQUFtQjtRQUNqQixJQUFJLENBQUMsc0JBQXNCLENBQUMsRUFBRSxDQUFDLGdCQUFnQixDQUFDLGtCQUFrQixDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsWUFBMEIsRUFBRSxFQUFFO1lBQzNHLElBQUksQ0FBQyxZQUFZLENBQUMsTUFBTSxJQUFJLFlBQVksQ0FBQyxTQUFTLEtBQUssMkJBQTJCLENBQUMsd0JBQXdCLEVBQUU7Z0JBQzNHLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQzthQUNuQjtRQUNILENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQzs7bUhBbERVLHFCQUFxQjt1SEFBckIscUJBQXFCLGNBRnBCLE1BQU07NEZBRVAscUJBQXFCO2tCQUhqQyxVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IG1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcbmltcG9ydCB7IEJhbmtDb25uZWN0aW9uIGFzIEJhbmtDb25uZWN0aW9uQmFzZSB9IGZyb20gJy4uLy4uLy4uLy4uL2RiL01vZGVscy9iYW5rL2JhbmstY29ubmVjdGlvbic7XG5pbXBvcnQgeyBwbGFpblRvQ2xhc3MgfSBmcm9tICdjbGFzcy10cmFuc2Zvcm1lcic7XG5pbXBvcnQgeyBCYW5rQ29ubmVjdGlvbiB9IGZyb20gJy4uLy4uLy4uLy4uL21vZGVscy9iYW5rL2JhbmstY29ubmVjdGlvbic7XG5pbXBvcnQgeyBSZXN0U2VydmljZSB9IGZyb20gJy4uLy4uL3Jlc3QvcmVzdC5zZXJ2aWNlJztcbmltcG9ydCB7IEFwcEV2ZW50VHlwZUVudW0gfSBmcm9tICcuLi8uLi8uLi8uLi9tb2RlbHMvZXZlbnQvYXBwLWV2ZW50LXR5cGUuZW51bSc7XG5pbXBvcnQgeyBJRXZlbnRMaXN0ZW5lciB9IGZyb20gJy4uLy4uLy4uLy4uL2ludGVyZmFjZXMvZXZlbnQtbGlzdGVuZXIuaW50ZXJmYWNlJztcbmltcG9ydCBjbG9uZURlZXAgZnJvbSAnbG9kYXNoL2Nsb25lRGVlcCc7XG5pbXBvcnQgeyByZXBsYWNlIH0gZnJvbSAnLi4vLi4vLi4vLi4vZnVuY3Rpb25zL2FycmF5JztcbmltcG9ydCB7IE5vdGlmaWNhdGlvbiB9IGZyb20gJy4uLy4uLy4uLy4uL21vZGVscy9ub3RpZmljYXRpb24vbm90aWZpY2F0aW9uJztcbmltcG9ydCB7IFVzZXJFdmVudFR5cGVDbGllbnRUeXBlRW51bSB9IGZyb20gJy4uLy4uLy4uLy4uL2RiL0VudW1zL3VzZXItZXZlbnQtdHlwZS1jbGllbnQtdHlwZS5lbnVtJztcblxuLyoqXG4gKiBCYW5rQ29ubmVjdGlvbiBtZWFucyB1c2VyIGFjY291bnQgYXQgc3BlY2lmaWMgYmFuayAodXN1YWxseSBlYWNoIHVzZXIgaGFzIG9ubHkgb25lIGF0IHRoZSBzYW1lIGJhbmspXG4gKiBzZXJ2aWNlIGhhbmRsZXMgQmFua0Nvbm5lY3Rpb24gbWFuYWdlbWVudFxuICovXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290J1xufSlcbmV4cG9ydCBjbGFzcyBCYW5rQ29ubmVjdGlvblNlcnZpY2UgZXh0ZW5kcyBSZXN0U2VydmljZTxCYW5rQ29ubmVjdGlvbkJhc2UsIEJhbmtDb25uZWN0aW9uPiBpbXBsZW1lbnRzIElFdmVudExpc3RlbmVyIHtcbiAgbW9kZWxDbGFzcyA9IEJhbmtDb25uZWN0aW9uO1xuICB1cmw6IHN0cmluZyA9ICdiYW5rLWNvbm5lY3Rpb25zJztcblxuICBsaXN0ZW5FdmVudHMoKTogdm9pZCB7XG4gICAgdGhpcy5saXN0ZW5Ub0FkZGVkQmFua0FjY291bnRzKCk7XG4gICAgdGhpcy5saXN0ZW5Ob3RpZmljYXRpb25zKCk7XG4gIH1cblxuICBhZGQoYmFua0Nvbm5lY3Rpb246IEJhbmtDb25uZWN0aW9uKTogT2JzZXJ2YWJsZTxCYW5rQ29ubmVjdGlvbj4ge1xuICAgIHJldHVybiB0aGlzLmh0dHAucG9zdChgJHt0aGlzLmVudmlyb25tZW50LmFwaVYyfS8ke3RoaXMudXJsfWAsIGJhbmtDb25uZWN0aW9uKVxuICAgICAgLnBpcGUoXG4gICAgICAgIG1hcCgoYmFua0Nvbm5lY3Rpb25CYXNlOiBCYW5rQ29ubmVjdGlvbkJhc2UpID0+IHtcbiAgICAgICAgICBjb25zdCBjb25uZWN0aW9uOiBCYW5rQ29ubmVjdGlvbiA9IHBsYWluVG9DbGFzcyhCYW5rQ29ubmVjdGlvbiwgYmFua0Nvbm5lY3Rpb25CYXNlKTtcblxuICAgICAgICAgIC8vIFdlIHVzZSB0aGlzIGVuZHBvaW50IGZvciBjcmVhdGUgYW5kIHJlY29ubmVjdCBiYW5rIGNvbm5lY3Rpb25zIGJlY2F1c2Ugb2YgYmFzaXEgbG9naWMuXG4gICAgICAgICAgLy8gU28gd2UgdHJ5IHRvIHJlcGxhY2UgYmFuayBjb25uZWN0aW9uIGluIGNhY2hlIGZvciByZWNvbm5lY3Rpb24gY2FzZS5cbiAgICAgICAgICBpZiAodGhpcy5jYWNoZSkge1xuICAgICAgICAgICAgaWYgKGJhbmtDb25uZWN0aW9uLmlkKSB7XG4gICAgICAgICAgICAgIGNvbnN0IHRlbXBDYWNoZTogQmFua0Nvbm5lY3Rpb25bXSA9IGNsb25lRGVlcCh0aGlzLmNhY2hlKTtcbiAgICAgICAgICAgICAgcmVwbGFjZSh0ZW1wQ2FjaGUsIGNvbm5lY3Rpb24pO1xuXG4gICAgICAgICAgICAgIHRoaXMuY2FjaGUgPSB0ZW1wQ2FjaGU7XG4gICAgICAgICAgICAgIHRoaXMuY2FjaGVTdWJqZWN0Lm5leHQodGhpcy5jYWNoZSk7XG4gICAgICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgICAgICB0aGlzLmNhY2hlLnB1c2goY29ubmVjdGlvbilcbiAgICAgICAgICAgICAgdGhpcy5jYWNoZVN1YmplY3QubmV4dChjbG9uZURlZXAodGhpcy5jYWNoZSkpO1xuICAgICAgICAgICAgfVxuICAgICAgICAgIH1cblxuICAgICAgICAgIHJldHVybiBwbGFpblRvQ2xhc3MoQmFua0Nvbm5lY3Rpb24sIGNvbm5lY3Rpb24pO1xuICAgICAgICB9KVxuICAgICAgKTtcbiAgfVxuXG4gIGxpc3RlblRvQWRkZWRCYW5rQWNjb3VudHMoKTogdm9pZCB7XG4gICAgdGhpcy5ldmVudERpc3BhdGNoZXJTZXJ2aWNlLm9uKEFwcEV2ZW50VHlwZUVudW0uQkFOS19BQ0NPVU5UX0NSRUFURUQpLnN1YnNjcmliZSgoKSA9PiB7XG4gICAgICB0aGlzLnJlc2V0Q2FjaGUoKTtcbiAgICB9KTtcbiAgfVxuXG4gIC8qKlxuICAgKiBVcGRhdGUgY2FjaGUgd2hlbiBiYXNpcSBsb2dpbiBmYWlsZWQgdG8gZ2V0IGFjdHVhbCBjb25uZWN0aW9ucyBzdGF0dXNlc1xuICAgKi9cbiAgbGlzdGVuTm90aWZpY2F0aW9ucygpOiB2b2lkIHtcbiAgICB0aGlzLmV2ZW50RGlzcGF0Y2hlclNlcnZpY2Uub24oQXBwRXZlbnRUeXBlRW51bS5OT1RJRklDQVRJT05fQURERUQpLnN1YnNjcmliZSgobm90aWZpY2F0aW9uOiBOb3RpZmljYXRpb24pID0+IHtcbiAgICAgIGlmICghbm90aWZpY2F0aW9uLmlzUmVhZCAmJiBub3RpZmljYXRpb24uZXZlbnRUeXBlID09PSBVc2VyRXZlbnRUeXBlQ2xpZW50VHlwZUVudW0uQkFTSVFfQVVUSE9SSVpBVElPTl9GQUlMKSB7XG4gICAgICAgIHRoaXMucmVzZXRDYWNoZSgpO1xuICAgICAgfVxuICAgIH0pO1xuICB9XG59XG4iXX0=
|
|
@@ -61,12 +61,11 @@ export class BasiqService extends RestService {
|
|
|
61
61
|
* we interact with basiq service.
|
|
62
62
|
*/
|
|
63
63
|
updateConnection(data, userId, connection) {
|
|
64
|
-
// Send login data to basiq API to create a basiq job
|
|
64
|
+
// Send login data and connection id to basiq API to create a basiq job
|
|
65
65
|
return this.http.post(`${BasiqService.basiqApiUrl}/users/${userId}/connections`, Object.assign(data, { id: connection.externalId }))
|
|
66
|
-
.pipe(
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
return this.bankConnectionService.add(plainToClass(BankConnection, Object.assign({ id: connection.id, basiqJob: { externalId: response.id } })));
|
|
66
|
+
.pipe(mergeMap((response) => {
|
|
67
|
+
// Create bank connection based on basiq job
|
|
68
|
+
return this.bankConnectionService.add(plainToClass(BankConnection, { id: connection.id, basiqJob: { externalId: response.id } }));
|
|
70
69
|
}), catchError((error) => {
|
|
71
70
|
// Show error when user provided wrong login data
|
|
72
71
|
if (error.status === 401) {
|
|
@@ -112,4 +111,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
|
|
|
112
111
|
type: Inject,
|
|
113
112
|
args: ['environment']
|
|
114
113
|
}] }, { type: i3.ToastService }, { type: i4.BankConnectionService }]; } });
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"basiq.service.js","sourceRoot":"","sources":["../../../../../../../../projects/tt-core/src/lib/services/http/bank/basiq/basiq.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable } from '@angular/core';\nimport { Observable } from 'rxjs';\nimport { catchError, map, mergeMap } from 'rxjs/operators';\nimport { BankAccount as BankAccountBase } from '../../../../db/Models/bank/bank-account';\nimport { UserEventTypeClientTypeEnum } from '../../../../db/Enums/user-event-type-client-type.enum';\nimport { RestService } from '../../rest/rest.service';\nimport { BankAccount } from '../../../../models/bank/bank-account';\nimport { AppEventTypeEnum } from '../../../../models/event/app-event-type.enum';\nimport { BankConnection } from '../../../../models/bank/bank-connection';\nimport { Notification } from '../../../../models/notification/notification';\nimport { IEventListener } from '../../../../interfaces/event-listener.interface';\nimport { HttpClient, HttpErrorResponse } from '@angular/common/http';\nimport { EventDispatcherService } from '../../../event/event-dispatcher.service';\nimport { BankConnectionService } from '../bank-connection/bank-connection.service';\nimport { ToastService } from '../../../toast/toast.service';\nimport { BasiqConnectionsResponse } from './basiq-connections-response.interface';\nimport { BankLoginData } from '../../../../models/bank/bank-login-data';\nimport { BankAccountCollection } from '../../../../collections/bank-account.collection';\nimport { plainToClass } from 'class-transformer';\nimport { throwError as observableThrowError } from 'rxjs/internal/observable/throwError';\n\n/**\n * basiq is a middleman between bank and user\n * service is responsible for fetching bank related information\n */\n@Injectable({\n  providedIn: 'root'\n})\nexport class BasiqService extends RestService<BankAccountBase, BankAccount> implements IEventListener {\n  static basiqApiUrl: string = 'https://au-api.basiq.io';\n\n  url: string = 'basiq/accounts';\n  modelClass = BankAccount;\n\n  constructor(\n    protected http: HttpClient,\n    protected eventDispatcherService: EventDispatcherService,\n    @Inject('environment') protected environment: any,\n    protected toastService: ToastService,\n    private bankConnectionService: BankConnectionService\n  ) {\n    super(http, eventDispatcherService, environment, toastService);\n  }\n\n  /**\n   * Listen events from Event Dispatcher service\n   */\n  listenEvents(): void {\n    this.listenNotifications();\n  }\n\n  /**\n   * Create a new Bank connection based on Basiq job.\n   * Here we have nested requests because we need to get a job id before we create a bank connection.\n   * There is no way to use event dispatcher because we expect some errors from bank-connections API, but in components\n   * we interact with basiq service.\n   */\n  createConnection(loginData: BankLoginData, userId: string): Observable<BankConnection> {\n    // Send login data to basiq API to create a basiq job\n    return this.http.post(`${BasiqService.basiqApiUrl}/users/${userId}/connections`, loginData)\n      .pipe(\n        mergeMap((response: BasiqConnectionsResponse) => {\n          // Create bank connection based on basiq job\n          return this.bankConnectionService.add(plainToClass(BankConnection, {basiqJob: {externalId: response.id}}));\n        }),\n        catchError((error: HttpErrorResponse) => {\n          // Show error when user provided wrong login data\n          if (error.status === 401) {\n            this.toastService.error('Invalid credentials');\n          }\n\n          return observableThrowError(error);\n        })\n      );\n  }\n\n  /**\n   * Update disconnected bank connection\n   * Here we have nested requests because we need to get a job id before we create a bank connection.\n   * There is no way to use event dispatcher because we expect some errors from bank-connections API, but in components\n   * we interact with basiq service.\n   */\n  updateConnection(data: BankLoginData, userId: string, connection: BankConnection): Observable<BankConnection> {\n    // Send login data to basiq API to create a basiq job\n    return this.http.post(`${BasiqService.basiqApiUrl}/users/${userId}/connections`, Object.assign(data, {id: connection.externalId}))\n      .pipe(\n        // Create bank connection based on basiq job\n        mergeMap((response: BasiqConnectionsResponse) => {\n          return this.bankConnectionService.add(plainToClass(BankConnection, Object.assign({id: connection.id, basiqJob: {externalId: response.id}})));\n        }),\n        catchError((error: HttpErrorResponse) => {\n          // Show error when user provided wrong login data\n          if (error.status === 401) {\n            this.toastService.error('Invalid credentials');\n          }\n\n          // Show error when user provided another login (not login he used before)\n          if (error.status === 400) {\n            this.toastService.error('Please enter the login you used before');\n          }\n\n          return observableThrowError(error);\n        })\n      );\n  }\n\n  getByConnection(connection: BankConnection): Observable<BankAccountCollection> {\n    return this.get().pipe(\n      map((bankAccounts: BankAccount[]) => {\n        return new BankAccountCollection(bankAccounts).filterBy('bankConnection.id', connection.id);\n      })\n    );\n  }\n\n  getNotImportedByConnection(savedAccounts: BankAccountCollection, connection: BankConnection): Observable<BankAccountCollection> {\n    return this.getByConnection(connection).pipe(\n      map((bankAccounts: BankAccountCollection) => {\n        return bankAccounts.removeBy('accountId', savedAccounts.mapBy('accountId'));\n      })\n    )\n  }\n\n  /**\n   * listen to notifications to update basiq accounts list\n   */\n  private listenNotifications(): void {\n    this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification: Notification): void => {\n      if (!notification.isRead && notification.eventType === UserEventTypeClientTypeEnum.BASIQ_NEW_ACCOUNTS) {\n        this.resetCache();\n      }\n    });\n  }\n}\n"]}
|
|
114
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"basiq.service.js","sourceRoot":"","sources":["../../../../../../../../projects/tt-core/src/lib/services/http/bank/basiq/basiq.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable } from '@angular/core';\nimport { Observable } from 'rxjs';\nimport { catchError, map, mergeMap } from 'rxjs/operators';\nimport { BankAccount as BankAccountBase } from '../../../../db/Models/bank/bank-account';\nimport { UserEventTypeClientTypeEnum } from '../../../../db/Enums/user-event-type-client-type.enum';\nimport { RestService } from '../../rest/rest.service';\nimport { BankAccount } from '../../../../models/bank/bank-account';\nimport { AppEventTypeEnum } from '../../../../models/event/app-event-type.enum';\nimport { BankConnection } from '../../../../models/bank/bank-connection';\nimport { Notification } from '../../../../models/notification/notification';\nimport { IEventListener } from '../../../../interfaces/event-listener.interface';\nimport { HttpClient, HttpErrorResponse } from '@angular/common/http';\nimport { EventDispatcherService } from '../../../event/event-dispatcher.service';\nimport { BankConnectionService } from '../bank-connection/bank-connection.service';\nimport { ToastService } from '../../../toast/toast.service';\nimport { BasiqConnectionsResponse } from './basiq-connections-response.interface';\nimport { BankLoginData } from '../../../../models/bank/bank-login-data';\nimport { BankAccountCollection } from '../../../../collections/bank-account.collection';\nimport { plainToClass } from 'class-transformer';\nimport { throwError as observableThrowError } from 'rxjs/internal/observable/throwError';\n\n/**\n * basiq is a middleman between bank and user\n * service is responsible for fetching bank related information\n */\n@Injectable({\n  providedIn: 'root'\n})\nexport class BasiqService extends RestService<BankAccountBase, BankAccount> implements IEventListener {\n  static basiqApiUrl: string = 'https://au-api.basiq.io';\n\n  url: string = 'basiq/accounts';\n  modelClass = BankAccount;\n\n  constructor(\n    protected http: HttpClient,\n    protected eventDispatcherService: EventDispatcherService,\n    @Inject('environment') protected environment: any,\n    protected toastService: ToastService,\n    private bankConnectionService: BankConnectionService\n  ) {\n    super(http, eventDispatcherService, environment, toastService);\n  }\n\n  /**\n   * Listen events from Event Dispatcher service\n   */\n  listenEvents(): void {\n    this.listenNotifications();\n  }\n\n  /**\n   * Create a new Bank connection based on Basiq job.\n   * Here we have nested requests because we need to get a job id before we create a bank connection.\n   * There is no way to use event dispatcher because we expect some errors from bank-connections API, but in components\n   * we interact with basiq service.\n   */\n  createConnection(loginData: BankLoginData, userId: string): Observable<BankConnection> {\n    // Send login data to basiq API to create a basiq job\n    return this.http.post(`${BasiqService.basiqApiUrl}/users/${userId}/connections`, loginData)\n      .pipe(\n        mergeMap((response: BasiqConnectionsResponse) => {\n          // Create bank connection based on basiq job\n          return this.bankConnectionService.add(plainToClass(BankConnection, {basiqJob: {externalId: response.id}}));\n        }),\n        catchError((error: HttpErrorResponse) => {\n          // Show error when user provided wrong login data\n          if (error.status === 401) {\n            this.toastService.error('Invalid credentials');\n          }\n\n          return observableThrowError(error);\n        })\n      );\n  }\n\n  /**\n   * Update disconnected bank connection\n   * Here we have nested requests because we need to get a job id before we create a bank connection.\n   * There is no way to use event dispatcher because we expect some errors from bank-connections API, but in components\n   * we interact with basiq service.\n   */\n  updateConnection(data: BankLoginData, userId: string, connection: BankConnection): Observable<BankConnection> {\n    // Send login data and connection id to basiq API to create a basiq job\n    return this.http.post(`${BasiqService.basiqApiUrl}/users/${userId}/connections`, Object.assign(data, {id: connection.externalId}))\n      .pipe(\n        mergeMap((response: BasiqConnectionsResponse) => {\n          // Create bank connection based on basiq job\n          return this.bankConnectionService.add(plainToClass(BankConnection, {id: connection.id, basiqJob: {externalId: response.id}}));\n        }),\n        catchError((error: HttpErrorResponse) => {\n          // Show error when user provided wrong login data\n          if (error.status === 401) {\n            this.toastService.error('Invalid credentials');\n          }\n\n          // Show error when user provided another login (not login he used before)\n          if (error.status === 400) {\n            this.toastService.error('Please enter the login you used before');\n          }\n\n          return observableThrowError(error);\n        })\n      );\n  }\n\n  getByConnection(connection: BankConnection): Observable<BankAccountCollection> {\n    return this.get().pipe(\n      map((bankAccounts: BankAccount[]) => {\n        return new BankAccountCollection(bankAccounts).filterBy('bankConnection.id', connection.id);\n      })\n    );\n  }\n\n  getNotImportedByConnection(savedAccounts: BankAccountCollection, connection: BankConnection): Observable<BankAccountCollection> {\n    return this.getByConnection(connection).pipe(\n      map((bankAccounts: BankAccountCollection) => {\n        return bankAccounts.removeBy('accountId', savedAccounts.mapBy('accountId'));\n      })\n    )\n  }\n\n  /**\n   * listen to notifications to update basiq accounts list\n   */\n  private listenNotifications(): void {\n    this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification: Notification): void => {\n      if (!notification.isRead && notification.eventType === UserEventTypeClientTypeEnum.BASIQ_NEW_ACCOUNTS) {\n        this.resetCache();\n      }\n    });\n  }\n}\n"]}
|
|
@@ -27,6 +27,13 @@ export class ChartAccountsService {
|
|
|
27
27
|
return response.map((item) => plainToClass(ChartAccounts, item));
|
|
28
28
|
}))
|
|
29
29
|
.subscribe((chartAccounts) => {
|
|
30
|
+
// Sort personal chart accounts by name (TT-1950)
|
|
31
|
+
chartAccounts.sort((a, b) => {
|
|
32
|
+
if (a.isPersonal() && b.isPersonal()) {
|
|
33
|
+
return a.name > b.name ? 1 : -1;
|
|
34
|
+
}
|
|
35
|
+
return 0;
|
|
36
|
+
});
|
|
30
37
|
this._chartAccounts = chartAccounts;
|
|
31
38
|
this.chartAccountsSubject.next(this._chartAccounts);
|
|
32
39
|
});
|
|
@@ -86,4 +93,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
|
|
|
86
93
|
type: Inject,
|
|
87
94
|
args: ['environment']
|
|
88
95
|
}] }]; } });
|
|
89
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"chart-accounts.service.js","sourceRoot":"","sources":["../../../../../../../projects/tt-core/src/lib/services/http/chart-accounts/chart-accounts.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable } from '@angular/core';\nimport { HttpClient } from '@angular/common/http';\nimport { Observable, ReplaySubject } from 'rxjs';\nimport { map } from 'rxjs/operators';\nimport { ChartAccountsCategoryEnum } from '../../../db/Enums/chart-accounts-category.enum';\nimport { ChartAccounts as ChartAccountBase } from '../../../db/Models/chart-accounts/chart-accounts';\nimport { plainToClass } from 'class-transformer';\nimport { ChartAccounts } from '../../../models/chart-accounts/chart-accounts';\nimport { ChartAccountsHeading } from '../../../models/chart-accounts/chart-accounts-heading';\nimport { CHART_ACCOUNTS_CATEGORIES } from '../../../models/chart-accounts/chart-accounts-categories.const';\n\n/**\n * Chart accounts service\n */\n@Injectable({\n  providedIn: 'root'\n})\nexport class ChartAccountsService {\n  _chartAccounts: ChartAccounts[];\n  chartAccountsSubject: ReplaySubject<ChartAccounts[]> = new ReplaySubject<ChartAccounts[]>(1);\n\n  constructor(\n    private http: HttpClient,\n    @Inject('environment') private environment: any\n  ) {\n  }\n\n  /**\n   * get all parent and child chart accounts and group it\n   */\n  getChartAccounts(): Observable<ChartAccounts[]> {\n    if (!this._chartAccounts) {\n      this._chartAccounts = [];\n      this.http.get(`${this.environment.apiV2}/chart-accounts`)\n        .pipe(\n          map((response: ChartAccountBase[]) => {\n            return response.map((item: ChartAccountBase) => plainToClass(ChartAccounts, item));\n          })\n        )\n        .subscribe((chartAccounts: ChartAccounts[]) => {\n          // Sort personal chart accounts by name (TT-1950)\n          chartAccounts.sort((a: ChartAccounts, b: ChartAccounts) => {\n            if (a.isPersonal() && b.isPersonal()) {\n              return a.name > b.name ? 1 : -1;\n            }\n\n            return 0;\n          })\n          this._chartAccounts = chartAccounts;\n          this.chartAccountsSubject.next(this._chartAccounts);\n        });\n    }\n\n    return this.chartAccountsSubject.asObservable();\n  }\n\n  /**\n   * Get list of chart accounts heading\n   * @param categories\n   */\n  getChartAccountsHeadings(categories: ChartAccountsCategoryEnum[] = CHART_ACCOUNTS_CATEGORIES.all): Observable<ChartAccountsHeading[]> {\n    return this.getChartAccounts()\n      .pipe(\n        map((chartAccounts: ChartAccounts[]) => {\n          const filteredChartAccounts: ChartAccounts[] = chartAccounts.filter((ca: ChartAccounts) => categories.includes(ca.category));\n          const headings: ChartAccountsHeading[] = [];\n\n          filteredChartAccounts.forEach((ca: ChartAccounts) => {\n            let heading: ChartAccountsHeading = headings.find((h: ChartAccountsHeading) => h.id === ca.heading?.id);\n\n            if (!heading) {\n              heading = plainToClass(ChartAccountsHeading, ca.heading);\n              heading.chartAccounts = [];\n              headings.push(heading);\n            }\n\n            heading.chartAccounts.push(ca);\n          });\n          return headings;\n        })\n      );\n  }\n\n  /**\n   * Get heading of chart accounts by it Id\n   * @param id\n   */\n  getHeadingByChartAccountsId(id: number): Observable<ChartAccountsHeading> {\n    return this.getChartAccountsById(id)\n      .pipe(\n        map((chartAccounts: ChartAccounts) => {\n          return chartAccounts.heading;\n        })\n      );\n  }\n\n  /**\n   * Get chart accounts by Id\n   * @param id\n   */\n  getChartAccountsById(id: number): Observable<ChartAccounts> {\n    return this.getChartAccounts()\n      .pipe(\n        map((chartAccountsList: ChartAccounts[]) => {\n          return chartAccountsList.find((chartAccounts: ChartAccounts) => chartAccounts.id === id);\n        })\n      );\n  }\n}\n"]}
|
package/fesm2015/taxtank-core.js
CHANGED
|
@@ -2716,15 +2716,17 @@ class BankConnectionService extends RestService {
|
|
|
2716
2716
|
const connection = plainToClass(BankConnection, bankConnectionBase);
|
|
2717
2717
|
// We use this endpoint for create and reconnect bank connections because of basiq logic.
|
|
2718
2718
|
// So we try to replace bank connection in cache for reconnection case.
|
|
2719
|
-
if (
|
|
2720
|
-
|
|
2721
|
-
|
|
2722
|
-
|
|
2723
|
-
|
|
2724
|
-
|
|
2725
|
-
|
|
2726
|
-
|
|
2727
|
-
|
|
2719
|
+
if (this.cache) {
|
|
2720
|
+
if (bankConnection.id) {
|
|
2721
|
+
const tempCache = cloneDeep$1(this.cache);
|
|
2722
|
+
replace(tempCache, connection);
|
|
2723
|
+
this.cache = tempCache;
|
|
2724
|
+
this.cacheSubject.next(this.cache);
|
|
2725
|
+
}
|
|
2726
|
+
else {
|
|
2727
|
+
this.cache.push(connection);
|
|
2728
|
+
this.cacheSubject.next(cloneDeep$1(this.cache));
|
|
2729
|
+
}
|
|
2728
2730
|
}
|
|
2729
2731
|
return plainToClass(BankConnection, connection);
|
|
2730
2732
|
}));
|
|
@@ -2802,12 +2804,11 @@ class BasiqService extends RestService {
|
|
|
2802
2804
|
* we interact with basiq service.
|
|
2803
2805
|
*/
|
|
2804
2806
|
updateConnection(data, userId, connection) {
|
|
2805
|
-
// Send login data to basiq API to create a basiq job
|
|
2807
|
+
// Send login data and connection id to basiq API to create a basiq job
|
|
2806
2808
|
return this.http.post(`${BasiqService.basiqApiUrl}/users/${userId}/connections`, Object.assign(data, { id: connection.externalId }))
|
|
2807
|
-
.pipe(
|
|
2808
|
-
|
|
2809
|
-
|
|
2810
|
-
return this.bankConnectionService.add(plainToClass(BankConnection, Object.assign({ id: connection.id, basiqJob: { externalId: response.id } })));
|
|
2809
|
+
.pipe(mergeMap((response) => {
|
|
2810
|
+
// Create bank connection based on basiq job
|
|
2811
|
+
return this.bankConnectionService.add(plainToClass(BankConnection, { id: connection.id, basiqJob: { externalId: response.id } }));
|
|
2811
2812
|
}), catchError((error) => {
|
|
2812
2813
|
// Show error when user provided wrong login data
|
|
2813
2814
|
if (error.status === 401) {
|
|
@@ -9433,6 +9434,13 @@ class ChartAccountsService {
|
|
|
9433
9434
|
return response.map((item) => plainToClass(ChartAccounts, item));
|
|
9434
9435
|
}))
|
|
9435
9436
|
.subscribe((chartAccounts) => {
|
|
9437
|
+
// Sort personal chart accounts by name (TT-1950)
|
|
9438
|
+
chartAccounts.sort((a, b) => {
|
|
9439
|
+
if (a.isPersonal() && b.isPersonal()) {
|
|
9440
|
+
return a.name > b.name ? 1 : -1;
|
|
9441
|
+
}
|
|
9442
|
+
return 0;
|
|
9443
|
+
});
|
|
9436
9444
|
this._chartAccounts = chartAccounts;
|
|
9437
9445
|
this.chartAccountsSubject.next(this._chartAccounts);
|
|
9438
9446
|
});
|