taxtank-core 0.32.107 → 0.32.109

package/lib/collections/report/property/property-report-item-depreciation.collection.d.ts

@@ -1,8 +1,8 @@
 import { Collection } from '../../collection';
-import { ChartAccounts } from '../../../models/chart-accounts/chart-accounts';
+import { ChartAccounts } from '../../../models';
 import { DepreciationCollection } from '../../depreciation.collection';
 import { PropertyReportItemCollection } from './property-report-item.collection';
-import { PropertyCollection } from '../../property/property.collection';
+import { PropertyCollection } from '../../property';
 /**
  * Collection to work with depreciation-based property report items
  */

package/lib/collections/report/property/property-report-item-transaction.collection.d.ts

@@ -1,8 +1,8 @@
 import { Collection } from '../../collection';
-import { TransactionCollection } from '../../transaction/transaction.collection';
-import { ChartAccounts } from '../../../models/chart-accounts/chart-accounts';
+import { TransactionCollection } from '../../transaction';
+import { ChartAccounts } from '../../../models';
 import { PropertyReportItemCollection } from './property-report-item.collection';
-import { PropertyCollection } from '../../property/property.collection';
+import { PropertyCollection } from '../../property';
 /**
  * Collection to work with transaction-based property report items
  */

package/lib/collections/report/property/property-report-item.collection.d.ts

@@ -1,5 +1,5 @@
 import { Collection } from '../../collection';
-import { PropertyReportItem } from '../../../models/report/property/property-report-item';
+import { PropertyReportItem } from '../../../models/report';
 /**
  * Base collection to work with property report items
  */

package/lib/db/Enums/bank/bank-connection-status.enum.d.ts

@@ -1,5 +1,6 @@
 export declare enum BankConnectionStatusEnum {
     PENDING = 1,
     ACTIVE = 2,
+    INVALID = 3,
     RECONNECTING = 4
 }

package/lib/forms/transaction/index.d.ts

@@ -5,4 +5,4 @@ export * from './sole/sole-income.form';
 export * from './work/work-income.form';
 export * from './work/work-expense.form';
 export * from './holding/holding-income.form';
-export * from './transaction-filter.form';
+export * from './transaction-base-filter.form';

package/lib/forms/transaction/transaction-base-filter.form.d.ts

@@ -0,0 +1,19 @@
+import { FormControl, FormGroup } from '@angular/forms';
+import { ControlsInterface } from '../abstract.form';
+import { Collection } from '../../collections';
+import { TankTypeEnum } from '../../db/Enums/tank-type.enum';
+import { SoleBusiness } from '../../models';
+import { IEventListener } from '../../interfaces';
+import { TransactionBase } from '../../db/Models';
+interface ITransactionBaseFilterControls extends ControlsInterface {
+    tankType: FormControl<TankTypeEnum>;
+    business: FormControl<SoleBusiness>;
+    dateFrom: FormControl<Date>;
+    dateTo: FormControl<Date>;
+}
+export declare class TransactionBaseFilterForm extends FormGroup<ITransactionBaseFilterControls> implements IEventListener {
+    constructor(tankType?: TankTypeEnum, business?: SoleBusiness);
+    listenEvents(): void;
+    filter<ModelClass extends TransactionBase, CollectionClass extends Collection<ModelClass>>(collection: CollectionClass): CollectionClass;
+}
+export {};

package/lib/models/bank/bank-connection.d.ts

@@ -11,6 +11,7 @@ export declare class BankConnection extends BankConnectionBase {
     lastSuccessImportDate: Date;
     expiryDate?: Date;
     isPending(): boolean;
+    isInvalid(): boolean;
     isActive(): boolean;
     isReconnecting(): boolean;
     setPending(): void;

package/lib/models/report/property/property-report-item-transaction.d.ts

@@ -1,7 +1,7 @@
 import { PropertyReportItem } from './property-report-item';
-import { TransactionCollection } from '../../../collections/transaction/transaction.collection';
-import { Property } from '../../property/property';
-import { ChartAccounts } from '../../chart-accounts/chart-accounts';
+import { TransactionCollection } from '../../../collections';
+import { Property } from '../../property';
+import { ChartAccounts } from '../../chart-accounts';
 /**
  * Class with transaction-based property transactions report entities
  */

package/lib/services/http/bank/bank-connection/bank-connection-messages.enum.d.ts

@@ -5,6 +5,7 @@ export declare enum BankConnectionMessagesEnum {
     CONFIRM_DEACTIVATE = "We are unable to deliver daily bank transactions to deactivated banks",
     DEACTIVATED = "Your live bank feeds are deactivated",
     RECONNECT = "Disconnected, There has been an issue with your bank connection. Please reconnect to continue receiving bank transactions",
+    INVALID = "There has been an issue with your bank connection. Please reconnect to continue receiving bank transactions",
     UPGRADE = "Upgrade needed from traditional feeds to an Open Banking connection to continue receiving bank transactions",
     CONFIRM_UPGRADE = "Upgrading to open banking improves stability and data integrity",
     AUTOMATE = "Upgrade from manual imports to an Open Banking connection to receive daily bank transactions",

package/lib/services/http/bank/basiq/basiq.service.d.ts

@@ -65,9 +65,8 @@ export declare class BasiqService extends RestService<BankAccountBase, BankAccou
     extendConsent(token: string): void;
     /**
      * redirect to basiq extend connection date to prolong it
-     * @TODO TT-4230 &connectionId=${connection.id}
      */
-    extendConnection(token: string, connection: BankConnection): void;
+    reauthoriseConnection(token: string, connection: BankConnection): void;
     /**
      * Open basiq consent ui to allow user to manage basiq access to his bank data
      * @param token User's basiq token

package/lib/services/report/property/property-transaction-report.service.d.ts

@@ -1,7 +1,7 @@
 import { ChartAccountsService, DepreciationService, PropertyService, TransactionService } from '../../http';
 import { Observable } from 'rxjs';
-import { Property } from '../../../models';
-import { ChartAccountsCollection, CollectionDictionary, DepreciationCollection, PropertyReportItemCollection, TransactionCollection } from '../../../collections';
+import { ChartAccountsCollection, CollectionDictionary, DepreciationCollection, PropertyCollection, PropertyReportItemCollection, TransactionCollection } from '../../../collections';
+import { TransactionBaseFilterForm } from '../../../forms';
 import * as i0 from "@angular/core";
 /**
  * Service to handle Property transactions report items data (get income / expense report items, e.t.c.)
@@ -11,7 +11,7 @@ export declare class PropertyTransactionReportService {
     private transactionService;
     private depreciationService;
     private chartAccountsService;
-    properties: Property[];
+    properties: PropertyCollection;
     transactions: TransactionCollection;
     depreciations: DepreciationCollection;
     chartAccounts: ChartAccountsCollection;
@@ -20,6 +20,7 @@ export declare class PropertyTransactionReportService {
      * Get collection of report items based on transactions & depreciations
      */
     get(): Observable<CollectionDictionary<PropertyReportItemCollection>>;
+    filter(filterForm: TransactionBaseFilterForm): CollectionDictionary<PropertyReportItemCollection>;
     private create;
     /**
      * Get collection of property transactions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "0.32.107",
+  "version": "0.32.109",
   "private": false,
   "peerDependencies": {
     "@angular/compiler": "^16.2.12",

package/esm2022/lib/forms/transaction/transaction-filter.form.mjs

@@ -1,35 +0,0 @@
-import { FormControl, FormGroup } from '@angular/forms';
-import { TankTypeEnum } from '../../db/Enums/tank-type.enum';
-export class TransactionFilterForm extends FormGroup {
-    constructor(tankType, business) {
-        super({
-            tankType: new FormControl(tankType),
-            business: new FormControl({ value: business, disabled: true }),
-            dateFrom: new FormControl(),
-            dateTo: new FormControl(),
-        });
-        this.listenEvents();
-    }
-    listenEvents() {
-        this.get('tankType').valueChanges.subscribe(tankType => {
-            tankType === TankTypeEnum.SOLE ? this.get('business').enable() : this.get('business').disable();
-        });
-    }
-    filter(collection) {
-        const value = this.value;
-        if (value.dateFrom) {
-            collection = collection.filter(transaction => transaction.date >= value.dateFrom);
-        }
-        if (value.dateTo) {
-            collection = collection.filter(transaction => transaction.date <= value.dateTo);
-        }
-        if (value.tankType) {
-            collection = collection.filterBy('tankType', value.tankType);
-        }
-        if (value.business) {
-            collection = collection.filterBy('business.id', value.business.id);
-        }
-        return collection;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tZmlsdGVyLmZvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvZm9ybXMvdHJhbnNhY3Rpb24vdHJhbnNhY3Rpb24tZmlsdGVyLmZvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUd4RCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFXN0QsTUFBTSxPQUFPLHFCQUFzQixTQUFRLFNBQXFDO0lBQzlFLFlBQVksUUFBc0IsRUFBRSxRQUF1QjtRQUN6RCxLQUFLLENBQUM7WUFDSixRQUFRLEVBQUUsSUFBSSxXQUFXLENBQUMsUUFBUSxDQUFDO1lBQ25DLFFBQVEsRUFBRSxJQUFJLFdBQVcsQ0FBQyxFQUFFLEtBQUssRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxDQUFDO1lBQzlELFFBQVEsRUFBRSxJQUFJLFdBQVcsRUFBRTtZQUMzQixNQUFNLEVBQUUsSUFBSSxXQUFXLEVBQUU7U0FDMUIsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQ3RCLENBQUM7SUFFRCxZQUFZO1FBQ1YsSUFBSSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxZQUFZLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxFQUFFO1lBQ3JELFFBQVEsS0FBSyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2xHLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE1BQU0sQ0FBQyxVQUFpQztRQUN0QyxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDO1FBRXpCLElBQUksS0FBSyxDQUFDLFFBQVEsRUFBRTtZQUNsQixVQUFVLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxJQUFJLElBQUksS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1NBQ25GO1FBQ0QsSUFBSSxLQUFLLENBQUMsTUFBTSxFQUFFO1lBQ2hCLFVBQVUsR0FBRyxVQUFVLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsV0FBVyxDQUFDLElBQUksSUFBSSxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUM7U0FDakY7UUFDRCxJQUFJLEtBQUssQ0FBQyxRQUFRLEVBQUU7WUFDbEIsVUFBVSxHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUMsVUFBVSxFQUFFLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQztTQUM5RDtRQUNELElBQUksS0FBSyxDQUFDLFFBQVEsRUFBRTtZQUNsQixVQUFVLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQztTQUNwRTtRQUVELE9BQU8sVUFBVSxDQUFDO0lBQ3BCLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEZvcm1Db250cm9sLCBGb3JtR3JvdXAgfSBmcm9tICdAYW5ndWxhci9mb3Jtcyc7XG5pbXBvcnQgeyBDb250cm9sc0ludGVyZmFjZSB9IGZyb20gJy4uL2Fic3RyYWN0LmZvcm0nO1xuaW1wb3J0IHsgVHJhbnNhY3Rpb25Db2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vY29sbGVjdGlvbnMnO1xuaW1wb3J0IHsgVGFua1R5cGVFbnVtIH0gZnJvbSAnLi4vLi4vZGIvRW51bXMvdGFuay10eXBlLmVudW0nO1xuaW1wb3J0IHsgU29sZUJ1c2luZXNzIH0gZnJvbSAnLi4vLi4vbW9kZWxzJztcbmltcG9ydCB7IElFdmVudExpc3RlbmVyIH0gZnJvbSAnLi4vLi4vaW50ZXJmYWNlcyc7XG5cbmludGVyZmFjZSBJVHJhbnNhY3Rpb25GaWx0ZXJDb250cm9scyBleHRlbmRzIENvbnRyb2xzSW50ZXJmYWNlIHtcbiAgdGFua1R5cGU6IEZvcm1Db250cm9sPFRhbmtUeXBlRW51bT47XG4gIGJ1c2luZXNzOiBGb3JtQ29udHJvbDxTb2xlQnVzaW5lc3M+O1xuICBkYXRlRnJvbTogRm9ybUNvbnRyb2w8RGF0ZT47XG4gIGRhdGVUbzogRm9ybUNvbnRyb2w8RGF0ZT47XG59XG5cbmV4cG9ydCBjbGFzcyBUcmFuc2FjdGlvbkZpbHRlckZvcm0gZXh0ZW5kcyBGb3JtR3JvdXA8SVRyYW5zYWN0aW9uRmlsdGVyQ29udHJvbHM+IGltcGxlbWVudHMgSUV2ZW50TGlzdGVuZXIge1xuICBjb25zdHJ1Y3Rvcih0YW5rVHlwZTogVGFua1R5cGVFbnVtLCBidXNpbmVzcz86IFNvbGVCdXNpbmVzcykge1xuICAgIHN1cGVyKHtcbiAgICAgIHRhbmtUeXBlOiBuZXcgRm9ybUNvbnRyb2wodGFua1R5cGUpLFxuICAgICAgYnVzaW5lc3M6IG5ldyBGb3JtQ29udHJvbCh7IHZhbHVlOiBidXNpbmVzcywgZGlzYWJsZWQ6IHRydWUgfSksXG4gICAgICBkYXRlRnJvbTogbmV3IEZvcm1Db250cm9sKCksXG4gICAgICBkYXRlVG86IG5ldyBGb3JtQ29udHJvbCgpLFxuICAgIH0pO1xuXG4gICAgdGhpcy5saXN0ZW5FdmVudHMoKTtcbiAgfVxuXG4gIGxpc3RlbkV2ZW50cygpOiB2b2lkIHtcbiAgICB0aGlzLmdldCgndGFua1R5cGUnKS52YWx1ZUNoYW5nZXMuc3Vic2NyaWJlKHRhbmtUeXBlID0+IHtcbiAgICAgIHRhbmtUeXBlID09PSBUYW5rVHlwZUVudW0uU09MRSA/IHRoaXMuZ2V0KCdidXNpbmVzcycpLmVuYWJsZSgpIDogdGhpcy5nZXQoJ2J1c2luZXNzJykuZGlzYWJsZSgpO1xuICAgIH0pO1xuICB9XG5cbiAgZmlsdGVyKGNvbGxlY3Rpb246IFRyYW5zYWN0aW9uQ29sbGVjdGlvbik6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbiB7XG4gICAgY29uc3QgdmFsdWUgPSB0aGlzLnZhbHVlO1xuXG4gICAgaWYgKHZhbHVlLmRhdGVGcm9tKSB7XG4gICAgICBjb2xsZWN0aW9uID0gY29sbGVjdGlvbi5maWx0ZXIodHJhbnNhY3Rpb24gPT4gdHJhbnNhY3Rpb24uZGF0ZSA+PSB2YWx1ZS5kYXRlRnJvbSk7XG4gICAgfVxuICAgIGlmICh2YWx1ZS5kYXRlVG8pIHtcbiAgICAgIGNvbGxlY3Rpb24gPSBjb2xsZWN0aW9uLmZpbHRlcih0cmFuc2FjdGlvbiA9PiB0cmFuc2FjdGlvbi5kYXRlIDw9IHZhbHVlLmRhdGVUbyk7XG4gICAgfVxuICAgIGlmICh2YWx1ZS50YW5rVHlwZSkge1xuICAgICAgY29sbGVjdGlvbiA9IGNvbGxlY3Rpb24uZmlsdGVyQnkoJ3RhbmtUeXBlJywgdmFsdWUudGFua1R5cGUpO1xuICAgIH1cbiAgICBpZiAodmFsdWUuYnVzaW5lc3MpIHtcbiAgICAgIGNvbGxlY3Rpb24gPSBjb2xsZWN0aW9uLmZpbHRlckJ5KCdidXNpbmVzcy5pZCcsIHZhbHVlLmJ1c2luZXNzLmlkKTtcbiAgICB9XG5cbiAgICByZXR1cm4gY29sbGVjdGlvbjtcbiAgfVxufVxuIl19

package/lib/forms/transaction/transaction-filter.form.d.ts

@@ -1,18 +0,0 @@
-import { FormControl, FormGroup } from '@angular/forms';
-import { ControlsInterface } from '../abstract.form';
-import { TransactionCollection } from '../../collections';
-import { TankTypeEnum } from '../../db/Enums/tank-type.enum';
-import { SoleBusiness } from '../../models';
-import { IEventListener } from '../../interfaces';
-interface ITransactionFilterControls extends ControlsInterface {
-    tankType: FormControl<TankTypeEnum>;
-    business: FormControl<SoleBusiness>;
-    dateFrom: FormControl<Date>;
-    dateTo: FormControl<Date>;
-}
-export declare class TransactionFilterForm extends FormGroup<ITransactionFilterControls> implements IEventListener {
-    constructor(tankType: TankTypeEnum, business?: SoleBusiness);
-    listenEvents(): void;
-    filter(collection: TransactionCollection): TransactionCollection;
-}
-export {};