taxtank-core 0.33.103 → 0.33.104

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?
@@ -14534,6 +14533,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 +23312,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 +23327,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 +23370,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 {