taxtank-core 0.32.15 → 0.32.17

package/fesm2022/taxtank-core.mjs

@@ -3,9 +3,9 @@ import { Injectable, Inject, inject, EventEmitter, NgModule, Pipe } from '@angul
 import * as i1$1 from '@angular/common';
 import { formatDate, CommonModule, CurrencyPipe, DatePipe } from '@angular/common';
 import * as i1 from '@angular/common/http';
-import { HttpParams, HttpErrorResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
-import { map, mergeMap, filter, first as first$1, catchError, take, switchMap, finalize, debounceTime, distinctUntilChanged, startWith, delay } from 'rxjs/operators';
-import { ReplaySubject, Subject, Observable, throwError, combineLatest, BehaviorSubject, forkJoin, of, from, merge as merge$1 } from 'rxjs';
+import { HttpParams, HttpClient, HttpErrorResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { map, mergeMap, filter, catchError, first as first$1, last as last$1, take, switchMap, finalize, debounceTime, distinctUntilChanged, startWith, delay } from 'rxjs/operators';
+import { ReplaySubject, Subject, BehaviorSubject, throwError, Observable, combineLatest, forkJoin, of, from, merge as merge$1 } from 'rxjs';
 import { plainToClass, Type, Transform, Exclude, Expose, classToPlain } from 'class-transformer';
 import get from 'lodash/get';
 import { __decorate } from 'tslib';
@@ -31,6 +31,7 @@ import { EventSourcePolyfill } from 'event-source-polyfill/src/eventsource.min.j
 import { JwtHelperService } from '@auth0/angular-jwt';
 import * as mixpanel from 'mixpanel-browser';
 import clone from 'lodash/clone';
+import { isArray } from 'rxjs/internal-compatibility';
 import * as i4 from '@angular/router';
 import { NavigationEnd } from '@angular/router';
 import _ from 'lodash';
@@ -200,7 +201,7 @@ class AddressService {
     getCountries() {
         if (!this._countries) {
             this.http.get(`${this.environment.apiV2}/countries`)
-                .pipe(map((response) => response['hydra:member'].map((item) => plainToClass(Country, item))))
+                .pipe(map((response) => response.map((item) => plainToClass(Country, item))))
                 .subscribe((countries) => {
                 this._countries = countries;
                 this.countriesSubject.next(countries);
@@ -549,7 +550,7 @@ let Chat$1 = class Chat extends AbstractModel {
 let ClientInvite$1 = class ClientInvite extends ObservableModel {
 };
 
-let ClientMovement$1 = class ClientMovement extends AbstractModel {
+let ClientMovement$1 = class ClientMovement extends ObservableModel {
 };
 
 let EmployeeInvite$1 = class EmployeeInvite extends AbstractModel {
@@ -1792,6 +1793,9 @@ class Collection {
     get last() {
         return last(this.items);
     }
+    get previous() {
+        return this.items[this.items.length - 2];
+    }
     reset() {
         this.index = 0;
         return this.items[this.index];
@@ -1848,8 +1852,11 @@ class Collection {
     filterByRange(path, from, to) {
         return this.filter((item) => get(item, path) >= from && get(item, path) <= to);
     }
-    filterByFinancialYear(path, financialYear = new FinancialYear()) {
-        return this.filterByRange(path, financialYear.startDate, financialYear.endDate);
+    filterByFinancialYear(pathFrom, pathTo, financialYear = new FinancialYear()) {
+        if (pathTo) {
+            return this.filter(model => get(model, pathFrom) <= financialYear.endDate && !get(model, pathTo) || get(model, pathTo) >= financialYear.startDate);
+        }
+        return this.filterByRange(pathFrom, financialYear.startDate, financialYear.endDate);
     }
     find(callback) {
         return this.items.find(callback);
@@ -2130,13 +2137,6 @@ class PropertySaleTaxExemptionMetaFieldCollection extends Collection {
 }
 
 class PropertyCollection extends Collection {
-    /**
-     * Get new property collection filtered by category id
-     * @param id id of category for filter
-     */
-    getByCategoryId(id) {
-        return new PropertyCollection(this.items.filter((property) => property.category.id === id));
-    }
     /**
      * Get new property collection filtered by active status
      */
@@ -2152,12 +2152,6 @@ class PropertyCollection extends Collection {
     getSharedProperties() {
         return new PropertyCollection(this.items.filter((property) => !property.isOwn()));
     }
-    /**
-     * Properties that are taxed and will be included in reports (Tax summary, My tax report, e.t.c.)
-     */
-    getTaxInclusive() {
-        return this.create(this.items.filter((property) => property.category.isTaxInclusive));
-    }
     getUnsold() {
         return this.create(this.items.filter((property) => !property.isSold()));
     }
@@ -2173,33 +2167,21 @@ class PropertyCollection extends Collection {
     get marketValue() {
         return this.sumBy('marketValue');
     }
-    get firstForecastYear() {
-        return this.items.reduce((min, property) => {
-            const current = property.firstForecastYear;
-            return min > current ? current : min;
-        }, new FinancialYear().year);
-    }
     get marketValueGrowth() {
         return (this.marketValue - this.purchasePrice) / this.purchasePrice;
     }
-    /**
-     * list of properties
-     */
-    getCGTApplicable() {
-        return this.create(this.items.filter((property) => property.isCGTApplicable()));
-    }
-    getOwnerOccupiedProperties() {
-        return new PropertyCollection(this.items.filter((property) => property.category.isOwnerOccupied()));
-    }
-    get earliestContractDate() {
-        return this.items.reduce((min, property) => min < property.contractDate ? min : property.contractDate, new FinancialYear(new Date()).startDate);
-    }
     /**
      * Get list of unique property categories from collection
      */
     getCategories() {
         return uniqBy(this.items.map((property) => property.category), 'id');
     }
+    /**
+     * list of properties
+     */
+    getCGTApplicable() {
+        return this.create(this.items.filter((property) => property.isCGTApplicable()));
+    }
     /**
      * Get property with the highest growth percent
      */
@@ -2219,6 +2201,7 @@ class PropertyCollection extends Collection {
         }, this.first);
     }
     /**
+     * @TODO Nicole not needed anymore?
      * Show best performance properties first
      * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677997/Property+Tank+Dashboard
      */
@@ -2239,19 +2222,50 @@ class PropertyCollection extends Collection {
     get netMonthlyIncome() {
         return this.sumBy('monthlyIncome') + this.sumBy('monthlyExpense');
     }
+    getOwnerOccupiedProperties() {
+        return new PropertyCollection(this.items.filter((property) => property.category.isOwnerOccupied()));
+    }
+    /**
+     * Properties that are taxed and will be included in reports (Tax summary, My tax report, e.t.c.)
+     */
+    getTaxInclusive() {
+        return this.create(this.items.filter((property) => property.category.isTaxInclusive));
+    }
+    groupByCategory(categories, movements, allowEmpty = false) {
+        const categoryById = categories.indexBy('id');
+        const movementsByCategory = movements.getCurrent().groupBy('propertyCategory.id');
+        const propertiesByCategory = new Map;
+        movementsByCategory.keys.forEach(key => {
+            propertiesByCategory.set(categoryById.get(key), this.filterBy('id', movementsByCategory.get(key).map(movement => movement.property.id)));
+        });
+        if (allowEmpty) {
+            categories.remove(...propertiesByCategory.keys()).toArray().forEach(category => {
+                propertiesByCategory.set(category, new PropertyCollection());
+            });
+        }
+        return propertiesByCategory;
+    }
 }
 
 class PropertyCategoryMovementCollection extends Collection {
     /**
      * @TODO TT-2355 Alex refactor propertyForecast, use separated api (then I can remove property from param)
      */
-    getByForecast(property, forecast) {
-        const financialYear = new FinancialYear(forecast.financialYear);
-        return this.filterBy('property.id', property.id).filter((movement) => movement.fromDate <= financialYear.endDate && !movement.toDate || movement.toDate >= financialYear.startDate);
+    filterByForecast(property, forecast) {
+        return this.filterBy('property.id', property.id)
+            .filterByFinancialYear('fromDate', 'toDate', new FinancialYear(forecast.financialYear));
     }
     hasCategory(categoryId) {
         return !!this.findBy('propertyCategory.id', categoryId);
     }
+    /**
+     * active movement by property based on selected year
+     */
+    getCurrent() {
+        return this.create(this.filterByFinancialYear('fromDate', 'toDate')
+            .indexBy('property.id')
+            .toArray());
+    }
 }
 
 class PropertyShareCollection extends Collection {
@@ -2273,6 +2287,9 @@ class PropertyShareCollection extends Collection {
     }
 }
 
+class PropertyValuationCollection extends Collection {
+}
+
 /**
  * Enum with symbols based on depreciation LVP asset type
  */
@@ -4479,6 +4496,105 @@ __decorate([
     Expose()
 ], ServiceSubscription.prototype, "promoCodeId", null);
 
+class ServicePayment extends ServicePayment$1 {
+    static { this.daysToInvoiceUrlExpired = 30; }
+    /**
+     * Stripe stores actual links to payment invoices for 30 days.
+     * Link expires after 30 days
+     */
+    isInvoiceLinkExpired() {
+        const expirationDate = new Date(this.date.setDate(this.date.getDate() + ServicePayment.daysToInvoiceUrlExpired));
+        return expirationDate.getTime() < new Date().getTime();
+    }
+}
+__decorate([
+    Type(() => ServiceSubscription)
+], ServicePayment.prototype, "subscription", void 0);
+__decorate([
+    Type(() => Date)
+], ServicePayment.prototype, "date", void 0);
+
+let ServicePaymentMethod$1 = class ServicePaymentMethod extends AbstractModel {
+};
+
+var PaymentMethodBrandEnum;
+(function (PaymentMethodBrandEnum) {
+    PaymentMethodBrandEnum["UNKNOWN"] = "Unknown";
+    PaymentMethodBrandEnum["AMEX"] = "American Express";
+    PaymentMethodBrandEnum["DINERS"] = "Diners Club";
+    PaymentMethodBrandEnum["DISCOVER"] = "Discover";
+    PaymentMethodBrandEnum["JCB"] = "JCB";
+    PaymentMethodBrandEnum["MASTERCARD"] = "Mastercard";
+    PaymentMethodBrandEnum["UNIONPAY"] = "UnionPay";
+    PaymentMethodBrandEnum["VISA"] = "Visa";
+})(PaymentMethodBrandEnum || (PaymentMethodBrandEnum = {}));
+
+var ServicePaymentMethodCardBrandEnum;
+(function (ServicePaymentMethodCardBrandEnum) {
+    ServicePaymentMethodCardBrandEnum[ServicePaymentMethodCardBrandEnum["UNKNOWN"] = 0] = "UNKNOWN";
+    ServicePaymentMethodCardBrandEnum[ServicePaymentMethodCardBrandEnum["AMEX"] = 1] = "AMEX";
+    ServicePaymentMethodCardBrandEnum[ServicePaymentMethodCardBrandEnum["DINERS"] = 2] = "DINERS";
+    ServicePaymentMethodCardBrandEnum[ServicePaymentMethodCardBrandEnum["DISCOVER"] = 3] = "DISCOVER";
+    ServicePaymentMethodCardBrandEnum[ServicePaymentMethodCardBrandEnum["JCB"] = 4] = "JCB";
+    ServicePaymentMethodCardBrandEnum[ServicePaymentMethodCardBrandEnum["MASTERCARD"] = 5] = "MASTERCARD";
+    ServicePaymentMethodCardBrandEnum[ServicePaymentMethodCardBrandEnum["UNIONPAY"] = 6] = "UNIONPAY";
+    ServicePaymentMethodCardBrandEnum[ServicePaymentMethodCardBrandEnum["VISA"] = 7] = "VISA";
+})(ServicePaymentMethodCardBrandEnum || (ServicePaymentMethodCardBrandEnum = {}));
+
+var ServicePaymentMethodTypeEnum;
+(function (ServicePaymentMethodTypeEnum) {
+    ServicePaymentMethodTypeEnum[ServicePaymentMethodTypeEnum["AU_BECS_DEBIT"] = 1] = "AU_BECS_DEBIT";
+    ServicePaymentMethodTypeEnum[ServicePaymentMethodTypeEnum["CARD"] = 2] = "CARD";
+})(ServicePaymentMethodTypeEnum || (ServicePaymentMethodTypeEnum = {}));
+
+class ServicePaymentMethod extends ServicePaymentMethod$1 {
+    get logo() {
+        if (!this.isCard()) {
+            return null;
+        }
+        return `/assets/img/payment-methods/${this.cardBrand}.svg`;
+    }
+    get brandName() {
+        return this.isCard() ? PaymentMethodBrandEnum[ServicePaymentMethodCardBrandEnum[this.cardBrand]] : 'BECS Direct Debit (AU)';
+    }
+    /**
+     * Get expiration date formatted string (MM/YY)
+     */
+    get expirationDate() {
+        if (!this.isCard()) {
+            return null;
+        }
+        return `${('0' + this.cardExpirationMonth).slice(-2)}/${this.cardExpirationYear.toString().slice(-2)}`;
+    }
+    get description() {
+        return `${this.brandName} ***${this.lastFourDigits}`;
+    }
+    isCard() {
+        return this.type === ServicePaymentMethodTypeEnum.CARD;
+    }
+}
+
+/**
+ * Enum with icon-names related to tank roles
+ */
+var ServiceProductIconsEnum;
+(function (ServiceProductIconsEnum) {
+    ServiceProductIconsEnum["ROLE_USER_WORK"] = "icon-case";
+    ServiceProductIconsEnum["ROLE_USER_PROPERTY"] = "icon-property";
+    ServiceProductIconsEnum["ROLE_USER_SOLE"] = "icon-sole-tank";
+    ServiceProductIconsEnum["ROLE_USER_HOLDING"] = "icon-holding-tank";
+})(ServiceProductIconsEnum || (ServiceProductIconsEnum = {}));
+
+/**
+ * List of user roles related to tanks (subscription products)
+ */
+const SERVICE_PRODUCT_ROLES = [
+    UserRolesEnum.WORK_TANK,
+    UserRolesEnum.PROPERTY_TANK,
+    UserRolesEnum.SOLE_TANK,
+    UserRolesEnum.HOLDING_TANK
+];
+
 class ClientMovement extends ClientMovement$1 {
 }
 __decorate([
@@ -4582,105 +4698,6 @@ __decorate([
     Type(() => Firm)
 ], EmployeeDetails.prototype, "firm", void 0);
 
-class ServicePayment extends ServicePayment$1 {
-    static { this.daysToInvoiceUrlExpired = 30; }
-    /**
-     * Stripe stores actual links to payment invoices for 30 days.
-     * Link expires after 30 days
-     */
-    isInvoiceLinkExpired() {
-        const expirationDate = new Date(this.date.setDate(this.date.getDate() + ServicePayment.daysToInvoiceUrlExpired));
-        return expirationDate.getTime() < new Date().getTime();
-    }
-}
-__decorate([
-    Type(() => ServiceSubscription)
-], ServicePayment.prototype, "subscription", void 0);
-__decorate([
-    Type(() => Date)
-], ServicePayment.prototype, "date", void 0);
-
-let ServicePaymentMethod$1 = class ServicePaymentMethod extends AbstractModel {
-};
-
-var PaymentMethodBrandEnum;
-(function (PaymentMethodBrandEnum) {
-    PaymentMethodBrandEnum["UNKNOWN"] = "Unknown";
-    PaymentMethodBrandEnum["AMEX"] = "American Express";
-    PaymentMethodBrandEnum["DINERS"] = "Diners Club";
-    PaymentMethodBrandEnum["DISCOVER"] = "Discover";
-    PaymentMethodBrandEnum["JCB"] = "JCB";
-    PaymentMethodBrandEnum["MASTERCARD"] = "Mastercard";
-    PaymentMethodBrandEnum["UNIONPAY"] = "UnionPay";
-    PaymentMethodBrandEnum["VISA"] = "Visa";
-})(PaymentMethodBrandEnum || (PaymentMethodBrandEnum = {}));
-
-var ServicePaymentMethodCardBrandEnum;
-(function (ServicePaymentMethodCardBrandEnum) {
-    ServicePaymentMethodCardBrandEnum[ServicePaymentMethodCardBrandEnum["UNKNOWN"] = 0] = "UNKNOWN";
-    ServicePaymentMethodCardBrandEnum[ServicePaymentMethodCardBrandEnum["AMEX"] = 1] = "AMEX";
-    ServicePaymentMethodCardBrandEnum[ServicePaymentMethodCardBrandEnum["DINERS"] = 2] = "DINERS";
-    ServicePaymentMethodCardBrandEnum[ServicePaymentMethodCardBrandEnum["DISCOVER"] = 3] = "DISCOVER";
-    ServicePaymentMethodCardBrandEnum[ServicePaymentMethodCardBrandEnum["JCB"] = 4] = "JCB";
-    ServicePaymentMethodCardBrandEnum[ServicePaymentMethodCardBrandEnum["MASTERCARD"] = 5] = "MASTERCARD";
-    ServicePaymentMethodCardBrandEnum[ServicePaymentMethodCardBrandEnum["UNIONPAY"] = 6] = "UNIONPAY";
-    ServicePaymentMethodCardBrandEnum[ServicePaymentMethodCardBrandEnum["VISA"] = 7] = "VISA";
-})(ServicePaymentMethodCardBrandEnum || (ServicePaymentMethodCardBrandEnum = {}));
-
-var ServicePaymentMethodTypeEnum;
-(function (ServicePaymentMethodTypeEnum) {
-    ServicePaymentMethodTypeEnum[ServicePaymentMethodTypeEnum["AU_BECS_DEBIT"] = 1] = "AU_BECS_DEBIT";
-    ServicePaymentMethodTypeEnum[ServicePaymentMethodTypeEnum["CARD"] = 2] = "CARD";
-})(ServicePaymentMethodTypeEnum || (ServicePaymentMethodTypeEnum = {}));
-
-class ServicePaymentMethod extends ServicePaymentMethod$1 {
-    get logo() {
-        if (!this.isCard()) {
-            return null;
-        }
-        return `/assets/img/payment-methods/${this.cardBrand}.svg`;
-    }
-    get brandName() {
-        return this.isCard() ? PaymentMethodBrandEnum[ServicePaymentMethodCardBrandEnum[this.cardBrand]] : 'BECS Direct Debit (AU)';
-    }
-    /**
-     * Get expiration date formatted string (MM/YY)
-     */
-    get expirationDate() {
-        if (!this.isCard()) {
-            return null;
-        }
-        return `${('0' + this.cardExpirationMonth).slice(-2)}/${this.cardExpirationYear.toString().slice(-2)}`;
-    }
-    get description() {
-        return `${this.brandName} ***${this.lastFourDigits}`;
-    }
-    isCard() {
-        return this.type === ServicePaymentMethodTypeEnum.CARD;
-    }
-}
-
-/**
- * Enum with icon-names related to tank roles
- */
-var ServiceProductIconsEnum;
-(function (ServiceProductIconsEnum) {
-    ServiceProductIconsEnum["ROLE_USER_WORK"] = "icon-case";
-    ServiceProductIconsEnum["ROLE_USER_PROPERTY"] = "icon-property";
-    ServiceProductIconsEnum["ROLE_USER_SOLE"] = "icon-sole-tank";
-    ServiceProductIconsEnum["ROLE_USER_HOLDING"] = "icon-holding-tank";
-})(ServiceProductIconsEnum || (ServiceProductIconsEnum = {}));
-
-/**
- * List of user roles related to tanks (subscription products)
- */
-const SERVICE_PRODUCT_ROLES = [
-    UserRolesEnum.WORK_TANK,
-    UserRolesEnum.PROPERTY_TANK,
-    UserRolesEnum.SOLE_TANK,
-    UserRolesEnum.HOLDING_TANK
-];
-
 class SoleBusinessAllocation extends SoleBusinessAllocation$1 {
 }
 __decorate([
@@ -5528,9 +5545,6 @@ __decorate([
 __decorate([
     Type(() => PropertyDocument)
 ], PropertyValuation.prototype, "document", void 0);
-__decorate([
-    Type(() => Number)
-], PropertyValuation.prototype, "marketValue", void 0);
 
 class PropertyForecast extends PropertyForecast$1 {
     constructor() {
@@ -5604,6 +5618,9 @@ __decorate([
 __decorate([
     Type(() => PropertyCategory)
 ], PropertyCategoryMovement.prototype, "propertyCategory", void 0);
+__decorate([
+    Type(() => Property)
+], PropertyCategoryMovement.prototype, "property", void 0);
 __decorate([
     Type(() => Date)
 ], PropertyCategoryMovement.prototype, "fromDate", void 0);
@@ -5635,11 +5652,8 @@ class Property extends Property$1 {
     get capitalCostsTotalAmount() {
         return this.stampDuty + this.legalFees + this.otherCapitalCosts;
     }
-    get currentYearValuations() {
-        return this.valuations.filter((valuation) => valuation.isCurrentYear());
-    }
     get marketValue() {
-        return this.actualValuation?.marketValue || 0;
+        return this.valuation?.marketValue || 0;
     }
     get currentYearForecast() {
         return this.forecasts.find((forecast) => forecast.isCurrentYear());
@@ -5653,18 +5667,12 @@ class Property extends Property$1 {
     get forecastedCashPosition() {
         return this.currentYearForecast?.cashPosition || 0;
     }
-    get firstForecastYear() {
-        return this.forecasts.reduce((min, forecast) => min > forecast.financialYear ? forecast.financialYear : min, new FinancialYear().year);
-    }
     get marketValueGrowth() {
         return (this.marketValue - this.purchasePrice) / this.marketValue;
     }
     get myShare() {
         return this.shares.find((share) => share.user.id === +localStorage.getItem('userId'));
     }
-    get actualValuation() {
-        return this.valuations.reduce((maxDateValuation, valuation) => maxDateValuation.date > valuation.date ? maxDateValuation : valuation, this.valuations[0]);
-    }
     get claimPercent() {
         return this.currentYearForecast.claimPercent;
     }
@@ -5677,14 +5685,6 @@ class Property extends Property$1 {
     get shareRatio() {
         return this.myShare.percent / 100;
     }
-    get previousCategory() {
-        let previousCategory;
-        const movementsCount = this.categoryMovements.length;
-        if (movementsCount > 1) {
-            previousCategory = this.categoryMovements[movementsCount - 2].propertyCategory;
-        }
-        return previousCategory;
-    }
     getCurrentSubscription() {
         // always return first element because subscriptions array contains only one element
         return this.subscriptions[0];
@@ -5828,6 +5828,9 @@ __decorate([
 __decorate([
     Type(() => PropertyCategory)
 ], Property.prototype, "category", void 0);
+__decorate([
+    Type(() => PropertyCategoryMovement)
+], Property.prototype, "categoryMovements", void 0);
 __decorate([
     Type(() => Number)
 ], Property.prototype, "stampDuty", void 0);
@@ -5837,15 +5840,18 @@ __decorate([
 __decorate([
     Type(() => Number)
 ], Property.prototype, "otherCapitalCosts", void 0);
-__decorate([
-    Type(() => PropertyValuation)
-], Property.prototype, "valuations", void 0);
 __decorate([
     Type(() => PropertyForecast)
 ], Property.prototype, "forecasts", void 0);
 __decorate([
-    Type(() => PropertyCategoryMovement)
-], Property.prototype, "categoryMovements", void 0);
+    Type(() => PropertyShare$1)
+], Property.prototype, "shares", void 0);
+__decorate([
+    Type(() => PropertyValuation)
+], Property.prototype, "valuations", void 0);
+__decorate([
+    Type(() => PropertyValuation)
+], Property.prototype, "valuation", void 0);
 __decorate([
     Type(() => User)
 ], Property.prototype, "user", void 0);
@@ -6239,17 +6245,6 @@ __decorate([
     Type(() => User)
 ], BorrowingReport.prototype, "user", void 0);
 
-/**
- * @TODO used only on dashboard, move from tt-core
- * Enum with properties ownership filter options
- */
-var ShareFilterOptionsEnum;
-(function (ShareFilterOptionsEnum) {
-    ShareFilterOptionsEnum[ShareFilterOptionsEnum["ALL"] = 1] = "ALL";
-    ShareFilterOptionsEnum[ShareFilterOptionsEnum["CREATED"] = 2] = "CREATED";
-    ShareFilterOptionsEnum[ShareFilterOptionsEnum["SHARED"] = 3] = "SHARED";
-})(ShareFilterOptionsEnum || (ShareFilterOptionsEnum = {}));
-
 class TransactionMetaField extends TransactionMetaField$1 {
 }
 __decorate([
@@ -6267,7 +6262,6 @@ class BankTransaction extends BankTransaction$1 {
         super(...arguments);
         // allocated money amount for bank transaction
         this.allocatedAmount = 0;
-        this.unallocatedAmount = 0;
     }
     /**
      * get allocated amount value but with +/- sign
@@ -9976,62 +9970,60 @@ var AppEventTypeEnum;
     AppEventTypeEnum[AppEventTypeEnum["BANK_TRANSACTION_ALLOCATED"] = 2] = "BANK_TRANSACTION_ALLOCATED";
     AppEventTypeEnum[AppEventTypeEnum["BANK_TRANSACTIONS_ADDED"] = 3] = "BANK_TRANSACTIONS_ADDED";
     AppEventTypeEnum[AppEventTypeEnum["BANK_TRANSACTIONS_DELETED"] = 4] = "BANK_TRANSACTIONS_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["BASIQ_CONSENT_UPDATED"] = 5] = "BASIQ_CONSENT_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["BASIQ_CONNECTION_UPDATED"] = 6] = "BASIQ_CONNECTION_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["BASIQ_JOB_CREATED"] = 7] = "BASIQ_JOB_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["BASIQ_LOGIN_SUCCESS"] = 8] = "BASIQ_LOGIN_SUCCESS";
-    AppEventTypeEnum[AppEventTypeEnum["BASIQ_LOGIN_FAILED"] = 9] = "BASIQ_LOGIN_FAILED";
-    AppEventTypeEnum[AppEventTypeEnum["BASIQ_ACCOUNTS_RETRIEVED"] = 10] = "BASIQ_ACCOUNTS_RETRIEVED";
-    AppEventTypeEnum[AppEventTypeEnum["CLIENT_INVITE_ACCEPTED"] = 11] = "CLIENT_INVITE_ACCEPTED";
-    AppEventTypeEnum[AppEventTypeEnum["CLIENT_OPEN_CHAT"] = 12] = "CLIENT_OPEN_CHAT";
-    AppEventTypeEnum[AppEventTypeEnum["CLIENT_TRANSFER_TO_OTHER_EMPLOYEE"] = 13] = "CLIENT_TRANSFER_TO_OTHER_EMPLOYEE";
-    AppEventTypeEnum[AppEventTypeEnum["CURRENT_USER_GET_FAILED"] = 14] = "CURRENT_USER_GET_FAILED";
-    AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_DELETED"] = 15] = "DEPRECIATION_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["DEPRECIATIONS_CREATED"] = 16] = "DEPRECIATIONS_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_CREATED"] = 17] = "INCOME_SOURCES_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_UPDATED"] = 18] = "INCOME_SOURCES_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_FORECASTS_CREATED"] = 19] = "INCOME_SOURCES_FORECASTS_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_FORECASTS_UPDATED"] = 20] = "INCOME_SOURCES_FORECASTS_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["LOAN_UPDATED"] = 21] = "LOAN_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["LOAN_PAYOUT_UPDATED"] = 22] = "LOAN_PAYOUT_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["MESSAGE_CREATED"] = 23] = "MESSAGE_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["MESSAGE_FILE_CREATED"] = 24] = "MESSAGE_FILE_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["MESSAGE_FILE_DELETED"] = 25] = "MESSAGE_FILE_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["NOTIFICATION_ADDED"] = 26] = "NOTIFICATION_ADDED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_DEPRECIATION_CALCULATION_UPDATED"] = 27] = "PROPERTY_DEPRECIATION_CALCULATION_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_UPDATED"] = 28] = "PROPERTY_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_UPDATED_WITH_DOCUMENT"] = 29] = "PROPERTY_UPDATED_WITH_DOCUMENT";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_DOCUMENT_ADDED"] = 30] = "PROPERTY_DOCUMENT_ADDED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_CREATED"] = 31] = "PROPERTY_MOVEMENT_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_UPDATED"] = 32] = "PROPERTY_MOVEMENT_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_DELETED"] = 33] = "PROPERTY_MOVEMENT_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SHARE_UPDATED"] = 34] = "PROPERTY_SHARE_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SALE_ADDED"] = 35] = "PROPERTY_SALE_ADDED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SALE_DELETED"] = 36] = "PROPERTY_SALE_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SUBSCRIPTION_ADDED"] = 37] = "PROPERTY_SUBSCRIPTION_ADDED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SUBSCRIPTION_DELETED"] = 38] = "PROPERTY_SUBSCRIPTION_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_VALUATION_DOCUMENT_CREATED"] = 39] = "PROPERTY_VALUATION_DOCUMENT_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["SERVICE_SUBSCRIPTION_UPDATED"] = 40] = "SERVICE_SUBSCRIPTION_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["SOLE_BUSINESS_CREATED"] = 41] = "SOLE_BUSINESS_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["SOLE_DEPRECIATION_METHOD_UPDATED"] = 42] = "SOLE_DEPRECIATION_METHOD_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["SOLE_DETAILS_CREATED"] = 43] = "SOLE_DETAILS_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["SOLE_DETAILS_UPDATED"] = 44] = "SOLE_DETAILS_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["SOLE_INVOICE_PUBLISHED"] = 45] = "SOLE_INVOICE_PUBLISHED";
-    AppEventTypeEnum[AppEventTypeEnum["TAX_REVIEW_UPDATED"] = 46] = "TAX_REVIEW_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_ALLOCATION_CREATED"] = 47] = "TRANSACTION_ALLOCATION_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_ALLOCATION_DELETED"] = 48] = "TRANSACTION_ALLOCATION_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_CREATED"] = 49] = "TRANSACTION_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_DELETED"] = 50] = "TRANSACTION_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED"] = 51] = "TRANSACTION_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTIONS_CREATED"] = 52] = "TRANSACTIONS_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_UPDATED"] = 53] = "VEHICLE_CLAIM_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_CREATED"] = 54] = "VEHICLE_CLAIM_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_UPDATED"] = 55] = "VEHICLE_CLAIM_DETAILS_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_CREATED"] = 56] = "VEHICLE_CLAIM_DETAILS_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_CREATED"] = 57] = "VEHICLE_LOGBOOK_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_UPDATED"] = 58] = "VEHICLE_LOGBOOK_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_DELETED"] = 59] = "VEHICLE_LOGBOOK_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED"] = 60] = "VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["BASIQ_CONNECTION_UPDATED"] = 5] = "BASIQ_CONNECTION_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["BASIQ_JOB_CREATED"] = 6] = "BASIQ_JOB_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["BASIQ_LOGIN_SUCCESS"] = 7] = "BASIQ_LOGIN_SUCCESS";
+    AppEventTypeEnum[AppEventTypeEnum["BASIQ_LOGIN_FAILED"] = 8] = "BASIQ_LOGIN_FAILED";
+    AppEventTypeEnum[AppEventTypeEnum["BASIQ_ACCOUNTS_RETRIEVED"] = 9] = "BASIQ_ACCOUNTS_RETRIEVED";
+    AppEventTypeEnum[AppEventTypeEnum["CLIENT_INVITE_ACCEPTED"] = 10] = "CLIENT_INVITE_ACCEPTED";
+    AppEventTypeEnum[AppEventTypeEnum["CLIENT_OPEN_CHAT"] = 11] = "CLIENT_OPEN_CHAT";
+    AppEventTypeEnum[AppEventTypeEnum["CLIENT_TRANSFER_TO_OTHER_EMPLOYEE"] = 12] = "CLIENT_TRANSFER_TO_OTHER_EMPLOYEE";
+    AppEventTypeEnum[AppEventTypeEnum["CURRENT_USER_GET_FAILED"] = 13] = "CURRENT_USER_GET_FAILED";
+    AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_DELETED"] = 14] = "DEPRECIATION_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["DEPRECIATIONS_CREATED"] = 15] = "DEPRECIATIONS_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_CREATED"] = 16] = "INCOME_SOURCES_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_UPDATED"] = 17] = "INCOME_SOURCES_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_FORECASTS_CREATED"] = 18] = "INCOME_SOURCES_FORECASTS_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_FORECASTS_UPDATED"] = 19] = "INCOME_SOURCES_FORECASTS_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["LOAN_UPDATED"] = 20] = "LOAN_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["LOAN_PAYOUT_UPDATED"] = 21] = "LOAN_PAYOUT_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["MESSAGE_CREATED"] = 22] = "MESSAGE_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["MESSAGE_FILE_CREATED"] = 23] = "MESSAGE_FILE_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["MESSAGE_FILE_DELETED"] = 24] = "MESSAGE_FILE_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["NOTIFICATION_ADDED"] = 25] = "NOTIFICATION_ADDED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_DEPRECIATION_CALCULATION_UPDATED"] = 26] = "PROPERTY_DEPRECIATION_CALCULATION_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_UPDATED"] = 27] = "PROPERTY_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_UPDATED_WITH_DOCUMENT"] = 28] = "PROPERTY_UPDATED_WITH_DOCUMENT";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_DOCUMENT_ADDED"] = 29] = "PROPERTY_DOCUMENT_ADDED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_CREATED"] = 30] = "PROPERTY_MOVEMENT_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_UPDATED"] = 31] = "PROPERTY_MOVEMENT_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_DELETED"] = 32] = "PROPERTY_MOVEMENT_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SHARE_UPDATED"] = 33] = "PROPERTY_SHARE_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SALE_ADDED"] = 34] = "PROPERTY_SALE_ADDED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SALE_DELETED"] = 35] = "PROPERTY_SALE_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SUBSCRIPTION_ADDED"] = 36] = "PROPERTY_SUBSCRIPTION_ADDED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SUBSCRIPTION_DELETED"] = 37] = "PROPERTY_SUBSCRIPTION_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_VALUATION_DOCUMENT_CREATED"] = 38] = "PROPERTY_VALUATION_DOCUMENT_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["SOLE_BUSINESS_CREATED"] = 39] = "SOLE_BUSINESS_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["SOLE_DEPRECIATION_METHOD_UPDATED"] = 40] = "SOLE_DEPRECIATION_METHOD_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["SOLE_DETAILS_CREATED"] = 41] = "SOLE_DETAILS_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["SOLE_DETAILS_UPDATED"] = 42] = "SOLE_DETAILS_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["SOLE_INVOICE_PUBLISHED"] = 43] = "SOLE_INVOICE_PUBLISHED";
+    AppEventTypeEnum[AppEventTypeEnum["TAX_REVIEW_UPDATED"] = 44] = "TAX_REVIEW_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_ALLOCATION_CREATED"] = 45] = "TRANSACTION_ALLOCATION_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_ALLOCATION_DELETED"] = 46] = "TRANSACTION_ALLOCATION_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_CREATED"] = 47] = "TRANSACTION_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_DELETED"] = 48] = "TRANSACTION_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED"] = 49] = "TRANSACTION_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTIONS_CREATED"] = 50] = "TRANSACTIONS_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_UPDATED"] = 51] = "VEHICLE_CLAIM_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_CREATED"] = 52] = "VEHICLE_CLAIM_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_UPDATED"] = 53] = "VEHICLE_CLAIM_DETAILS_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_CREATED"] = 54] = "VEHICLE_CLAIM_DETAILS_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_CREATED"] = 55] = "VEHICLE_LOGBOOK_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_UPDATED"] = 56] = "VEHICLE_LOGBOOK_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_DELETED"] = 57] = "VEHICLE_LOGBOOK_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED"] = 58] = "VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED";
 })(AppEventTypeEnum || (AppEventTypeEnum = {}));
 
 /**
@@ -10351,12 +10343,10 @@ class Budget extends Budget$1 {
     }
 }
 __decorate([
-    Type(() => BudgetRule),
-    Expose()
+    Type(() => BudgetRule)
 ], Budget.prototype, "rules", void 0);
 __decorate([
-    Type(() => User),
-    Expose()
+    Type(() => User)
 ], Budget.prototype, "user", void 0);
 
 class TaxReturnCategory extends TaxReturnCategory$1 {
@@ -10544,6 +10534,53 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                 }]
         }] });
 
+class AuthService {
+    constructor(http, jwtService, mpService, environment) {
+        this.http = http;
+        this.jwtService = jwtService;
+        this.mpService = mpService;
+        this.environment = environment;
+        this.isLoggedInSubject = new BehaviorSubject(!this.jwtService.isTokenExpired());
+    }
+    setAuth(response) {
+        this.jwtService.saveTokens(response);
+        this.isLoggedInSubject.next(true);
+    }
+    login(username, password) {
+        return this.http.post(`${this.environment.apiV2}/login`, { username, password }).pipe(map((response) => {
+            this.setAuth(response);
+            this.mpService.track('login');
+            return response;
+        }), catchError((error) => {
+            this.mpService.track('loginError', { username });
+            return throwError(error);
+        }));
+    }
+    refresh(refreshToken) {
+        return this.http.post(`${this.environment.apiV2}/token/refresh`, { refreshToken }).pipe(map((response) => {
+            this.setAuth(response);
+            return response;
+        }));
+    }
+    logoutFront(url = '/login') {
+        localStorage.clear();
+        this.mpService.track('logout');
+        this.mpService.reset();
+        location.replace(url);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: AuthService, deps: [{ token: i1.HttpClient }, { token: JwtService }, { token: MixpanelService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: AuthService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: AuthService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: JwtService }, { type: MixpanelService }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
+
 /**
  * server sent events service
  * https://symfony.com/doc/current/mercure.html
@@ -10641,8 +10678,7 @@ class DataService {
      * @param model Single object or array from which will be created model instance(s)
      */
     createModelInstance(model) {
-        // excludePrefixes - class-transformer option is using to ignore hydra fields
-        return plainToClass(this.modelClass, model, { excludePrefixes: ['@'] });
+        return plainToClass(this.modelClass, model);
     }
     createCollectionInstance(collectionClass, items) {
         return new collectionClass(items);
@@ -10754,10 +10790,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
  * CollectionModel - entity collection class
  */
 let RestService$1 = class RestService extends DataService {
-    constructor(http, eventDispatcherService, environment) {
+    constructor(environment) {
         super();
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
         this.environment = environment;
         /**
          * Subject for service cache
@@ -10772,15 +10806,9 @@ let RestService$1 = class RestService extends DataService {
         this.mpService = inject(MixpanelService);
         this.sseService = inject(SseService);
         this.toastService = inject(ToastService);
+        this.http = inject(HttpClient);
+        this.eventDispatcherService = inject(EventDispatcherService);
         this.roles = [];
-        /**
-         * disable cache update by requests, update only by SSE events
-         */
-        this.disableCache = false;
-        // @TODO Alex remove, bad idea to call empty method overrided in child (because it will be called with parent context)
-        this.listenEvents();
-        // @TODO Alex remove, bad idea to call empty method overrided in child (because it will be called with parent context)
-        this.listenSSE();
     }
     get apiUrl() {
         return `${this.environment.apiV2}/${this.endpointUri}`;
@@ -10810,7 +10838,7 @@ let RestService$1 = class RestService extends DataService {
         // Set cache as empty collection to avoid multiple requests before cache filled
         this.setCache([]);
         return this.http.get(path)
-            .pipe(map((response) => this.isApiPlatform ? response['hydra:member'] : toArray(response)), map((response) => {
+            .pipe(map((response) => isArray(response) ? response : toArray(response)), map((response) => {
             this.setCache(response, true);
             return this.cache;
         }));
@@ -10839,7 +10867,9 @@ let RestService$1 = class RestService extends DataService {
         return this.http.post(path, classToPlain(model))
             .pipe(map((response) => {
             const result = this.createModelInstance(response);
-            this.handleResponse([result], 'post', mpData);
+            if (!this.mercureTopic) {
+                this.handleResponse([result], 'post', mpData);
+            }
             return result;
         }), catchError((error) => {
             this.handleResponseError([model], 'post', mpData);
@@ -10854,7 +10884,9 @@ let RestService$1 = class RestService extends DataService {
         return this.http.post(this.apiUrl, classToPlain(models))
             .pipe(map((response) => {
             const result = response.map((item) => this.createModelInstance(item));
-            this.handleResponse(result, 'post');
+            if (!this.mercureTopic) {
+                this.handleResponse(result, 'post');
+            }
             return result;
         }), catchError((error) => {
             this.handleResponseError(models, 'post');
@@ -10869,7 +10901,9 @@ let RestService$1 = class RestService extends DataService {
         return this.http.put(path, classToPlain(model))
             .pipe(map((response) => {
             const result = this.createModelInstance(response);
-            this.handleResponse([result], 'put', mpData);
+            if (!this.mercureTopic) {
+                this.handleResponse([result], 'put', mpData);
+            }
             return result;
         }), catchError((error) => {
             this.handleResponseError([model], 'put', mpData);
@@ -10884,7 +10918,9 @@ let RestService$1 = class RestService extends DataService {
         return this.http.put(this.apiUrl, classToPlain(models))
             .pipe(map((response) => {
             const result = response.map((item) => this.createModelInstance(item));
-            this.handleResponse(result, 'put');
+            if (!this.mercureTopic) {
+                this.handleResponse(result, 'put');
+            }
             return result;
         }), catchError((error) => {
             this.handleResponseError(models, 'put');
@@ -10898,7 +10934,9 @@ let RestService$1 = class RestService extends DataService {
         this.handleAccessError('delete');
         return this.http.delete(`${this.apiUrl}/${model.id}`)
             .pipe(map(() => {
-            this.handleResponse([model], 'delete', mpData);
+            if (!this.mercureTopic) {
+                this.handleResponse([model], 'delete', mpData);
+            }
         }), catchError((error) => {
             this.handleResponseError([model], 'delete', mpData);
             return throwError(error);
@@ -10911,7 +10949,9 @@ let RestService$1 = class RestService extends DataService {
         this.handleAccessError('deleteBatch');
         return this.http.post(`${this.apiUrl}/delete`, classToPlain(models))
             .pipe(map(() => {
-            this.handleResponse(models, 'delete');
+            if (!this.mercureTopic) {
+                this.handleResponse(models, 'delete');
+            }
         }), catchError((error) => {
             this.handleResponseError(models, 'delete');
             return throwError(error);
@@ -10938,7 +10978,7 @@ let RestService$1 = class RestService extends DataService {
      */
     handleResponse(response, method, mpData) {
         this.track(response, method, mpData);
-        if (this.getCache() && !this.disableCache) {
+        if (this.getCache()) {
             this.updateCache(response, method);
         }
         // dispatch event for interested services
@@ -10993,7 +11033,7 @@ let RestService$1 = class RestService extends DataService {
      * @param methods The list of http methods should be listened for
      * @param callback The function to be called when event triggered
      */
-    listenCSE(modelClass, methods, callback) {
+    listenCSE(modelClass, callback, methods = ['post', 'put', 'delete']) {
         callback = callback.bind(this);
         methods.forEach((method) => {
             this.eventDispatcherService.on2(modelClass.getEventName(method)).subscribe((data) => {
@@ -11011,15 +11051,29 @@ let RestService$1 = class RestService extends DataService {
         return !!intersection(JSON.parse(localStorage.getItem('roles')), this.roles).length;
     }
     /**
-     * // @TODO Alex remove
-     * Method that call all listeners. Empty by default. Should be redefined by child services if required
+     * Listen for Server-Sent Events (SSE) on the specified Mercure topic
      */
-    listenEvents() { }
-    /**
-     * Listen SSE events
-     */
-    listenSSE() { }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: RestService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    listenSSE() {
+        if (!this.mercureTopic) {
+            return;
+        }
+        this.sseService.on(this.mercureTopic).pipe(map((response) => {
+            let model = this.createModelInstance(response);
+            let method;
+            if (model.id) {
+                method = this.hasInCache(model.id) ? 'put' : 'post';
+            }
+            else {
+                method = 'delete';
+                // we got empty body when item deleted, so we should get id from Api Platform data (@id)
+                model = merge(model, { id: +last$1(model['@id'].split('/')) });
+            }
+            return { method, model };
+        })).subscribe((change) => {
+            this.handleResponse([change.model], change.method);
+        });
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: RestService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: RestService, providedIn: 'root' }); }
 };
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: RestService$1, decorators: [{
@@ -11027,7 +11081,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
                 }] }]; } });
@@ -11037,7 +11091,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
  */
 class BankAccountService extends RestService$1 {
     constructor(http, eventDispatcherService, sseService, environment) {
-        super(http, eventDispatcherService, environment);
+        super(environment);
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;
         this.sseService = sseService;
@@ -11046,16 +11100,17 @@ class BankAccountService extends RestService$1 {
         this.modelClass = BankAccount;
         this.collectionClass = BankAccountCollection;
         this.disabledMethods = ['post', 'putBatch', 'delete', 'deleteBatch'];
-        this.listenConnections();
+        this.listenEvents();
     }
     /**
      * Listen system notifications and update cache when got basiq notification received
      */
     listenEvents() {
         this.listenToEventDispatcherChanges();
-        this.listenCSE(BankTransaction, ['post', 'delete'], this.refreshCache);
-        this.listenCSE(PropertyShare, ['put'], this.refreshCache);
-        this.listenCSE(BankConnection, ['post'], this.refreshCache);
+        this.listenCSE(BankTransaction, this.refreshCache, ['post', 'delete']);
+        this.listenCSE(PropertyShare, this.refreshCache, ['put']);
+        this.listenCSE(BankConnection, this.refreshCache, ['post']);
+        this.listenConnections();
     }
     /**
      * Update bank account current balance
@@ -11081,7 +11136,7 @@ class BankAccountService extends RestService$1 {
         });
     }
     /**
-     * @TODO don't refresh the whole cache, update what's needed
+     * @TODO remove when TT-3826 is ready
      * manualConnection moved to basiq, old manual bankAccounts closed to let user add automated bankAccounts (because there is no reliable way to merge)
      */
     listenConnections() {
@@ -11130,18 +11185,19 @@ var BankConnectionMessagesEnum;
  * service handles BankConnection management
  */
 class BankConnectionService extends RestService$1 {
-    constructor(http, eventDispatcherService, sseService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.sseService = sseService;
+    constructor(environment) {
+        super(environment);
         this.environment = environment;
-        this.isApiPlatform = true;
         this.modelClass = BankConnection;
         this.collectionClass = Collection;
         this.endpointUri = 'bank-connections';
         this.disabledMethods = ['postBatch', 'putBatch', 'delete', 'deleteBatch'];
-        this.listenBankConnections();
+        this.mercureTopic = 'bankConnections';
+        this.listenEvents();
+    }
+    listenEvents() {
+        // @TODO remove when TT-3826 is ready
+        this.listenSSE();
     }
     /**
      * there is no put BankConnection method, we have to post to update
@@ -11186,15 +11242,7 @@ class BankConnectionService extends RestService$1 {
     deactivate(bankConnection) {
         return this.put(bankConnection, null, `${this.apiUrl}/${bankConnection.id}/deactivate`);
     }
-    /**
-     * connection's status updated in background on backend, so reset cache required to inform user
-     */
-    listenBankConnections() {
-        this.sseService.on(`bankConnections`).subscribe((bankConnection) => {
-            this.refreshCache();
-        });
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: BankConnectionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: BankConnectionService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: BankConnectionService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: BankConnectionService, decorators: [{
@@ -11202,7 +11250,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: SseService }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
                 }] }]; } });
@@ -11259,12 +11307,14 @@ var UserEventTypeTypeEnum;
  * Service for bank transactions business logic
  */
 class BankTransactionService extends RestService$1 {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.endpointUri = 'bank-transactions';
         this.modelClass = BankTransaction;
         this.collectionClass = BankTransactionCollection;
         this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'deleteBatch'];
+        this.listenEvents();
     }
     listenEvents() {
         this.listenBankTransactionsImport();
@@ -11309,7 +11359,7 @@ class BankTransactionService extends RestService$1 {
             }
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: BankTransactionService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: BankTransactionService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: BankTransactionService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: BankTransactionService, decorators: [{
@@ -11317,7 +11367,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 /**
  * @TODO Alex shouldn't be a separated service, move to basiqService or interceptor
@@ -11372,7 +11425,7 @@ class BasiqService extends RestService$1 {
     constructor(http, eventDispatcherService, environment, 
     // this inject required to init bank connection service and listen basiq login event
     bankConnectionService) {
-        super(http, eventDispatcherService, environment);
+        super(environment);
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;
         this.environment = environment;
@@ -11381,6 +11434,7 @@ class BasiqService extends RestService$1 {
         this.collectionClass = BankAccountCollection;
         this.modelClass = BankAccount;
         this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
+        this.listenEvents();
     }
     /**
      * Listen events from Event Dispatcher service
@@ -11394,11 +11448,10 @@ class BasiqService extends RestService$1 {
      */
     deleteBasiq(connection) {
         return this.http.put(`${this.environment.apiV2}/bank-connections/${connection.id}/remove-basiq`, {})
-            .pipe(map((connection) => {
-            return connection;
-            // @TODO Alex token should be inside this service
-            // this.redirectToBasiqConsent(token.value, connection.bank.externalId, true);
-        }));
+            .pipe(map((connection) => connection
+        // @TODO Alex token should be inside this service
+        // this.redirectToBasiqConsent(token.value, connection.bank.externalId, true);
+        ));
     }
     revokeConsent() {
         return this.http.delete(`${this.environment.apiV2}/basiq/consent`);
@@ -11500,7 +11553,6 @@ class BankService extends RestService$1 {
         this.modelClass = Bank;
         this.collectionClass = Collection;
         this.endpointUri = 'banks';
-        this.isApiPlatform = true;
         this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: BankService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -11519,7 +11571,6 @@ class BudgetService extends RestService$1 {
         this.modelClass = Budget;
         this.collectionClass = Collection;
         this.endpointUri = 'budgets';
-        this.isApiPlatform = true;
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: BudgetService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -11549,7 +11600,6 @@ class ChartAccountsDepreciationService extends RestService$1 {
         this.endpointUri = 'chart-accounts-depreciations';
         this.modelClass = ChartAccountsDepreciation;
         this.collectionClass = Collection;
-        this.isApiPlatform = true;
         this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ChartAccountsDepreciationService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -11608,16 +11658,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
  * Service for work with chats
  */
 class ChatService extends RestService$1 {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
+    constructor(environment) {
+        super(environment);
         this.environment = environment;
         this.modelClass = Chat;
         this.collectionClass = ChatCollection;
         this.endpointUri = 'chats';
-        this.isApiPlatform = true;
         this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
+        this.listenEvents();
+    }
+    listenEvents() {
         this.listenChats();
         this.listenMessages();
     }
@@ -11626,7 +11676,7 @@ class ChatService extends RestService$1 {
         return super.get(path).pipe(map((chats) => chats.filter((chat) => chat.employee.email !== this.environment.ttAdvisor)));
     }
     /**
-     * Listen chats events
+     * @TODO refactor with listenSSE method
      */
     listenChats() {
         this.sseService.on(`chats`).subscribe((chatBase) => {
@@ -11660,15 +11710,15 @@ class ChatService extends RestService$1 {
      * Update chat's 'updatedAt' field with the last chat's message date for chat list sorting
      */
     listenMessages() {
-        this.listenCSE(Message, ['post'], (messages) => {
+        this.listenCSE(Message, (messages) => {
             const message = messages[0];
             const cache = this.cache.toArray();
             const updatedChat = cache.find((chat) => chat?.id === message.chat?.id);
             updatedChat.updatedAt = message?.createdAt;
             this.handleResponse([updatedChat], 'put');
-        });
+        }, ['post']);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ChatService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ChatService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ChatService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ChatService, decorators: [{
@@ -11676,7 +11726,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
                 }] }]; } });
@@ -11685,48 +11735,20 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
  * Service for work with messages
  */
 class MessageService extends RestService$1 {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
+    constructor(environment) {
+        super(environment);
         this.environment = environment;
         this.modelClass = Message;
         this.collectionClass = MessageCollection;
         this.endpointUri = 'messages';
-        this.isApiPlatform = true;
         this.disabledMethods = ['postBatch', 'putBatch'];
-        this.listenMessages();
-    }
-    /**
-     * Overwrite default methods because we need to handle messages via SSE events only
-     */
-    post(message) {
-        return this.http.post(this.apiUrl, message)
-            .pipe(map((response) => plainToClass(Message, response)));
-    }
-    /**
-     * Overwrite default methods because we need to handle messages via SSE events only
-     */
-    put(message) {
-        return this.http.put(`${this.apiUrl}/${message.id}`, message)
-            .pipe(map((response) => plainToClass(Message, response)));
+        this.mercureTopic = 'messages';
+        this.listenEvents();
     }
-    /**
-     * subscribe to new chat messages
-     */
-    listenMessages() {
-        this.sseService.on(`messages`).subscribe((messageBase) => {
-            const message = plainToClass(Message, messageBase);
-            // update existing message if read and add new message if not read
-            if (this.cache.findBy('id', message.id)) {
-                this.handleResponse([message], 'put');
-            }
-            else {
-                this.handleResponse([message], 'post');
-            }
-        });
+    listenEvents() {
+        this.listenSSE();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MessageService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MessageService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MessageService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MessageService, decorators: [{
@@ -11734,7 +11756,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
                 }] }]; } });
@@ -11743,13 +11765,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
  * Service for work with Message Documents
  */
 class MessageDocumentService extends RestService$1 {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.modelClass = MessageDocument;
         this.collectionClass = MessageDocumentCollection;
         this.endpointUri = 'message-documents';
         this.disabledMethods = ['postBatch', 'deleteBatch', 'put', 'putBatch'];
-        this.isApiPlatform = true;
+        this.listenEvents();
     }
     /**
      * SSE and Event Dispatcher Services listeners
@@ -11761,7 +11784,7 @@ class MessageDocumentService extends RestService$1 {
      * listen new messages event to update documents cache
      */
     listenMessages() {
-        this.listenCSE(Message, ['post'], (messages) => {
+        this.listenCSE(Message, (messages) => {
             const message = messages[0];
             if (message.documents?.length) {
                 const array = this.cache.toArray();
@@ -11775,7 +11798,7 @@ class MessageDocumentService extends RestService$1 {
                 this.cache = new MessageDocumentCollection(array);
                 this.cacheSubject.next(this.cache);
             }
-        });
+        }, ['post']);
     }
     /**
      * Upload file to chat
@@ -11797,7 +11820,7 @@ class MessageDocumentService extends RestService$1 {
     addBatch(chatId, files) {
         return combineLatest(files.map((file) => this.add(chatId, file))).pipe(map((docsBase) => docsBase.map((docBase) => plainToClass(MessageDocument, docBase))));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MessageDocumentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MessageDocumentService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MessageDocumentService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MessageDocumentService, decorators: [{
@@ -11805,11 +11828,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 class DepreciationService extends RestService$1 {
     constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
+        super(environment);
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;
         this.environment = environment;
@@ -11817,6 +11843,7 @@ class DepreciationService extends RestService$1 {
         this.collectionClass = DepreciationCollection;
         this.endpointUri = 'depreciations';
         this.disabledMethods = ['post', 'putBatch', 'deleteBatch'];
+        this.listenEvents();
     }
     /**
      * Listen to Depreciations events
@@ -11845,17 +11872,17 @@ class DepreciationService extends RestService$1 {
      * Listen to EventDispatcherService event related to updated bank loan
      */
     listenToUpdatedLoan() {
-        this.listenCSE(Loan, ['put'], this.refreshCache);
+        this.listenCSE(Loan, this.refreshCache, ['put']);
     }
     /**
      * Listen to EventDispatcherService event related to updated bank account
      */
     listenToUpdatedBankAccount() {
-        this.listenCSE(BankAccount, ['put'], (bankAccounts) => {
+        this.listenCSE(BankAccount, (bankAccounts) => {
             if (bankAccounts.find(ba => ba.isPropertyTank())) {
                 this.refreshCache();
             }
-        });
+        }, ['put']);
     }
     /**
      * Listen to EventDispatcherService event related to updated vehicle claim
@@ -11962,7 +11989,6 @@ class DocumentService extends RestService$1 {
         this.modelClass = Document;
         this.collectionClass = Collection;
         this.disabledMethods = ['postBatch', 'putBatch'];
-        this.isApiPlatform = true;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: DocumentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: DocumentService, providedIn: 'root' }); }
@@ -11982,53 +12008,6 @@ var DocumentMessagesEnum;
     DocumentMessagesEnum["DELETED"] = "Document deleted!";
 })(DocumentMessagesEnum || (DocumentMessagesEnum = {}));
 
-class AuthService {
-    constructor(http, jwtService, mpService, environment) {
-        this.http = http;
-        this.jwtService = jwtService;
-        this.mpService = mpService;
-        this.environment = environment;
-        this.isLoggedInSubject = new BehaviorSubject(!this.jwtService.isTokenExpired());
-    }
-    setAuth(response) {
-        this.jwtService.saveTokens(response);
-        this.isLoggedInSubject.next(true);
-    }
-    login(username, password) {
-        return this.http.post(`${this.environment.apiV2}/login`, { username, password }).pipe(map((response) => {
-            this.setAuth(response);
-            this.mpService.track('login');
-            return response;
-        }), catchError((error) => {
-            this.mpService.track('loginError', { username });
-            return throwError(error);
-        }));
-    }
-    refresh(refreshToken) {
-        return this.http.post(`${this.environment.apiV2}/token/refresh`, { refreshToken }).pipe(map((response) => {
-            this.setAuth(response);
-            return response;
-        }));
-    }
-    logoutFront(url = '/login') {
-        localStorage.clear();
-        this.mpService.track('logout');
-        this.mpService.reset();
-        location.replace(url);
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: AuthService, deps: [{ token: i1.HttpClient }, { token: JwtService }, { token: MixpanelService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: AuthService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: AuthService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: JwtService }, { type: MixpanelService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
-
 const ERROR_EMAIL_PERMISSION = 'Access to email denied. Please provide access to email in facebook.';
 class FacebookService {
     static { this.authOptions = {
@@ -12189,7 +12168,6 @@ class FileService extends RestService$1 {
         this.endpointUri = 'files';
         this.modelClass = AppFile;
         this.collectionClass = Collection;
-        this.isApiPlatform = true;
         this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
     }
     getById(id) {
@@ -12222,7 +12200,6 @@ class ClientIncomeTypesService extends RestService$1 {
         this.modelClass = ClientIncomeTypes;
         this.collectionClass = Collection;
         this.endpointUri = 'client-income-types';
-        this.isApiPlatform = true;
         this.disabledMethods = ['postBatch', 'putBatch', 'delete', 'deleteBatch'];
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientIncomeTypesService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -12236,11 +12213,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
         }] });
 
 class ClientInviteService extends RestService$1 {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.endpointUri = 'clients/invites';
         this.collectionClass = ClientInviteCollection;
         this.modelClass = ClientInvite;
+        this.mercureTopic = 'clientInvites';
+        this.listenEvents();
+    }
+    listenEvents() {
+        // @TODO remove when TT-3826 is ready
+        this.listenSSE();
     }
     getFirmInvites() {
         return super.get(`${this.apiUrl}/all`);
@@ -12306,29 +12290,7 @@ class ClientInviteService extends RestService$1 {
             return throwError(error);
         }));
     }
-    /**
-     * Listem clientInvites db changes via mercure to update cache
-     * @TODO make it universal and move to parent
-     */
-    listenSSE() {
-        this.sseService.on('clientInvites')
-            .pipe(map((clientInvite) => plainToClass(ClientInvite, clientInvite)))
-            .subscribe((clientInvite) => {
-            // we got empty body when item deleted so we should get id from Api Platform data (@id)
-            const id = clientInvite.id ?? +last(clientInvite['@id'].split('/'));
-            switch (true) {
-                case !clientInvite.id:
-                    this.updateCache([merge(clientInvite, { id })], 'delete');
-                    break;
-                case this.hasInCache(id):
-                    this.updateCache([clientInvite], 'put');
-                    break;
-                case !this.hasInCache(id):
-                    this.updateCache([clientInvite], 'post');
-            }
-        });
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientInviteService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientInviteService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientInviteService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientInviteService, decorators: [{
@@ -12336,7 +12298,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 var ClientInviteMessages;
 (function (ClientInviteMessages) {
@@ -12354,17 +12319,21 @@ var ClientInviteMessages;
 })(ClientInviteMessages || (ClientInviteMessages = {}));
 
 class ClientMovementService extends RestService$1 {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.endpointUri = 'client-movements';
         this.collectionClass = ClientMovementCollection;
         this.modelClass = ClientMovement;
-        this.isApiPlatform = true;
         this.disabledMethods = ['postBatch', 'delete', 'deleteBatch'];
+        this.mercureTopic = 'clientMovements';
+        this.listenEvents();
     }
     listenEvents() {
-        // @TODO handle with mercure
-        this.listenCSE(ClientInvite, ['post', 'put', 'delete'], this.refreshCache);
+        // client invite accept triggers client movement update
+        this.listenCSE(ClientInvite, this.refreshCache, ['post', 'put', 'delete']);
+        // @TODO remove when TT-3826 is ready
+        this.listenSSE();
     }
     getActive() {
         return this.get().pipe(map((clientMovements) => clientMovements.active));
@@ -12411,18 +12380,7 @@ class ClientMovementService extends RestService$1 {
             this.updateCache([clientMovement], 'delete');
         }));
     }
-    /**
-     * Listem clientMovements db changes via mercure to update cache
-     * @TODO make it universal and move to parent
-     */
-    listenSSE() {
-        this.sseService.on('clientMovements')
-            .pipe(map((clientMovement) => plainToClass(ClientMovement, clientMovement)))
-            .subscribe((clientMovement) => {
-            this.hasInCache(clientMovement.id) ? this.updateCache([clientMovement], 'put') : this.updateCache([clientMovement], 'post');
-        });
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientMovementService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientMovementService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientMovementService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientMovementService, decorators: [{
@@ -12430,7 +12388,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 /**
  * Abstract base service that implements common services functionality
@@ -12440,16 +12401,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
  * @TODO TT-1777 Alex: remove when all services refactored
  */
 class RestService {
-    constructor(http, eventDispatcherService, environment, toastService) {
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
+    constructor(environment) {
         this.environment = environment;
-        this.toastService = toastService;
+        this.toastService = inject(ToastService);
+        this.http = inject(HttpClient);
+        this.eventDispatcherService = inject(EventDispatcherService);
         // subject for service cache
         this.cacheSubject = new ReplaySubject(1);
         this.mpService = inject(MixpanelService);
         this.roles = [];
-        this.listenEvents();
     }
     get apiUrl() {
         return `${this.environment.apiV2}/${this.url}`;
@@ -12463,8 +12423,7 @@ class RestService {
         }
         return this.http.get(path)
             .pipe(map((response) => {
-            const items = (this.isHydra ? response['hydra:member'] : response)
-                .map((item) => this.createModelInstance(item));
+            const items = response.map((item) => this.createModelInstance(item));
             if (cache) {
                 this.setCache(items, true);
             }
@@ -12645,13 +12604,9 @@ class RestService {
      * @param model instance that we will use as constructor options
      */
     createModelInstance(model) {
-        return plainToClass(this.modelClass, model, { excludePrefixes: ['@'] });
+        return plainToClass(this.modelClass, model);
     }
-    /**
-     * Method that call all listeners. Empty by default. Should be redefined by child services if required
-     */
-    listenEvents() { }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: RestService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: RestService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: RestService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: RestService, decorators: [{
@@ -12659,10 +12614,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
-                }] }, { type: ToastService }]; } });
+                }] }]; } });
 
 var EmployeeMessagesEnum;
 (function (EmployeeMessagesEnum) {
@@ -12863,7 +12818,7 @@ class FirmService {
      */
     getAll() {
         return this.http.get(`${this.environment.apiV2}/firms`)
-            .pipe(map((response) => response['hydra:member'].map((firmBase) => plainToClass(Firm, firmBase))));
+            .pipe(map((response) => response.map((firmBase) => plainToClass(Firm, firmBase))));
     }
     getByType(type) {
         return this.getAll().pipe(map((firms) => firms.filter((firm) => firm.type === type)));
@@ -12885,10 +12840,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
  * Service to work with Other Income Forecasts
  */
 class IncomeSourceForecastService extends RestService {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.modelClass = IncomeSourceForecast;
         this.url = 'income-source-forecasts';
+        this.listenEvents();
     }
     /**
      * Listen to Income Sources events
@@ -12944,7 +12901,7 @@ class IncomeSourceForecastService extends RestService {
             return incomeSource.incomeSourceForecasts;
         }).flat();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: IncomeSourceForecastService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: IncomeSourceForecastService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: IncomeSourceForecastService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: IncomeSourceForecastService, decorators: [{
@@ -12952,16 +12909,21 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 /**
  * Service to work with Salary Forecasts
  */
 class SalaryForecastService extends RestService {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.modelClass = SalaryForecast;
         this.url = 'salary-forecasts';
+        this.listenEvents();
     }
     /**
      * Listen to Income Sources events
@@ -13016,7 +12978,7 @@ class SalaryForecastService extends RestService {
             return incomeSource.salaryForecasts;
         }).flat();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SalaryForecastService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SalaryForecastService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SalaryForecastService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SalaryForecastService, decorators: [{
@@ -13024,13 +12986,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 class SoleForecastService extends RestService {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.modelClass = SoleForecast;
         this.url = 'sole-forecasts';
+        this.listenEvents();
     }
     /**
      * Listen to Income Sources events
@@ -13095,7 +13062,7 @@ class SoleForecastService extends RestService {
             this.refreshCache();
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleForecastService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleForecastService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleForecastService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleForecastService, decorators: [{
@@ -13103,16 +13070,21 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 /**
  * Service to work with income sources
  */
 class IncomeSourceService extends RestService {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.url = 'income-sources';
         this.modelClass = IncomeSource;
+        this.listenEvents();
     }
     listenEvents() {
         this.listenSoleBusinessCreated();
@@ -13176,7 +13148,7 @@ class IncomeSourceService extends RestService {
             this.refreshCache();
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: IncomeSourceService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: IncomeSourceService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: IncomeSourceService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: IncomeSourceService, decorators: [{
@@ -13184,7 +13156,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 var IncomeSourceMessagesEnum;
 (function (IncomeSourceMessagesEnum) {
@@ -13266,24 +13241,26 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
  * Service that handling loans logic
  */
 class LoanService extends RestService$1 {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.endpointUri = 'bank-accounts/loans';
         this.modelClass = Loan;
         this.collectionClass = LoanCollection;
         this.disabledMethods = ['post', 'delete', 'deleteBatch'];
+        this.listenEvents();
     }
     /**
      * Listen to Loans events
      */
     listenEvents() {
         // Update list of loans when added/changed loan bank account
-        this.listenCSE(BankAccount, ['post', 'put'], (bankAccounts) => {
+        this.listenCSE(BankAccount, (bankAccounts) => {
             if (bankAccounts.find(ba => !!ba.loan)) {
                 this.refreshCache();
             }
-        });
-        this.listenCSE(LoanPayout, ['post', 'put', 'delete'], this.refreshCache);
+        }, ['post', 'put']);
+        this.listenCSE(LoanPayout, this.refreshCache, ['post', 'put', 'delete']);
     }
     /**
      * Calculate loan payments
@@ -13331,7 +13308,7 @@ class LoanService extends RestService$1 {
             this.refreshCache();
         }));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: LoanService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: LoanService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: LoanService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: LoanService, decorators: [{
@@ -13339,13 +13316,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 class BorrowingReportService extends RestService$1 {
     constructor() {
         super(...arguments);
         this.endpointUri = 'borrowing-reports';
-        this.isApiPlatform = true;
         this.modelClass = BorrowingReport;
         this.collectionClass = Collection;
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
@@ -13393,11 +13372,12 @@ class PropertyCategoryMovementService extends RestService$1 {
         super(...arguments);
         this.modelClass = PropertyCategoryMovement;
         this.collectionClass = PropertyCategoryMovementCollection;
-        this.endpointUri = 'properties/category-movements';
+        this.endpointUri = 'property-category-movements';
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
     }
     post(movement, property) {
-        return super.post(movement, property, `${this.environment.apiV2}/properties/${movement.property.id}/category-movements`);
+        movement.property = movement.valuation.property = plainToClass(Property, { id: property.id });
+        return super.post(movement, property);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: PropertyCategoryMovementService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: PropertyCategoryMovementService, providedIn: 'root' }); }
@@ -13427,30 +13407,6 @@ class PropertyDocumentService extends RestService$1 {
         this.collectionClass = Collection;
         this.endpointUri = 'property-documents';
         this.disabledMethods = ['postBatch', 'putBatch'];
-        this.isApiPlatform = true;
-    }
-    /**
-     * Add new Property Document
-     */
-    upload(file, propertyId) {
-        // create formData object with provided file
-        const formDataDocument = new FormData();
-        formDataDocument.append('file', file);
-        return this.http.post(`${this.environment.apiV2}/properties/${propertyId}/documents`, formDataDocument).pipe(map((documentBase) => {
-            const newDocument = plainToClass(PropertyDocument, documentBase);
-            if (this.cache) {
-                this.updateCache([newDocument], 'post');
-            }
-            return newDocument;
-        }));
-    }
-    listenEvents() {
-        this.listenPropertyUpdateWithDocument();
-    }
-    listenPropertyUpdateWithDocument() {
-        this.eventDispatcherService.on(AppEventTypeEnum.PROPERTY_UPDATED_WITH_DOCUMENT).subscribe((property) => {
-            this.upload(property.documentFile, property.id).subscribe();
-        });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: PropertyDocumentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: PropertyDocumentService, providedIn: 'root' }); }
@@ -13499,13 +13455,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
 
 // @TODO check and improve logic during refactoring
 class PropertyShareService extends RestService$1 {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         // api url parameter for properties shares
         this.endpointUri = 'properties/shares';
         this.modelClass = PropertyShare;
         this.collectionClass = PropertyShareCollection;
         this.disabledMethods = ['deleteBatch', 'putBatch', 'postBatch'];
+        this.listenEvents();
     }
     /**
      * Listen to Event Dispatcher events
@@ -13539,9 +13497,9 @@ class PropertyShareService extends RestService$1 {
      * @Todo Alex refactor after PropertyShare functionality in PropertyService will be cleared up
      */
     listenSalesChanges() {
-        this.listenCSE(PropertySale, ['post', 'delete'], this.refreshCache);
+        this.listenCSE(PropertySale, this.refreshCache, ['post', 'delete']);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: PropertyShareService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: PropertyShareService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: PropertyShareService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: PropertyShareService, decorators: [{
@@ -13549,29 +13507,22 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
-/**
- * @TODO Alex: refacotor with api platform (old endpoint)
- */
 class PropertyValuationService extends RestService$1 {
     constructor() {
         super(...arguments);
-        this.endpointUri = 'properties';
+        this.endpointUri = 'property-valuations';
         this.modelClass = PropertyValuation;
         this.collectionClass = (Collection);
         this.disabledMethods = ['postBatch', 'putBatch'];
-        this.isApiPlatform = true;
-    }
-    get(propertyId) {
-        return this.http.get(`${this.apiUrl}/${propertyId}/valuations`)
-            .pipe(map((valuations) => new Collection(valuations.map((valuation) => plainToClass(PropertyValuation, valuation)))));
     }
     post(valuation, property) {
-        return super.post(valuation, property, `${this.apiUrl}/${property.id}/valuations`);
-    }
-    put(valuation, property) {
-        return super.put(valuation, property, `${this.apiUrl}/${property.id}/valuations/${valuation.id}`);
+        valuation.property = plainToClass(Property, { id: property.id });
+        return super.post(valuation, property);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: PropertyValuationService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: PropertyValuationService, providedIn: 'root' }); }
@@ -13601,53 +13552,36 @@ var PropertyMessagesEnum;
  * Service for work with Property
  */
 class PropertyService extends RestService$1 {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.modelClass = Property;
         this.collectionClass = PropertyCollection;
         this.endpointUri = 'properties';
         this.disabledMethods = ['deleteBatch'];
+        this.listenEvents();
     }
+    /**
+     * @TODO remove when forecast moved to separated api
+     */
     put(property) {
         return super.put(property)
-            // @TODO Alex (TT-1777): handle this events and refactor
             .pipe(map((updatedProperty) => {
-            if (property.documentFile) {
-                this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.PROPERTY_UPDATED_WITH_DOCUMENT, property));
-            }
-            else {
-                this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.PROPERTY_UPDATED, property));
-            }
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.PROPERTY_UPDATED, property));
             return updatedProperty;
         }));
     }
-    listenEvents() {
-        this.listenShareInviteAccepted();
-        // @TODO Alex: consider to refactor property movements logic similar to client-movements
-        this.listenMovementsChanges();
-        this.listenSalesChanges();
-        this.listenValuations();
-    }
-    /**
-     * Update cache when share invitation accepted
-     */
-    listenShareInviteAccepted() {
-        this.listenCSE(PropertyShare, ['put'], this.refreshCache);
-    }
-    /**
-     * Update cache when property category changed
-     */
-    listenMovementsChanges() {
-        this.listenCSE(PropertyCategoryMovement, ['post', 'put', 'delete'], this.refreshCache);
-    }
     /**
-     * Update cache when property sales changed
+     * @TODO no refresh cache with this.updateCache([this.getCache().findBy('id', change.model.property.id)], 'put');
      */
-    listenSalesChanges() {
-        this.listenCSE(PropertySale, ['post', 'delete'], this.refreshCache);
-    }
-    listenValuations() {
-        this.listenCSE(PropertyValuation, ['post', 'put'], this.refreshCache);
+    listenEvents() {
+        // share invite accepted event gives access to new property
+        this.listenCSE(PropertyShare, this.refreshCache, ['put']);
+        // @TODO get from separated api?
+        this.listenCSE(PropertySale, this.refreshCache, ['post', 'put', 'delete']);
+        // property caches child entities to improve performance
+        this.listenCSE(PropertyValuation, this.refreshCache);
+        this.listenCSE(PropertyCategoryMovement, this.refreshCache);
     }
     updateDepreciationCalculation(property) {
         const propertyToUpdate = plainToClass(Property, { id: property.id, depreciationCalculation: property.depreciationCalculation });
@@ -13657,6 +13591,7 @@ class PropertyService extends RestService$1 {
         }));
     }
     /**
+     * @TODO move to separated api
      * Activate deactivated property
      */
     activate(property) {
@@ -13676,6 +13611,7 @@ class PropertyService extends RestService$1 {
         }));
     }
     /**
+     * @TODO move to separated api
      * Deactivate activated property
      */
     deactivate(property) {
@@ -13693,18 +13629,7 @@ class PropertyService extends RestService$1 {
             return throwError(error);
         }));
     }
-    /**
-     * Update property photo
-     * @param property Property instance for photo update
-     * @param photoFormData FormData with property photo image
-     */
-    updatePhoto(property, photoFormData) {
-        return this.http.post(`${this.environment.apiV2}/properties/${property.id}/photo?_method=PUT`, photoFormData)
-            .pipe(map((photoLink) => {
-            this.updateCache([plainToClass(Property, merge(property, { photo: photoLink }))], 'put');
-        }));
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: PropertyService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: PropertyService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: PropertyService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: PropertyService, decorators: [{
@@ -13712,26 +13637,30 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 /**
  * Service to handle service notifications logic
  */
 class ServiceNotificationService extends RestService {
-    constructor(http, eventDispatcherService, environment, toastService, sseService) {
-        super(http, eventDispatcherService, environment, toastService);
-        this.http = http;
+    constructor(eventDispatcherService, environment, toastService, sseService) {
+        super(environment);
         this.eventDispatcherService = eventDispatcherService;
         this.environment = environment;
         this.toastService = toastService;
         this.sseService = sseService;
         this.modelClass = Notification;
         this.url = 'service-notifications';
-        this.isHydra = true;
+        this.listenEvents();
+    }
+    listenEvents() {
         this.listenNotifications();
     }
     /**
-     * subscribe to new chat messages
+     * @TODO refactor with listenSSE
      */
     listenNotifications() {
         this.sseService.on(`serviceNotification`).subscribe((notificationBase) => {
@@ -13760,7 +13689,7 @@ class ServiceNotificationService extends RestService {
             this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.NOTIFICATION_ADDED, notification));
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServiceNotificationService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServiceNotificationService, deps: [{ token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServiceNotificationService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServiceNotificationService, decorators: [{
@@ -13768,7 +13697,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: EventDispatcherService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
                 }] }, { type: ToastService }, { type: SseService }]; } });
@@ -13783,7 +13712,6 @@ class SoleBusinessService extends RestService {
         super(...arguments);
         this.modelClass = SoleBusiness;
         this.url = 'sole-businesses';
-        this.isHydra = true;
     }
     add(soleBusiness) {
         return super.add(soleBusiness).pipe(map((business) => {
@@ -13806,7 +13734,6 @@ class SoleBusinessActivityService extends RestService {
         super(...arguments);
         this.modelClass = SoleBusinessActivity;
         this.url = 'sole-business-activities';
-        this.isHydra = true;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleBusinessActivityService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleBusinessActivityService, providedIn: 'root' }); }
@@ -13819,11 +13746,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
         }] });
 
 class SoleBusinessLossService extends RestService {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.modelClass = SoleBusinessLoss;
         this.url = 'sole-business-losses';
-        this.isHydra = true;
+        this.listenEvents();
     }
     listenEvents() {
         this.listenBusinessCreated();
@@ -13836,7 +13764,7 @@ class SoleBusinessLossService extends RestService {
             this.refreshCache();
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleBusinessLossService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleBusinessLossService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleBusinessLossService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleBusinessLossService, decorators: [{
@@ -13844,7 +13772,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 /**
  * @TODO vik replace with json when the final list is confirmed
@@ -13854,7 +13785,6 @@ class SoleBusinessLossOffsetRuleService extends RestService {
         super(...arguments);
         this.modelClass = SoleBusinessLossOffsetRule;
         this.url = 'sole-business-loss-offset-rules';
-        this.isHydra = true;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleBusinessLossOffsetRuleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleBusinessLossOffsetRuleService, providedIn: 'root' }); }
@@ -13871,7 +13801,6 @@ class SoleContactService extends RestService {
         super(...arguments);
         this.modelClass = SoleContact;
         this.url = 'sole-contacts';
-        this.isHydra = true;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleContactService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleContactService, providedIn: 'root' }); }
@@ -13902,7 +13831,7 @@ class SoleDepreciationMethodService {
     get() {
         if (!this.cache) {
             this.http.get(`${this.environment.apiV2}/${this.url}`)
-                .pipe(map((response) => plainToClass(SoleDepreciationMethod, response['hydra:member'][0])))
+                .pipe(map((response) => plainToClass(SoleDepreciationMethod, response[0])))
                 .subscribe((soleDepreciationMethod) => {
                 this.cache = soleDepreciationMethod;
                 this.cacheSubject.next(this.cache);
@@ -13920,7 +13849,8 @@ class SoleDepreciationMethodService {
             this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.SOLE_DEPRECIATION_METHOD_UPDATED, method));
             return this.cache;
         }), catchError((error) => {
-            this.toastService.error(error.error['hydra:description']);
+            // @TODO test
+            this.toastService.error(error.error['detail']);
             return throwError(error);
         }));
     }
@@ -13957,7 +13887,7 @@ class SoleDetailsService {
     get() {
         if (!this.cache) {
             this.http.get(`${this.environment.apiV2}/sole-details`)
-                .pipe(map((response) => plainToClass(SoleDetails, response['hydra:member'][0])))
+                .pipe(map((response) => plainToClass(SoleDetails, response[0])))
                 .subscribe((soleDetails) => {
                 // undefined when user not created sole details
                 if (!soleDetails) {
@@ -14000,12 +13930,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                 }] }, { type: EventDispatcherService }]; } });
 
 class SoleInvoiceService extends RestService {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.modelClass = SoleInvoice;
         this.url = 'sole-invoices';
-        this.isHydra = true;
         this.roles = [UserRolesEnum.SOLE_TANK];
+        this.listenEvents();
     }
     listenEvents() {
         this.listenAllocations();
@@ -14062,7 +13993,7 @@ class SoleInvoiceService extends RestService {
             this.refreshCache();
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleInvoiceService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleInvoiceService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleInvoiceService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleInvoiceService, decorators: [{
@@ -14070,14 +14001,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 class SoleInvoiceTemplateService extends RestService {
     constructor() {
         super(...arguments);
         this.modelClass = SoleInvoiceTemplate;
         this.url = 'sole-invoice-templates';
-        this.isHydra = true;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleInvoiceTemplateService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SoleInvoiceTemplateService, providedIn: 'root' }); }
@@ -14094,7 +14027,6 @@ class BasReportService extends RestService {
         super(...arguments);
         this.modelClass = BasReport;
         this.url = 'bas-reports';
-        this.isHydra = true;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: BasReportService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: BasReportService, providedIn: 'root' }); }
@@ -14109,7 +14041,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
 class ServicePaymentService extends RestService$1 {
     constructor() {
         super(...arguments);
-        this.isApiPlatform = true;
         this.endpointUri = 'service-payments';
         this.modelClass = ServicePayment;
         this.collectionClass = Collection;
@@ -14135,16 +14066,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
         }] });
 
 class ServicePaymentMethodService extends RestService$1 {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
+    constructor(environment) {
+        super(environment);
         this.environment = environment;
         this.endpointUri = 'service-payment-methods';
         this.collectionClass = Collection;
         this.modelClass = ServicePaymentMethod;
-        this.isApiPlatform = true;
-        this.listenPaymentMethods();
+        this.listenEvents();
+    }
+    listenEvents() {
+        // @TODO remove when TT-3826 is ready
+        this.listenSSE();
     }
     /**
      * Get Stripe client secret required for Payment form initialization
@@ -14157,23 +14089,7 @@ class ServicePaymentMethodService extends RestService$1 {
         return this.http.put(`${this.apiUrl}/${paymentMethod.id}/default`, {})
             .pipe(map((updatedPaymentMethod) => plainToClass(ServicePaymentMethod, updatedPaymentMethod)));
     }
-    listenPaymentMethods() {
-        this.sseService.on('servicePaymentMethods').subscribe((newPaymentMethod) => {
-            const paymentMethodFromCache = this.cache.findBy('id', newPaymentMethod.id);
-            // backend send empty object when payment method deleted
-            if (!newPaymentMethod.id) {
-                return;
-            }
-            // replace cache item in cache when exist
-            if (paymentMethodFromCache) {
-                this.handleResponse([plainToClass(ServicePaymentMethod, newPaymentMethod)], 'put');
-                return;
-            }
-            // add a new payment method to cache
-            this.handleResponse([plainToClass(ServicePaymentMethod, newPaymentMethod)], 'post');
-        });
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePaymentMethodService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePaymentMethodService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePaymentMethodService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePaymentMethodService, decorators: [{
@@ -14181,7 +14097,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
                 }] }]; } });
@@ -14194,7 +14110,6 @@ class ServicePriceService extends RestService$1 {
         super(...arguments);
         this.endpointUri = 'service-prices';
         this.modelClass = ServicePrice;
-        this.isApiPlatform = true;
         this.collectionClass = ServicePriceCollection;
         this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
     }
@@ -14222,17 +14137,19 @@ var SubscriptionMessagesEnum;
  * @TODO Alex refactor
  */
 class SubscriptionService extends RestService$1 {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
+    constructor(http, environment) {
+        super(environment);
         this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
         this.environment = environment;
-        this.isApiPlatform = true;
         this.endpointUri = 'service-subscriptions';
         this.modelClass = ServiceSubscription;
         this.collectionClass = ServiceSubscriptionCollection;
         this.disabledMethods = ['putBatch', 'delete', 'deleteBatch'];
-        this.listenSubscriptions();
+        this.mercureTopic = 'serviceSubscriptions';
+        this.listenEvents();
+    }
+    listenEvents() {
+        this.listenSSE();
     }
     startTrial(subscription) {
         return this.http.post(`${this.apiUrl}/trial`, subscription)
@@ -14282,25 +14199,7 @@ class SubscriptionService extends RestService$1 {
             params: { code }
         }).pipe(map((response) => plainToClass(ServicePromoCode, response)));
     }
-    listenSubscriptions() {
-        this.sseService.on(`serviceSubscriptions`)
-            .subscribe((serviceSubscription) => {
-            const subscription = plainToClass(ServiceSubscription, serviceSubscription);
-            // update existing message if read and add new message if not read
-            if (this.cache.findBy('id', subscription.id)) {
-                this.handleResponse([subscription], 'put');
-            }
-            else {
-                this.handleResponse([subscription], 'post');
-            }
-            // @TODO vik test and remove
-            setTimeout(() => {
-                this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.SERVICE_SUBSCRIPTION_UPDATED, null));
-                this.toastService.success('Subscription successfully updated!!!');
-            }, 2000);
-        });
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SubscriptionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SubscriptionService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SubscriptionService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SubscriptionService, decorators: [{
@@ -14308,7 +14207,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
                 }] }]; } });
@@ -14320,7 +14219,6 @@ class ServiceProductService extends RestService$1 {
         this.modelClass = ServiceProduct;
         this.endpointUri = 'service-products';
         this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
-        this.isApiPlatform = true;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServiceProductService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServiceProductService, providedIn: 'root' }); }
@@ -14430,10 +14328,12 @@ __decorate([
  * Service to work with tax review history
  */
 class TaxReviewHistoryService extends RestService {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.url = 'tax-reviews/history';
         this.modelClass = TaxReview;
+        this.listenEvents();
     }
     listenEvents() {
         this.listenTaxReviewUpdate();
@@ -14450,7 +14350,7 @@ class TaxReviewHistoryService extends RestService {
             this.updateCache();
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TaxReviewHistoryService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TaxReviewHistoryService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TaxReviewHistoryService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TaxReviewHistoryService, decorators: [{
@@ -14458,16 +14358,21 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 /**
  * Service to work with tax review
  */
 class TaxReviewService extends RestService {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.url = 'tax-reviews';
         this.modelClass = TaxReview;
+        this.listenEvents();
     }
     /**
      * Listen events from SSE and Event Dispatcher services
@@ -14541,7 +14446,7 @@ class TaxReviewService extends RestService {
             }
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TaxReviewService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TaxReviewService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TaxReviewService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TaxReviewService, decorators: [{
@@ -14549,7 +14454,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 var TaxReviewMessagesEnum;
 (function (TaxReviewMessagesEnum) {
@@ -14853,7 +14761,6 @@ class AllocationRuleService extends RestService$1 {
         this.endpointUri = 'allocation-rules';
         this.collectionClass = AllocationRuleCollection;
         this.modelClass = AllocationRule;
-        this.isApiPlatform = true;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: AllocationRuleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: AllocationRuleService, providedIn: 'root' }); }
@@ -14869,11 +14776,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
  * @TODO move to new rest
  */
 class TransactionAllocationService extends RestService {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         // API URL param for transaction allocations
         this.url = 'transaction-allocations';
         this.modelClass = TransactionAllocation;
+        this.listenEvents();
     }
     /**
      * Add single transaction allocation
@@ -14945,7 +14854,7 @@ class TransactionAllocationService extends RestService {
             this.refreshCache();
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TransactionAllocationService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TransactionAllocationService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TransactionAllocationService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TransactionAllocationService, decorators: [{
@@ -14953,22 +14862,25 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 /**
  * Service for transactions business logic
  */
 class TransactionService extends RestService {
-    constructor(http, eventDispatcherService, environment, toastService) {
-        super(http, eventDispatcherService, environment, toastService);
+    constructor(http, eventDispatcherService, environment) {
+        super(environment);
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;
         this.environment = environment;
-        this.toastService = toastService;
         // url part for Transaction API
         this.url = 'transactions';
         this.modelClass = Transaction;
         this.transactionDeleted = new EventEmitter();
+        this.listenEvents();
     }
     /**
      * Listen events from Event Dispatcher services
@@ -15200,7 +15112,7 @@ class TransactionService extends RestService {
             this.refreshCache();
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TransactionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TransactionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TransactionService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TransactionService, decorators: [{
@@ -15211,7 +15123,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
         }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
-                }] }, { type: ToastService }]; } });
+                }] }]; } });
 
 // @TODO Artem: implement cache and extend rest?
 class TutorialVideoService {
@@ -15326,7 +15238,7 @@ class VehicleClaimDetailsService {
     get() {
         if (!this.cache) {
             this.http.get(`${this.environment.apiV2}/${this.url}`)
-                .pipe(map((response) => plainToClass(VehicleClaimDetails, response['hydra:member'][0], { excludePrefixes: ['@'] })))
+                .pipe(map((response) => plainToClass(VehicleClaimDetails, response[0])))
                 .subscribe((vehicleClaimDetails) => {
                 this.cache = vehicleClaimDetails;
                 this.cacheSubject.next(this.cache);
@@ -15345,7 +15257,7 @@ class VehicleClaimDetailsService {
     }
     update(details) {
         return this.http.put(`${this.environment.apiV2}/${this.url}/${details.id}`, details).pipe(map((updatedDetails) => {
-            const details = plainToClass(VehicleClaimDetails, updatedDetails, { excludePrefixes: ['@'] });
+            const details = plainToClass(VehicleClaimDetails, updatedDetails);
             this.cache = details;
             this.cacheSubject.next(details);
             this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_UPDATED, details));
@@ -15411,7 +15323,6 @@ class AnnualClientDetailsService extends RestService$1 {
         this.modelClass = AnnualClientDetails;
         this.collectionClass = Collection;
         this.endpointUri = 'annual-client-details';
-        this.isApiPlatform = true;
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch', 'delete'];
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: AnnualClientDetailsService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -15510,7 +15421,6 @@ class UserEventSettingService extends RestService$1 {
         this.modelClass = UserEventSetting;
         this.collectionClass = UserEventSettingCollection;
         this.endpointUri = 'user-event-settings';
-        this.isApiPlatform = true;
         this.disabledMethods = ['postBatch', 'putBatch', 'delete', 'deleteBatch'];
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: UserEventSettingService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -15529,7 +15439,6 @@ class UserEventTypeService extends RestService$1 {
         this.modelClass = UserEventType;
         this.collectionClass = UserEventTypeCollection;
         this.endpointUri = 'user-event-types';
-        this.isApiPlatform = true;
         this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: UserEventTypeService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -15569,17 +15478,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
         }] });
 
 class UserService extends RestService$1 {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.modelClass = User;
         this.collectionClass = Collection;
         this.endpointUri = 'users';
-        this.isApiPlatform = false;
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch', 'delete'];
+        this.listenEvents();
     }
     listenEvents() {
         this.listenServiceSubscriptionUpdated();
-        this.listenBasiqConsentUpdated();
     }
     fetch() {
         return super.fetch(`${this.apiUrl}/current`).pipe(map((users) => {
@@ -15676,15 +15585,15 @@ class UserService extends RestService$1 {
      * Update cache when user's service subscription is updated
      */
     listenServiceSubscriptionUpdated() {
-        this.eventDispatcherService.on(AppEventTypeEnum.SERVICE_SUBSCRIPTION_UPDATED).subscribe(() => this.refreshCache());
-    }
-    /**
-     * Update cache when user's basiq consent flag is updated
-     */
-    listenBasiqConsentUpdated() {
-        this.eventDispatcherService.on(AppEventTypeEnum.BASIQ_CONSENT_UPDATED).subscribe(() => this.refreshCache());
+        this.listenCSE(ServiceSubscription, () => {
+            // @TODO vik test and remove
+            setTimeout(() => {
+                this.refreshCache();
+                this.toastService.success('Subscription successfully updated');
+            }, 2000);
+        }, ['post', 'put']);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: UserService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: UserService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: UserService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: UserService, decorators: [{
@@ -15692,7 +15601,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 class FinancialYearService {
     constructor(http, environment, mpService) {
@@ -15721,19 +15633,20 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                 }] }, { type: MixpanelService }]; } });
 
 class HoldingService extends RestService$1 {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.modelClass = Holding;
         this.collectionClass = HoldingCollection;
         this.endpointUri = 'holdings';
-        this.isApiPlatform = true;
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
         this.roles = [UserRolesEnum.HOLDING_TANK];
+        this.listenEvents();
     }
     listenEvents() {
-        this.listenCSE(HoldingSale, ['post', 'put', 'delete'], this.refreshCache);
+        this.listenCSE(HoldingSale, this.refreshCache, ['post', 'put', 'delete']);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: HoldingService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: HoldingService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: HoldingService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: HoldingService, decorators: [{
@@ -15741,7 +15654,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
 
 class HoldingTypeService extends RestService$1 {
     constructor() {
@@ -15749,7 +15665,6 @@ class HoldingTypeService extends RestService$1 {
         this.modelClass = HoldingType;
         this.collectionClass = HoldingTypeCollection;
         this.endpointUri = 'holding-types';
-        this.isApiPlatform = true;
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: HoldingTypeService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -15768,7 +15683,6 @@ class HoldingSaleService extends RestService$1 {
         this.modelClass = HoldingSale;
         this.collectionClass = HoldingSaleCollection;
         this.endpointUri = 'holding-sales';
-        this.isApiPlatform = true;
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: HoldingSaleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -18110,7 +18024,6 @@ class SetupItemService extends RestService$1 {
     constructor() {
         super(...arguments);
         this.endpointUri = 'setup-items';
-        this.isApiPlatform = true;
         this.modelClass = AccountSetupItem;
         this.collectionClass = AccountSetupItemCollection;
         this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
@@ -18966,7 +18879,6 @@ class PropertyCalculationService {
         ]).pipe(map(([properties, bankAccounts, loans]) => this.getLvrCommencement(properties, loans, bankAccounts)));
     }
     getLvrGrowth(properties, bankAccounts, loans) {
-        const lvr = this.getLvr(properties, bankAccounts);
         const lvrCommencement = this.getLvrCommencement(properties, loans, bankAccounts);
         if (!lvrCommencement) {
             // check if lvrCommencement = 0 to avoid division by zero
@@ -19457,7 +19369,6 @@ class Endpoint {
  * @TODO Alex/Vik: Create some smart system for preloader endpoints.
  */
 const ENDPOINTS = {
-    ASSETS_GET: new Endpoint('GET', '\\/assets\\/\.\*\\/\\d+'),
     ALLOCATION_RULES_GET: new Endpoint('GET', '\\/allocation-rules'),
     ALLOCATION_RULES_POST: new Endpoint('POST', '\\/allocation-rules'),
     ALLOCATION_RULES_PUT: new Endpoint('PUT', '\\/allocation-rules\\/\\d+'),
@@ -19502,7 +19413,7 @@ const ENDPOINTS = {
     ANNUAL_CLIENT_DETAILS_POST: new Endpoint('POST', '\\/annual-client-details'),
     ANNUAL_CLIENT_DETAILS_PUT: new Endpoint('PUT', '\\/annual-client-details\\/\\d+'),
     ANNUAL_CLIENT_DETAILS_DELETE: new Endpoint('DELETE', '\\/annual-client-details\\/\\d+'),
-    DEPRECIATIONS_OPENING_GET: new Endpoint('GET', '\\/depreciations\\/\\opening-balance\.\*'),
+    DEPRECIATIONS_OPENING_POST: new Endpoint('GET', '\\/depreciations\\/\\opening-balance'),
     DEPRECIATIONS_GET: new Endpoint('GET', '\\/depreciations'),
     DEPRECIATIONS_POST: new Endpoint('POST', '\\/depreciations'),
     DEPRECIATIONS_PUT: new Endpoint('PUT', '\\/depreciations\\/\\d+'),
@@ -19520,7 +19431,7 @@ const ENDPOINTS = {
     FILE_POST: new Endpoint('POST', '\\/api\\/files'),
     FIRM_GET: new Endpoint('GET', '\\/firms'),
     FIRM_CURRENT_GET: new Endpoint('GET', '\\/firms\\/current'),
-    FIRM_CURRENT_PUT: new Endpoint('PUT', '\\/firms\\/current\.\*'),
+    FIRM_CURRENT_PUT: new Endpoint('PUT', '\\/firms\\/current'),
     FIRM_INVITE_POST: new Endpoint('POST', '\\/firms\\/invite'),
     FIRM_REGISTRATION_POST: new Endpoint('POST', '\\/firms\\/registration'),
     FOLDERS_GET: new Endpoint('GET', '\\/folders'),
@@ -19573,9 +19484,9 @@ const ENDPOINTS = {
     PROPERTIES_CATEGORIES_GET: new Endpoint('GET', '\\/properties\\/categories'),
     PROPERTIES_CATEGORIES_PUT: new Endpoint('PUT', '\\/properties\\/categories\\/\\d+'),
     PROPERTIES_CATEGORIES_POST: new Endpoint('POST', '\\/properties\\/categories'),
-    PROPERTIES_CATEGORIES_MOVEMENTS_GET: new Endpoint('GET', '\\/properties\\/\\d+\\/category-movements'),
-    PROPERTIES_CATEGORY_MOVEMENTS_POST: new Endpoint('POST', '\\/properties\\/\\d+\\/category-movements'),
-    PROPERTIES_CATEGORY_MOVEMENTS_PUT: new Endpoint('PUT', '\\/properties\\/\\d+\\/category-movements\\/\\d+'),
+    PROPERTIES_CATEGORIES_MOVEMENTS_GET: new Endpoint('GET', '\\/property-category-movements'),
+    PROPERTIES_CATEGORY_MOVEMENTS_POST: new Endpoint('POST', '\\/property-category-movements'),
+    PROPERTIES_CATEGORY_MOVEMENTS_PUT: new Endpoint('PUT', '\\/property-category-movements\\/\\d+'),
     PROPERTIES_SHARES_PUT: new Endpoint('PUT', '\\/properties\\/shares\\/\\d+'),
     PROPERTIES_SHARES_GET: new Endpoint('GET', '\\/properties\\/shares'),
     PROPERTIES_SHARES_POST: new Endpoint('POST', '\\/properties\\/shares'),
@@ -19588,10 +19499,8 @@ const ENDPOINTS = {
     PROPERTIES_DOCUMENTS_POST: new Endpoint('POST', '\\/property-documents'),
     PROPERTIES_DOCUMENTS_PUT: new Endpoint('PUT', '\\/property-documents\\/\\d+'),
     PROPERTIES_DOCUMENTS_DELETE: new Endpoint('DELETE', '\\/property-documents\\/\\d+'),
-    PROPERTIES_PHOTO_POST: new Endpoint('POST', '\\/properties\\/\\d+\\/photo\.\*'),
     PROPERTIES_SALES_GET: new Endpoint('GET', '\\/properties\\/sales'),
     PROPERTIES_SUGGESTIONS_GET: new Endpoint('GET', '/property\\/\\w+\\/v2\\/.*$'),
-    PROPERTIES_VALUATIONS_DOCUMENTS_POST: new Endpoint('POST', '\\/properties\\/\\d+\\/valuations\\/\\d+\\/documents'),
     BORROWING_REPORTS_GET: new Endpoint('GET', '\\/borrowing-reports'),
     BORROWING_REPORTS_POST: new Endpoint('POST', '\\/borrowing-reports'),
     BORROWING_REPORTS_PUT: new Endpoint('PUT', '\\/borrowing-reports/\\d+'),
@@ -19662,7 +19571,7 @@ const ENDPOINTS = {
     USER_CONFIRMATION_POST: new Endpoint('POST', '\\/users\\/confirmation'),
     USER_CONFIRMATION_RESEND_POST: new Endpoint('POST', '\\/users\\/confirmation\\/resend'),
     USER_CURRENT_GET: new Endpoint('GET', '\\/users\\/current'),
-    USER_CURRENT_PASSWORD_PUT: new Endpoint('PUT', '\\/password\\/change'),
+    USER_CURRENT_PASSWORD_PUT: new Endpoint('PUT', '\\/users\\/password\\/change'),
     USER_EVENT_SETTINGS_GET: new Endpoint('GET', '\\/user-event-settings'),
     USER_EVENT_TYPES_GET: new Endpoint('GET', '\\/user-event-types'),
     USER_INVITE_DELETE: new Endpoint('DELETE', '\\/users\\/invite\\/\\d+'),
@@ -19670,8 +19579,9 @@ const ENDPOINTS = {
     USER_INVITE_RESEND_POST: new Endpoint('POST', '\\/users\\/invite/\\d+\\/resend'),
     USER_PUT: new Endpoint('PUT', '\\/users\\/\\d+'),
     USER_REGISTRATION_POST: new Endpoint('POST', '\\/users\\/registration'),
-    USER_SEARCH_GET: new Endpoint('GET', '\\/users\\/search\.\*'),
-    USER_UPDATE_PHOTO_POST: new Endpoint('POST', '\\/users\\/photo\.\*'),
+    USER_RESET_PASSWORD_PUT: new Endpoint('PUT', '\\/users\\/password\\/reset'),
+    USER_SEARCH_GET: new Endpoint('GET', '\\/users\\/search'),
+    USER_UPDATE_PHOTO_POST: new Endpoint('POST', '\\/users\\/photo'),
     USER_STATUS_PUT: new Endpoint('PUT', '\\/users\\/status'),
     USER_RECOVERY_PASSWORD_PUT: new Endpoint('PUT', '\\/users\\/password\\/recovery'),
     USER_PASSWORD_RESET_PUT: new Endpoint('PUT', '\\/password\\/reset'),
@@ -20626,7 +20536,6 @@ class BudgetForm extends AbstractForm {
             searchQuery: new UntypedFormControl(''),
             rules: new UntypedFormArray((budget.rules || [plainToClass(BudgetRule, {})]).map((budgetRule) => BudgetForm.createRuleFormGroup(budgetRule))),
         }, budget);
-        this.excludeExtraneousValues = true;
         combineLatest([
             this.get('category').valueChanges.pipe(startWith(null)),
             this.get('searchQuery').valueChanges.pipe(startWith(null))
@@ -22078,13 +21987,13 @@ class PropertyDocumentForm extends AbstractForm {
 }
 
 class PropertyValuationForm extends AbstractForm {
-    constructor(valuation) {
+    constructor(valuation = plainToClass(PropertyValuation, {})) {
         super({
             date: new UntypedFormControl(valuation.date || new Date(), Validators.required),
             marketValue: new UntypedFormControl(valuation.marketValue, Validators.required),
             document: new UntypedFormGroup({
                 file: new UntypedFormControl(valuation.document?.file)
-            })
+            }),
         }, valuation);
     }
     submit() {
@@ -22092,6 +22001,119 @@ class PropertyValuationForm extends AbstractForm {
     }
 }
 
+class PropertyCategoryMovementForm extends AbstractForm {
+    constructor(movement = plainToClass(PropertyCategoryMovement, {})) {
+        super({
+            fromDate: new UntypedFormControl(movement.valuation?.date || new Date()),
+            propertyCategory: new UntypedFormControl(movement.propertyCategory, Validators.required),
+            valuation: new PropertyValuationForm(movement.valuation),
+        }, movement);
+        this.get('valuation').get('date').valueChanges.subscribe((value) => {
+            this.get('fromDate').setValue(value);
+        });
+    }
+    submit() {
+        return super.submit({ valuation: this.get('valuation').submit() });
+    }
+}
+
+/**
+ * Class describes property share form fields and form logic
+ */
+class PropertyShareForm extends AbstractForm {
+    constructor(share = plainToClass(PropertyShare, {})) {
+        super({
+            fromDate: new UntypedFormControl(share.fromDate || new Date()),
+            percent: new UntypedFormControl(share.percent, [Validators.required, Validators.min(0), Validators.max(100)])
+        }, share);
+    }
+}
+
+/**
+ * Class describes property forecast form fields and form logic
+ */
+class PropertyForecastForm extends AbstractForm {
+    /**
+     * @param forecast
+     * @param movements property could have multiple categories within forecast year, based on categories we hide/show some fields
+     */
+    constructor(forecast = plainToClass(PropertyForecast, {}), movements = new PropertyCategoryMovementCollection()) {
+        const noIncomeCategories = [PropertyCategoryListEnum.VACANT_LAND, PropertyCategoryListEnum.OWNER_OCCUPIED];
+        const noIncome = movements.filterBy('propertyCategory.id', noIncomeCategories).length === movements.length;
+        super({
+            financialYear: new UntypedFormControl({ value: forecast.financialYear, disabled: true }),
+            marketValue: new UntypedFormControl(forecast.marketValue, Validators.required),
+            income: new UntypedFormControl({ value: forecast.income, disabled: noIncome }, Validators.required),
+            expense: new UntypedFormControl(forecast.expense, Validators.required),
+            interest: new UntypedFormControl(forecast.interest, Validators.required),
+            depreciation: new UntypedFormControl({ value: forecast.depreciation, disabled: noIncome }, Validators.required),
+            claimPercent: new UntypedFormControl({ value: forecast.claimPercent, disabled: !movements.hasCategory(PropertyCategoryListEnum.SHARED) }, [Validators.min(0), Validators.max(100), Validators.required])
+        }, forecast);
+    }
+}
+
+/**
+ * Form class for the single new property
+ */
+class PropertyAddForm extends AbstractForm {
+    constructor() {
+        super({
+            address: new UntypedFormControl(null, Validators.required),
+            purchasePrice: new UntypedFormControl(null, Validators.required),
+            contractDate: new UntypedFormControl(null, Validators.required),
+            settlementDate: new UntypedFormControl(null, Validators.required),
+            forecasts: new UntypedFormArray([
+                new PropertyForecastForm()
+            ]),
+            shares: new UntypedFormArray([
+                new PropertyShareForm()
+            ]),
+            categoryMovements: new UntypedFormArray([
+                new PropertyCategoryMovementForm()
+            ])
+        }, plainToClass(Property, {}));
+        // @TODO move to submit, no need to watch
+        // we should put the same market value to both, forecast and valuation.
+        this.valuationForm.get('marketValue').valueChanges.subscribe((marketValue) => {
+            this.forecastForm.get('marketValue').setValue(marketValue);
+        });
+        this.get('contractDate').valueChanges.subscribe((contractDate) => {
+            this.valuationForm.get('date').setValue(contractDate);
+        });
+        this.categoryMovementForm.get('propertyCategory').valueChanges.subscribe((category) => {
+            if (category.isShared()) {
+                this.forecastForm.get('claimPercent').enable();
+            }
+            else {
+                this.forecastForm.get('claimPercent').disable();
+            }
+            if (category.isOwnerOccupied() || category.isVacantLand()) {
+                this.forecastForm.get('income').disable();
+                this.forecastForm.get('depreciation').disable();
+            }
+            else {
+                this.forecastForm.get('income').enable();
+                this.forecastForm.get('depreciation').enable();
+            }
+        });
+    }
+    get valuationForm() {
+        return this.categoryMovementForm.get('valuation');
+    }
+    get forecastForm() {
+        // [0] because for property add form we have always 1 forecast form inside
+        return this.get('forecasts').controls[0];
+    }
+    get shareForm() {
+        // [0] because for property add form we have always 1 forecast form inside
+        return this.get('shares').controls[0];
+    }
+    get categoryMovementForm() {
+        // [0] because for property add form we always have 1 category movement form inside
+        return this.get('categoryMovements').controls[0];
+    }
+}
+
 class MyTaxBusinessDetailsForm extends AbstractForm {
     constructor(businessDetails) {
         super({
@@ -23684,5 +23706,5 @@ var MessagesEnum;
  * Generated bundle index. Do not edit.
  */
 
-export { AbstractForm, AbstractModel, AccountSetupItem, AccountSetupItemCollection, AccountSetupService, Address, AddressForm, AddressService, AddressTypeEnum, AllocationGroup, AllocationGroupCollection, AllocationRule, AllocationRuleCollection, AllocationRuleConditionComparisonOperatorEnum, AllocationRuleConditionFieldEnum, AllocationRuleConditionOperatorEnum, AllocationRuleForm, AllocationRuleService, AllocationRuleTransaction, AllocationRuleTransactionMetaField, AllocationRuleTypeEnum, AlphabetColorsEnum, AnnualClientDetails, AnnualClientDetailsForm, AnnualClientDetailsService, AnnualFrequencyEnum, AppCurrencyPipe, AppEvent, AppEvent2, AppEventTypeEnum, AppFile, AssetEntityTypeEnum, AssetSale, AssetSaleCollection, AssetTypeEnum, AssetsService, AuthService, BANK_ACCOUNT_TYPES, Badge, BadgeColorEnum, Bank, BankAccount, BankAccountAddManualForm, BankAccountAllocationForm, BankAccountCalculationService, BankAccountChartData, BankAccountCollection, BankAccountImportForm, BankAccountPropertiesForm, BankAccountProperty, BankAccountService, BankAccountStatusEnum, BankAccountTypeEnum, BankAccountsImportForm, BankConnection, BankConnectionMessagesEnum, BankConnectionService, BankConnectionStatusEnum, BankExternalStats, BankPopularEnum, BankProviderEnum, BankService, BankTransaction, BankTransactionCalculationService, BankTransactionChartData, BankTransactionCollection, BankTransactionService, BankTransactionSummaryFieldsEnum, BankTransactionTypeEnum, BasReport, BasReportForm, BasReportService, BasiqConfig, BasiqJob, BasiqJobResponse, BasiqJobStep, BasiqMessagesEnum, BasiqService, BasiqToken, BasiqTokenService, BestVehicleLogbookCollection, BorrowingExpense, BorrowingExpenseLoan, BorrowingExpenseService, BorrowingReport, BorrowingReportForm, BorrowingReportMessagesEnum, BorrowingReportService, Budget, BudgetForm, BudgetMessagesEnum, BudgetRule, BudgetService, BusinessTypeEnum, CAPITAL_COSTS_ITEMS, CHART_ACCOUNTS_CATEGORIES, CalculationFormItem, CalculationFormTypeEnum, CgtExemptionAndRolloverCodeEnum, ChartAccounts, ChartAccountsCategoryECollection, ChartAccountsCategoryEnum, ChartAccountsCollection, ChartAccountsDepreciation, ChartAccountsDepreciationService, ChartAccountsEtpEnum, ChartAccountsHeading, ChartAccountsHeadingListEnum, ChartAccountsHeadingTaxDeductibleEnum, ChartAccountsHeadingTaxableEnum, ChartAccountsHeadingVehicleListEnum, ChartAccountsHoldingUntaxedIncomeListEnum, ChartAccountsInvoiceExpenseEnum, ChartAccountsKeepSign, ChartAccountsListEnum, ChartAccountsMetaField, ChartAccountsMetaFieldListEnum, ChartAccountsMetaFieldTypeEnum, ChartAccountsSalaryAdjustmentsListEnum, ChartAccountsSalaryIncludedListEnum, ChartAccountsService, ChartAccountsTaxLabelsEnum, ChartAccountsTypeEnum, ChartAccountsValue, ChartAccountsValueService, ChartData, ChartSerie, Chat, ChatCollection, ChatService, ChatStatusEnum, ChatViewTypeEnum, ClientCollection, ClientDetails, ClientDetailsForm, ClientDetailsMedicareExemptionEnum, ClientDetailsWorkDepreciationCalculationEnum, ClientDetailsWorkingHolidayMakerEnum, ClientIncomeTypes, ClientIncomeTypesForm, ClientIncomeTypesService, ClientInvite, ClientInviteCollection, ClientInviteMessages, ClientInviteService, ClientInviteStatusEnum, ClientInviteTypeEnum, ClientMovement, ClientMovementCollection, ClientMovementService, ClientPortfolioChartData, ClientPortfolioReport, ClientPortfolioReportCollection, ClientPortfolioReportService, Collection, CollectionDictionary, CorelogicService, CorelogicSuggestion, Country, DEDUCTION_CATEGORIES, DEPRECIATION_GROUPS, DOCUMENT_FILE_TYPES, DeductionClothingTypeEnum, DeductionSelfEducationTypeEnum, Depreciation, DepreciationCalculationEnum, DepreciationCalculationPercentEnum, DepreciationCapitalProject, DepreciationCapitalProjectService, DepreciationCollection, DepreciationForecast, DepreciationForecastCollection, DepreciationForm, DepreciationGroup, DepreciationGroupEnum, DepreciationGroupItem, DepreciationLvpAssetTypeEnum, DepreciationLvpRateEnum, DepreciationLvpReportItem, DepreciationLvpReportItemCollection, DepreciationReportItem, DepreciationReportItemCollection, DepreciationService, DepreciationTypeEnum, DepreciationWriteOffAmountEnum, Dictionary, Document, DocumentApiUrlPrefixEnum, DocumentFolder, DocumentFolderForm, DocumentFolderMessagesEnum, DocumentFolderService, DocumentForm, DocumentMessagesEnum, DocumentService, DocumentTypeEnum, ENDPOINTS, EmployeeCollection, EmployeeDetails, EmployeeInvite, EmployeeInviteService, EmployeeMessagesEnum, EmployeeService, Endpoint, EquityPositionChartService, EventDispatcherService, ExportDataTable, ExportFormatEnum, ExportFormatterService, ExportableCollection, FacebookService, FileService, FileValidator, FinancialYear, FinancialYearService, Firm, FirmForm, FirmMessagesEnum, FirmService, FirmTypeEnum, FormValidationsEnum, GoogleService, HeaderTitleService, Holding, HoldingCollection, HoldingForm, HoldingIncomeForm, HoldingMessagesEnum, HoldingReinvest, HoldingReinvestForm, HoldingSale, HoldingSaleCollection, HoldingSaleForm, HoldingSaleMessagesEnum, HoldingSaleService, HoldingService, HoldingType, HoldingTypeCategoryEnum, HoldingTypeCollection, HoldingTypeExchange, HoldingTypeExchangeService, HoldingTypeForm, HoldingTypeMessagesEnum, HoldingTypeService, IconsFileEnum, IncomeAmountTypeEnum, IncomePosition, IncomeSource, IncomeSourceChartData, IncomeSourceCollection, IncomeSourceForecast, IncomeSourceForecastCollection, IncomeSourceForecastService, IncomeSourceForecastTrustTypeEnum, IncomeSourceMessagesEnum, IncomeSourceService, IncomeSourceType, IncomeSourceTypeEnum, IncomeSourceTypeListHoldingEnum, IncomeSourceTypeListOtherEnum, IncomeSourceTypeListSoleEnum, IncomeSourceTypeListWorkEnum, IncomeSourceTypeService, InterceptorsModule, IntercomService, InviteStatusEnum, JsPdf, JwtService, Loan, LoanBankTypeEnum, LoanCollection, LoanForm, LoanFrequencyEnum, LoanInterestTypeEnum, LoanInterestTypeLabelEnum, LoanMaxNumberOfPaymentsEnum, LoanPayment, LoanPaymentCollection, LoanPayout, LoanPayoutTypeEnum, LoanRepaymentFrequencyEnum, LoanRepaymentTypeEnum, LoanRepaymentTypeLabelEnum, LoanService, LoanTypeEnum, LoanVehicleTypeEnum, LoginForm, LossTypeEnum, MODULE_URL_LIST, MONTHS, Message, MessageCollection, MessageDocument, MessageDocumentCollection, MessageDocumentService, MessageService, MessagesEnum, MixpanelService, MonthNameShortEnum, MonthNumberEnum, MyAccountHistory, MyAccountHistoryInitiatedByEnum, MyAccountHistoryStatusEnum, MyAccountHistoryTypeEnum, MyTaxBusinessDetails, MyTaxBusinessDetailsForm, MyTaxBusinessIncome, MyTaxBusinessIncomeForm, MyTaxBusinessIncomeOrLossesForm, MyTaxBusinessLosses, MyTaxBusinessLossesForm, MyTaxCgt, MyTaxCgtForm, MyTaxDeductions, MyTaxDeductionsForm, MyTaxDividends, MyTaxDividendsForm, MyTaxEstimate, MyTaxIncomeStatements, MyTaxIncomeStatementsForm, MyTaxIncomeTests, MyTaxIncomeTestsForm, MyTaxInterest, MyTaxInterestForm, MyTaxLosses, MyTaxLossesForm, MyTaxMedicareForm, MyTaxOffsets, MyTaxOffsetsForm, MyTaxOtherIncome, MyTaxOtherIncomeForm, MyTaxPartnershipsAndTrusts, MyTaxPartnershipsAndTrustsForm, MyTaxRent, MyTaxRentForm, Notification, Occupation, OccupationService, PASSWORD_REGEXPS, PasswordForm, PdfFromDataTableService, PdfFromDomElementService, PdfFromHtmlTableService, PdfFromTableService, PdfOrientationEnum, PdfSettings, Phone, PhoneForm, PhoneTypeEnum, PreloaderService, Property, PropertyCalculationService, PropertyCategory, PropertyCategoryListEnum, PropertyCategoryMovement, PropertyCategoryMovementCollection, PropertyCategoryMovementService, PropertyCategoryService, PropertyCollection, PropertyDepreciationCalculationEnum, PropertyDocument, PropertyDocumentForm, PropertyDocumentMessagesEnum, PropertyDocumentService, PropertyEditForm, PropertyEquityChartData, PropertyEquityChartItem, PropertyEquityChartTypeEnum, PropertyForecast, PropertyMessagesEnum, PropertyReportItem, PropertyReportItemCollection, PropertyReportItemDepreciation, PropertyReportItemDepreciationCollection, PropertyReportItemTransaction, PropertyReportItemTransactionCollection, PropertySale, PropertySaleCollection, PropertySaleCostBase, PropertySaleCostBaseForm, PropertySaleCostSaleForm, PropertySaleExemptionsForm, PropertySaleService, PropertySaleTaxExemptionMetaField, PropertySaleTaxExemptionMetaFieldCollection, PropertyService, PropertyShare, PropertyShareAccessEnum, PropertyShareCollection, PropertyShareService, PropertyShareStatusEnum, PropertySubscription, PropertyTransactionReportService, PropertyValuation, PropertyValuationForm, PropertyValuationMessages, PropertyValuationService, RegisterClientForm, RegisterFirmForm, RegistrationInvite, RegistrationInviteStatusEnum, ReportItem, ReportItemCollection, ReportItemDetails, ResetPasswordForm, RestService$1 as RestService, RewardfulService, SERVICE_PRODUCT_ROLES, SalaryForecast, SalaryForecastFrequencyEnum, SalaryForecastService, ServiceNotificationService, ServiceNotificationStatusEnum, ServiceNotificationTypeEnum, ServicePayment, ServicePaymentMethod, ServicePaymentMethodService, ServicePaymentService, ServicePaymentStatusEnum, ServicePrice, ServicePriceCollection, ServicePriceRecurringIntervalEnum, ServicePriceService, ServicePriceTypeEnum, ServiceProduct, ServiceProductCollection, ServiceProductIconsEnum, ServiceProductIdEnum, ServiceProductService, ServiceProductStatusEnum, ServicePromoCode, ServiceSubscription, ServiceSubscriptionCollection, ServiceSubscriptionItem, ServiceSubscriptionStatusEnum, SetupItemTypeEnum, ShareFilterOptionsEnum, SoleBusiness, SoleBusinessActivity, SoleBusinessActivityService, SoleBusinessAllocation, SoleBusinessAllocationsForm, SoleBusinessForm, SoleBusinessLoss, SoleBusinessLossForm, SoleBusinessLossOffsetRule, SoleBusinessLossOffsetRuleService, SoleBusinessLossReport, SoleBusinessLossService, SoleBusinessLossesCollection, SoleBusinessMessagesEnum, SoleBusinessService, SoleContact, SoleContactForm, SoleContactService, SoleDepreciationMethod, SoleDepreciationMethodEnum, SoleDepreciationMethodForm, SoleDepreciationMethodService, SoleDetails, SoleDetailsForm, SoleDetailsService, SoleForecast, SoleForecastService, SoleIncomeForm, SoleInvoice, SoleInvoiceCollection, SoleInvoiceForm, SoleInvoiceItem, SoleInvoiceItemCollection, SoleInvoiceItemForm, SoleInvoiceService, SoleInvoiceStatusesEnum, SoleInvoiceTaxTypeEnum, SoleInvoiceTemplate, SoleInvoiceTemplateForm, SoleInvoiceTemplateService, SoleInvoiceTemplateTaxTypeEnum, SpareDocumentSpareTypeEnum, SseService, StatesEnum, SubscriptionItemCollection, SubscriptionMessagesEnum, SubscriptionService, TAX_RETURN_CATEGORIES, TYPE_LOAN, TankTypeEnum, TaxCalculationMedicareExemptionEnum, TaxCalculationTypeEnum, TaxExemption, TaxExemptionEnum, TaxExemptionMetaField, TaxExemptionMetaFieldEnum, TaxExemptionService, TaxReturn, TaxReturnCategory, TaxReturnCategoryListEnum, TaxReturnCategorySectionEnum, TaxReturnItem, TaxReturnItemEnum, TaxReturnItemService, TaxReview, TaxReviewCollection, TaxReviewHistoryService, TaxReviewMessagesEnum, TaxReviewService, TaxReviewStatusEnum, TaxSummary, TaxSummaryListEnum, TaxSummarySection, TaxSummarySectionEnum, TaxSummaryService, TaxSummaryTaxSummaryEnum, TaxSummaryTypeEnum, TicketFeedbackEnum, TicketStatusEnum, TicketTypesEnum, Toast, ToastService, ToastTypeEnum, Transaction, TransactionAllocation, TransactionAllocationCollection, TransactionAllocationService, TransactionBase, TransactionBaseForm, TransactionCalculationService, TransactionCategoryEnum, TransactionCollection, TransactionForm, TransactionMetaField, TransactionOperationEnum, TransactionService, TransactionSourceEnum, TransactionTypeEnum, TtCoreModule, TutorialVideoService, USER_ROLES, USER_WORK_POSITION, UniqueEmailValidator, User, UserEventSetting, UserEventSettingCollection, UserEventSettingFieldEnum, UserEventSettingService, UserEventStatusEnum, UserEventType, UserEventTypeCategory, UserEventTypeClientTypeEnum, UserEventTypeCollection, UserEventTypeEmployeeTypeEnum, UserEventTypeFrequencyEnum, UserEventTypeService, UserEventTypeUserTypeEnum, UserForm, UserInviteForm, UserMedicareExemptionEnum, UserMessagesEnum, UserRolesEnum, UserService, UserStatusEnum, UserSwitcherService, UserTitleEnum, UserToRegister, UserWorkDepreciationCalculationEnum, UserWorkingHolidayMakerEnum, UsersInviteService, Vehicle, VehicleClaim, VehicleClaimCollection, VehicleClaimDetails, VehicleClaimDetailsForm, VehicleClaimDetailsMethodEnum, VehicleClaimDetailsService, VehicleClaimForm, VehicleClaimService, VehicleExpense, VehicleExpenseCollection, VehicleForm, VehicleLogbook, VehicleLogbookCollection, VehicleLogbookForm, VehicleLogbookMessages, VehicleLogbookPurposeEnum, VehicleLogbookService, VehicleMessagesEnum, VehicleService, WorkExpenseForm, WorkIncomeForm, XlsxService, atLeastOneCheckedValidator, atoLinks, autocompleteValidator, cloneDeep, compare, compareMatOptions, conditionalValidator, createDate, currentFinYearValidator, displayMatOptions, enumToList, fieldsSumValidator, getDocIcon, greaterThanValidator, minDateValidator, passwordMatchValidator, passwordValidator, replace, sort, sortDeep, taxReviewFilterPredicate, toArray };
+export { AbstractForm, AbstractModel, AccountSetupItem, AccountSetupItemCollection, AccountSetupService, Address, AddressForm, AddressService, AddressTypeEnum, AllocationGroup, AllocationGroupCollection, AllocationRule, AllocationRuleCollection, AllocationRuleConditionComparisonOperatorEnum, AllocationRuleConditionFieldEnum, AllocationRuleConditionOperatorEnum, AllocationRuleForm, AllocationRuleService, AllocationRuleTransaction, AllocationRuleTransactionMetaField, AllocationRuleTypeEnum, AlphabetColorsEnum, AnnualClientDetails, AnnualClientDetailsForm, AnnualClientDetailsService, AnnualFrequencyEnum, AppCurrencyPipe, AppEvent, AppEvent2, AppEventTypeEnum, AppFile, AssetEntityTypeEnum, AssetSale, AssetSaleCollection, AssetTypeEnum, AssetsService, AuthService, BANK_ACCOUNT_TYPES, Badge, BadgeColorEnum, Bank, BankAccount, BankAccountAddManualForm, BankAccountAllocationForm, BankAccountCalculationService, BankAccountChartData, BankAccountCollection, BankAccountImportForm, BankAccountPropertiesForm, BankAccountProperty, BankAccountService, BankAccountStatusEnum, BankAccountTypeEnum, BankAccountsImportForm, BankConnection, BankConnectionMessagesEnum, BankConnectionService, BankConnectionStatusEnum, BankExternalStats, BankPopularEnum, BankProviderEnum, BankService, BankTransaction, BankTransactionCalculationService, BankTransactionChartData, BankTransactionCollection, BankTransactionService, BankTransactionSummaryFieldsEnum, BankTransactionTypeEnum, BasReport, BasReportForm, BasReportService, BasiqConfig, BasiqJob, BasiqJobResponse, BasiqJobStep, BasiqMessagesEnum, BasiqService, BasiqToken, BasiqTokenService, BestVehicleLogbookCollection, BorrowingExpense, BorrowingExpenseLoan, BorrowingExpenseService, BorrowingReport, BorrowingReportForm, BorrowingReportMessagesEnum, BorrowingReportService, Budget, BudgetForm, BudgetMessagesEnum, BudgetRule, BudgetService, BusinessTypeEnum, CAPITAL_COSTS_ITEMS, CHART_ACCOUNTS_CATEGORIES, CalculationFormItem, CalculationFormTypeEnum, CgtExemptionAndRolloverCodeEnum, ChartAccounts, ChartAccountsCategoryECollection, ChartAccountsCategoryEnum, ChartAccountsCollection, ChartAccountsDepreciation, ChartAccountsDepreciationService, ChartAccountsEtpEnum, ChartAccountsHeading, ChartAccountsHeadingListEnum, ChartAccountsHeadingTaxDeductibleEnum, ChartAccountsHeadingTaxableEnum, ChartAccountsHeadingVehicleListEnum, ChartAccountsHoldingUntaxedIncomeListEnum, ChartAccountsInvoiceExpenseEnum, ChartAccountsKeepSign, ChartAccountsListEnum, ChartAccountsMetaField, ChartAccountsMetaFieldListEnum, ChartAccountsMetaFieldTypeEnum, ChartAccountsSalaryAdjustmentsListEnum, ChartAccountsSalaryIncludedListEnum, ChartAccountsService, ChartAccountsTaxLabelsEnum, ChartAccountsTypeEnum, ChartAccountsValue, ChartAccountsValueService, ChartData, ChartSerie, Chat, ChatCollection, ChatService, ChatStatusEnum, ChatViewTypeEnum, ClientCollection, ClientDetails, ClientDetailsForm, ClientDetailsMedicareExemptionEnum, ClientDetailsWorkDepreciationCalculationEnum, ClientDetailsWorkingHolidayMakerEnum, ClientIncomeTypes, ClientIncomeTypesForm, ClientIncomeTypesService, ClientInvite, ClientInviteCollection, ClientInviteMessages, ClientInviteService, ClientInviteStatusEnum, ClientInviteTypeEnum, ClientMovement, ClientMovementCollection, ClientMovementService, ClientPortfolioChartData, ClientPortfolioReport, ClientPortfolioReportCollection, ClientPortfolioReportService, Collection, CollectionDictionary, CorelogicService, CorelogicSuggestion, Country, DEDUCTION_CATEGORIES, DEPRECIATION_GROUPS, DOCUMENT_FILE_TYPES, DeductionClothingTypeEnum, DeductionSelfEducationTypeEnum, Depreciation, DepreciationCalculationEnum, DepreciationCalculationPercentEnum, DepreciationCapitalProject, DepreciationCapitalProjectService, DepreciationCollection, DepreciationForecast, DepreciationForecastCollection, DepreciationForm, DepreciationGroup, DepreciationGroupEnum, DepreciationGroupItem, DepreciationLvpAssetTypeEnum, DepreciationLvpRateEnum, DepreciationLvpReportItem, DepreciationLvpReportItemCollection, DepreciationReportItem, DepreciationReportItemCollection, DepreciationService, DepreciationTypeEnum, DepreciationWriteOffAmountEnum, Dictionary, Document, DocumentApiUrlPrefixEnum, DocumentFolder, DocumentFolderForm, DocumentFolderMessagesEnum, DocumentFolderService, DocumentForm, DocumentMessagesEnum, DocumentService, DocumentTypeEnum, ENDPOINTS, EmployeeCollection, EmployeeDetails, EmployeeInvite, EmployeeInviteService, EmployeeMessagesEnum, EmployeeService, Endpoint, EquityPositionChartService, EventDispatcherService, ExportDataTable, ExportFormatEnum, ExportFormatterService, ExportableCollection, FacebookService, FileService, FileValidator, FinancialYear, FinancialYearService, Firm, FirmForm, FirmMessagesEnum, FirmService, FirmTypeEnum, FormValidationsEnum, GoogleService, HeaderTitleService, Holding, HoldingCollection, HoldingForm, HoldingIncomeForm, HoldingMessagesEnum, HoldingReinvest, HoldingReinvestForm, HoldingSale, HoldingSaleCollection, HoldingSaleForm, HoldingSaleMessagesEnum, HoldingSaleService, HoldingService, HoldingType, HoldingTypeCategoryEnum, HoldingTypeCollection, HoldingTypeExchange, HoldingTypeExchangeService, HoldingTypeForm, HoldingTypeMessagesEnum, HoldingTypeService, IconsFileEnum, IncomeAmountTypeEnum, IncomePosition, IncomeSource, IncomeSourceChartData, IncomeSourceCollection, IncomeSourceForecast, IncomeSourceForecastCollection, IncomeSourceForecastService, IncomeSourceForecastTrustTypeEnum, IncomeSourceMessagesEnum, IncomeSourceService, IncomeSourceType, IncomeSourceTypeEnum, IncomeSourceTypeListHoldingEnum, IncomeSourceTypeListOtherEnum, IncomeSourceTypeListSoleEnum, IncomeSourceTypeListWorkEnum, IncomeSourceTypeService, InterceptorsModule, IntercomService, InviteStatusEnum, JsPdf, JwtService, Loan, LoanBankTypeEnum, LoanCollection, LoanForm, LoanFrequencyEnum, LoanInterestTypeEnum, LoanInterestTypeLabelEnum, LoanMaxNumberOfPaymentsEnum, LoanPayment, LoanPaymentCollection, LoanPayout, LoanPayoutTypeEnum, LoanRepaymentFrequencyEnum, LoanRepaymentTypeEnum, LoanRepaymentTypeLabelEnum, LoanService, LoanTypeEnum, LoanVehicleTypeEnum, LoginForm, LossTypeEnum, MODULE_URL_LIST, MONTHS, Message, MessageCollection, MessageDocument, MessageDocumentCollection, MessageDocumentService, MessageService, MessagesEnum, MixpanelService, MonthNameShortEnum, MonthNumberEnum, MyAccountHistory, MyAccountHistoryInitiatedByEnum, MyAccountHistoryStatusEnum, MyAccountHistoryTypeEnum, MyTaxBusinessDetails, MyTaxBusinessDetailsForm, MyTaxBusinessIncome, MyTaxBusinessIncomeForm, MyTaxBusinessIncomeOrLossesForm, MyTaxBusinessLosses, MyTaxBusinessLossesForm, MyTaxCgt, MyTaxCgtForm, MyTaxDeductions, MyTaxDeductionsForm, MyTaxDividends, MyTaxDividendsForm, MyTaxEstimate, MyTaxIncomeStatements, MyTaxIncomeStatementsForm, MyTaxIncomeTests, MyTaxIncomeTestsForm, MyTaxInterest, MyTaxInterestForm, MyTaxLosses, MyTaxLossesForm, MyTaxMedicareForm, MyTaxOffsets, MyTaxOffsetsForm, MyTaxOtherIncome, MyTaxOtherIncomeForm, MyTaxPartnershipsAndTrusts, MyTaxPartnershipsAndTrustsForm, MyTaxRent, MyTaxRentForm, Notification, Occupation, OccupationService, PASSWORD_REGEXPS, PasswordForm, PdfFromDataTableService, PdfFromDomElementService, PdfFromHtmlTableService, PdfFromTableService, PdfOrientationEnum, PdfSettings, Phone, PhoneForm, PhoneTypeEnum, PreloaderService, Property, PropertyAddForm, PropertyCalculationService, PropertyCategory, PropertyCategoryListEnum, PropertyCategoryMovement, PropertyCategoryMovementCollection, PropertyCategoryMovementForm, PropertyCategoryMovementService, PropertyCategoryService, PropertyCollection, PropertyDepreciationCalculationEnum, PropertyDocument, PropertyDocumentForm, PropertyDocumentMessagesEnum, PropertyDocumentService, PropertyEditForm, PropertyEquityChartData, PropertyEquityChartItem, PropertyEquityChartTypeEnum, PropertyForecast, PropertyForecastForm, PropertyMessagesEnum, PropertyReportItem, PropertyReportItemCollection, PropertyReportItemDepreciation, PropertyReportItemDepreciationCollection, PropertyReportItemTransaction, PropertyReportItemTransactionCollection, PropertySale, PropertySaleCollection, PropertySaleCostBase, PropertySaleCostBaseForm, PropertySaleCostSaleForm, PropertySaleExemptionsForm, PropertySaleService, PropertySaleTaxExemptionMetaField, PropertySaleTaxExemptionMetaFieldCollection, PropertyService, PropertyShare, PropertyShareAccessEnum, PropertyShareCollection, PropertyShareForm, PropertyShareService, PropertyShareStatusEnum, PropertySubscription, PropertyTransactionReportService, PropertyValuation, PropertyValuationCollection, PropertyValuationForm, PropertyValuationMessages, PropertyValuationService, RegisterClientForm, RegisterFirmForm, RegistrationInvite, RegistrationInviteStatusEnum, ReportItem, ReportItemCollection, ReportItemDetails, ResetPasswordForm, RestService$1 as RestService, RewardfulService, SERVICE_PRODUCT_ROLES, SalaryForecast, SalaryForecastFrequencyEnum, SalaryForecastService, ServiceNotificationService, ServiceNotificationStatusEnum, ServiceNotificationTypeEnum, ServicePayment, ServicePaymentMethod, ServicePaymentMethodService, ServicePaymentService, ServicePaymentStatusEnum, ServicePrice, ServicePriceCollection, ServicePriceRecurringIntervalEnum, ServicePriceService, ServicePriceTypeEnum, ServiceProduct, ServiceProductCollection, ServiceProductIconsEnum, ServiceProductIdEnum, ServiceProductService, ServiceProductStatusEnum, ServicePromoCode, ServiceSubscription, ServiceSubscriptionCollection, ServiceSubscriptionItem, ServiceSubscriptionStatusEnum, SetupItemTypeEnum, SoleBusiness, SoleBusinessActivity, SoleBusinessActivityService, SoleBusinessAllocation, SoleBusinessAllocationsForm, SoleBusinessForm, SoleBusinessLoss, SoleBusinessLossForm, SoleBusinessLossOffsetRule, SoleBusinessLossOffsetRuleService, SoleBusinessLossReport, SoleBusinessLossService, SoleBusinessLossesCollection, SoleBusinessMessagesEnum, SoleBusinessService, SoleContact, SoleContactForm, SoleContactService, SoleDepreciationMethod, SoleDepreciationMethodEnum, SoleDepreciationMethodForm, SoleDepreciationMethodService, SoleDetails, SoleDetailsForm, SoleDetailsService, SoleForecast, SoleForecastService, SoleIncomeForm, SoleInvoice, SoleInvoiceCollection, SoleInvoiceForm, SoleInvoiceItem, SoleInvoiceItemCollection, SoleInvoiceItemForm, SoleInvoiceService, SoleInvoiceStatusesEnum, SoleInvoiceTaxTypeEnum, SoleInvoiceTemplate, SoleInvoiceTemplateForm, SoleInvoiceTemplateService, SoleInvoiceTemplateTaxTypeEnum, SpareDocumentSpareTypeEnum, SseService, StatesEnum, SubscriptionItemCollection, SubscriptionMessagesEnum, SubscriptionService, TAX_RETURN_CATEGORIES, TYPE_LOAN, TankTypeEnum, TaxCalculationMedicareExemptionEnum, TaxCalculationTypeEnum, TaxExemption, TaxExemptionEnum, TaxExemptionMetaField, TaxExemptionMetaFieldEnum, TaxExemptionService, TaxReturn, TaxReturnCategory, TaxReturnCategoryListEnum, TaxReturnCategorySectionEnum, TaxReturnItem, TaxReturnItemEnum, TaxReturnItemService, TaxReview, TaxReviewCollection, TaxReviewHistoryService, TaxReviewMessagesEnum, TaxReviewService, TaxReviewStatusEnum, TaxSummary, TaxSummaryListEnum, TaxSummarySection, TaxSummarySectionEnum, TaxSummaryService, TaxSummaryTaxSummaryEnum, TaxSummaryTypeEnum, TicketFeedbackEnum, TicketStatusEnum, TicketTypesEnum, Toast, ToastService, ToastTypeEnum, Transaction, TransactionAllocation, TransactionAllocationCollection, TransactionAllocationService, TransactionBase, TransactionBaseForm, TransactionCalculationService, TransactionCategoryEnum, TransactionCollection, TransactionForm, TransactionMetaField, TransactionOperationEnum, TransactionService, TransactionSourceEnum, TransactionTypeEnum, TtCoreModule, TutorialVideoService, USER_ROLES, USER_WORK_POSITION, UniqueEmailValidator, User, UserEventSetting, UserEventSettingCollection, UserEventSettingFieldEnum, UserEventSettingService, UserEventStatusEnum, UserEventType, UserEventTypeCategory, UserEventTypeClientTypeEnum, UserEventTypeCollection, UserEventTypeEmployeeTypeEnum, UserEventTypeFrequencyEnum, UserEventTypeService, UserEventTypeUserTypeEnum, UserForm, UserInviteForm, UserMedicareExemptionEnum, UserMessagesEnum, UserRolesEnum, UserService, UserStatusEnum, UserSwitcherService, UserTitleEnum, UserToRegister, UserWorkDepreciationCalculationEnum, UserWorkingHolidayMakerEnum, UsersInviteService, Vehicle, VehicleClaim, VehicleClaimCollection, VehicleClaimDetails, VehicleClaimDetailsForm, VehicleClaimDetailsMethodEnum, VehicleClaimDetailsService, VehicleClaimForm, VehicleClaimService, VehicleExpense, VehicleExpenseCollection, VehicleForm, VehicleLogbook, VehicleLogbookCollection, VehicleLogbookForm, VehicleLogbookMessages, VehicleLogbookPurposeEnum, VehicleLogbookService, VehicleMessagesEnum, VehicleService, WorkExpenseForm, WorkIncomeForm, XlsxService, atLeastOneCheckedValidator, atoLinks, autocompleteValidator, cloneDeep, compare, compareMatOptions, conditionalValidator, createDate, currentFinYearValidator, displayMatOptions, enumToList, fieldsSumValidator, getDocIcon, greaterThanValidator, minDateValidator, passwordMatchValidator, passwordValidator, replace, sort, sortDeep, taxReviewFilterPredicate, toArray };
 //# sourceMappingURL=taxtank-core.mjs.map