taxtank-core 0.30.18 → 0.30.20

package/lib/collections/allocation-rule.collection.d.ts

@@ -1,7 +1,15 @@
 import { Collection } from './collection';
 import { AllocationRule } from '../models';
+import { CollectionDictionary } from './collection-dictionary';
+import { BankTransactionCollection } from './bank-transaction.collection';
 export declare class AllocationRuleCollection extends Collection<AllocationRule> {
     getExpense(): this;
     getIncome(): this;
     getTransfer(): this;
+    /**
+     * Get dictionary where key is bank transaction id and value is collection of matched rules.
+     * Group by this way for better performance
+     * @TODO Alex: break bank transactions by pagination in case of bad performance
+     */
+    groupByBankTransaction(bankTransactions: BankTransactionCollection): CollectionDictionary<AllocationRuleCollection>;
 }

package/lib/db/Enums/chart-accounts/chart-accounts-category.enum.d.ts

@@ -12,5 +12,7 @@ export declare enum ChartAccountsCategoryEnum {
     PERSONAL_EXPENSE = 11,
     SOLE_INCOME = 12,
     SOLE_EXPENSE = 13,
-    SOLE_DEPRECIATION = 14
+    SOLE_DEPRECIATION = 14,
+    HOLDING_EXPENSE = 15,
+    HOLDING_INCOME = 16
 }

package/lib/db/Enums/chart-accounts/chart-accounts-list.enum.d.ts

@@ -88,5 +88,7 @@ export declare enum ChartAccountsListEnum {
     PLATFORM_FEES = 857,
     PSI_OTHER = 858,
     PSI_DEDUCTION_ASSOCIATES = 859,
-    PSI_DEDUCTION_OTHER = 860
+    PSI_DEDUCTION_OTHER = 860,
+    AUSTRALIAN_GOVERNMENT_SPECIAL_PAYMENTS = 871,
+    FHSS = 872
 }

package/lib/db/Enums/holding/holding-type-category.enum.d.ts

@@ -0,0 +1,8 @@
+export declare enum HoldingTypeCategoryEnum {
+    CRYPTO = 1,
+    STOCK = 2,
+    UNLISTED_STOCK = 3,
+    UNLISTED_UNIT = 4,
+    COLLECTIBLE = 5,
+    OTHER = 6
+}

package/lib/db/Enums/subscription/service-product-id.enum.d.ts

@@ -4,5 +4,6 @@ export declare enum ServiceProductIdEnum {
     PROPERTY_TANK = 3,
     WORK_TANK = 4,
     PROPERTIES = 5,
-    SOLE_TANK = 6
+    SOLE_TANK = 6,
+    HOLDINGS_TANK = 7
 }

package/lib/db/Enums/tank-type.enum.d.ts

@@ -2,5 +2,6 @@ export declare enum TankTypeEnum {
     PROPERTY = 1,
     WORK = 2,
     OTHER = 3,
-    SOLE = 4
+    SOLE = 4,
+    HOLDING = 5
 }

package/lib/db/Enums/user-roles.enum.d.ts

@@ -10,5 +10,6 @@ export declare enum UserRolesEnum {
     WORK_TANK = "ROLE_USER_WORK",
     PROPERTY_TANK = "ROLE_USER_PROPERTY",
     SOLE_TANK = "ROLE_USER_SOLE",
+    HOLDING_TANK = "ROLE_USER_HOLDING",
     SWITCH_USER = "ROLE_PREVIOUS_ADMIN"
 }

package/lib/db/Models/holding/holding-sale.d.ts

@@ -0,0 +1,12 @@
+import { Holding } from './holding';
+import { File } from '../file';
+export declare class HoldingSale {
+    quantity?: number;
+    price?: number;
+    fee?: number;
+    total?: number;
+    profit?: number;
+    id?: number;
+    holding?: Holding;
+    file?: File;
+}

package/lib/db/Models/holding/holding-type.d.ts

@@ -0,0 +1,12 @@
+import { HoldingTypeCategoryEnum } from '../../Enums/holding/holding-type-category.enum';
+import { User } from '../user/user';
+export declare class HoldingType {
+    category?: HoldingTypeCategoryEnum;
+    name?: string;
+    ticker?: string;
+    description?: string;
+    price?: number;
+    dividendPercent?: number;
+    id?: number;
+    user?: User;
+}

package/lib/db/Models/holding/holding.d.ts

@@ -0,0 +1,16 @@
+import { User } from '../user/user';
+import { HoldingType } from './holding-type';
+import { File } from '../file';
+import { HoldingSale } from './holding-sale';
+export declare class Holding {
+    isTaxFree?: boolean;
+    date?: Date;
+    quantity?: number;
+    price?: number;
+    fee?: number;
+    id?: number;
+    user?: User;
+    type?: HoldingType;
+    file?: File;
+    sales?: HoldingSale[];
+}

package/lib/db/Models/holding/index.d.ts

@@ -0,0 +1,3 @@
+export * from './holding';
+export * from './holding-type';
+export * from './holding-sale';

package/lib/db/Models/index.d.ts

@@ -99,3 +99,4 @@ export * from './observable-model';
 export * from './phone';
 export * from './service-notification';
 export * from './tax-calculation';
+export * from './holding';

package/lib/db/Models/transaction/transaction-base.d.ts

@@ -39,6 +39,7 @@ export declare class TransactionBase extends ObservableModel {
      * Check if current tank is Sole
      */
     isSoleTank(): boolean;
+    isHoldingTank(): boolean;
     get amountWithGst(): number;
     get gstAmount(): number;
     get gstClaimAmount(): number;

package/lib/forms/report/my-tax/my-tax-income-statements.form.d.ts

@@ -1,6 +1,6 @@
 import { AbstractForm } from '../../abstract.form';
-import { MyTaxIncomeStatements } from '../../../models/report/my-tax/my-tax-income-statements/my-tax-income-statements';
-import { User } from '../../../models/user/user';
+import { MyTaxIncomeStatements } from '../../../models/report';
+import { User } from '../../../models';
 export declare class MyTaxIncomeStatementsForm extends AbstractForm<MyTaxIncomeStatements> {
     private incomeStatements;
     constructor(incomeStatements: MyTaxIncomeStatements, user: User);

package/lib/models/account-setup/account-setup-item.d.ts

@@ -1,7 +1,7 @@
 /**
  * Account setup item instance is using for account setup checklist
  */
-import { AbstractModel } from '../../db/Models/abstract-model';
+import { AbstractModel } from '../../db/Models';
 export declare class AccountSetupItem extends AbstractModel {
     title: string;
     description: string;

package/lib/models/account-setup/account-setup-items.enum.d.ts

@@ -8,5 +8,6 @@ export declare enum AccountSetupItemsEnum {
     BANK_FEEDS = 3,
     WORK_LOGBOOK = 4,
     TRANSACTION = 5,
-    SOLE_BUSINESS = 6
+    SOLE_BUSINESS = 6,
+    HOLDINGS = 7
 }

package/lib/models/chart-accounts/chart-accounts.d.ts

@@ -112,4 +112,5 @@ export declare class ChartAccounts extends ChartAccountsBase {
     isSalaryIncluded(): boolean;
     isPropertyCapitalWorks(): boolean;
     isTaxable(): boolean;
+    isTransfer(): boolean;
 }

package/lib/models/client/client-income-types.d.ts

@@ -1,12 +1,3 @@
 import { ClientIncomeTypes as ClientIncomeTypesBase } from '../../db/Models/user/client-income-types';
 export declare class ClientIncomeTypes extends ClientIncomeTypesBase {
-    salary: boolean;
-    property: boolean;
-    sole: boolean;
-    dividends: boolean;
-    other: boolean;
-    /**
-     * Get count of selected income types
-     */
-    get length(): number;
 }

package/lib/models/holding/holding-sale.d.ts

@@ -0,0 +1,12 @@
+import { Holding } from './holding';
+import { AppFile } from '../file';
+import { AbstractModel } from '../../db/Models';
+export declare class HoldingSale extends AbstractModel {
+    quantity: number;
+    price: number;
+    fee: number;
+    total: number;
+    profit: number;
+    holding?: Holding;
+    file: AppFile;
+}

package/lib/models/holding/holding-type.d.ts

@@ -0,0 +1,12 @@
+import { HoldingTypeCategoryEnum } from '../../db/Enums/holding/holding-type-category.enum';
+import { User } from '../user';
+import { AbstractModel } from '../../db/Models';
+export declare class HoldingType extends AbstractModel {
+    category: HoldingTypeCategoryEnum;
+    name: string;
+    ticker: string;
+    description: string;
+    price: number;
+    dividendPercent: number;
+    user: User;
+}

package/lib/models/holding/holding.d.ts

@@ -0,0 +1,17 @@
+import { User } from '../user';
+import { HoldingType } from './holding-type';
+import { AppFile } from '../file';
+import { HoldingSale } from './holding-sale';
+import { Collection } from '../../collections';
+import { AbstractModel } from '../../db/Models';
+export declare class Holding extends AbstractModel {
+    isTaxFree: boolean;
+    date: Date;
+    quantity: number;
+    price: number;
+    fee: number;
+    user: User;
+    type: HoldingType;
+    file: AppFile;
+    sales: Collection<HoldingSale>;
+}

package/lib/models/holding/index.d.ts

@@ -0,0 +1,3 @@
+export * from './holding';
+export * from './holding-type';
+export * from './holding-sale';

package/lib/models/index.d.ts

@@ -17,3 +17,4 @@ export * from './document';
 export * from './property';
 export * from './transaction';
 export * from './user';
+export * from './holding';

package/lib/models/report/my-tax/my-tax-income-statements/my-tax-income-statements.d.ts

@@ -26,5 +26,9 @@ export declare class MyTaxIncomeStatements {
     superannuationIncomeStreamsTotalUntaxed: number;
     attributablePsiTransactionsTotalAmount: number;
     attributablePsiTransactionsTotalTax: number;
+    fhssTransactionsTotalAmount: number;
+    fhssTransactionsTotalTax: number;
+    australianSpecialPaymentsTotalAmount: number;
+    australianSpecialPaymentsTotalTax: number;
     constructor(transactions: TransactionCollection);
 }

package/lib/models/service-subscription/service-product.d.ts

@@ -4,5 +4,6 @@ export declare class ServiceProduct extends BaseServiceProduct {
     isProperties(): boolean;
     isWorkTank(): boolean;
     isSoleTank(): boolean;
+    isHoldingsTank(): boolean;
     isArchived(): boolean;
 }

package/lib/models/transaction/allocation-rule-condition.d.ts

@@ -1,3 +1,7 @@
 import { AllocationRuleCondition as AllocationRuleConditionBase } from '../../db/Models/transaction/allocation-rule-condition';
+import { BankTransaction } from '../bank';
 export declare class AllocationRuleCondition extends AllocationRuleConditionBase {
+    matchBankTransaction(bankTransaction: BankTransaction): boolean;
+    matchBankTransactionByAmount(bankTransaction: BankTransaction): boolean;
+    matchBankTransactionByDescription(bankTransaction: BankTransaction): boolean;
 }

package/lib/models/transaction/allocation-rule-transaction.d.ts

@@ -1,7 +1,7 @@
 import { AllocationRuleTransaction as AllocationRuleTransactionBase } from '../../db/Models/transaction/allocation-rule-transaction';
 import { ChartAccounts } from '../chart-accounts';
 import { AllocationRuleTransactionMetaField } from './allocation-rule-transaction-meta-field';
-import { Loan, Property, SoleBusiness } from '../../models';
+import { BankTransaction, Loan, Property, SoleBusiness, Transaction } from '../../models';
 import { IncomeSource } from '../income-source/income-source';
 export declare class AllocationRuleTransaction extends AllocationRuleTransactionBase {
     chartAccounts: ChartAccounts;
@@ -14,4 +14,8 @@ export declare class AllocationRuleTransaction extends AllocationRuleTransaction
     childTransactions: AllocationRuleTransaction[];
     claimPercent: number;
     calculateClaimPercent(): number;
+    /**
+     * Create Transaction instance based on passed bank transaction and rule transaction
+     */
+    toTransaction(bankTransaction: BankTransaction): Transaction;
 }

package/lib/models/transaction/allocation-rule.d.ts

@@ -1,8 +1,9 @@
 import { AllocationRule as AllocationRuleBase } from '../../db/Models/transaction/allocation-rule';
-import { BankAccount } from '../bank';
+import { BankAccount, BankTransaction } from '../bank';
 import { AllocationRuleCondition } from './allocation-rule-condition';
 import { AllocationRuleTransaction } from './allocation-rule-transaction';
 import { AllocationRuleConditionOperatorEnum, AllocationRuleTypeEnum } from '../../db/Enums';
+import { Transaction } from './transaction';
 export declare class AllocationRule extends AllocationRuleBase {
     bankAccount?: BankAccount;
     conditions?: AllocationRuleCondition[];
@@ -21,4 +22,21 @@ export declare class AllocationRule extends AllocationRuleBase {
     isPropertyIncome(): boolean;
     isWorkIncome(): boolean;
     isSoleIncome(): boolean;
+    /**
+     * @TODO Alex: move to collection
+     */
+    matchBankTransaction(bankTransaction: BankTransaction): boolean;
+    createTransaction(bankTransaction: BankTransaction): Transaction;
+    /**
+     * Rule is matched when all conditions matched
+     */
+    private checkAnd;
+    /**
+     * Rule is matched when at least one condition matched
+     */
+    private checkOr;
+    /**
+     * Create allocation rule based on bank transaction (just prefill rule fields with bank transaction values)
+     */
+    static fromBankTransaction(bankTransaction: BankTransaction): AllocationRule;
 }

package/lib/services/account-setup/account-setup.service.d.ts

@@ -9,7 +9,7 @@ import { Observable, ReplaySubject } from 'rxjs';
 import { AccountSetupItemCollection } from '../../collections/account-setup-item.collection';
 import { VehicleClaimService } from '../http/vehicle/vehicle-claim.service';
 import { TransactionService } from '../http/transaction/transaction.service';
-import { SoleBusinessService } from '../http';
+import { HoldingService, SoleBusinessService } from '../http';
 import * as i0 from "@angular/core";
 /**
  * Service handling user's account setup process.
@@ -24,10 +24,11 @@ export declare class AccountSetupService {
     private vehicleClaimService;
     private transactionService;
     private soleBusinessService;
+    private holdingService;
     cache: AccountSetupItemCollection;
     cacheSubject: ReplaySubject<AccountSetupItemCollection>;
     clientIncomeTypesId: number;
-    constructor(clientIncomeTypesService: ClientIncomeTypesService, propertyService: PropertyService, incomeSourceService: IncomeSourceService, bankAccountsService: BankAccountService, transactionAllocationService: TransactionAllocationService, vehicleClaimService: VehicleClaimService, transactionService: TransactionService, soleBusinessService: SoleBusinessService);
+    constructor(clientIncomeTypesService: ClientIncomeTypesService, propertyService: PropertyService, incomeSourceService: IncomeSourceService, bankAccountsService: BankAccountService, transactionAllocationService: TransactionAllocationService, vehicleClaimService: VehicleClaimService, transactionService: TransactionService, soleBusinessService: SoleBusinessService, holdingService: HoldingService);
     /**
      * Get list of account setup items for current user
      */

package/lib/services/http/holding/holding-sale.service.d.ts

@@ -0,0 +1,17 @@
+import { HoldingSale as HoldingSaleBase } from '../../../db/Models';
+import { HoldingSale } from '../../../models';
+import { RestService, RestMethod } from '../rest';
+import { Collection } from '../../../collections';
+import * as i0 from "@angular/core";
+/**
+ * Service that handling banks logic
+ */
+export declare class HoldingSaleService extends RestService<HoldingSaleBase, HoldingSale, Collection<HoldingSale>> {
+    modelClass: typeof HoldingSale;
+    collectionClass: typeof Collection;
+    endpointUri: string;
+    isApiPlatform: boolean;
+    disabledMethods: RestMethod[];
+    static ɵfac: i0.ɵɵFactoryDeclaration<HoldingSaleService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<HoldingSaleService>;
+}

package/lib/services/http/holding/holding-type.service.d.ts

@@ -0,0 +1,17 @@
+import { HoldingType as HoldingTypeBase } from '../../../db/Models';
+import { HoldingType } from '../../../models';
+import { RestService, RestMethod } from '../rest';
+import { Collection } from '../../../collections';
+import * as i0 from "@angular/core";
+/**
+ * Service that handling banks logic
+ */
+export declare class HoldingTypeService extends RestService<HoldingTypeBase, HoldingType, Collection<HoldingType>> {
+    modelClass: typeof HoldingType;
+    collectionClass: typeof Collection;
+    endpointUri: string;
+    isApiPlatform: boolean;
+    disabledMethods: RestMethod[];
+    static ɵfac: i0.ɵɵFactoryDeclaration<HoldingTypeService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<HoldingTypeService>;
+}

package/lib/services/http/holding/holding.service.d.ts

@@ -0,0 +1,17 @@
+import { Holding as HoldingBase } from '../../../db/Models';
+import { Holding } from '../../../models';
+import { RestService, RestMethod } from '../rest';
+import { Collection } from '../../../collections';
+import * as i0 from "@angular/core";
+/**
+ * Service that handling banks logic
+ */
+export declare class HoldingService extends RestService<HoldingBase, Holding, Collection<Holding>> {
+    modelClass: typeof Holding;
+    collectionClass: typeof Collection;
+    endpointUri: string;
+    isApiPlatform: boolean;
+    disabledMethods: RestMethod[];
+    static ɵfac: i0.ɵɵFactoryDeclaration<HoldingService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<HoldingService>;
+}

package/lib/services/http/holding/index.d.ts

@@ -0,0 +1,3 @@
+export * from './holding.service';
+export * from './holding-type.service';
+export * from './holding-sale.service';

package/lib/services/http/index.d.ts

@@ -23,3 +23,4 @@ export * from './tutorial-video';
 export * from './vehicle';
 export * from './user';
 export * from './document';
+export * from './holding';

package/lib/services/http/rest/rest.service.d.ts

@@ -14,7 +14,7 @@ import * as i0 from "@angular/core";
  * BaseModel - base entity model that extends by Model
  * CollectionModel - entity collection class
  */
-export declare abstract class RestService<BaseModel extends AbstractModel, Model extends BaseModel, CollectionModel extends Collection<Model>> implements IEventListener {
+export declare abstract class RestService<BaseModel, Model extends AbstractModel, CollectionModel extends Collection<Model>> implements IEventListener {
     protected http: HttpClient;
     protected eventDispatcherService: EventDispatcherService;
     protected environment: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "0.30.18",
+  "version": "0.30.20",
   "private": false,
   "peerDependencies": {
     "@angular/compiler": "^15.1.5",