taxtank-core 0.33.70 → 0.33.72
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/src/lib/db/Models/observable-model.mjs +1 -1
- package/esm2022/src/lib/models/holding/holding-trade.mjs +4 -3
- package/esm2022/src/lib/models/property/property-equity-chart-data.mjs +13 -15
- package/esm2022/src/lib/services/data.service.mjs +4 -4
- package/esm2022/src/lib/services/http/bank/bank-connection/bank-connection.service.mjs +3 -6
- package/esm2022/src/lib/services/http/holding/holding-trade.service.mjs +3 -4
- package/esm2022/src/lib/services/http/holding/holding-type.service.mjs +18 -11
- package/esm2022/src/lib/services/http/rest/rest.service.mjs +13 -9
- package/esm2022/src/lib/services/http/user/user-messages.enum.mjs +2 -2
- package/fesm2022/taxtank-core.mjs +48 -42
- package/fesm2022/taxtank-core.mjs.map +1 -1
- package/package.json +1 -1
- package/src/lib/db/Models/observable-model.d.ts +1 -0
- package/src/lib/models/holding/holding-trade.d.ts +3 -2
- package/src/lib/models/property/property-equity-chart-data.d.ts +0 -3
- package/src/lib/services/data.service.d.ts +1 -1
- package/src/lib/services/http/holding/holding-type.service.d.ts +4 -0
- package/src/lib/services/http/rest/rest.service.d.ts +1 -1
- package/src/lib/services/http/user/user-messages.enum.d.ts +1 -1
@@ -11,4 +11,4 @@ export class ObservableModel extends AbstractModel {
|
|
11
11
|
return methods.map((method) => this.getEventName(method));
|
12
12
|
}
|
13
13
|
}
|
14
|
-
//# sourceMappingURL=data:application/json;base64,
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2JzZXJ2YWJsZS1tb2RlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9kYi9Nb2RlbHMvb2JzZXJ2YWJsZS1tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFakQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFnQixlQUFnQixTQUFRLGFBQWE7SUFPekQsTUFBTSxDQUFDLFlBQVksQ0FBQyxNQUFrQjtRQUNwQyxPQUFPLEdBQUcsSUFBSSxDQUFDLFNBQVMsSUFBSSxNQUFNLEVBQUUsQ0FBQztJQUN2QyxDQUFDO0lBRUQsTUFBTSxDQUFDLGFBQWEsQ0FBQyxHQUFHLE9BQXFCO1FBQzNDLE9BQU8sT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO0lBQzVELENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJlc3RNZXRob2QgfSBmcm9tICcuLi8uLi9zZXJ2aWNlcyc7XG5pbXBvcnQgeyBBYnN0cmFjdE1vZGVsIH0gZnJvbSAnLi9hYnN0cmFjdC1tb2RlbCc7XG5cbi8qKlxuICogQFRPRE8gbW92ZSBmcm9tIGRiIGZvbGRlciB3aGVuIHJlZmFjdG9yZWQgYmFzZSBtb2RlbHNcbiAqIE1vZGVsLCB3aGljaCBjaGlsZHJlbiBzaG91bGQgYmUgbGlzdGVuZWQgdmlhIGV2ZW50IGRpc3BhdGNoZXIgc2VydmljZSBpc2luZyBhdXRvbWF0aWMgZXZlbnRzXG4gKi9cbmV4cG9ydCBhYnN0cmFjdCBjbGFzcyBPYnNlcnZhYmxlTW9kZWwgZXh0ZW5kcyBBYnN0cmFjdE1vZGVsIHtcbiAgLyoqXG4gICAqIEBUT0RPIGFic3RyYWN0IG1ldGhvZD9cbiAgICogcmVxdWlyZWQsIGJlY2F1c2UgY2xhc3MncyBuYW1lIGlzIG1pbmlmaWVkIGluIHByb2RcbiAgICovXG4gIHN0YXRpYyBjbGFzc05hbWU6IHN0cmluZztcblxuICBzdGF0aWMgZ2V0RXZlbnROYW1lKG1ldGhvZDogUmVzdE1ldGhvZCk6IHN0cmluZyB7XG4gICAgcmV0dXJuIGAke3RoaXMuY2xhc3NOYW1lfV8ke21ldGhvZH1gO1xuICB9XG5cbiAgc3RhdGljIGdldEV2ZW50TmFtZXMoLi4ubWV0aG9kczogUmVzdE1ldGhvZFtdKTogc3RyaW5nW10ge1xuICAgIHJldHVybiBtZXRob2RzLm1hcCgobWV0aG9kKSA9PiB0aGlzLmdldEV2ZW50TmFtZShtZXRob2QpKTtcbiAgfVxufVxuIl19
|
@@ -3,10 +3,10 @@ import { Expose, Transform, Type, plainToClass } from 'class-transformer';
|
|
3
3
|
import { User } from '../user';
|
4
4
|
import { HoldingType } from './holding-type';
|
5
5
|
import { AppFile } from '../file';
|
6
|
-
import {
|
6
|
+
import { ObservableModel } from '../../db/Models';
|
7
7
|
import { FinancialYear } from '../financial-year';
|
8
8
|
import { HoldingTradeTypeEnum, HoldingTypeCategoryEnum } from '../../db/Enums';
|
9
|
-
export class HoldingTrade extends
|
9
|
+
export class HoldingTrade extends ObservableModel {
|
10
10
|
constructor() {
|
11
11
|
super(...arguments);
|
12
12
|
this.isTaxFree = false;
|
@@ -14,6 +14,7 @@ export class HoldingTrade extends AbstractModel {
|
|
14
14
|
this.price = 0;
|
15
15
|
this.type = HoldingTradeTypeEnum.BUY;
|
16
16
|
}
|
17
|
+
static { this.className = 'HoldingTrade'; }
|
17
18
|
isPurchase() {
|
18
19
|
return this.type === HoldingTradeTypeEnum.BUY;
|
19
20
|
}
|
@@ -86,4 +87,4 @@ __decorate([
|
|
86
87
|
}, { toClassOnly: true }),
|
87
88
|
Expose({ toClassOnly: true })
|
88
89
|
], HoldingTrade.prototype, "category", void 0);
|
89
|
-
//# sourceMappingURL=data:application/json;base64,
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9sZGluZy10cmFkZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9tb2RlbHMvaG9sZGluZy9ob2xkaW5nLXRyYWRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsWUFBWSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDMUUsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUMvQixPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDN0MsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUNsQyxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDbEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRS9FLE1BQU0sT0FBTyxZQUFhLFNBQVEsZUFBZTtJQUFqRDs7UUFFRSxjQUFTLEdBQUcsS0FBSyxDQUFDO1FBQ2xCLGFBQVEsR0FBRyxDQUFDLENBQUM7UUFFYixVQUFLLEdBQUcsQ0FBQyxDQUFDO1FBRVYsU0FBSSxHQUFHLG9CQUFvQixDQUFDLEdBQUcsQ0FBQztJQTBGbEMsQ0FBQzthQWhHUSxjQUFTLEdBQUcsY0FBYyxBQUFqQixDQUFrQjtJQXdCbEMsVUFBVTtRQUNSLE9BQU8sSUFBSSxDQUFDLElBQUksS0FBSyxvQkFBb0IsQ0FBQyxHQUFHLENBQUM7SUFDaEQsQ0FBQztJQUVELElBQUksU0FBUztRQUNYLE9BQU8sSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQztJQUM1QyxDQUFDO0lBRUQsSUFBSSxJQUFJO1FBQ04sT0FBTyxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDO0lBQ3RDLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUksS0FBSztRQUNQLE9BQU8sSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDO0lBQ3BDLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUksV0FBVztRQUNiLE9BQU8sSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQztJQUNoRCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsSUFBSSxpQkFBaUI7UUFDbkIsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBRUQsWUFBWTtRQUNWLE1BQU0sUUFBUSxHQUFXLElBQUksR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxHQUFHLENBQUM7UUFFbkQsT0FBTyxDQUFDLElBQUksYUFBYSxFQUFFLENBQUMsU0FBUyxDQUFDLE9BQU8sRUFBRSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUMsR0FBRyxRQUFRLENBQUM7SUFDcEYsQ0FBQztJQXVCRCxJQUFJLGFBQWE7UUFDZixPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsYUFBYSxDQUFDO0lBQ3hDLENBQUM7SUFFRCxJQUFJLElBQUk7UUFDTixPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDO0lBQy9CLENBQUM7SUFFRCxJQUFJLE1BQU07UUFDUixPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDO0lBQ2pDLENBQUM7O0FBckZEO0lBREMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQzswQ0FDTjtBQUdYO0lBREMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQzswQ0FDTjtBQU1YO0lBREMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLFdBQVcsQ0FBQztpREFDQztBQUd6QjtJQURDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxPQUFPLENBQUM7MENBQ047QUE2RGlCO0lBZjlCLFNBQVMsQ0FBQyxDQUFDLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRTtRQUNyQixNQUFNLFdBQVcsR0FBZ0IsWUFBWSxDQUFDLFdBQVcsRUFBRSxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUE7UUFDM0UsSUFBSSxXQUFXLEVBQUU7WUFDZixPQUFPLFdBQVcsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFBO1NBQzNEO1FBQ0QsSUFBSSxHQUFHLENBQUMsUUFBUSxFQUFFO1lBQ2hCLE9BQU87Z0JBQ0wsdUJBQXVCLENBQUMsV0FBVztnQkFDbkMsdUJBQXVCLENBQUMsY0FBYztnQkFDdEMsdUJBQXVCLENBQUMsYUFBYTtnQkFDckMsdUJBQXVCLENBQUMsS0FBSzthQUM5QixDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztTQUNoRDtRQUNELE9BQU8sdUJBQXVCLENBQUMsS0FBSyxDQUFDO0lBQ3ZDLENBQUMsRUFBRSxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsQ0FBQztJQUN4QixNQUFNLENBQUMsRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLENBQUM7OENBQW1DIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRXhwb3NlLCBUcmFuc2Zvcm0sIFR5cGUsIHBsYWluVG9DbGFzcyB9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcbmltcG9ydCB7IFVzZXIgfSBmcm9tICcuLi91c2VyJztcbmltcG9ydCB7IEhvbGRpbmdUeXBlIH0gZnJvbSAnLi9ob2xkaW5nLXR5cGUnO1xuaW1wb3J0IHsgQXBwRmlsZSB9IGZyb20gJy4uL2ZpbGUnO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZU1vZGVsIH0gZnJvbSAnLi4vLi4vZGIvTW9kZWxzJztcbmltcG9ydCB7IEZpbmFuY2lhbFllYXIgfSBmcm9tICcuLi9maW5hbmNpYWwteWVhcic7XG5pbXBvcnQgeyBIb2xkaW5nVHJhZGVUeXBlRW51bSwgSG9sZGluZ1R5cGVDYXRlZ29yeUVudW0gfSBmcm9tICcuLi8uLi9kYi9FbnVtcyc7XG5cbmV4cG9ydCBjbGFzcyBIb2xkaW5nVHJhZGUgZXh0ZW5kcyBPYnNlcnZhYmxlTW9kZWwge1xuICBzdGF0aWMgY2xhc3NOYW1lID0gJ0hvbGRpbmdUcmFkZSc7XG4gIGlzVGF4RnJlZSA9IGZhbHNlO1xuICBxdWFudGl0eSA9IDA7XG4gIG93bmVyc2hpcFBlcmNlbnQ/OiBudW1iZXI7XG4gIHByaWNlID0gMDtcbiAgZmVlOiBudW1iZXI7XG4gIHR5cGUgPSBIb2xkaW5nVHJhZGVUeXBlRW51bS5CVVk7XG4gIGV4dGVybmFsSWQ/OiBudW1iZXI7XG5cbiAgQFR5cGUoKCkgPT4gRGF0ZSlcbiAgZGF0ZTogRGF0ZTtcblxuICBAVHlwZSgoKSA9PiBVc2VyKVxuICB1c2VyOiBVc2VyO1xuXG4gIC8qKlxuICAgKiBAVE9ETyB2aWsgNDUyMSByZW5hbWUgdG8gaG9sZGluZ1xuICAgKi9cbiAgQFR5cGUoKCkgPT4gSG9sZGluZ1R5cGUpXG4gIGhvbGRpbmdUeXBlOiBIb2xkaW5nVHlwZTtcblxuICBAVHlwZSgoKSA9PiBBcHBGaWxlKVxuICBmaWxlOiBBcHBGaWxlO1xuXG4gIGlzUHVyY2hhc2UoKTogYm9vbGVhbiB7XG4gICAgcmV0dXJuIHRoaXMudHlwZSA9PT0gSG9sZGluZ1RyYWRlVHlwZUVudW0uQlVZO1xuICB9XG5cbiAgZ2V0IHR5cGVMYWJlbCgpOiBzdHJpbmcge1xuICAgIHJldHVybiB0aGlzLmlzUHVyY2hhc2UoKSA/ICdCdXknIDogJ1NlbGwnO1xuICB9XG5cbiAgZ2V0IHNpZ24oKTogc3RyaW5nIHtcbiAgICByZXR1cm4gdGhpcy5pc1B1cmNoYXNlKCkgPyAnJyA6ICctJztcbiAgfVxuXG4gIC8qKlxuICAgKiBHZXQgdG90YWwgcHVyY2hhc2luZyBwcmljZVxuICAgKi9cbiAgZ2V0IHRvdGFsKCk6IG51bWJlciB7XG4gICAgcmV0dXJuIHRoaXMucHJpY2UgKiB0aGlzLnF1YW50aXR5O1xuICB9XG5cbiAgLyoqXG4gICAqIEBUT0RPIHZpayByZW1vdmVcbiAgICovXG4gIGdldCBtYXJrZXRWYWx1ZSgpOiBudW1iZXIge1xuICAgIHJldHVybiB0aGlzLnF1YW50aXR5ICogdGhpcy5ob2xkaW5nVHlwZS5wcmljZTtcbiAgfVxuXG4gIC8qKlxuICAgKiBHZXQgcGVyY2VudCBkaWZmZXJlbmNlIGJldHdlZW4gY3VycmVudCBhbmQgYnV5IHByaWNlXG4gICAqIEBUT0RPIHZpay9hbGV4IG5vIG5lZWQgdG8gcGFzcyBob2xkaW5nVHlwZSwgc2hvdWxkIGNvbWUgZnJvbSBiYWNrZW5kXG4gICAqL1xuICBnZXQgZ3Jvd3RoQ29lZmZpY2llbnQoKTogbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy5ob2xkaW5nVHlwZS5wcmljZSAvIHRoaXMucHJpY2UgLSAxO1xuICB9XG5cbiAgaGVsZE1vcmVZZWFyKCk6IGJvb2xlYW4ge1xuICAgIGNvbnN0IHllYXJUaW1lOiBudW1iZXIgPSAxMDAwICogNjAgKiA2MCAqIDI0ICogMzY1O1xuXG4gICAgcmV0dXJuIChuZXcgRmluYW5jaWFsWWVhcigpLnN0YXJ0RGF0ZS5nZXRUaW1lKCkgLSB0aGlzLmRhdGUuZ2V0VGltZSgpKSA+IHllYXJUaW1lO1xuICB9XG5cbiAgLyoqXG4gICAqIEBUT0RPIEFydGVtL0FsZXggbG9va3MgYmFkLCBjb21lIHVwIHdpdGggYSBiZXR0ZXIgc29sdXRpb25cbiAgICogZ2V0IGN1cnJlbnQgY2F0ZWdvcnksIGluIGhvbGRpbmcgd2UgYXJlIGludGVyZXN0ZWQgaW4gMyBtYWluIGNhdGVnb3JpZXM6IHN0b2NrL2NyeXB0by9vdGhlclxuICAgKi9cbiAgQFRyYW5zZm9ybSgoeyBvYmogfSkgPT4ge1xuICAgIGNvbnN0IGhvbGRpbmdUeXBlOiBIb2xkaW5nVHlwZSA9IHBsYWluVG9DbGFzcyhIb2xkaW5nVHlwZSwgb2JqLmhvbGRpbmdUeXBlKVxuICAgIGlmIChob2xkaW5nVHlwZSkge1xuICAgICAgcmV0dXJuIGhvbGRpbmdUeXBlLmlzT3RoZXIoKSA/IG51bGwgOiBob2xkaW5nVHlwZS5jYXRlZ29yeVxuICAgIH1cbiAgICBpZiAob2JqLmNhdGVnb3J5KSB7XG4gICAgICByZXR1cm4gW1xuICAgICAgICBIb2xkaW5nVHlwZUNhdGVnb3J5RW51bS5DT0xMRUNUSUJMRSxcbiAgICAgICAgSG9sZGluZ1R5cGVDYXRlZ29yeUVudW0uVU5MSVNURURfU1RPQ0ssXG4gICAgICAgIEhvbGRpbmdUeXBlQ2F0ZWdvcnlFbnVtLlVOTElTVEVEX1VOSVQsXG4gICAgICAgIEhvbGRpbmdUeXBlQ2F0ZWdvcnlFbnVtLk9USEVSXG4gICAgICBdLmluY2x1ZGVzKG9iai5jYXRlZ29yeSkgPyBudWxsIDogb2JqLmNhdGVnb3J5O1xuICAgIH1cbiAgICByZXR1cm4gSG9sZGluZ1R5cGVDYXRlZ29yeUVudW0uU1RPQ0s7XG4gIH0sIHsgdG9DbGFzc09ubHk6IHRydWUgfSlcbiAgQEV4cG9zZSh7IHRvQ2xhc3NPbmx5OiB0cnVlIH0pIGNhdGVnb3J5OiBIb2xkaW5nVHlwZUNhdGVnb3J5RW51bTtcblxuICBnZXQgY2F0ZWdvcnlMYWJlbCgpOiBzdHJpbmcge1xuICAgIHJldHVybiB0aGlzLmhvbGRpbmdUeXBlLmNhdGVnb3J5TGFiZWw7XG4gIH1cblxuICBnZXQgbmFtZSgpOiBzdHJpbmcge1xuICAgIHJldHVybiB0aGlzLmhvbGRpbmdUeXBlLm5hbWU7XG4gIH1cblxuICBnZXQgdGlja2VyKCk6IHN0cmluZyB7XG4gICAgcmV0dXJuIHRoaXMuaG9sZGluZ1R5cGUudGlja2VyO1xuICB9XG59XG4iXX0=
|
@@ -79,7 +79,7 @@ export class PropertyEquityChartData {
|
|
79
79
|
items.forEach((item) => {
|
80
80
|
// increase item values with property actual forecasts for item year
|
81
81
|
item.marketValue = this.properties.items.reduce((sum, property) => sum + this.getMarketValueForPropertyByYear(property, item.year), 0);
|
82
|
-
item.loanBalance = Math.abs(this.properties.items.reduce((sum, property) => sum + this.
|
82
|
+
item.loanBalance = Math.abs(this.properties.items.reduce((sum, property) => sum + this.getLoanBalanceByYear(property, item.year), 0));
|
83
83
|
});
|
84
84
|
}
|
85
85
|
/**
|
@@ -104,9 +104,8 @@ export class PropertyEquityChartData {
|
|
104
104
|
this.list
|
105
105
|
.filter((item) => item.year > this.currentYear)
|
106
106
|
.forEach((item) => {
|
107
|
-
const propertyBankAccounts = this.bankAccounts.getByPropertyId(property.id);
|
108
107
|
// increase loan balance amount for handling equity position item
|
109
|
-
item.loanBalance += this.getLoanBalanceByYear(property, item.year
|
108
|
+
item.loanBalance += this.getLoanBalanceByYear(property, item.year);
|
110
109
|
// increase market value amount for handling equity position item
|
111
110
|
item.marketValue += forecastedMarketValue;
|
112
111
|
// increase current market value forecast for the next cycle iteration
|
@@ -118,26 +117,25 @@ export class PropertyEquityChartData {
|
|
118
117
|
* Get property loan balance by financial year
|
119
118
|
* @param property Property instance for filter
|
120
119
|
* @param year Financial year number
|
121
|
-
* @param bankAccounts List of bank accounts
|
122
|
-
* @param loans List of loans
|
123
120
|
* @private
|
124
121
|
*/
|
125
|
-
getLoanBalanceByYear(property, year
|
126
|
-
const offset = bankAccounts.filterBy('type', BankAccountTypeEnum.OFFSET).getPropertyBalanceAmount(property.id);
|
127
|
-
return bankAccounts.items.reduce((totalSum, bankAccount) => totalSum + (bankAccount.getPropertyPercentage(property.id) * (loans.getByBankAccountId(bankAccount.id)?.getLastPaymentByYear(year)?.totalOwed || 0)), 0) - offset;
|
128
|
-
}
|
129
|
-
getMarketValueForPropertyByYear(property, year) {
|
122
|
+
getLoanBalanceByYear(property, year) {
|
130
123
|
if (new FinancialYear(property.contractDate).year > year) {
|
131
124
|
return 0;
|
132
125
|
}
|
133
|
-
|
126
|
+
const bankAccounts = this.bankAccounts.getByPropertyId(property.id);
|
127
|
+
const loans = this.loans.getByBankAccountsIds(bankAccounts.getIds());
|
128
|
+
const offset = bankAccounts.filterBy('type', BankAccountTypeEnum.OFFSET).getPropertyBalanceAmount(property.id);
|
129
|
+
if (year > this.currentYear) {
|
130
|
+
return bankAccounts.items.reduce((totalSum, bankAccount) => totalSum + (bankAccount.getPropertyPercentage(property.id) * (loans.getByBankAccountId(bankAccount.id)?.getLastPaymentByYear(year)?.totalOwed || 0)), 0) - offset;
|
131
|
+
}
|
132
|
+
return ((property.getForecastByYear(year) || first(property.forecasts)).marketValue) - offset;
|
134
133
|
}
|
135
|
-
|
134
|
+
getMarketValueForPropertyByYear(property, year) {
|
136
135
|
if (new FinancialYear(property.contractDate).year > year) {
|
137
136
|
return 0;
|
138
137
|
}
|
139
|
-
|
140
|
-
return property.getForecastByYear(year)?.loanBalance;
|
138
|
+
return (property.getForecastByYear(year) || first(property.forecasts)).marketValue;
|
141
139
|
}
|
142
140
|
/**
|
143
141
|
* Check if loan balance is 0 and set it as null (to not to draw point on the chart)
|
@@ -160,4 +158,4 @@ export class PropertyEquityChartData {
|
|
160
158
|
});
|
161
159
|
}
|
162
160
|
}
|
163
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"property-equity-chart-data.js","sourceRoot":"","sources":["../../../../../../../projects/tt-core/src/lib/models/property/property-equity-chart-data.ts"],"names":[],"mappings":"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","sourcesContent":["import first from 'lodash/first';\nimport { PropertyEquityChartItem } from './property-equity-chart-item';\nimport {\n  BankAccountCollection,\n  LoanCollection,\n  PropertyCollection,\n  PropertyValuationCollection\n} from '../../collections';\nimport { FinancialYear } from '../financial-year';\nimport { PropertyEquityChartTypeEnum } from './property-equity-chart-type.enum';\nimport { Property } from './property';\nimport { BankAccount } from '../bank';\nimport { BankAccountTypeEnum } from '../../db/Enums';\n\n// count of years for future values\nconst FORECAST_YEARS = 25;\n\n/**\n * class contain actual and forecasted market values and loan balances for passed properties\n * X axis - years from the first actual data year to the last forecasted year\n * Y axis - amounts of market values, loan balances\n * Also on hover appear equity positions point\n */\nexport class PropertyEquityChartData {\n  // list of equity positions for all years range\n  list: PropertyEquityChartItem[];\n  // current financial year\n  currentYear: number;\n\n  constructor(\n    private properties: PropertyCollection,\n    private valuations: PropertyValuationCollection,\n    private bankAccounts: BankAccountCollection,\n    private loans: LoanCollection,\n    private registerDate: Date\n  ) {\n    this.bankAccounts = bankAccounts.getLoanAndOffsetAccounts();\n    this.currentYear = new FinancialYear(new Date()).year;\n    this.initItems();\n    this.buildHistoryItems();\n    this.buildActualItem();\n    this.buildForecastedItems();\n    this.checkZeroLoanBalance();\n    this.checkZeroMarketValue();\n  }\n\n  /**\n   * get items list in chart series format\n   * @param type\n   */\n  getChartSeries(type: PropertyEquityChartTypeEnum): number[][] {\n    return this.list.map((item: PropertyEquityChartItem) => item.getSerie(type));\n  }\n\n  /**\n   * get prepared chart data\n   */\n  getChartData(): object[] {\n    return [\n      {\n        id: 'marketValue',\n        name: 'Market Value',\n        series: this.getChartSeries(PropertyEquityChartTypeEnum.MARKET_VALUE),\n        // display future market value with dash line and past market value with solid line\n        zones: [{\n          // line style after current calendar year\n          value: this.currentYear,\n          dashStyle: 'Solid'\n        }, {\n          // default line style\n          dashStyle: 'Dash'\n        }]\n      },\n      {\n        // id used to add/remove serie to chart\n        id: 'loanBalance',\n        name: 'Loan Balance',\n        series: this.getChartSeries(PropertyEquityChartTypeEnum.LOAN_BALANCE)\n      }\n    ];\n  }\n\n  /**\n   * create empty equity position item for each year in collection\n   */\n  private initItems(): void {\n    this.list = [];\n    for (let year: number = new FinancialYear(this.registerDate).year - 1; year <= (this.currentYear + FORECAST_YEARS); year++) {\n      this.list.push(new PropertyEquityChartItem(year));\n    }\n  }\n\n  /**\n   * collect equity position items with past values from properties forecasts\n   */\n  private buildHistoryItems(): void {\n    // get items for past and current years\n    const items: PropertyEquityChartItem[] = this.list.filter((item: PropertyEquityChartItem) => item.year <= this.currentYear);\n    items.forEach((item: PropertyEquityChartItem) => {\n      // increase item values with property actual forecasts for item year\n      item.marketValue = this.properties.items.reduce((sum: number, property: Property): number => sum + this.getMarketValueForPropertyByYear(property, item.year), 0);\n\n      item.loanBalance = Math.abs(this.properties.items.reduce((sum: number, property: Property): number => sum + this.getLoanBalanceForPropertyByYear(property, item.year), 0));\n    });\n  }\n\n  /**\n   * @TODO remove, there is no difference between actual and history calculations\n   * set actual year's real data\n   * @private\n   */\n  private buildActualItem(): void {\n    const item: PropertyEquityChartItem = this.list.find((i: PropertyEquityChartItem) => i.year === this.currentYear);\n    item.marketValue = this.valuations.getMarketValue(new Date());\n    item.loanBalance = this.properties.items.reduce((sum: number, property: Property): number => sum + Math.abs(this.bankAccounts.getPropertyBalanceAmount(property.id)), 0);\n  }\n\n  /**\n   * collect equity position items with forecasted (future) calculated values\n   */\n  private buildForecastedItems(): void {\n    // calculate future values for all properties separately\n    this.properties.items.forEach((property: Property) => {\n      const marketValue = this.valuations.filterBy('property.id', property.id).getMarketValue(new Date());\n      let forecastedMarketValue: number = (property.growthPercent / 100) * marketValue + marketValue;\n\n      // calculate future values for each future year for current handling property\n      this.list\n        .filter((item: PropertyEquityChartItem) => item.year > this.currentYear)\n        .forEach((item: PropertyEquityChartItem) => {\n          const propertyBankAccounts: BankAccountCollection = this.bankAccounts.getByPropertyId(property.id);\n          // increase loan balance amount for handling equity position item\n          item.loanBalance += this.getLoanBalanceByYear(property, item.year, propertyBankAccounts, this.loans.getByBankAccountsIds(propertyBankAccounts.getIds()));\n\n          // increase market value amount for handling equity position item\n          item.marketValue += forecastedMarketValue;\n\n          // increase current market value forecast for the next cycle iteration\n          forecastedMarketValue += forecastedMarketValue * (property.growthPercent / 100);\n        });\n    });\n  }\n\n  /**\n   * Get property loan balance by financial year\n   * @param property Property instance for filter\n   * @param year Financial year number\n   * @param bankAccounts List of bank accounts\n   * @param loans List of loans\n   * @private\n   */\n  private getLoanBalanceByYear(property: Property, year: number, bankAccounts: BankAccountCollection, loans: LoanCollection): number {\n    const offset = bankAccounts.filterBy('type', BankAccountTypeEnum.OFFSET).getPropertyBalanceAmount(property.id);\n\n    return bankAccounts.items.reduce((totalSum: number, bankAccount: BankAccount) => totalSum + (bankAccount.getPropertyPercentage(property.id) * (loans.getByBankAccountId(bankAccount.id)?.getLastPaymentByYear(year)?.totalOwed || 0)), 0) - offset;\n  }\n\n  getMarketValueForPropertyByYear(property: Property, year: number): number {\n    if (new FinancialYear(property.contractDate).year > year) {\n      return 0;\n    }\n\n    return (property.getForecastByYear(year) || first(property.forecasts)).marketValue;\n  }\n\n  getLoanBalanceForPropertyByYear(property: Property, year: number): number {\n    if (new FinancialYear(property.contractDate).year > year) {\n      return 0;\n    }\n\n    // @TODO remove after tests `|| this.bankAccounts.getPropertyBalanceAmount(property.id)`\n    return property.getForecastByYear(year)?.loanBalance;\n  }\n\n  /**\n   * Check if loan balance is 0 and set it as null (to not to draw point on the chart)\n   */\n  private checkZeroLoanBalance(): void {\n    this.list.forEach((item: PropertyEquityChartItem) => {\n      if (item.loanBalance === 0) {\n        item.loanBalance = null;\n      }\n    });\n  }\n\n  /**\n   * Check if market value is 0 and set it as null (to not to draw point on the chart)\n   */\n  private checkZeroMarketValue(): void {\n    this.list.forEach((item: PropertyEquityChartItem) => {\n      if (item.marketValue === 0) {\n        item.marketValue = null;\n      }\n    });\n  }\n}\n"]}
|
161
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"property-equity-chart-data.js","sourceRoot":"","sources":["../../../../../../../projects/tt-core/src/lib/models/property/property-equity-chart-data.ts"],"names":[],"mappings":"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","sourcesContent":["import first from 'lodash/first';\nimport { PropertyEquityChartItem } from './property-equity-chart-item';\nimport {\n  BankAccountCollection,\n  LoanCollection,\n  PropertyCollection,\n  PropertyValuationCollection\n} from '../../collections';\nimport { FinancialYear } from '../financial-year';\nimport { PropertyEquityChartTypeEnum } from './property-equity-chart-type.enum';\nimport { Property } from './property';\nimport { BankAccount } from '../bank';\nimport { BankAccountTypeEnum } from '../../db/Enums';\n\n// count of years for future values\nconst FORECAST_YEARS = 25;\n\n/**\n * class contain actual and forecasted market values and loan balances for passed properties\n * X axis - years from the first actual data year to the last forecasted year\n * Y axis - amounts of market values, loan balances\n * Also on hover appear equity positions point\n */\nexport class PropertyEquityChartData {\n  // list of equity positions for all years range\n  list: PropertyEquityChartItem[];\n  // current financial year\n  currentYear: number;\n\n  constructor(\n    private properties: PropertyCollection,\n    private valuations: PropertyValuationCollection,\n    private bankAccounts: BankAccountCollection,\n    private loans: LoanCollection,\n    private registerDate: Date\n  ) {\n    this.bankAccounts = bankAccounts.getLoanAndOffsetAccounts();\n    this.currentYear = new FinancialYear(new Date()).year;\n    this.initItems();\n    this.buildHistoryItems();\n    this.buildActualItem();\n    this.buildForecastedItems();\n    this.checkZeroLoanBalance();\n    this.checkZeroMarketValue();\n  }\n\n  /**\n   * get items list in chart series format\n   * @param type\n   */\n  getChartSeries(type: PropertyEquityChartTypeEnum): number[][] {\n    return this.list.map((item: PropertyEquityChartItem) => item.getSerie(type));\n  }\n\n  /**\n   * get prepared chart data\n   */\n  getChartData(): object[] {\n    return [\n      {\n        id: 'marketValue',\n        name: 'Market Value',\n        series: this.getChartSeries(PropertyEquityChartTypeEnum.MARKET_VALUE),\n        // display future market value with dash line and past market value with solid line\n        zones: [{\n          // line style after current calendar year\n          value: this.currentYear,\n          dashStyle: 'Solid'\n        }, {\n          // default line style\n          dashStyle: 'Dash'\n        }]\n      },\n      {\n        // id used to add/remove serie to chart\n        id: 'loanBalance',\n        name: 'Loan Balance',\n        series: this.getChartSeries(PropertyEquityChartTypeEnum.LOAN_BALANCE)\n      }\n    ];\n  }\n\n  /**\n   * create empty equity position item for each year in collection\n   */\n  private initItems(): void {\n    this.list = [];\n    for (let year: number = new FinancialYear(this.registerDate).year - 1; year <= (this.currentYear + FORECAST_YEARS); year++) {\n      this.list.push(new PropertyEquityChartItem(year));\n    }\n  }\n\n  /**\n   * collect equity position items with past values from properties forecasts\n   */\n  private buildHistoryItems(): void {\n    // get items for past and current years\n    const items: PropertyEquityChartItem[] = this.list.filter((item: PropertyEquityChartItem) => item.year <= this.currentYear);\n    items.forEach((item: PropertyEquityChartItem) => {\n      // increase item values with property actual forecasts for item year\n      item.marketValue = this.properties.items.reduce((sum: number, property: Property): number => sum + this.getMarketValueForPropertyByYear(property, item.year), 0);\n\n      item.loanBalance = Math.abs(this.properties.items.reduce((sum: number, property: Property): number => sum + this.getLoanBalanceByYear(property, item.year), 0));\n    });\n  }\n\n  /**\n   * @TODO remove, there is no difference between actual and history calculations\n   * set actual year's real data\n   * @private\n   */\n  private buildActualItem(): void {\n    const item: PropertyEquityChartItem = this.list.find((i: PropertyEquityChartItem) => i.year === this.currentYear);\n    item.marketValue = this.valuations.getMarketValue(new Date());\n    item.loanBalance = this.properties.items.reduce((sum: number, property: Property): number => sum + Math.abs(this.bankAccounts.getPropertyBalanceAmount(property.id)), 0);\n  }\n\n  /**\n   * collect equity position items with forecasted (future) calculated values\n   */\n  private buildForecastedItems(): void {\n    // calculate future values for all properties separately\n    this.properties.items.forEach((property: Property) => {\n      const marketValue = this.valuations.filterBy('property.id', property.id).getMarketValue(new Date());\n      let forecastedMarketValue: number = (property.growthPercent / 100) * marketValue + marketValue;\n\n      // calculate future values for each future year for current handling property\n      this.list\n        .filter((item: PropertyEquityChartItem) => item.year > this.currentYear)\n        .forEach((item: PropertyEquityChartItem) => {\n          // increase loan balance amount for handling equity position item\n          item.loanBalance += this.getLoanBalanceByYear(property, item.year);\n\n          // increase market value amount for handling equity position item\n          item.marketValue += forecastedMarketValue;\n\n          // increase current market value forecast for the next cycle iteration\n          forecastedMarketValue += forecastedMarketValue * (property.growthPercent / 100);\n        });\n    });\n  }\n\n  /**\n   * Get property loan balance by financial year\n   * @param property Property instance for filter\n   * @param year Financial year number\n   * @private\n   */\n  private getLoanBalanceByYear(property: Property, year: number): number {\n    if (new FinancialYear(property.contractDate).year > year) {\n      return 0;\n    }\n\n    const bankAccounts = this.bankAccounts.getByPropertyId(property.id);\n    const loans = this.loans.getByBankAccountsIds(bankAccounts.getIds());\n    const offset = bankAccounts.filterBy('type', BankAccountTypeEnum.OFFSET).getPropertyBalanceAmount(property.id);\n\n    if (year > this.currentYear) {\n      return bankAccounts.items.reduce((totalSum: number, bankAccount: BankAccount) => totalSum + (bankAccount.getPropertyPercentage(property.id) * (loans.getByBankAccountId(bankAccount.id)?.getLastPaymentByYear(year)?.totalOwed || 0)), 0) - offset;\n    }\n\n    return ((property.getForecastByYear(year) || first(property.forecasts)).marketValue) - offset;\n  }\n\n  getMarketValueForPropertyByYear(property: Property, year: number): number {\n    if (new FinancialYear(property.contractDate).year > year) {\n      return 0;\n    }\n\n    return (property.getForecastByYear(year) || first(property.forecasts)).marketValue;\n  }\n\n  /**\n   * Check if loan balance is 0 and set it as null (to not to draw point on the chart)\n   */\n  private checkZeroLoanBalance(): void {\n    this.list.forEach((item: PropertyEquityChartItem) => {\n      if (item.loanBalance === 0) {\n        item.loanBalance = null;\n      }\n    });\n  }\n\n  /**\n   * Check if market value is 0 and set it as null (to not to draw point on the chart)\n   */\n  private checkZeroMarketValue(): void {\n    this.list.forEach((item: PropertyEquityChartItem) => {\n      if (item.marketValue === 0) {\n        item.marketValue = null;\n      }\n    });\n  }\n}\n"]}
|
@@ -11,8 +11,8 @@ export class DataService {
|
|
11
11
|
createModelInstance(model) {
|
12
12
|
return plainToClass(this.modelClass, model);
|
13
13
|
}
|
14
|
-
createCollectionInstance(collectionClass,
|
15
|
-
return new collectionClass(
|
14
|
+
createCollectionInstance(collectionClass, data) {
|
15
|
+
return new collectionClass(data.map((item) => this.createModelInstance(item)));
|
16
16
|
}
|
17
17
|
/**
|
18
18
|
* never return cache directly to prevent update
|
@@ -30,7 +30,7 @@ export class DataService {
|
|
30
30
|
* @TODO vik any[] because of problems with base models extending abstractModel
|
31
31
|
*/
|
32
32
|
setCache(data) {
|
33
|
-
this.cache = this.createCollectionInstance(this.collectionClass, data
|
33
|
+
this.cache = this.createCollectionInstance(this.collectionClass, data);
|
34
34
|
}
|
35
35
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: DataService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
|
36
36
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: DataService, providedIn: 'root' }); }
|
@@ -41,4 +41,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
|
|
41
41
|
providedIn: 'root'
|
42
42
|
}]
|
43
43
|
}] });
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL3NlcnZpY2VzL2RhdGEuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVqRCxPQUFPLEtBQUssTUFBTSxjQUFjLENBQUM7O0FBS2pDLE1BQU0sT0FBZ0IsV0FBVztJQWtCL0I7Ozs7T0FJRztJQUNPLG1CQUFtQixDQUFDLEtBQWE7UUFDekMsT0FBTyxZQUFZLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUM5QyxDQUFDO0lBRVMsd0JBQXdCLENBQUMsZUFBd0QsRUFBRSxJQUFXO1FBQ3RHLE9BQU8sSUFBSSxlQUFlLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNqRixDQUFDO0lBRUQ7O09BRUc7SUFDSCxRQUFRO1FBQ04sT0FBTyxLQUFLLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzNCLENBQUM7SUFFRDs7T0FFRztJQUNILGFBQWE7UUFDWCxPQUFPLElBQUksQ0FBQyxRQUFRLEVBQUUsRUFBRSxLQUFLLENBQUM7SUFDaEMsQ0FBQztJQUVEOztPQUVHO0lBQ0gsUUFBUSxDQUFDLElBQVc7UUFDbEIsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUMsd0JBQXdCLENBQUMsSUFBSSxDQUFDLGVBQWUsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUN6RSxDQUFDOytHQWxEbUIsV0FBVzttSEFBWCxXQUFXLGNBRm5CLE1BQU07OzRGQUVFLFdBQVc7a0JBSGhDLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25CIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgQ29sbGVjdGlvbiB9IGZyb20gJy4uL2NvbGxlY3Rpb25zJztcbmltcG9ydCB7IHBsYWluVG9DbGFzcyB9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcbmltcG9ydCB7IEFic3RyYWN0TW9kZWwgfSBmcm9tICcuLi9kYi9Nb2RlbHMnO1xuaW1wb3J0IGNsb25lIGZyb20gJ2xvZGFzaC9jbG9uZSc7XG5cbkBJbmplY3RhYmxlKHtcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnXG59KVxuZXhwb3J0IGFic3RyYWN0IGNsYXNzIERhdGFTZXJ2aWNlPEJhc2VNb2RlbCwgTW9kZWwgZXh0ZW5kcyBBYnN0cmFjdE1vZGVsLCBDb2xsZWN0aW9uTW9kZWwgZXh0ZW5kcyBDb2xsZWN0aW9uPE1vZGVsPj4ge1xuICBkYXRhOiBCYXNlTW9kZWxbXTtcblxuICAvKipcbiAgICogTW9kZWwgY2xhc3MgZm9yIGluc3RhbmNlcyBjcmVhdGluZ1xuICAgKi9cbiAgYWJzdHJhY3QgbW9kZWxDbGFzcztcblxuICAvKipcbiAgICogQ29sbGVjdGlvbiBNb2RlbCBjbGFzcyBmb3IgaW5zdGFuY2VzIGNyZWF0aW5nXG4gICAqL1xuICBhYnN0cmFjdCBjb2xsZWN0aW9uQ2xhc3M7XG5cbiAgLyoqXG4gICAqIENhY2hlZCBhcnJheSBvZiBzZXJ2aWNlIGNsYXNzIGluc3RhbmNlc1xuICAgKi9cbiAgcHJvdGVjdGVkIGNhY2hlOiBDb2xsZWN0aW9uTW9kZWw7XG5cbiAgLyoqXG4gICAqIEBUT0RPIHVzZSBleGNsdWRlRXh0cmFuZW91c1ZhbHVlcyB3aGVuIGFsbCBtb2RlbHMgcmVmYWN0b3JlZCAoZXhwb3NlZCBhbGwgbmVlZGVkIHByb3BlcnRpZXMpXG4gICAqIENyZWF0ZSBuZXcgaW5zdGFuY2Ugb2YgY2xhc3NcbiAgICogQHBhcmFtIG1vZGVsIFNpbmdsZSBvYmplY3Qgb3IgYXJyYXkgZnJvbSB3aGljaCB3aWxsIGJlIGNyZWF0ZWQgbW9kZWwgaW5zdGFuY2UocylcbiAgICovXG4gIHByb3RlY3RlZCBjcmVhdGVNb2RlbEluc3RhbmNlKG1vZGVsOiBvYmplY3QpOiBNb2RlbCB7XG4gICAgcmV0dXJuIHBsYWluVG9DbGFzcyh0aGlzLm1vZGVsQ2xhc3MsIG1vZGVsKTtcbiAgfVxuXG4gIHByb3RlY3RlZCBjcmVhdGVDb2xsZWN0aW9uSW5zdGFuY2UoY29sbGVjdGlvbkNsYXNzOiBuZXcgKGl0ZW1zOiBNb2RlbFtdKSA9PiBDb2xsZWN0aW9uTW9kZWwsIGRhdGE6IGFueVtdKTogQ29sbGVjdGlvbk1vZGVsIHtcbiAgICByZXR1cm4gbmV3IGNvbGxlY3Rpb25DbGFzcyhkYXRhLm1hcCgoaXRlbSkgPT4gdGhpcy5jcmVhdGVNb2RlbEluc3RhbmNlKGl0ZW0pKSk7XG4gIH1cblxuICAvKipcbiAgICogbmV2ZXIgcmV0dXJuIGNhY2hlIGRpcmVjdGx5IHRvIHByZXZlbnQgdXBkYXRlXG4gICAqL1xuICBnZXRDYWNoZSgpOiBDb2xsZWN0aW9uTW9kZWwge1xuICAgIHJldHVybiBjbG9uZSh0aGlzLmNhY2hlKTtcbiAgfVxuXG4gIC8qKlxuICAgKiBuZXZlciByZXR1cm4gY2FjaGUgZGlyZWN0bHkgdG8gcHJldmVudCB1cGRhdGVcbiAgICovXG4gIGdldENhY2hlRmlyc3QoKTogTW9kZWwge1xuICAgIHJldHVybiB0aGlzLmdldENhY2hlKCk/LmZpcnN0O1xuICB9XG5cbiAgLyoqXG4gICAqIEBUT0RPIHZpayBhbnlbXSBiZWNhdXNlIG9mIHByb2JsZW1zIHdpdGggYmFzZSBtb2RlbHMgZXh0ZW5kaW5nIGFic3RyYWN0TW9kZWxcbiAgICovXG4gIHNldENhY2hlKGRhdGE6IGFueVtdKTogdm9pZCB7XG4gICAgdGhpcy5jYWNoZSA9IHRoaXMuY3JlYXRlQ29sbGVjdGlvbkluc3RhbmNlKHRoaXMuY29sbGVjdGlvbkNsYXNzLCBkYXRhKTtcbiAgfVxufVxuIl19
|
@@ -1,6 +1,5 @@
|
|
1
1
|
import { Inject, Injectable } from '@angular/core';
|
2
2
|
import { catchError, map } from 'rxjs/operators';
|
3
|
-
import { plainToClass } from 'class-transformer';
|
4
3
|
import { RestService } from '../../rest';
|
5
4
|
import { AppEventTypeEnum, BankConnection } from '../../../../models';
|
6
5
|
import { throwError as observableThrowError } from 'rxjs';
|
@@ -30,10 +29,8 @@ export class BankConnectionService extends RestService {
|
|
30
29
|
* POST endpoint is using for create and for update.
|
31
30
|
*/
|
32
31
|
post(bankConnection) {
|
33
|
-
return
|
34
|
-
.pipe(map((
|
35
|
-
const result = plainToClass(BankConnection, response);
|
36
|
-
// @TODO test if `!bankConnection.id &&` doesn't break anything
|
32
|
+
return super.post(bankConnection)
|
33
|
+
.pipe(map((result) => {
|
37
34
|
if (result.isBasiq()) {
|
38
35
|
switch (true) {
|
39
36
|
case result.isLoginSuccess():
|
@@ -91,4 +88,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
|
|
91
88
|
type: Inject,
|
92
89
|
args: ['environment']
|
93
90
|
}] }] });
|
94
|
-
//# sourceMappingURL=data:application/json;base64,
|
91
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bank-connection.service.js","sourceRoot":"","sources":["../../../../../../../../../projects/tt-core/src/lib/services/http/bank/bank-connection/bank-connection.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable } from '@angular/core';\nimport { Observable } from 'rxjs';\nimport { catchError, map } from 'rxjs/operators';\nimport { BankConnection as BankConnectionBase } from '../../../../db/Models';\nimport { plainToClass } from 'class-transformer';\nimport { RestMethod, RestService } from '../../rest';\nimport { AppEventTypeEnum, BankConnection, Notification } from '../../../../models';\nimport { IEventListener } from '../../../../interfaces';\nimport { HttpErrorResponse } from '@angular/common/http';\nimport { throwError as observableThrowError } from 'rxjs';\nimport { Collection } from '../../../../collections';\nimport { BankConnectionMessagesEnum } from './bank-connection-messages.enum';\nimport { UserEventTypeTypeEnum } from '../../../../db/Enums/user-event-type-type.enum';\n\n/**\n * BankConnection means user account at specific bank (usually each user has only one at the same bank)\n * service handles BankConnection management\n */\n@Injectable({\n  providedIn: 'root'\n})\nexport class BankConnectionService extends RestService<BankConnectionBase, BankConnection, Collection<BankConnection>> implements IEventListener {\n  modelClass: typeof BankConnection = BankConnection;\n  collectionClass: typeof Collection = Collection;\n  endpointUri = 'bank-connections';\n  disabledMethods: RestMethod[] = ['postBatch', 'putBatch', 'delete', 'deleteBatch'];\n\n  constructor(@Inject('environment') protected environment: any) {\n    super(environment);\n    this.listenEvents();\n  }\n\n  listenEvents() {\n    this.listenNotifications();\n  }\n\n  /**\n   * there is no put BankConnection method, we have to post to update\n   * POST endpoint is using for create and for update.\n   */\n  post(bankConnection: BankConnection): Observable<BankConnection> {\n    return super.post(bankConnection)\n      .pipe(\n        map((result: BankConnection) => {\n          if (result.isBasiq()) {\n            switch (true) {\n              case result.isLoginSuccess():\n                this.toastService.success(BankConnectionMessagesEnum.LOGIN_SUCCESS);\n                break;\n              case result.isAccountsRetrieved():\n                this.toastService.success(BankConnectionMessagesEnum.ACCOUNTS_RETRIEVED);\n                break;\n            }\n          }\n\n          return result;\n        }),\n        catchError((error: HttpErrorResponse) => {\n          // Show error when user provided wrong login data\n          if (error.status === 401) {\n            this.toastService.error(BankConnectionMessagesEnum.INVALID_CREDENTIALS);\n          }\n\n          // Show error when user provided another login (not login he used before)\n          if (error.status === 400) {\n            this.toastService.error(BankConnectionMessagesEnum.WRONG_LOGIN_DATA);\n          }\n\n          if (error.status === 500) {\n            this.toastService.error(BankConnectionMessagesEnum.TEMPORARY_UNAVAILABLE);\n          }\n\n          return observableThrowError(error);\n        })\n      )\n  }\n\n  activate(bankConnection: BankConnection): Observable<BankConnection> {\n    return this.put(bankConnection, `${this.apiUrl}/${bankConnection.id}/activate`);\n  }\n\n  deactivate(bankConnection: BankConnection): Observable<BankConnection> {\n    return this.put(bankConnection, `${this.apiUrl}/${bankConnection.id}/deactivate`);\n  }\n\n  private listenNotifications(): void {\n    this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification: Notification) => {\n      const events = [\n        UserEventTypeTypeEnum.BASIQ_NEW_ACCOUNTS,\n        UserEventTypeTypeEnum.BASIQ_FIRST_IMPORT_COMPLETE,\n        UserEventTypeTypeEnum.BASIQ_AUTHORIZATION_FAIL,\n      ];\n\n      if (!notification.isRead && events.includes(notification.eventType)) {\n        // @TODO TT-3826 move to unified mercure event\n        this.refreshCache();\n      }\n    });\n  }\n}\n"]}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import { Inject, Injectable } from '@angular/core';
|
2
|
-
import { AppEventTypeEnum,
|
2
|
+
import { AppEventTypeEnum, HoldingTrade } from '../../../models';
|
3
3
|
import { RestService } from '../rest';
|
4
4
|
import { HoldingTradeCollection } from '../../../collections';
|
5
5
|
import { UserRolesEnum } from 'taxtank-core/common';
|
@@ -19,8 +19,7 @@ export class HoldingTradeService extends RestService {
|
|
19
19
|
this.listenNotifications();
|
20
20
|
}
|
21
21
|
listenEvents() {
|
22
|
-
this.listenCSE(
|
23
|
-
this.listenCSE(HoldingTradeImport, this.refreshCache, ['post', 'put', 'delete']);
|
22
|
+
this.listenCSE(HoldingTradeImport, this.refreshCache, ['post', 'delete']);
|
24
23
|
}
|
25
24
|
listenNotifications() {
|
26
25
|
this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification) => {
|
@@ -41,4 +40,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
|
|
41
40
|
type: Inject,
|
42
41
|
args: ['environment']
|
43
42
|
}] }] });
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9sZGluZy10cmFkZS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL3NlcnZpY2VzL2h0dHAvaG9sZGluZy9ob2xkaW5nLXRyYWRlLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFbkQsT0FBTyxFQUFFLGdCQUFnQixFQUFlLFlBQVksRUFBZ0IsTUFBTSxpQkFBaUIsQ0FBQztBQUM1RixPQUFPLEVBQWMsV0FBVyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQ2xELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRTlELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNwRCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQzs7QUFLcEYsTUFBTSxPQUFPLG1CQUFvQixTQUFRLFdBQThEO0lBT3JHLFlBQTZDLFdBQWdCO1FBQzNELEtBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUR3QixnQkFBVyxHQUFYLFdBQVcsQ0FBSztRQU43RCxlQUFVLEdBQXdCLFlBQVksQ0FBQztRQUMvQyxvQkFBZSxHQUFrQyxzQkFBc0IsQ0FBQztRQUN4RSxnQkFBVyxHQUFHLGdCQUFnQixDQUFDO1FBQy9CLG9CQUFlLEdBQWlCLENBQUMsV0FBVyxFQUFFLFVBQVUsRUFBRSxhQUFhLENBQUMsQ0FBQztRQUN6RSxVQUFLLEdBQUcsQ0FBQyxhQUFhLENBQUMsWUFBWSxDQUFDLENBQUM7UUFJbkMsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQ3BCLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO0lBQzdCLENBQUM7SUFFRCxZQUFZO1FBQ1YsSUFBSSxDQUFDLFNBQVMsQ0FBQyxrQkFBa0IsRUFBRSxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUM7SUFDNUUsQ0FBQztJQUVPLG1CQUFtQjtRQUN6QixJQUFJLENBQUMsc0JBQXNCLENBQUMsRUFBRSxDQUFDLGdCQUFnQixDQUFDLGtCQUFrQixDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsWUFBMEIsRUFBUSxFQUFFO1lBQ2pILElBQUksQ0FBQyxZQUFZLENBQUMsTUFBTSxJQUFJLFlBQVksQ0FBQyxTQUFTLEtBQUsscUJBQXFCLENBQUMsaUJBQWlCLEVBQUU7Z0JBQzlGLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQzthQUNyQjtRQUNILENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQzsrR0F2QlUsbUJBQW1CLGtCQU9WLGFBQWE7bUhBUHRCLG1CQUFtQixjQUZsQixNQUFNOzs0RkFFUCxtQkFBbUI7a0JBSC9CLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25COzswQkFRYyxNQUFNOzJCQUFDLGFBQWEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3QsIEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEhvbGRpbmdUcmFkZSBhcyBIb2xkaW5nQmFzZSB9IGZyb20gJy4uLy4uLy4uL2RiL01vZGVscyc7XG5pbXBvcnQgeyBBcHBFdmVudFR5cGVFbnVtLCBIb2xkaW5nU2FsZSwgSG9sZGluZ1RyYWRlLCBOb3RpZmljYXRpb24gfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgUmVzdE1ldGhvZCwgUmVzdFNlcnZpY2UgfSBmcm9tICcuLi9yZXN0JztcbmltcG9ydCB7IEhvbGRpbmdUcmFkZUNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi8uLi9jb2xsZWN0aW9ucyc7XG5pbXBvcnQgeyBJRXZlbnRMaXN0ZW5lciB9IGZyb20gJy4uLy4uLy4uL2ludGVyZmFjZXMnO1xuaW1wb3J0IHsgVXNlclJvbGVzRW51bSB9IGZyb20gJ3RheHRhbmstY29yZS9jb21tb24nO1xuaW1wb3J0IHsgSG9sZGluZ1RyYWRlSW1wb3J0IH0gZnJvbSAnLi4vLi4vLi4vbW9kZWxzJztcbmltcG9ydCB7IFVzZXJFdmVudFR5cGVUeXBlRW51bSB9IGZyb20gJy4uLy4uLy4uL2RiL0VudW1zL3VzZXItZXZlbnQtdHlwZS10eXBlLmVudW0nO1xuXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290J1xufSlcbmV4cG9ydCBjbGFzcyBIb2xkaW5nVHJhZGVTZXJ2aWNlIGV4dGVuZHMgUmVzdFNlcnZpY2U8SG9sZGluZ0Jhc2UsIEhvbGRpbmdUcmFkZSwgSG9sZGluZ1RyYWRlQ29sbGVjdGlvbj4gaW1wbGVtZW50cyBJRXZlbnRMaXN0ZW5lciB7XG4gIG1vZGVsQ2xhc3M6IHR5cGVvZiBIb2xkaW5nVHJhZGUgPSBIb2xkaW5nVHJhZGU7XG4gIGNvbGxlY3Rpb25DbGFzczogdHlwZW9mIEhvbGRpbmdUcmFkZUNvbGxlY3Rpb24gPSBIb2xkaW5nVHJhZGVDb2xsZWN0aW9uO1xuICBlbmRwb2ludFVyaSA9ICdob2xkaW5nLXRyYWRlcyc7XG4gIGRpc2FibGVkTWV0aG9kczogUmVzdE1ldGhvZFtdID0gWydwb3N0QmF0Y2gnLCAncHV0QmF0Y2gnLCAnZGVsZXRlQmF0Y2gnXTtcbiAgcm9sZXMgPSBbVXNlclJvbGVzRW51bS5IT0xESU5HX1RBTktdO1xuXG4gIGNvbnN0cnVjdG9yKEBJbmplY3QoJ2Vudmlyb25tZW50JykgcHJvdGVjdGVkIGVudmlyb25tZW50OiBhbnkpIHtcbiAgICBzdXBlcihlbnZpcm9ubWVudCk7XG4gICAgdGhpcy5saXN0ZW5FdmVudHMoKTtcbiAgICB0aGlzLmxpc3Rlbk5vdGlmaWNhdGlvbnMoKTtcbiAgfVxuXG4gIGxpc3RlbkV2ZW50cygpOiB2b2lkIHtcbiAgICB0aGlzLmxpc3RlbkNTRShIb2xkaW5nVHJhZGVJbXBvcnQsIHRoaXMucmVmcmVzaENhY2hlLCBbJ3Bvc3QnLCAnZGVsZXRlJ10pO1xuICB9XG5cbiAgcHJpdmF0ZSBsaXN0ZW5Ob3RpZmljYXRpb25zKCk6IHZvaWQge1xuICAgIHRoaXMuZXZlbnREaXNwYXRjaGVyU2VydmljZS5vbihBcHBFdmVudFR5cGVFbnVtLk5PVElGSUNBVElPTl9BRERFRCkuc3Vic2NyaWJlKChub3RpZmljYXRpb246IE5vdGlmaWNhdGlvbik6IHZvaWQgPT4ge1xuICAgICAgaWYgKCFub3RpZmljYXRpb24uaXNSZWFkICYmIG5vdGlmaWNhdGlvbi5ldmVudFR5cGUgPT09IFVzZXJFdmVudFR5cGVUeXBlRW51bS5TSEFSRVNJR0hUX0lNUE9SVCkge1xuICAgICAgICB0aGlzLnJlZnJlc2hDYWNoZSgpO1xuICAgICAgfVxuICAgIH0pO1xuICB9XG59XG4iXX0=
|
@@ -1,8 +1,9 @@
|
|
1
1
|
import { Inject, Injectable } from '@angular/core';
|
2
|
-
import {
|
2
|
+
import { AppEventTypeEnum, HoldingTrade, HoldingTradeImport, HoldingType } from '../../../models';
|
3
3
|
import { RestService } from '../rest';
|
4
4
|
import { HoldingTypeCollection } from '../../../collections';
|
5
5
|
import { UserRolesEnum } from 'taxtank-core/common';
|
6
|
+
import { UserEventTypeTypeEnum } from '../../../db/Enums/user-event-type-type.enum';
|
6
7
|
import * as i0 from "@angular/core";
|
7
8
|
export class HoldingTypeService extends RestService {
|
8
9
|
constructor(environment) {
|
@@ -13,17 +14,23 @@ export class HoldingTypeService extends RestService {
|
|
13
14
|
this.endpointUri = 'holding-types';
|
14
15
|
this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
|
15
16
|
this.roles = [UserRolesEnum.HOLDING_TANK];
|
16
|
-
|
17
|
+
this.listenEvents();
|
18
|
+
this.listenNotifications();
|
19
|
+
}
|
20
|
+
search(query, category = null) {
|
21
|
+
query = query.toLowerCase().trim();
|
22
|
+
return this.fetch(`${this.apiUrl}/search`, false, { params: { query, category } });
|
17
23
|
}
|
18
|
-
// search(searchQuery: string, category: HoldingTypeCategoryEnum = null): Observable<HoldingType[]> {
|
19
|
-
// searchQuery = searchQuery.toLowerCase().trim();
|
20
|
-
//
|
21
|
-
// return this.http.get(`${this.apiUrl}`, { params: { searchQuery, category } }).pipe(
|
22
|
-
// map((userBase: UserBase) => this.createModelInstance(userBase))
|
23
|
-
// );
|
24
|
-
// }
|
25
24
|
listenEvents() {
|
26
|
-
this.listenCSE(
|
25
|
+
this.listenCSE(HoldingTrade, (trade) => this.hasInCache(trade.holdingType.id) ? this.updateCache([trade.holdingType], 'post') : '', ['post']);
|
26
|
+
this.listenCSE(HoldingTradeImport, this.refreshCache, ['post']);
|
27
|
+
}
|
28
|
+
listenNotifications() {
|
29
|
+
this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification) => {
|
30
|
+
if (!notification.isRead && notification.eventType === UserEventTypeTypeEnum.SHARESIGHT_IMPORT) {
|
31
|
+
this.refreshCache();
|
32
|
+
}
|
33
|
+
});
|
27
34
|
}
|
28
35
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: HoldingTypeService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
29
36
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: HoldingTypeService, providedIn: 'root' }); }
|
@@ -37,4 +44,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
|
|
37
44
|
type: Inject,
|
38
45
|
args: ['environment']
|
39
46
|
}] }] });
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9sZGluZy10eXBlLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvc2VydmljZXMvaHR0cC9ob2xkaW5nL2hvbGRpbmctdHlwZS5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRW5ELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxZQUFZLEVBQUUsa0JBQWtCLEVBQUUsV0FBVyxFQUFnQixNQUFNLGlCQUFpQixDQUFDO0FBQ2hILE9BQU8sRUFBYyxXQUFXLEVBQUUsTUFBTSxTQUFTLENBQUM7QUFDbEQsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFN0QsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBR3BELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLDZDQUE2QyxDQUFDOztBQUtwRixNQUFNLE9BQU8sa0JBQW1CLFNBQVEsV0FBZ0U7SUFPdEcsWUFBNkMsV0FBZ0I7UUFDM0QsS0FBSyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBRHdCLGdCQUFXLEdBQVgsV0FBVyxDQUFLO1FBTjdELGVBQVUsR0FBdUIsV0FBVyxDQUFDO1FBQzdDLG9CQUFlLEdBQWlDLHFCQUFxQixDQUFDO1FBQ3RFLGdCQUFXLEdBQUcsZUFBZSxDQUFDO1FBQzlCLG9CQUFlLEdBQWlCLENBQUMsV0FBVyxFQUFFLFVBQVUsRUFBRSxhQUFhLENBQUMsQ0FBQztRQUN6RSxVQUFLLEdBQUcsQ0FBQyxhQUFhLENBQUMsWUFBWSxDQUFDLENBQUM7UUFJbkMsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQ3BCLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO0lBQzdCLENBQUM7SUFFRCxNQUFNLENBQUMsS0FBYSxFQUFFLFdBQW9DLElBQUk7UUFDNUQsS0FBSyxHQUFHLEtBQUssQ0FBQyxXQUFXLEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUVuQyxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsTUFBTSxTQUFTLEVBQUUsS0FBSyxFQUFFLEVBQUUsTUFBTSxFQUFFLEVBQUUsS0FBSyxFQUFFLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNyRixDQUFDO0lBRUQsWUFBWTtRQUNWLElBQUksQ0FBQyxTQUFTLENBQ1osWUFBWSxFQUNaLENBQUMsS0FBbUIsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQ25ILENBQUMsTUFBTSxDQUFDLENBQ1QsQ0FBQztRQUNGLElBQUksQ0FBQyxTQUFTLENBQUMsa0JBQWtCLEVBQUUsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7SUFDbEUsQ0FBQztJQUVPLG1CQUFtQjtRQUN6QixJQUFJLENBQUMsc0JBQXNCLENBQUMsRUFBRSxDQUFDLGdCQUFnQixDQUFDLGtCQUFrQixDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsWUFBMEIsRUFBUSxFQUFFO1lBQ2pILElBQUksQ0FBQyxZQUFZLENBQUMsTUFBTSxJQUFJLFlBQVksQ0FBQyxTQUFTLEtBQUsscUJBQXFCLENBQUMsaUJBQWlCLEVBQUU7Z0JBQzlGLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQzthQUNyQjtRQUNILENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQzsrR0FsQ1Usa0JBQWtCLGtCQU9ULGFBQWE7bUhBUHRCLGtCQUFrQixjQUZqQixNQUFNOzs0RkFFUCxrQkFBa0I7a0JBSDlCLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25COzswQkFRYyxNQUFNOzJCQUFDLGFBQWEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3QsIEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEhvbGRpbmdUeXBlIGFzIEhvbGRpbmdUeXBlQmFzZSB9IGZyb20gJy4uLy4uLy4uL2RiL01vZGVscyc7XG5pbXBvcnQgeyBBcHBFdmVudFR5cGVFbnVtLCBIb2xkaW5nVHJhZGUsIEhvbGRpbmdUcmFkZUltcG9ydCwgSG9sZGluZ1R5cGUsIE5vdGlmaWNhdGlvbiB9IGZyb20gJy4uLy4uLy4uL21vZGVscyc7XG5pbXBvcnQgeyBSZXN0TWV0aG9kLCBSZXN0U2VydmljZSB9IGZyb20gJy4uL3Jlc3QnO1xuaW1wb3J0IHsgSG9sZGluZ1R5cGVDb2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vLi4vY29sbGVjdGlvbnMnO1xuaW1wb3J0IHsgSUV2ZW50TGlzdGVuZXIgfSBmcm9tICcuLi8uLi8uLi9pbnRlcmZhY2VzJztcbmltcG9ydCB7IFVzZXJSb2xlc0VudW0gfSBmcm9tICd0YXh0YW5rLWNvcmUvY29tbW9uJztcbmltcG9ydCB7IEhvbGRpbmdUeXBlQ2F0ZWdvcnlFbnVtIH0gZnJvbSAnLi4vLi4vLi4vZGIvRW51bXMnO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgVXNlckV2ZW50VHlwZVR5cGVFbnVtIH0gZnJvbSAnLi4vLi4vLi4vZGIvRW51bXMvdXNlci1ldmVudC10eXBlLXR5cGUuZW51bSc7XG5cbkBJbmplY3RhYmxlKHtcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnXG59KVxuZXhwb3J0IGNsYXNzIEhvbGRpbmdUeXBlU2VydmljZSBleHRlbmRzIFJlc3RTZXJ2aWNlPEhvbGRpbmdUeXBlQmFzZSwgSG9sZGluZ1R5cGUsIEhvbGRpbmdUeXBlQ29sbGVjdGlvbj4gaW1wbGVtZW50cyBJRXZlbnRMaXN0ZW5lciB7XG4gIG1vZGVsQ2xhc3M6IHR5cGVvZiBIb2xkaW5nVHlwZSA9IEhvbGRpbmdUeXBlO1xuICBjb2xsZWN0aW9uQ2xhc3M6IHR5cGVvZiBIb2xkaW5nVHlwZUNvbGxlY3Rpb24gPSBIb2xkaW5nVHlwZUNvbGxlY3Rpb247XG4gIGVuZHBvaW50VXJpID0gJ2hvbGRpbmctdHlwZXMnO1xuICBkaXNhYmxlZE1ldGhvZHM6IFJlc3RNZXRob2RbXSA9IFsncG9zdEJhdGNoJywgJ3B1dEJhdGNoJywgJ2RlbGV0ZUJhdGNoJ107XG4gIHJvbGVzID0gW1VzZXJSb2xlc0VudW0uSE9MRElOR19UQU5LXTtcblxuICBjb25zdHJ1Y3RvcihASW5qZWN0KCdlbnZpcm9ubWVudCcpIHByb3RlY3RlZCBlbnZpcm9ubWVudDogYW55KSB7XG4gICAgc3VwZXIoZW52aXJvbm1lbnQpO1xuICAgIHRoaXMubGlzdGVuRXZlbnRzKCk7XG4gICAgdGhpcy5saXN0ZW5Ob3RpZmljYXRpb25zKCk7XG4gIH1cblxuICBzZWFyY2gocXVlcnk6IHN0cmluZywgY2F0ZWdvcnk6IEhvbGRpbmdUeXBlQ2F0ZWdvcnlFbnVtID0gbnVsbCk6IE9ic2VydmFibGU8SG9sZGluZ1R5cGVDb2xsZWN0aW9uPiB7XG4gICAgcXVlcnkgPSBxdWVyeS50b0xvd2VyQ2FzZSgpLnRyaW0oKTtcblxuICAgIHJldHVybiB0aGlzLmZldGNoKGAke3RoaXMuYXBpVXJsfS9zZWFyY2hgLCBmYWxzZSwgeyBwYXJhbXM6IHsgcXVlcnksIGNhdGVnb3J5IH0gfSk7XG4gIH1cblxuICBsaXN0ZW5FdmVudHMoKTogdm9pZCB7XG4gICAgdGhpcy5saXN0ZW5DU0UoXG4gICAgICBIb2xkaW5nVHJhZGUsXG4gICAgICAodHJhZGU6IEhvbGRpbmdUcmFkZSkgPT4gdGhpcy5oYXNJbkNhY2hlKHRyYWRlLmhvbGRpbmdUeXBlLmlkKSA/IHRoaXMudXBkYXRlQ2FjaGUoW3RyYWRlLmhvbGRpbmdUeXBlXSwgJ3Bvc3QnKSA6ICcnLFxuICAgICAgWydwb3N0J11cbiAgICApO1xuICAgIHRoaXMubGlzdGVuQ1NFKEhvbGRpbmdUcmFkZUltcG9ydCwgdGhpcy5yZWZyZXNoQ2FjaGUsIFsncG9zdCddKTtcbiAgfVxuXG4gIHByaXZhdGUgbGlzdGVuTm90aWZpY2F0aW9ucygpOiB2b2lkIHtcbiAgICB0aGlzLmV2ZW50RGlzcGF0Y2hlclNlcnZpY2Uub24oQXBwRXZlbnRUeXBlRW51bS5OT1RJRklDQVRJT05fQURERUQpLnN1YnNjcmliZSgobm90aWZpY2F0aW9uOiBOb3RpZmljYXRpb24pOiB2b2lkID0+IHtcbiAgICAgIGlmICghbm90aWZpY2F0aW9uLmlzUmVhZCAmJiBub3RpZmljYXRpb24uZXZlbnRUeXBlID09PSBVc2VyRXZlbnRUeXBlVHlwZUVudW0uU0hBUkVTSUdIVF9JTVBPUlQpIHtcbiAgICAgICAgdGhpcy5yZWZyZXNoQ2FjaGUoKTtcbiAgICAgIH1cbiAgICB9KTtcbiAgfVxufVxuIl19
|