taxtank-core 0.33.103 → 0.33.105

package/esm2022/src/lib/services/http/property/property.service.mjs

@@ -1,5 +1,5 @@
 import { Inject, Injectable } from '@angular/core';
-import { throwError } from 'rxjs';
+import { of, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 import { plainToClass } from 'class-transformer';
 import { AppEvent, AppEventTypeEnum, Property, PropertyCategoryMovement, PropertySale, PropertyShare, PropertySubscription, PropertyValuation } from '../../../models';
@@ -116,6 +116,9 @@ export class PropertyService extends RestService {
             updatedProperty.corelogicLastRequest = new Date();
             this.updateCache([updatedProperty], 'put');
             return stats;
+        }), catchError((error) => {
+            this.handleError(error);
+            return of({ growthPercent: 0, lowMarketValue: 0, marketValue: 0, highMarketValue: 0 });
         }));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: PropertyService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -130,4 +133,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
                     type: Inject,
                     args: ['environment']
                 }] }] });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"property.service.js","sourceRoot":"","sources":["../../../../../../../../projects/tt-core/src/lib/services/http/property/property.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable } from '@angular/core';\nimport {\n  Property as PropertyBase,\n  PropertySubscription as PropertySubscriptionBase\n} from '../../../db/Models';\nimport { Observable, throwError } from 'rxjs';\nimport { catchError, map } from 'rxjs/operators';\nimport { plainToClass } from 'class-transformer';\nimport {\n  AppEvent,\n  AppEventTypeEnum, Notification,\n  Property, PropertyCategoryMovement,\n  PropertySale,\n  PropertyShare,\n  PropertySubscription,\n  PropertyValuation\n} from '../../../models';\nimport { IEventListener } from '../../../interfaces';\nimport { RestMethod, RestService } from '../rest';\nimport { PropertyCollection } from '../../../collections';\nimport { UserRolesEnum } from 'taxtank-core/common';\nimport { HttpErrorResponse } from '@angular/common/http';\nimport { PropertyMessagesEnum } from './property-messages.enum';\nimport { PropertyCorelogicStatsInterface } from '../../../models/property/property-corelogic-stats.interface';\nimport { UserEventTypeTypeEnum } from '../../../db/Enums/user-event-type-type.enum';\n\n/**\n * @Todo Alex remove functionality related to PropertyShare\n * @TODO Alex (TT-1777): replace all event listeners with the new this.listen()\n * Service for work with Property\n */\n@Injectable({\n  providedIn: 'root'\n})\nexport class PropertyService extends RestService<PropertyBase, Property, PropertyCollection> implements IEventListener {\n  modelClass: typeof Property = Property;\n  collectionClass: typeof PropertyCollection = PropertyCollection;\n  endpointUri = 'properties';\n  disabledMethods: RestMethod[] = ['deleteBatch'];\n\n  constructor(@Inject('environment') protected environment: any) {\n    super(environment);\n    this.listenEvents();\n    this.listenNotifications();\n  }\n\n  get(): Observable<PropertyCollection> {\n    return super.get().pipe(map((properties) => properties.getActive()));\n  }\n\n  getAll(): Observable<PropertyCollection> {\n    return super.get();\n  }\n\n  /**\n   * @TODO remove when forecast moved to separated api\n   */\n  put(property: Property): Observable<Property> {\n    return super.put(property)\n      .pipe(\n        map((updatedProperty: Property): Property => {\n          this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.PROPERTY_UPDATED, property));\n\n          return updatedProperty;\n        })\n      );\n  }\n\n  sharesightConnect(property: Property): Observable<Property> {\n    return super.put(property, `${this.apiUrl}/${property.id}/sharesight-connect`);\n  }\n\n  sharesightDisconnect(property: Property): Observable<Property> {\n    return super.put(property, `${this.apiUrl}/${property.id}/sharesight-disconnect`);\n  }\n\n  /**\n   * @TODO no refresh cache with this.updateCache([this.getCache().findBy('id', change.model.property.id)], 'put');\n   */\n  listenEvents(): void {\n    // share invite accepted event gives access to new property\n    this.listenCSE(PropertyShare, this.refreshCache, ['put']);\n    // @TODO get from separated api?\n    this.listenCSE(PropertySale, this.refreshCache, ['post', 'put', 'delete']);\n    // property caches child entities to improve performance\n    this.listenCSE(PropertyValuation, (valuations: PropertyValuation[]) => {\n      const property = this.getCache().findBy('id', valuations[0].property.id);\n      if (property.valuation.date < valuations[0].date) {\n        property.valuation = valuations[0];\n        this.updateCache([property], 'put');\n      }\n    });\n    this.listenCSE(PropertyCategoryMovement, this.refreshCache);\n  }\n\n  private listenNotifications(): void {\n    this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification: Notification): void => {\n      if (!notification.isRead && notification.eventType === UserEventTypeTypeEnum.SHARESIGHT_IMPORT) {\n        this.refreshCache();\n      }\n    });\n  }\n\n  updateDepreciationCalculation(property: Property): Observable<void> {\n    const propertyToUpdate: Property = plainToClass(Property, { id: property.id, depreciationCalculation: property.depreciationCalculation })\n\n    return this.put(propertyToUpdate)\n      .pipe(\n        map((updatedProperty: Property) => {\n          this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.PROPERTY_DEPRECIATION_CALCULATION_UPDATED, updatedProperty));\n        })\n      );\n  }\n\n  /**\n   * @TODO move to separated api\n   * Activate deactivated property\n   */\n  activate(property: Property): Observable<void> {\n    return this.http.post(`${this.environment.apiV2}/property-subscriptions`, { property })\n      .pipe(\n        map((propertySubscriptionBase: PropertySubscriptionBase) => {\n          const newPropertySubscription: PropertySubscription = plainToClass(PropertySubscription, propertySubscriptionBase);\n          const activatedProperty: Property = plainToClass(Property, Object.assign({}, property, { subscriptions: [newPropertySubscription] }));\n\n          this.updateCache([activatedProperty], 'put');\n        })\n      );\n  }\n\n  /**\n   * @TODO move to separated api\n   * Deactivate activated property\n   */\n  deactivate(property: Property): Observable<void> {\n    return this.http.delete(`${this.environment.apiV2}/property-subscriptions/${property.getCurrentSubscription().id}`)\n      .pipe(\n        map(() => {\n          const deactivatedProperty: Property = plainToClass(Property, Object.assign({}, property, { subscriptions: [] }));\n\n          this.updateCache([deactivatedProperty], 'put');\n        })\n      );\n  }\n\n  delete(property: Property): Observable<void> {\n    return super.delete(property).pipe(\n      catchError((error: HttpErrorResponse) => {\n        if (error.status === 500) {\n          this.toastService.error(PropertyMessagesEnum.DELETE_500);\n        }\n\n        return throwError(() => error);\n      }),\n    )\n  }\n\n  getCorelogicStats(property: Property): Observable<PropertyCorelogicStatsInterface> {\n    return this.http.get<PropertyCorelogicStatsInterface>(`${this.apiUrl}/${property.id}/corelogic-stats`)\n      .pipe(map((stats) => {\n        const updatedProperty = this.getCache().findBy('id', property.id);\n        updatedProperty.corelogicLastRequest = new Date();\n        this.updateCache([updatedProperty], 'put');\n\n        return stats;\n      }));\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"property.service.js","sourceRoot":"","sources":["../../../../../../../../projects/tt-core/src/lib/services/http/property/property.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable } from '@angular/core';\nimport {\n  Property as PropertyBase,\n  PropertySubscription as PropertySubscriptionBase\n} from '../../../db/Models';\nimport { Observable, of, throwError } from 'rxjs';\nimport { catchError, map } from 'rxjs/operators';\nimport { plainToClass } from 'class-transformer';\nimport {\n  AppEvent,\n  AppEventTypeEnum, Notification,\n  Property, PropertyCategoryMovement,\n  PropertySale,\n  PropertyShare,\n  PropertySubscription,\n  PropertyValuation\n} from '../../../models';\nimport { IEventListener } from '../../../interfaces';\nimport { RestMethod, RestService } from '../rest';\nimport { PropertyCollection } from '../../../collections';\nimport { UserRolesEnum } from 'taxtank-core/common';\nimport { HttpErrorResponse } from '@angular/common/http';\nimport { PropertyMessagesEnum } from './property-messages.enum';\nimport { PropertyCorelogicStatsInterface } from '../../../models/property/property-corelogic-stats.interface';\nimport { UserEventTypeTypeEnum } from '../../../db/Enums/user-event-type-type.enum';\n\n/**\n * @Todo Alex remove functionality related to PropertyShare\n * @TODO Alex (TT-1777): replace all event listeners with the new this.listen()\n * Service for work with Property\n */\n@Injectable({\n  providedIn: 'root'\n})\nexport class PropertyService extends RestService<PropertyBase, Property, PropertyCollection> implements IEventListener {\n  modelClass: typeof Property = Property;\n  collectionClass: typeof PropertyCollection = PropertyCollection;\n  endpointUri = 'properties';\n  disabledMethods: RestMethod[] = ['deleteBatch'];\n\n  constructor(@Inject('environment') protected environment: any) {\n    super(environment);\n    this.listenEvents();\n    this.listenNotifications();\n  }\n\n  get(): Observable<PropertyCollection> {\n    return super.get().pipe(map((properties) => properties.getActive()));\n  }\n\n  getAll(): Observable<PropertyCollection> {\n    return super.get();\n  }\n\n  /**\n   * @TODO remove when forecast moved to separated api\n   */\n  put(property: Property): Observable<Property> {\n    return super.put(property)\n      .pipe(\n        map((updatedProperty: Property): Property => {\n          this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.PROPERTY_UPDATED, property));\n\n          return updatedProperty;\n        })\n      );\n  }\n\n  sharesightConnect(property: Property): Observable<Property> {\n    return super.put(property, `${this.apiUrl}/${property.id}/sharesight-connect`);\n  }\n\n  sharesightDisconnect(property: Property): Observable<Property> {\n    return super.put(property, `${this.apiUrl}/${property.id}/sharesight-disconnect`);\n  }\n\n  /**\n   * @TODO no refresh cache with this.updateCache([this.getCache().findBy('id', change.model.property.id)], 'put');\n   */\n  listenEvents(): void {\n    // share invite accepted event gives access to new property\n    this.listenCSE(PropertyShare, this.refreshCache, ['put']);\n    // @TODO get from separated api?\n    this.listenCSE(PropertySale, this.refreshCache, ['post', 'put', 'delete']);\n    // property caches child entities to improve performance\n    this.listenCSE(PropertyValuation, (valuations: PropertyValuation[]) => {\n      const property = this.getCache().findBy('id', valuations[0].property.id);\n      if (property.valuation.date < valuations[0].date) {\n        property.valuation = valuations[0];\n        this.updateCache([property], 'put');\n      }\n    });\n    this.listenCSE(PropertyCategoryMovement, this.refreshCache);\n  }\n\n  private listenNotifications(): void {\n    this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification: Notification): void => {\n      if (!notification.isRead && notification.eventType === UserEventTypeTypeEnum.SHARESIGHT_IMPORT) {\n        this.refreshCache();\n      }\n    });\n  }\n\n  updateDepreciationCalculation(property: Property): Observable<void> {\n    const propertyToUpdate: Property = plainToClass(Property, { id: property.id, depreciationCalculation: property.depreciationCalculation })\n\n    return this.put(propertyToUpdate)\n      .pipe(\n        map((updatedProperty: Property) => {\n          this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.PROPERTY_DEPRECIATION_CALCULATION_UPDATED, updatedProperty));\n        })\n      );\n  }\n\n  /**\n   * @TODO move to separated api\n   * Activate deactivated property\n   */\n  activate(property: Property): Observable<void> {\n    return this.http.post(`${this.environment.apiV2}/property-subscriptions`, { property })\n      .pipe(\n        map((propertySubscriptionBase: PropertySubscriptionBase) => {\n          const newPropertySubscription: PropertySubscription = plainToClass(PropertySubscription, propertySubscriptionBase);\n          const activatedProperty: Property = plainToClass(Property, Object.assign({}, property, { subscriptions: [newPropertySubscription] }));\n\n          this.updateCache([activatedProperty], 'put');\n        })\n      );\n  }\n\n  /**\n   * @TODO move to separated api\n   * Deactivate activated property\n   */\n  deactivate(property: Property): Observable<void> {\n    return this.http.delete(`${this.environment.apiV2}/property-subscriptions/${property.getCurrentSubscription().id}`)\n      .pipe(\n        map(() => {\n          const deactivatedProperty: Property = plainToClass(Property, Object.assign({}, property, { subscriptions: [] }));\n\n          this.updateCache([deactivatedProperty], 'put');\n        })\n      );\n  }\n\n  delete(property: Property): Observable<void> {\n    return super.delete(property).pipe(\n      catchError((error: HttpErrorResponse) => {\n        if (error.status === 500) {\n          this.toastService.error(PropertyMessagesEnum.DELETE_500);\n        }\n\n        return throwError(() => error);\n      }),\n    )\n  }\n\n  getCorelogicStats(property: Property): Observable<PropertyCorelogicStatsInterface> {\n    return this.http.get<PropertyCorelogicStatsInterface>(`${this.apiUrl}/${property.id}/corelogic-stats`)\n      .pipe(\n        map((stats) => {\n          const updatedProperty = this.getCache().findBy('id', property.id);\n          updatedProperty.corelogicLastRequest = new Date();\n          this.updateCache([updatedProperty], 'put');\n\n          return stats;\n        }),\n        catchError((error: unknown) => {\n          this.handleError(error);\n\n          return of({ growthPercent: 0, lowMarketValue: 0, marketValue: 0, highMarketValue: 0 });\n        })\n      );\n  }\n}\n"]}

package/fesm2022/taxtank-core.mjs

@@ -2311,6 +2311,7 @@ class PropertyCategoryMovementCollection extends Collection {
      * @TODO TT-2355 Alex refactor propertyForecast, use separated api (then I can remove property from param)
      */
     filterByForecast(property, forecast) {
+        console.log(property, forecast);
         return this.filterBy('property.id', property.id)
             .filterByFinancialYear('fromDate', 'toDate', new FinancialYear(forecast.financialYear));
     }
@@ -4387,7 +4388,8 @@ __decorate([
 
 var SharesightDetailsMessagesEnum;
 (function (SharesightDetailsMessagesEnum) {
-    SharesightDetailsMessagesEnum["CONNECTED"] = "We're syncing your ShareSight trades, which might take a few minutes.";
+    SharesightDetailsMessagesEnum["HOLDING_CONNECTED"] = "We're syncing your ShareSight trades, which might take a few minutes.";
+    SharesightDetailsMessagesEnum["PROPERTY_CONNECTED"] = "We're syncing your properties, which might take a few minutes.";
     SharesightDetailsMessagesEnum["DISCONNECTED"] = "Sharesight disconnected";
     SharesightDetailsMessagesEnum["DISCONNECT_CONFIRM"] = "Disconnecting ShareSight means we can no longer sync data. Any trades already imported will become editable in TaxTank.";
     SharesightDetailsMessagesEnum["ERROR"] = "Sharesight connection error";
@@ -4403,6 +4405,9 @@ class SharesightDetails extends AbstractModel {
     isHolding() {
         return this.redirectUri.includes('holdings-tank');
     }
+    get connectedMessage() {
+        return this.isHolding() ? SharesightDetailsMessagesEnum.HOLDING_CONNECTED : SharesightDetailsMessagesEnum.PROPERTY_CONNECTED;
+    }
 }
 __decorate([
     Type(() => Date)
@@ -5663,6 +5668,11 @@ __decorate([
 class PropertyForecast extends PropertyForecast$1 {
     constructor() {
         super(...arguments);
+        this.income = 0;
+        this.expense = 0;
+        this.interest = 0;
+        this.depreciation = 0;
+        this.loanBalance = 0;
         this.financialYear = new FinancialYear(new Date()).year;
     }
     /**
@@ -5679,13 +5689,6 @@ class PropertyForecast extends PropertyForecast$1 {
     get taxPosition() {
         return this.cashPosition + this.depreciation;
     }
-    /**
-     * Get rental return percent
-     * Rental Return = Income / Market Value
-     */
-    get rentalReturn() {
-        return this.income / this.marketValue;
-    }
 }
 __decorate([
     Transform(({ value }) => +value)
@@ -5702,9 +5705,6 @@ __decorate([
 __decorate([
     Transform(({ value }) => +value)
 ], PropertyForecast.prototype, "loanBalance", void 0);
-__decorate([
-    Transform(({ value }) => +value)
-], PropertyForecast.prototype, "marketValue", void 0);
 
 /**
  * propertySale docs - https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4209508353/Property+Sold+button
@@ -5749,7 +5749,7 @@ class Property extends Property$1 {
             ?? plainToClass(PropertyForecast, {});
     }
     get forecastedRentalReturn() {
-        return this.currentYearForecast?.rentalReturn || 0;
+        return (this.currentYearForecast?.income ?? 0) / this.valuation.marketValue;
     }
     get forecastedTaxPosition() {
         return this.currentYearForecast?.taxPosition || 0;
@@ -5777,7 +5777,7 @@ class Property extends Property$1 {
         return this.subscriptions[0];
     }
     getForecastByYear(year) {
-        return this.forecasts.find((forecast) => forecast.financialYear === year);
+        return this.forecasts.find((forecast) => forecast.financialYear === year) ?? plainToClass(PropertyForecast, {});
     }
     get isShared() {
         return this.shares.length > 1;
@@ -8101,7 +8101,6 @@ class PropertyReportItemDepreciation extends PropertyReportItem {
     constructor(depreciations, property, chartAccounts) {
         super(property, chartAccounts);
         this.amount = Math.abs(depreciations.getCurrentYearForecastAmount());
-        console.log(depreciations.first.type);
         this.description = DEPRECIATION_TYPE_LABELS[depreciations.first.type];
     }
 }
@@ -9072,7 +9071,7 @@ class BankAccountCollection extends Collection {
         return this.getLoanAccounts().reduce((sum, bankAccount) => sum + bankAccount.getMonthlyRepaymentAmount(propertyId), 0);
     }
     getLVR(property) {
-        return this.getPropertyBalanceAmount(property.id) / property.currentYearForecast.marketValue;
+        return this.getPropertyBalanceAmount(property.id) / property.valuation.marketValue;
     }
     /**
      * @TODO Alex/Vik: maybe we should get it from jwtToken or think about some localStorageService?
@@ -14397,6 +14396,7 @@ class PropertyValuationService extends RestService$1 {
         this.modelClass = PropertyValuation;
         this.collectionClass = PropertyValuationCollection;
         this.disabledMethods = ['postBatch', 'putBatch'];
+        this.useBackendError = true;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: PropertyValuationService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: PropertyValuationService, providedIn: 'root' }); }
@@ -14534,6 +14534,9 @@ class PropertyService extends RestService$1 {
             updatedProperty.corelogicLastRequest = new Date();
             this.updateCache([updatedProperty], 'put');
             return stats;
+        }), catchError((error) => {
+            this.handleError(error);
+            return of({ growthPercent: 0, lowMarketValue: 0, marketValue: 0, highMarketValue: 0 });
         }));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: PropertyService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -23310,7 +23313,6 @@ class PropertyForecastForm extends AbstractForm {
         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),
@@ -23326,30 +23328,33 @@ class PropertyForecastForm extends AbstractForm {
 class PropertyAddForm extends AbstractForm {
     constructor() {
         super({
-            address: new UntypedFormControl(null, Validators.required),
-            purchasePrice: new UntypedFormControl(null, Validators.required),
-            contractDate: new UntypedFormControl(null, [
+            address: new FormControl(null, Validators.required),
+            purchasePrice: new FormControl(null, Validators.required),
+            contractDate: new FormControl(null, [
                 Validators.required,
                 maxDateValidator(new FinancialYear().endDate, 'You cannot add a property with a contract date in future financial years.')
             ]),
-            settlementDate: new UntypedFormControl(null, Validators.required),
-            forecasts: new UntypedFormArray([
-                new PropertyForecastForm()
-            ]),
-            shares: new UntypedFormArray([
-                new PropertyShareForm()
-            ]),
-            categoryMovements: new UntypedFormArray([
-                new PropertyCategoryMovementForm()
-            ])
+            settlementDate: new FormControl(null, Validators.required),
+            share: new PropertyShareForm(),
+            forecast: new PropertyForecastForm(),
+            category: new FormControl(null, Validators.required)
         }, plainToClass(Property, {}));
-        // we should put the same market value to both, forecast and valuation. also we moved marketValue to another form - leave it as 0
-        this.valuationForm.get('marketValue').setValue(0);
-        this.forecastForm.get('marketValue').setValue(0);
-        this.get('contractDate').valueChanges.subscribe((contractDate) => {
-            this.categoryMovementForm.get('fromDate').setValue(contractDate);
+        this.listenEvents();
+    }
+    get forecastForm() {
+        return this.get('forecast');
+    }
+    submit() {
+        return super.submit({
+            shares: [this.value.share],
+            forecasts: [this.forecastForm.submit()]
         });
-        this.categoryMovementForm.get('propertyCategory').valueChanges.subscribe((category) => {
+    }
+    listenEvents() {
+        this.listenCategoryChanges();
+    }
+    listenCategoryChanges() {
+        this.get('category').valueChanges.subscribe((category) => {
             if (category.isShared()) {
                 this.forecastForm.get('claimPercent').enable();
             }
@@ -23366,21 +23371,6 @@ class PropertyAddForm extends AbstractForm {
             }
         });
     }
-    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 {