taxtank-core 2.1.58 → 2.1.60

package/fesm2022/taxtank-core.mjs

@@ -17,8 +17,8 @@ import uniqBy from 'lodash/uniqBy';
 import first from 'lodash/first';
 import last from 'lodash/last';
 import orderBy from 'lodash/orderBy';
-import round from 'lodash/round';
 import uniq from 'lodash/uniq';
+import round from 'lodash/round';
 import moment from 'moment';
 import { DateRange as DateRange$1 } from 'moment-range';
 import * as i3 from 'taxtank-core/common';
@@ -289,9 +289,6 @@ class ObservableModel extends AbstractModel {
 let BankAccount$1 = class BankAccount extends ObservableModel {
     static { this.className = 'BankAccount'; }
 };
-__decorate([
-    Type(() => Number)
-], BankAccount$1.prototype, "currentBalance", void 0);
 
 let BankConnection$1 = class BankConnection extends ObservableModel {
     static { this.className = 'BankConnection'; }
@@ -1310,6 +1307,12 @@ class TransactionBase extends ObservableModel {
     get grossClaimAmount() {
         return this.grossAmount * this.claimRatio;
     }
+    get isForeign() {
+        return this.currency !== 'AUD';
+    }
+    get foreignAmount() {
+        return this.amount / this.exchangeRate;
+    }
 }
 __decorate([
     Transform(({ value }) => value === null ? null : +value)
@@ -1735,7 +1738,7 @@ class AllocationGroup extends AbstractModel {
             category: transaction.chartAccounts.name,
             tankType: transaction.tankType,
             amount: transaction.netAmount,
-            foreignAmount: transaction.foreignAmount,
+            // foreignAmount: transaction.foreignAmount,
             childTransactions: transaction.transactions,
             allocations,
             bankTransactions
@@ -2205,6 +2208,9 @@ class Collection {
             .filter((item) => !!get(item, path))
             .map((item) => get(item, path));
     }
+    uniqMapBy(path) {
+        return uniq(this.mapBy(path));
+    }
     sortBy(paths = ['id'], order = ['desc']) {
         this.items = orderBy(this.items, paths instanceof Array ? paths : [paths], order instanceof Array ? order : [order]);
         return this;
@@ -6939,7 +6945,7 @@ class PropertyEquityChartData {
             return bankAccounts.items.reduce((totalSum, bankAccount) => totalSum + (bankAccount.getPropertyPercentage(property.id) * (loans.getByBankAccountId(bankAccount.id)?.getLastPaymentByYear(year)?.totalOwed || 0)), 0) - offset;
         }
         if (year == this.currentYear) {
-            return bankAccounts.items.reduce((totalSum, bankAccount) => totalSum + (bankAccount.getPropertyPercentage(property.id) * (Math.abs(loans.getByBankAccountId(bankAccount.id)?.currentBalance) || 0)), 0) - offset;
+            return bankAccounts.items.reduce((totalSum, bankAccount) => totalSum + (bankAccount.getPropertyPercentage(property.id) * (Math.abs(bankAccount.convertedBalance) || 0)), 0) - offset;
         }
         return Math.abs(property.getForecastByYear(year).loanBalance) - offset;
         // @TODO TT-4888 no idea why it was calculated like that
@@ -7196,7 +7202,7 @@ class Transaction extends Transaction$1 {
             business: this.business,
             currency: this.currency,
             exchangeRate: this.exchangeRate,
-            foreignAmount: this.foreignAmount,
+            // foreignAmount: this.foreignAmount,
         });
     }
     /**
@@ -11029,6 +11035,7 @@ class BankAccount extends BankAccount$1 {
         this.businessAllocations = [];
         this.balances = [];
         this.currency = 'AUD';
+        this.exchangeRate = 1;
     }
     get bank() {
         return this.bankConnection.bank;
@@ -11045,6 +11052,9 @@ class BankAccount extends BankAccount$1 {
     get partialAccountNumber() {
         return `xxxx${this.accountNumber.slice(-4)}`;
     }
+    /**
+     * @TODO remove after tests
+     */
     get balance() {
         return FinancialYear.isCurrent() ? this.currentBalance : this.getOpeningBalance(FinancialYear.year + 1);
     }
@@ -11067,8 +11077,8 @@ class BankAccount extends BankAccount$1 {
     /**
      * Get the current opening balance amount
      */
-    getOpeningBalance(year = FinancialYear.year) {
-        return this.getBalanceByYear(year)?.openingBalance || 0;
+    getOpeningBalance(year = FinancialYear.year, convertToAud = false) {
+        return (this.getBalanceByYear(year)?.openingBalance || 0) * (convertToAud ? this.exchangeRate : 1);
     }
     /**
      * Get bank account balance for current financial year
@@ -11149,7 +11159,7 @@ class BankAccount extends BankAccount$1 {
      * @param propertyId Id of property
      */
     getPropertyBalanceAmount(propertyId) {
-        return this.currentBalance * this.getPropertyPercentage(propertyId);
+        return this.convertedBalance * this.getPropertyPercentage(propertyId);
     }
     getMonthlyRepaymentAmount(propertyId) {
         return this.loan ? this.loan.monthlyRepaymentAmount * this.getPropertyPercentage(propertyId) : 0;
@@ -11185,7 +11195,7 @@ class BankAccount extends BankAccount$1 {
         // we don't check the current balance for basiq accounts, because basiq doesn't provide us last transactions (can't do for closed accounts),
         // that's why the balance won't be 0 (updated by basiq)
         if (shouldPayoutLoanAccount && this.isManual()) {
-            return this.currentBalance === 0;
+            return this.convertedBalance === 0;
         }
         return shouldPayoutLoanAccount;
     }
@@ -11195,6 +11205,9 @@ class BankAccount extends BankAccount$1 {
     get isForeign() {
         return this.currency !== 'AUD';
     }
+    get convertedBalance() {
+        return this.currentBalance * this.exchangeRate;
+    }
 }
 __decorate([
     Type(() => BankAccountProperty)
@@ -11205,6 +11218,9 @@ __decorate([
 __decorate([
     Type(() => BankAccountBalance)
 ], BankAccount.prototype, "balances", void 0);
+__decorate([
+    Type(() => Number)
+], BankAccount.prototype, "currentBalance", void 0);
 __decorate([
     Type(() => Loan)
 ], BankAccount.prototype, "loan", void 0);
@@ -11231,7 +11247,7 @@ class BankAccountChartData {
     getBalancePieChartData() {
         return this.bankAccounts.map((bankAccount) => plainToClass(ChartData, {
             name: bankAccount.accountName,
-            data: Math.abs(bankAccount.currentBalance)
+            data: Math.abs(bankAccount.convertedBalance)
         }));
     }
     /**
@@ -11242,7 +11258,7 @@ class BankAccountChartData {
                 name: 'Balance',
                 data: this.bankAccounts.map((bankAccount) => ({
                     label: bankAccount.accountName,
-                    value: bankAccount.currentBalance
+                    value: bankAccount.convertedBalance
                 }))
             })];
     }
@@ -14360,7 +14376,7 @@ class FinancialGoalService extends RestService$1 {
         return this.put(Object.assign({}, goal, { status: FinancialGoalStatusEnum.ACTIVE }));
     }
     complete(goal) {
-        return this.put(Object.assign({}, goal, { status: FinancialGoalStatusEnum.COMPLETE, finalValue: goal.bankAccount.currentBalance }));
+        return this.put(Object.assign({}, goal, { status: FinancialGoalStatusEnum.COMPLETE, finalValue: goal.bankAccount.convertedBalance }));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: FinancialGoalService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: FinancialGoalService, providedIn: 'root' }); }
@@ -21481,52 +21497,27 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImpo
                     args: ['environment']
                 }] }] });
 
+/**
+ * @TODO move to BankAccountCollection
+ */
 class BankAccountCalculationService {
     /**
      * Sum of bank accounts opening balances and their bank transactions allocated amounts
      */
-    getTaxTankBalance(bankAccounts, bankTransactions, allocations, exchangeRateByCurrency, excludeOpenBalance = false) {
-        let totalBalance = 0;
-        bankAccounts.items.forEach(bankAccount => {
-            let balance = bankTransactions.getByBankAccountsIds([bankAccount.id]).getAllocatedAmount(allocations);
-            if (!excludeOpenBalance) {
-                balance += bankAccount.getOpeningBalance();
-            }
-            if (exchangeRateByCurrency && bankAccount.isForeign) {
-                balance *= exchangeRateByCurrency.get(bankAccount.currency).rate;
-            }
-            totalBalance += balance;
-        });
-        return totalBalance;
-    }
-    getCashIn(bankAccounts, bankTransactions, allocations, exchangeRateByCurrency) {
-        let total = 0;
-        bankAccounts.items.forEach(bankAccount => {
-            let cash = bankTransactions.getByBankAccountsIds([bankAccount.id]).creditTransactions.getAllocatedAmount(allocations);
-            if (bankAccount.isForeign) {
-                cash *= exchangeRateByCurrency.get(bankAccount.currency).rate;
-            }
-            total += cash;
-        });
-        return total;
+    getTaxTankBalance(bankAccounts, bankTransactions, allocations, convertToAud = true) {
+        return bankAccounts.reduce((sum, bankAccount) => sum + bankAccount.getOpeningBalance(FinancialYear.year, convertToAud)) + this.getAllocatedAmount(bankAccounts, bankTransactions, allocations, convertToAud);
     }
-    getCashOut(bankAccounts, bankTransactions, allocations, exchangeRateByCurrency) {
+    getAllocatedAmount(bankAccounts, bankTransactions, allocations, convertToAud = true) {
         let total = 0;
         bankAccounts.items.forEach(bankAccount => {
-            let cash = bankTransactions.getByBankAccountsIds([bankAccount.id]).debitTransactions.getAllocatedAmount(allocations);
-            if (bankAccount.isForeign) {
-                cash *= exchangeRateByCurrency.get(bankAccount.currency).rate;
+            let amount = bankTransactions.getByBankAccountsIds([bankAccount.id]).getAllocatedAmount(allocations);
+            if (convertToAud) {
+                amount *= bankAccount.exchangeRate;
             }
-            total += cash;
+            total += amount;
         });
         return total;
     }
-    /**
-     * get difference between total loans amount and total cash amount
-     */
-    getNetPosition(bankAccounts, bankTransactions, allocations) {
-        return bankAccounts.currentBalance - this.getTaxTankBalance(bankAccounts.getLoanAccounts(), bankTransactions, allocations);
-    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BankAccountCalculationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BankAccountCalculationService, providedIn: 'root' }); }
 }
@@ -24677,7 +24668,7 @@ class FinancialGoalForm extends AbstractForm {
         this.get('bankAccount').valueChanges
             .pipe(filter((bankAccount) => !!bankAccount))
             .subscribe(bankAccount => {
-            this.get('initialValue').setValue(bankAccount.currentBalance);
+            this.get('initialValue').setValue(bankAccount.convertedBalance);
         });
     }
     /**
@@ -25458,7 +25449,7 @@ class BankAccountForm extends BankAccountAllocationForm {
         super(bankAccount, {
             type: new FormControl(bankAccount.type, Validators.required),
             accountName: new FormControl(bankAccount.accountName, Validators.required),
-            currentBalance: new FormControl(bankAccount.currentBalance, Validators.required),
+            currentBalance: new FormControl(bankAccount.convertedBalance, Validators.required),
             accountNumber: new FormControl(bankAccount.accountNumber, [Validators.required, Validators.pattern(BankAccountForm.accountNumberPattern)]),
             payId: new FormControl(bankAccount.payId),
             currency: new FormControl({ value: bankAccount.currency, disabled: !!bankAccount.id }),