taxtank-core 0.28.1 → 0.28.4

package/fesm2015/taxtank-core.js

@@ -4,7 +4,7 @@ import * as i1$1 from '@angular/common';
 import { CommonModule, DatePipe } from '@angular/common';
 import * as i1 from '@angular/common/http';
 import { HttpParams, HttpErrorResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
-import { ReplaySubject, Subject, BehaviorSubject, throwError, combineLatest, forkJoin, Observable, of, from } from 'rxjs';
+import { ReplaySubject, Subject, BehaviorSubject, throwError, Observable, combineLatest, forkJoin, of, from } from 'rxjs';
 import { map, filter, catchError, take, switchMap, finalize, mergeMap, skip, distinctUntilChanged } from 'rxjs/operators';
 import { plainToClass, classToPlain, Type, Exclude, Transform, Expose } from 'class-transformer';
 import { JwtHelperService } from '@auth0/angular-jwt';
@@ -20,12 +20,12 @@ import uniqBy from 'lodash/uniqBy';
 import concat from 'lodash/concat';
 import { throwError as throwError$1 } from 'rxjs/internal/observable/throwError';
 import cloneDeep$1 from 'lodash/cloneDeep';
+import { EventSourcePolyfill } from 'event-source-polyfill/src/eventsource.min.js';
 import compact from 'lodash/compact';
 import { Validators, FormGroup, FormControl, FormArray } from '@angular/forms';
 import isEqual from 'lodash/isEqual';
 import fromPairs from 'lodash/fromPairs';
 import _ from 'lodash';
-import { EventSourcePolyfill } from 'event-source-polyfill/src/eventsource.min.js';
 import * as i1$2 from '@angular/router';
 import { NavigationEnd } from '@angular/router';
 import clone from 'lodash/clone';
@@ -240,24 +240,26 @@ var AppEventTypeEnum;
     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["TAX_REVIEW_UPDATED"] = 43] = "TAX_REVIEW_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_CREATED"] = 44] = "TRANSACTION_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_DELETED"] = 45] = "TRANSACTION_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED"] = 46] = "TRANSACTION_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_RECEIPT"] = 47] = "TRANSACTION_UPDATED_WITH_RECEIPT";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_DELETED_RECEIPT"] = 48] = "TRANSACTION_UPDATED_WITH_DELETED_RECEIPT";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_CREATED"] = 49] = "TRANSACTION_RECEIPT_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_DELETED"] = 50] = "TRANSACTION_RECEIPT_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTIONS_CREATED"] = 51] = "TRANSACTIONS_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["USER_UPDATED"] = 52] = "USER_UPDATED";
-    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["SOLE_DETAILS_CREATED"] = 43] = "SOLE_DETAILS_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["SOLE_DETAILS_UPDATED"] = 44] = "SOLE_DETAILS_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["TAX_REVIEW_UPDATED"] = 45] = "TAX_REVIEW_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_CREATED"] = 46] = "TRANSACTION_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_DELETED"] = 47] = "TRANSACTION_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED"] = 48] = "TRANSACTION_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_RECEIPT"] = 49] = "TRANSACTION_UPDATED_WITH_RECEIPT";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_DELETED_RECEIPT"] = 50] = "TRANSACTION_UPDATED_WITH_DELETED_RECEIPT";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_CREATED"] = 51] = "TRANSACTION_RECEIPT_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_DELETED"] = 52] = "TRANSACTION_RECEIPT_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTIONS_CREATED"] = 53] = "TRANSACTIONS_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["USER_UPDATED"] = 54] = "USER_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_UPDATED"] = 55] = "VEHICLE_CLAIM_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_CREATED"] = 56] = "VEHICLE_CLAIM_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_UPDATED"] = 57] = "VEHICLE_CLAIM_DETAILS_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_CREATED"] = 58] = "VEHICLE_CLAIM_DETAILS_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_CREATED"] = 59] = "VEHICLE_LOGBOOK_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_UPDATED"] = 60] = "VEHICLE_LOGBOOK_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_DELETED"] = 61] = "VEHICLE_LOGBOOK_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED"] = 62] = "VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED";
 })(AppEventTypeEnum || (AppEventTypeEnum = {}));
 
 class EventDispatcherService {
@@ -587,6 +589,7 @@ const ENDPOINTS = {
     BANK_TRANSACTIONS_IMPORT_POST: new Endpoint('POST', '\\/bank-transactions\\/\\d+\\/import'),
     BASIQ_ACCOUNTS_GET: new Endpoint('GET', '\\/basiq\\/accounts'),
     BASIQ_TOKEN_GET: new Endpoint('GET', '\\/basiq\\/tokens'),
+    BORROWING_EXPENSES_GET: new Endpoint('GET', '\\/borrowing-expenses'),
     CHARTS_INCOME_GET: new Endpoint('GET', '\\/charts\\/\\incomes'),
     CHARTS_EXPENSES_GET: new Endpoint('GET', '\\/charts\\/\\expenses'),
     CHART_ACCOUNTS_GET: new Endpoint('GET', '\\/chart-accounts'),
@@ -684,6 +687,7 @@ const ENDPOINTS = {
     SOLE_BUSINESSES_GET: new Endpoint('GET', '\\/sole-businesses'),
     SOLE_BUSINESSES_POST: new Endpoint('POST', '\\/sole-businesses'),
     SOLE_BUSINESSES_PUT: new Endpoint('PUT', '\\/sole-businesses\\/\\d+'),
+    BUSINESS_ACTIVITIES_GET: new Endpoint('GET', '\\/sole-business-activities'),
     SOLE_DEPRECIATION_METHODS_GET: new Endpoint('GET', '\\/sole-depreciation-methods'),
     SOLE_DEPRECIATION_METHODS_PUT: new Endpoint('PUT', '\\/sole-depreciation-methods\\/\\d+'),
     SOLE_INVOICES_GET: new Endpoint('GET', '\\/sole-invoices'),
@@ -2607,14 +2611,14 @@ class VehicleLogbook extends VehicleLogbook$1 {
      * Get logbook period date range from logbook date and weeksInPeriod duration
      */
     getPeriod() {
-        return moment.rangeFromInterval('weeks', VehicleLogbook.bestPeriodWeeks, this.date);
+        return moment.rangeFromInterval('milliseconds', VehicleLogbook.bestPeriodDuration, this.date);
     }
 }
 /**
- * Logbook period duration in weeks.
+ * Logbook period duration in milliseconds.
  * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/211517441/Logbook+Vehicle
  */
-VehicleLogbook.bestPeriodWeeks = 12;
+VehicleLogbook.bestPeriodDuration = 12 * 7 * 24 * 3600 * 1000;
 __decorate([
     Type(() => Date)
 ], VehicleLogbook.prototype, "date", void 0);
@@ -4732,7 +4736,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
 /**
  * Interceptor which adds user's basiq token to any http request to basiq api
  */
-class BasiqInterceptor {
+class BasiqTokenInterceptor {
     constructor(basiqTokenService) {
         this.basiqTokenService = basiqTokenService;
     }
@@ -4753,12 +4757,239 @@ class BasiqInterceptor {
         });
     }
 }
-BasiqInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqInterceptor, deps: [{ token: BasiqTokenService }], target: i0.ɵɵFactoryTarget.Injectable });
-BasiqInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqInterceptor, decorators: [{
+BasiqTokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqTokenInterceptor, deps: [{ token: BasiqTokenService }], target: i0.ɵɵFactoryTarget.Injectable });
+BasiqTokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqTokenInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqTokenInterceptor, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: BasiqTokenService }]; } });
 
+/**
+ * server sent events service
+ * https://symfony.com/doc/current/mercure.html
+ */
+class SseService {
+    constructor(zone, jwtService, environment) {
+        this.zone = zone;
+        this.jwtService = jwtService;
+        this.environment = environment;
+    }
+    /**
+     * list to url for server events
+     */
+    on(topic) {
+        const url = new URL(this.environment.mercureUrl);
+        url.searchParams.append('topic', `${this.environment.apiV2}/users/${this.jwtService.decodeToken().username}/${topic}`);
+        // tslint:disable-next-line:typedef
+        return new Observable((observer) => {
+            const es = new EventSourcePolyfill(url, {
+                headers: {
+                    Authorization: 'Bearer ' + this.jwtService.getToken(),
+                }
+            });
+            es.onmessage = (event) => {
+                this.zone.run(() => observer.next(event));
+            };
+        })
+            .pipe(map((messageEvent) => {
+            return JSON.parse(messageEvent.data);
+        }));
+    }
+}
+SseService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SseService, deps: [{ token: i0.NgZone }, { token: JwtService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+SseService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SseService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SseService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: i0.NgZone }, { type: JwtService }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
+
+/**
+ * Service to work with user
+ */
+class UserService {
+    constructor(http, jwtService, eventDispatcherService, sseService, environment) {
+        this.http = http;
+        this.jwtService = jwtService;
+        this.eventDispatcherService = eventDispatcherService;
+        this.sseService = sseService;
+        this.environment = environment;
+        this.cacheSubject = new ReplaySubject(1);
+        this.listenEvents();
+    }
+    listenEvents() {
+        this.listenServiceSubscriptionUpdated();
+    }
+    get() {
+        if (!this.cache) {
+            this.fetch().subscribe(() => { }, (error) => {
+                // force logout user (clear localStorage) when get current user return error
+                if (error.status === 500) {
+                    this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.CURRENT_USER_GET_FAILED, null));
+                }
+            });
+        }
+        return this.cacheSubject.asObservable();
+    }
+    /**
+     * Get current user
+     */
+    fetch() {
+        return this.http.get(`${this.environment.apiV2}/users/current`)
+            .pipe(map((userBase) => {
+            const user = plainToClass(User, userBase);
+            localStorage.setItem('userId', user.id.toString());
+            // @TODO remove
+            localStorage.setItem('financialYear', user.financialYear.toString());
+            this.cache = user;
+            this.cacheSubject.next(this.cache);
+            return user;
+        }));
+    }
+    /**
+     * Register new user
+     */
+    register(data) {
+        return this.http.post(`${this.environment.apiV2}/users/registration`, data);
+    }
+    /**
+     * Update user
+     */
+    update(user) {
+        return this.http.put(`${this.environment.apiV2}/users/${user.id}`, user)
+            .pipe(map((userBase) => {
+            this.cache = plainToClass(User, userBase);
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.USER_UPDATED, null));
+            this.cacheSubject.next(this.cache);
+        }));
+    }
+    /**
+     * Change user password
+     */
+    changePassword(currentPassword, newPassword) {
+        return this.http.put(`${this.environment.apiV2}/users/password/change`, { currentPassword, newPassword });
+    }
+    /**
+     * Recovery user password
+     */
+    recoveryPassword(email) {
+        return this.http.put(`${this.environment.apiV2}/users/password/recovery`, { email });
+    }
+    /**
+     * Reset user password
+     */
+    resetPassword(newPassword, resetToken) {
+        return this.http.put(`${this.environment.apiV2}/users/password/reset`, { newPassword, resetToken });
+    }
+    resendConfirmationEmail(email) {
+        return this.http.post(`${this.environment.apiV2}/users/confirmation/resend`, { email });
+    }
+    /**
+     * Confirm registered user
+     */
+    confirm(verificationCode) {
+        return this.http.post(`${this.environment.apiV2}/users/confirmation`, { verificationCode });
+    }
+    /**
+     * Search existing user
+     */
+    search(email) {
+        return this.http.get(`${this.environment.apiV2}/users/search?email=${email}`)
+            .pipe(map((userBase) => {
+            return plainToClass(User, userBase);
+        }));
+    }
+    /**
+     * Finish onboarding process
+     */
+    finishOnboarding(user) {
+        return this.http.put(`${this.environment.apiV2}/users/status`, user)
+            .pipe(map(() => {
+            this.cache = user;
+            this.cacheSubject.next(this.cache);
+        }));
+    }
+    /**
+     * Update user photo
+     */
+    updatePhoto(photo) {
+        return this.http.post(`${this.environment.apiV2}/users/photo?_method=PUT`, photo)
+            .pipe(map((photoUrl) => {
+            this.cache = plainToClass(User, Object.assign(this.cache, { photo: photoUrl }));
+            this.cacheSubject.next(this.cache);
+        }));
+    }
+    switchFinancialYear(year) {
+        return this.http.get(`${this.environment.apiV2}/financial-year/switch`, { params: new HttpParams({ fromString: `financialYear=${year}` }) }).pipe(map(() => {
+            localStorage.setItem('financialYear', year.toString());
+            window.location.reload();
+        }));
+    }
+    /**
+     * clear service cache
+     */
+    resetCache() {
+        this.fetch().subscribe();
+    }
+    /**
+     * Create basiq (if not exist yet) to provide access to basiq api
+     */
+    createBasiq() {
+        return this.http.post(`${this.environment.apiV2}/basiq/user`, {})
+            .pipe(map((basiqId) => {
+            this.cache = plainToClass(User, Object.assign(this.cache, { basiqId }));
+            this.cacheSubject.next(this.cache);
+            return basiqId;
+        }));
+    }
+    /**
+     * Update cache when user's service subscription is updated
+     */
+    listenServiceSubscriptionUpdated() {
+        this.eventDispatcherService.on(AppEventTypeEnum.SERVICE_SUBSCRIPTION_UPDATED).subscribe(() => this.resetCache());
+    }
+}
+UserService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserService, deps: [{ token: i1.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+UserService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: JwtService }, { type: EventDispatcherService }, { type: SseService }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
+
+/**
+ * Interceptor which check if client's basiq id exist and request it if not
+ */
+class BasiqClientIdInterceptor {
+    constructor(userService) {
+        this.userService = userService;
+    }
+    intercept(request, next) {
+        // Check if 'client id' URL segment contains null instead of id
+        if (!request.url.startsWith(`${BasiqService.basiqApiUrl}/users/null`)) {
+            return next.handle(request);
+        }
+        return this.userService.createBasiq().pipe(mergeMap((basiqClientId) => next.handle(this.addId(request, basiqClientId))));
+    }
+    addId(request, basiqClientId) {
+        return request.clone({
+            url: request.url.replace('null', basiqClientId)
+        });
+    }
+}
+BasiqClientIdInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqClientIdInterceptor, deps: [{ token: UserService }], target: i0.ɵɵFactoryTarget.Injectable });
+BasiqClientIdInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqClientIdInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqClientIdInterceptor, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: UserService }]; } });
+
 class InterceptorsModule {
 }
 InterceptorsModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: InterceptorsModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
@@ -4792,7 +5023,12 @@ InterceptorsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", vers
         },
         {
             provide: HTTP_INTERCEPTORS,
-            useClass: BasiqInterceptor,
+            useClass: BasiqTokenInterceptor,
+            multi: true
+        },
+        {
+            provide: HTTP_INTERCEPTORS,
+            useClass: BasiqClientIdInterceptor,
             multi: true
         }
     ] });
@@ -4828,7 +5064,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
                         },
                         {
                             provide: HTTP_INTERCEPTORS,
-                            useClass: BasiqInterceptor,
+                            useClass: BasiqTokenInterceptor,
+                            multi: true
+                        },
+                        {
+                            provide: HTTP_INTERCEPTORS,
+                            useClass: BasiqClientIdInterceptor,
                             multi: true
                         }
                     ]
@@ -4899,7 +5140,7 @@ class VehicleLogbookCollection extends Collection {
         if (this.items.length < 2) {
             return false;
         }
-        return VehicleLogbook.bestPeriodWeeks < (this.last.date.getTime() - this.first.date.getTime());
+        return VehicleLogbook.bestPeriodDuration < (this.last.date.getTime() - this.first.date.getTime());
     }
     /**
      * Get collection of non-personal logbooks (work-related, sole-related).
@@ -8974,6 +9215,10 @@ class SoleDepreciationMethodService {
         this.toastService = toastService;
         this.cacheSubject = new ReplaySubject(1);
         this.url = 'sole-depreciation-methods';
+        this.listenEvents();
+    }
+    listenEvents() {
+        this.listenSoleDetailsChanges();
     }
     get() {
         if (!this.cache) {
@@ -9000,6 +9245,13 @@ class SoleDepreciationMethodService {
             return throwError$1(error);
         }));
     }
+    listenSoleDetailsChanges() {
+        this.eventDispatcherService.on([AppEventTypeEnum.SOLE_DETAILS_CREATED, AppEventTypeEnum.SOLE_DETAILS_UPDATED])
+            .subscribe(() => {
+            this.cache = null;
+            this.get().subscribe();
+        });
+    }
 }
 SoleDepreciationMethodService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDepreciationMethodService, deps: [{ token: i1.HttpClient }, { token: 'environment' }, { token: EventDispatcherService }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
 SoleDepreciationMethodService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDepreciationMethodService, providedIn: 'root' });
@@ -9017,9 +9269,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
  * @TODO TT-1777 Alex: extend from rest service when it refactored
  */
 class SoleDetailsService {
-    constructor(http, environment) {
+    constructor(http, environment, eventDispatcherService) {
         this.http = http;
         this.environment = environment;
+        this.eventDispatcherService = eventDispatcherService;
         this.cacheSubject = new ReplaySubject(1);
     }
     get() {
@@ -9042,6 +9295,7 @@ class SoleDetailsService {
         return this.http.post(`${this.environment.apiV2}/sole-details`, soleDetails).pipe(map((soleDetailsBase) => {
             this.cache = plainToClass(SoleDetails, soleDetailsBase);
             this.cacheSubject.next(this.cache);
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.SOLE_DETAILS_CREATED, soleDetails));
             return this.cache;
         }));
     }
@@ -9049,11 +9303,12 @@ class SoleDetailsService {
         return this.http.put(`${this.environment.apiV2}/sole-details/${soleDetails.id}`, soleDetails).pipe(map((soleDetailsBase) => {
             this.cache = plainToClass(SoleDetails, soleDetailsBase);
             this.cacheSubject.next(this.cache);
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.SOLE_DETAILS_UPDATED, soleDetails));
             return this.cache;
         }));
     }
 }
-SoleDetailsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDetailsService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+SoleDetailsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDetailsService, deps: [{ token: i1.HttpClient }, { token: 'environment' }, { token: EventDispatcherService }], target: i0.ɵɵFactoryTarget.Injectable });
 SoleDetailsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDetailsService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDetailsService, decorators: [{
             type: Injectable,
@@ -9063,7 +9318,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
         }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
-                }] }]; } });
+                }] }, { type: EventDispatcherService }]; } });
 
 class SoleInvoiceService extends RestService {
     constructor() {
@@ -11042,50 +11297,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
                 }]
         }] });
 
-/**
- * server sent events service
- * https://symfony.com/doc/current/mercure.html
- */
-class SseService {
-    constructor(zone, jwtService, environment) {
-        this.zone = zone;
-        this.jwtService = jwtService;
-        this.environment = environment;
-    }
-    /**
-     * list to url for server events
-     */
-    on(topic) {
-        const url = new URL(this.environment.mercureUrl);
-        url.searchParams.append('topic', `${this.environment.apiV2}/users/${this.jwtService.decodeToken().username}/${topic}`);
-        // tslint:disable-next-line:typedef
-        return new Observable((observer) => {
-            const es = new EventSourcePolyfill(url, {
-                headers: {
-                    Authorization: 'Bearer ' + this.jwtService.getToken(),
-                }
-            });
-            es.onmessage = (event) => {
-                this.zone.run(() => observer.next(event));
-            };
-        })
-            .pipe(map((messageEvent) => {
-            return JSON.parse(messageEvent.data);
-        }));
-    }
-}
-SseService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SseService, deps: [{ token: i0.NgZone }, { token: JwtService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-SseService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SseService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SseService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return [{ type: i0.NgZone }, { type: JwtService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
-
 /**
  * Service for work with chats
  */
@@ -13570,152 +13781,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
                 }]
         }] });
 
-/**
- * Service to work with user
- */
-class UserService {
-    constructor(http, jwtService, eventDispatcherService, sseService, environment) {
-        this.http = http;
-        this.jwtService = jwtService;
-        this.eventDispatcherService = eventDispatcherService;
-        this.sseService = sseService;
-        this.environment = environment;
-        this.cacheSubject = new ReplaySubject(1);
-        this.listenEvents();
-    }
-    listenEvents() {
-        this.listenServiceSubscriptionUpdated();
-    }
-    get() {
-        if (!this.cache) {
-            this.fetch().subscribe(() => { }, (error) => {
-                // force logout user (clear localStorage) when get current user return error
-                if (error.status === 500) {
-                    this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.CURRENT_USER_GET_FAILED, null));
-                }
-            });
-        }
-        return this.cacheSubject.asObservable();
-    }
-    /**
-     * Get current user
-     */
-    fetch() {
-        return this.http.get(`${this.environment.apiV2}/users/current`)
-            .pipe(map((userBase) => {
-            const user = plainToClass(User, userBase);
-            localStorage.setItem('userId', user.id.toString());
-            // @TODO remove
-            localStorage.setItem('financialYear', user.financialYear.toString());
-            this.cache = user;
-            this.cacheSubject.next(this.cache);
-            return user;
-        }));
-    }
-    /**
-     * Register new user
-     */
-    register(data) {
-        return this.http.post(`${this.environment.apiV2}/users/registration`, data);
-    }
-    /**
-     * Update user
-     */
-    update(user) {
-        return this.http.put(`${this.environment.apiV2}/users/${user.id}`, user)
-            .pipe(map((userBase) => {
-            this.cache = plainToClass(User, userBase);
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.USER_UPDATED, null));
-            this.cacheSubject.next(this.cache);
-        }));
-    }
-    /**
-     * Change user password
-     */
-    changePassword(currentPassword, newPassword) {
-        return this.http.put(`${this.environment.apiV2}/users/password/change`, { currentPassword, newPassword });
-    }
-    /**
-     * Recovery user password
-     */
-    recoveryPassword(email) {
-        return this.http.put(`${this.environment.apiV2}/users/password/recovery`, { email });
-    }
-    /**
-     * Reset user password
-     */
-    resetPassword(newPassword, resetToken) {
-        return this.http.put(`${this.environment.apiV2}/users/password/reset`, { newPassword, resetToken });
-    }
-    resendConfirmationEmail(email) {
-        return this.http.post(`${this.environment.apiV2}/users/confirmation/resend`, { email });
-    }
-    /**
-     * Confirm registered user
-     */
-    confirm(verificationCode) {
-        return this.http.post(`${this.environment.apiV2}/users/confirmation`, { verificationCode });
-    }
-    /**
-     * Search existing user
-     */
-    search(email) {
-        return this.http.get(`${this.environment.apiV2}/users/search?email=${email}`)
-            .pipe(map((userBase) => {
-            return plainToClass(User, userBase);
-        }));
-    }
-    /**
-     * Finish onboarding process
-     */
-    finishOnboarding(user) {
-        return this.http.put(`${this.environment.apiV2}/users/status`, user)
-            .pipe(map(() => {
-            this.cache = user;
-            this.cacheSubject.next(this.cache);
-        }));
-    }
-    /**
-     * Update user photo
-     */
-    updatePhoto(photo) {
-        return this.http.post(`${this.environment.apiV2}/users/photo?_method=PUT`, photo)
-            .pipe(map((photoUrl) => {
-            this.cache = plainToClass(User, Object.assign(this.cache, { photo: photoUrl }));
-            this.cacheSubject.next(this.cache);
-        }));
-    }
-    switchFinancialYear(year) {
-        return this.http.get(`${this.environment.apiV2}/financial-year/switch`, { params: new HttpParams({ fromString: `financialYear=${year}` }) }).pipe(map(() => {
-            localStorage.setItem('financialYear', year.toString());
-            window.location.reload();
-        }));
-    }
-    /**
-     * clear service cache
-     */
-    resetCache() {
-        this.fetch().subscribe();
-    }
-    /**
-     * Update cache when user's service subscription is updated
-     */
-    listenServiceSubscriptionUpdated() {
-        this.eventDispatcherService.on(AppEventTypeEnum.SERVICE_SUBSCRIPTION_UPDATED).subscribe(() => this.resetCache());
-    }
-}
-UserService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserService, deps: [{ token: i1.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-UserService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: JwtService }, { type: EventDispatcherService }, { type: SseService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
-
 /**
  * Service to work with XLSX (generate, download, e.t.c.)
  */
@@ -14198,7 +14263,11 @@ var MessagesEnum;
  */
 function minDateValidator(date, message = MessagesEnum.INVALID_DATE.replace('$1', new DatePipe('en-US').transform(date))) {
     return (control) => {
-        if (!control.value || (control.value >= date)) {
+        if (!control.value) {
+            return null;
+        }
+        // form control value can be as a Moment object - we wrap it in "new Date()" to work with it like with JS Date
+        if (new Date(control.value) >= new Date(date)) {
             return null;
         }
         return { minDate: message };
@@ -14297,7 +14366,7 @@ class SoleBusinessForm extends AbstractForm {
             name: new FormControl(business.name, Validators.required),
             activity: new FormControl(business.activity, Validators.required),
             description: new FormControl(business.description),
-            website: new FormControl(business.website),
+            website: new FormControl(business.website)
         }, business);
         // User have to create income source with new business.
         // Income source is not able for edit business
@@ -14314,11 +14383,20 @@ class SoleBusinessForm extends AbstractForm {
                     })
                 ])
             }));
+            this.addControl('losses', new FormArray([
+                new FormGroup({
+                    financialYear: new FormControl(new FinancialYear().year),
+                    openBalance: new FormControl(null, Validators.required)
+                })
+            ]));
         }
     }
     get forecastFormGroup() {
         return this.get('incomeSource').get('soleForecasts').at(0);
     }
+    get lossFormGroup() {
+        return this.get('losses').at(0);
+    }
 }
 
 /**
@@ -14406,10 +14484,22 @@ class SoleDepreciationMethodForm extends AbstractForm {
     }
 }
 
+/**
+ * Validator check if entered strong length is equal to passed length parameter
+ */
+function requiredLengthValidator(length) {
+    return (control) => {
+        if (control.value && control.value.length !== length) {
+            return { requiredLength: length };
+        }
+        return null;
+    };
+}
+
 class SoleDetailsForm extends AbstractForm {
     constructor(soleDetails) {
         super({
-            abn: new FormControl(soleDetails.abn, [Validators.required, Validators.minLength(11), Validators.maxLength(11)]),
+            abn: new FormControl(soleDetails.abn, [Validators.required, requiredLengthValidator(11)]),
             isGST: new FormControl(soleDetails.isGST || false)
         }, soleDetails);
     }