taxtank-core 2.0.111 → 2.0.112

package/fesm2022/taxtank-core.mjs

@@ -3,9 +3,9 @@ import { Inject, Injectable, inject, NgModule, EventEmitter, InjectionToken, Pip
 import * as i1$1 from '@angular/common';
 import { formatDate, DatePipe, CurrencyPipe, CommonModule as CommonModule$1 } from '@angular/common';
 import * as i1 from '@angular/common/http';
-import { HttpClient, HttpErrorResponse, HttpHeaders, HTTP_INTERCEPTORS, HttpParams } from '@angular/common/http';
+import { HttpClient, HttpErrorResponse, HTTP_INTERCEPTORS, HttpHeaders, HttpParams } from '@angular/common/http';
 import { map, filter, catchError, finalize, switchMap, first as first$1, take, mergeMap, startWith, debounceTime, distinctUntilChanged } from 'rxjs/operators';
-import { ReplaySubject, Subject, Observable, shareReplay, of, forkJoin, throwError, concatMap, BehaviorSubject, combineLatest, from, merge as merge$1 } from 'rxjs';
+import { ReplaySubject, Subject, Observable, shareReplay, of, forkJoin, throwError, BehaviorSubject, concatMap, combineLatest, from, merge as merge$1 } from 'rxjs';
 import { plainToClass, Type, Transform, Exclude, Expose, classToPlain } from 'class-transformer';
 import get from 'lodash/get';
 import 'reflect-metadata';
@@ -7235,13 +7235,13 @@ class Depreciation extends Depreciation$1 {
      */
     toTransaction(params = {}) {
         const claimPercent = this.currentYearForecast?.claimPercent || 0;
-        return plainToClass(Transaction, Object.assign(params, this, {
+        return plainToClass(Transaction, Object.assign({}, this, {
             amount: -this.currentYearForecast?.amount || 0,
             claimAmount: -this.currentYearForecast?.claimAmount || 0,
             claimPercent: claimPercent,
             date: this.currentYearForecast?.fromDate ?? this.date,
             sharedClaimPercent: claimPercent,
-        }));
+        }, params));
     }
     /**
      * @TODO Michael: remove and check everywhere in reports
@@ -12917,7 +12917,7 @@ class BankAccountService extends RestService$1 {
         this.modelClass = BankAccount;
         this.collectionClass = BankAccountCollection;
         this.disabledMethods = ['post', 'putBatch', 'delete', 'deleteBatch'];
-        this.roles = [UserRolesEnum$1.WORK_TANK, UserRolesEnum$1.PROPERTY_TANK, UserRolesEnum$1.SOLE_TANK, UserRolesEnum$1.MONEY_TANK];
+        this.roles = [UserRolesEnum$1.SUBSCRIPTION];
         this.listenEvents();
     }
     getActive() {
@@ -13278,128 +13278,6 @@ var BasiqMessagesEnum;
     BasiqMessagesEnum["REVOKE_SUCCESS"] = "Consent to bank feeds has been revoked.";
 })(BasiqMessagesEnum || (BasiqMessagesEnum = {}));
 
-class BasiqUserService extends RestService$1 {
-    constructor() {
-        super(...arguments);
-        this.endpointUri = 'basiq-users';
-        this.modelClass = BasiqUser;
-        this.collectionClass = Collection;
-        this.disabledMethods = ['postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
-        this.basiqTokenService = inject(BasiqTokenService);
-    }
-    static { this.basiqApiUrl = 'https://au-api.basiq.io'; }
-    static { this.basiqConsentUrl = 'https://consent.basiq.io/home'; }
-    revokeConsent() {
-        return this.http.put(`${this.environment.apiV2}/basiq-users/consents/revoke`, {});
-    }
-    post(basiqUser = new BasiqUser()) {
-        return super.post(basiqUser);
-    }
-    retrieveJob(jobId, basiqUserId) {
-        return this.basiqTokenService.getOne(basiqUserId).pipe(concatMap(token => {
-            const headers = new HttpHeaders({ Authorization: 'Bearer ' + token.value });
-            return this.http.get(`${BasiqUserService.basiqApiUrl}/jobs/${jobId}`, { headers })
-                .pipe(map((response) => plainToClass(BasiqJobResponse, response)));
-        }));
-    }
-    /**
-     * Open basiq consent ui to allow user to log in to bank
-     */
-    redirectToBasiqConsent(bankId, basiqUserId) {
-        const user$ = basiqUserId ? this.findBy('id', basiqUserId) : this.post();
-        return user$.pipe(filter(user => !!user), concatMap(user => this.basiqTokenService.getOne(user.id).pipe(map(token => ({ user, token: token })))), map(({ user, token }) => {
-            const url = new URL(BasiqUserService.basiqConsentUrl);
-            url.searchParams.set('token', token.value);
-            url.searchParams.set('institutionId', bankId);
-            // @TODO TT-4883 vik state not coming from basiq
-            localStorage.setItem('basiqUserId', user.id);
-            // url.searchParams.set('state', user.id);
-            if (user.consentId) {
-                url.searchParams.set('action', 'connect');
-            }
-            window.location.replace(url.toString());
-        }));
-    }
-    /**
-     * redirect to basiq extend consent date to prolong it
-     */
-    extendConsent(basiqUserId) {
-        return this.basiqTokenService.getOne(basiqUserId).pipe(map(token => {
-            window.location.replace(`${BasiqUserService.basiqConsentUrl}?token=${token.value}&action=extend`);
-        }));
-    }
-    /**
-     * redirect to basiq extend connection date to prolong it
-     */
-    reauthoriseConnection(connection) {
-        return this.basiqTokenService.getOne(connection.basiqUser.id).pipe(map(token => {
-            let url = `${BasiqUserService.basiqConsentUrl}?token=${token.value}&action=reauthorise`;
-            if (connection.isExpiring()) {
-                url += `&connectionId=${connection.externalId}`;
-            }
-            window.location.replace(url);
-        }));
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BasiqUserService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BasiqUserService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BasiqUserService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
-/**
- * Service that handling banks logic
- */
-class BankTransactionCommentService extends RestService$1 {
-    constructor() {
-        super(...arguments);
-        this.modelClass = BankTransactionComment;
-        this.collectionClass = Collection;
-        this.endpointUri = 'bank-transaction-comments';
-        this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BankTransactionCommentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BankTransactionCommentService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BankTransactionCommentService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
-var BankTransactionCommentMessagesEnum;
-(function (BankTransactionCommentMessagesEnum) {
-    BankTransactionCommentMessagesEnum["CREATED"] = "Note created";
-    BankTransactionCommentMessagesEnum["UPDATED"] = "Note updated";
-    BankTransactionCommentMessagesEnum["DELETED"] = "Note deleted";
-    BankTransactionCommentMessagesEnum["CONFIRM_DELETE"] = "Are you sure you want to delete this note?";
-})(BankTransactionCommentMessagesEnum || (BankTransactionCommentMessagesEnum = {}));
-
-/**
- * Service that handling banks logic
- */
-class BankService extends RestService$1 {
-    constructor() {
-        super(...arguments);
-        this.modelClass = Bank;
-        this.collectionClass = Collection;
-        this.endpointUri = 'banks';
-        this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BankService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BankService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BankService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
 /**
  * Service to work with mixpanel https://docs.mixpanel.com/docs/tracking/reference/javascript
  */
@@ -13766,6 +13644,129 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImpo
                 }]
         }] });
 
+class BasiqUserService extends RestService$1 {
+    constructor() {
+        super(...arguments);
+        this.endpointUri = 'basiq-users';
+        this.modelClass = BasiqUser;
+        this.collectionClass = Collection;
+        this.disabledMethods = ['postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
+        this.roles = [UserRolesEnum.SUBSCRIPTION];
+        this.basiqTokenService = inject(BasiqTokenService);
+    }
+    static { this.basiqApiUrl = 'https://au-api.basiq.io'; }
+    static { this.basiqConsentUrl = 'https://consent.basiq.io/home'; }
+    revokeConsent() {
+        return this.http.put(`${this.environment.apiV2}/basiq-users/consents/revoke`, {});
+    }
+    post(basiqUser = new BasiqUser()) {
+        return super.post(basiqUser);
+    }
+    retrieveJob(jobId, basiqUserId) {
+        return this.basiqTokenService.getOne(basiqUserId).pipe(concatMap(token => {
+            const headers = new HttpHeaders({ Authorization: 'Bearer ' + token.value });
+            return this.http.get(`${BasiqUserService.basiqApiUrl}/jobs/${jobId}`, { headers })
+                .pipe(map((response) => plainToClass(BasiqJobResponse, response)));
+        }));
+    }
+    /**
+     * Open basiq consent ui to allow user to log in to bank
+     */
+    redirectToBasiqConsent(bankId, basiqUserId) {
+        const user$ = basiqUserId ? this.findBy('id', basiqUserId) : this.post();
+        return user$.pipe(filter(user => !!user), concatMap(user => this.basiqTokenService.getOne(user.id).pipe(map(token => ({ user, token: token })))), map(({ user, token }) => {
+            const url = new URL(BasiqUserService.basiqConsentUrl);
+            url.searchParams.set('token', token.value);
+            url.searchParams.set('institutionId', bankId);
+            // @TODO TT-4883 vik state not coming from basiq
+            localStorage.setItem('basiqUserId', user.id);
+            // url.searchParams.set('state', user.id);
+            if (user.consentId) {
+                url.searchParams.set('action', 'connect');
+            }
+            window.location.replace(url.toString());
+        }));
+    }
+    /**
+     * redirect to basiq extend consent date to prolong it
+     */
+    extendConsent(basiqUserId) {
+        return this.basiqTokenService.getOne(basiqUserId).pipe(map(token => {
+            window.location.replace(`${BasiqUserService.basiqConsentUrl}?token=${token.value}&action=extend`);
+        }));
+    }
+    /**
+     * redirect to basiq extend connection date to prolong it
+     */
+    reauthoriseConnection(connection) {
+        return this.basiqTokenService.getOne(connection.basiqUser.id).pipe(map(token => {
+            let url = `${BasiqUserService.basiqConsentUrl}?token=${token.value}&action=reauthorise`;
+            if (connection.isExpiring()) {
+                url += `&connectionId=${connection.externalId}`;
+            }
+            window.location.replace(url);
+        }));
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BasiqUserService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BasiqUserService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BasiqUserService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+/**
+ * Service that handling banks logic
+ */
+class BankTransactionCommentService extends RestService$1 {
+    constructor() {
+        super(...arguments);
+        this.modelClass = BankTransactionComment;
+        this.collectionClass = Collection;
+        this.endpointUri = 'bank-transaction-comments';
+        this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BankTransactionCommentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BankTransactionCommentService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BankTransactionCommentService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+var BankTransactionCommentMessagesEnum;
+(function (BankTransactionCommentMessagesEnum) {
+    BankTransactionCommentMessagesEnum["CREATED"] = "Note created";
+    BankTransactionCommentMessagesEnum["UPDATED"] = "Note updated";
+    BankTransactionCommentMessagesEnum["DELETED"] = "Note deleted";
+    BankTransactionCommentMessagesEnum["CONFIRM_DELETE"] = "Are you sure you want to delete this note?";
+})(BankTransactionCommentMessagesEnum || (BankTransactionCommentMessagesEnum = {}));
+
+/**
+ * Service that handling banks logic
+ */
+class BankService extends RestService$1 {
+    constructor() {
+        super(...arguments);
+        this.modelClass = Bank;
+        this.collectionClass = Collection;
+        this.endpointUri = 'banks';
+        this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BankService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BankService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BankService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
 class BudgetService extends RestService$1 {
     constructor() {
         super(...arguments);
@@ -24751,7 +24752,9 @@ class BasReportForm extends AbstractForm {
             const filteredTransactions = transactions.filterByRange('date', dateFrom, dateTo);
             const filteredDepreciations = depreciations.filterByRange('date', dateFrom, dateTo);
             const incomeTransactions = filteredTransactions.getIncomeTransactions();
-            const expenseTransactions = new TransactionCollection(filteredTransactions.getExpenseTransactions().toArray(), filteredDepreciations.toArray());
+            const depreciationTransactions = filteredDepreciations.map(depreciation => depreciation.toTransaction({ amount: -depreciation.amount }));
+            const expenseTransactions = new TransactionCollection(filteredTransactions.getExpenseTransactions().toArray());
+            expenseTransactions.push(...depreciationTransactions);
             // all sole income claimed as 100%
             // @TODO temp fix, waiting for TT-3503/TT-3495 breaking changes
             this.patchField('income', incomeTransactions.sumBy('amountWithGst'));